WIP: Define connect drag layer to specify drag preview within drag source

Co-authored-by: D8H <Davy.Helard@gmail.com>

.github/workflows/build-storybook.yml

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

.github/workflows/extract-translations.yml

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

.github/workflows/update-translations.yml

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

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -726,6 +726,8 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
              metadata.GetType() == "fontResource" ||
              metadata.GetType() == "imageResource" ||
              metadata.GetType() == "jsonResource" ||
+             metadata.GetType() == "tilemapResource" ||
+             metadata.GetType() == "tilesetResource" ||
              metadata.GetType() == "videoResource" ||
              // Deprecated, old parameter names:
              metadata.GetType() == "password" || metadata.GetType() == "musicfile" ||

Core/GDCore/Extensions/Builtin/AdvancedExtension.cpp

@@ -34,6 +34,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           "res/function32.png")
       .SetHelpPath("/events/functions/return")
       .AddParameter("expression", "The number to be returned")
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -48,6 +49,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           "res/function32.png")
       .SetHelpPath("/events/functions/return")
       .AddParameter("string", "The text to be returned")
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -61,6 +63,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                  "res/function32.png")
       .SetHelpPath("/events/functions/return")
       .AddParameter("trueorfalse", "Should the condition be true or false?")
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -75,6 +78,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
                     "res/function32.png",
                     "res/function32.png")
       .AddParameter("functionParameterName", "Parameter name")
+      .SetRelevantForFunctionEventsOnly()
       .MarkAsAdvanced();
 
   extension
@@ -84,7 +88,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           _("Get function parameter (also called \"argument\") value."),
           "",
           "res/function16.png")
-      .AddParameter("functionParameterName", "Parameter name");
+      .AddParameter("functionParameterName", "Parameter name")
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddStrExpression(
@@ -93,7 +98,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           _("Get function parameter (also called \"argument\") text."),
           "",
           "res/function16.png")
-      .AddParameter("functionParameterName", "Parameter name");
+      .AddParameter("functionParameterName", "Parameter name")
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddCondition(
@@ -105,7 +111,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           "res/function32.png",
           "res/function16.png")
       .AddParameter("functionParameterName", "Parameter name")
-      .UseStandardRelationalOperatorParameters("number");
+      .UseStandardRelationalOperatorParameters(
+          "number", gd::ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly();
 
   extension
       .AddCondition(
@@ -117,7 +125,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(
           "res/function32.png",
           "res/function16.png")
       .AddParameter("functionParameterName", "Parameter name")
-      .UseStandardRelationalOperatorParameters("string");
+      .UseStandardRelationalOperatorParameters(
+          "string", gd::ParameterOptions::MakeNewOptions())
+      .SetRelevantForFunctionEventsOnly();
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/AsyncExtension.cpp

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

Core/GDCore/Extensions/Builtin/AudioExtension.cpp

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

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -27,6 +27,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .SetIcon("res/actions/create24.png");
   extension.AddInstructionOrExpressionGroupMetadata(_("Movement using forces"))
       .SetIcon("res/actions/force24.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Variables"))
+      .SetIcon("res/conditions/var24.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Position"))
+      .SetIcon("res/actions/position24_black.png");
 
   gd::ObjectMetadata& obj = extension.AddObject<gd::ObjectConfiguration>(
       "", _("Base object"), _("Base object"), "res/objeticon24.png");
@@ -40,7 +44,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/position_black.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
       .MarkAsSimple();
 
   obj.AddAction("MettreX",
@@ -52,7 +57,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/position_black.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters("number",
+                                     ParameterOptions::MakeNewOptions())
       .MarkAsSimple();
 
   obj.AddCondition("PosY",
@@ -64,7 +70,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/position_black.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
       .MarkAsSimple();
 
   obj.AddAction("MettreY",
@@ -76,7 +83,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/position_black.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters("number",
+                                     ParameterOptions::MakeNewOptions())
       .MarkAsSimple();
 
   obj.AddAction("MettreXY",
@@ -120,7 +128,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Position/Center"),
          "res/actions/position24_black.png")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
 
   obj.AddExpressionAndConditionAndAction(
          "number",
@@ -131,7 +139,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Position/Center"),
          "res/actions/position24_black.png")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxLeft",
@@ -142,7 +150,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("Position/Bounding Box"),
                                 "res/conditions/bounding-box-left_black.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
 
   obj.AddExpressionAndCondition(
          "number",
@@ -153,7 +161,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
          _("Position/Bounding Box"),
          "res/conditions/bounding-box-top_black.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxRight",
@@ -164,7 +172,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("Position/Bounding Box"),
                                 "res/conditions/bounding-box-right_black.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxBottom",
@@ -175,7 +183,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("Position/Bounding Box"),
                                 "res/conditions/bounding-box-bottom_black.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxCenterX",
@@ -186,7 +194,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("Position/Bounding Box"),
                                 "res/conditions/bounding-box-center_black.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
 
   obj.AddExpressionAndCondition("number",
                                 "BoundingBoxCenterY",
@@ -197,7 +205,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                                 _("Position/Bounding Box"),
                                 "res/conditions/bounding-box-center_black.svg")
       .AddParameter("object", _("Object"))
-      .UseStandardParameters("number");
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions());
 
   obj.AddAction("MettreAutourPos",
                 _("Put around a position"),
@@ -226,7 +234,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/direction_black.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardOperatorParameters("number");
+      .UseStandardOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Angle (in degrees)")));
 
   obj.AddAction("Rotate",
                 _("Rotate"),
@@ -382,7 +393,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                 "res/actions/planicon.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardOperatorParameters("number");
+      .UseStandardOperatorParameters("number",
+                                     ParameterOptions::MakeNewOptions());
 
   obj.AddAction("ChangeLayer",
                 _("Layer"),
@@ -398,8 +410,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddAction("ModVarObjet",
-                _("Value of an object variable"),
-                _("Change the value of an object variable."),
+                _("Change number variable"),
+                _("Modify the number value of an object variable."),
                 _("the variable _PARAM1_"),
                 _("Variables"),
                 "res/actions/var24.png",
@@ -407,11 +419,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .UseStandardOperatorParameters("number");
+      .UseStandardOperatorParameters("number",
+                                     ParameterOptions::MakeNewOptions());
 
   obj.AddAction("ModVarObjetTxt",
-                _("Text of an object variable"),
-                _("Change the text of an object variable."),
+                _("Change text variable"),
+                _("Modify the text of an object variable."),
                 _("the text of variable _PARAM1_"),
                 _("Variables"),
                 "res/actions/var24.png",
@@ -419,11 +432,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .UseStandardOperatorParameters("string");
+      .UseStandardOperatorParameters("string",
+                                     ParameterOptions::MakeNewOptions());
 
   obj.AddAction("SetObjectVariableAsBoolean",
-                _("Boolean value of an object variable"),
-                _("Change the boolean value of an object variable."),
+                _("Change boolean variable"),
+                _("Modify the boolean value of an object variable."),
                 _("Set the boolean value of variable _PARAM1_ of "
                   "_PARAM0_ to _PARAM2_"),
                 _("Variables"),
@@ -436,7 +450,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddAction(
          "ToggleObjectVariableAsBoolean",
-         _("Toggle the boolean value of an object variable"),
+         _("Toggle boolean variable"),
          _("Toggles the boolean value of an object variable.") + "\n" +
              _("If it was true, it will become false, and if it was false "
                "it will become true."),
@@ -451,37 +465,39 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddCondition("ObjectVariableChildExists",
                    _("Child existence"),
-                   _("Check if the specified child of the variable exists."),
+                   _("Check if the specified child of the object "
+                     "structure variable exists."),
                    _("Child _PARAM2_ of variable _PARAM1_ of _PARAM0_ exists"),
-                   _("Variables/Collections/Structures"),
+                   _("Variables/Arrays and structures"),
                    "res/conditions/var24.png",
                    "res/conditions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("objectvar", _("Structure variable"))
       .AddParameter("string", _("Name of the child"))
       .MarkAsAdvanced();
 
   obj.AddAction("ObjectVariableRemoveChild",
                 _("Remove a child"),
-                _("Remove a child from an object variable."),
+                _("Remove a child from an object structure variable."),
                 _("Remove child _PARAM2_ from variable _PARAM1_ of _PARAM0_"),
-                _("Variables/Collections/Structures"),
+                _("Variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("objectvar", _("Structure variable"))
       .AddParameter("string", _("Child's name"))
       .MarkAsAdvanced();
 
   obj.AddAction("ObjectVariableClearChildren",
-                _("Clear variable"),
-                _("Remove all the children from the object variable."),
+                _("Clear children"),
+                _("Remove all the children from the object array or structure "
+                  "variable."),
                 _("Clear children from variable _PARAM1_ of _PARAM0_"),
-                _("Variables/Collections"),
+                _("Variables/Arrays and structures"),
                 "res/actions/var24.png",
                 "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("objectvar", _("Array or structure variable"))
       .MarkAsAdvanced();
 
   obj.AddAction("Cache",
@@ -516,7 +532,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/direction_black.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          ParameterOptions::MakeNewOptions().SetDescription(
+              _("Angle to compare to (in degrees)")))
       .MarkAsAdvanced();
 
   obj.AddCondition("Plan",
@@ -528,7 +547,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/planicon.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   obj.AddCondition("Layer",
@@ -585,7 +605,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                    "res/conditions/vitesse.png")
 
       .AddParameter("object", _("Object"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   obj.AddCondition("AngleOfDisplacement",
@@ -604,8 +625,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsAdvanced();
 
   obj.AddCondition("VarObjet",
-                   _("Value of an object variable"),
-                   _("Compare the value of an object variable."),
+                   _("Number variable"),
+                   _("Compare the number value of an object variable."),
                    _("the variable _PARAM1_"),
                    _("Variables"),
                    "res/conditions/var24.png",
@@ -613,10 +634,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters("number");
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions());
 
   obj.AddCondition("VarObjetTxt",
-                   _("Text of an object variable"),
+                   _("Text variable"),
                    _("Compare the text of an object variable."),
                    _("the text of variable _PARAM1_"),
                    _("Variables"),
@@ -625,10 +647,11 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"))
-      .UseStandardRelationalOperatorParameters("string");
+      .UseStandardRelationalOperatorParameters(
+          "string", ParameterOptions::MakeNewOptions());
 
   obj.AddCondition("ObjectVariableAsBoolean",
-                   _("Boolean value of an object variable"),
+                   _("Boolean variable"),
                    _("Compare the boolean value of an object variable."),
                    _("The boolean value of variable _PARAM1_ of object "
                      "_PARAM0_ is _PARAM2_"),
@@ -642,7 +665,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
   obj.AddCondition("VarObjetDef",
                    "Variable defined",
-                   "Check if the variable is defined.",
+                   "Check if the object variable is defined.",
                    "Variable _PARAM1 of _PARAM0_ is defined",
                    _("Variables"),
                    "res/conditions/var24.png",
@@ -650,78 +673,131 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
 
       .AddParameter("object", _("Object"))
       .AddParameter("string", _("Variable"))
-      .SetHidden();
+      .SetHidden();  // Deprecated.
 
   obj.AddAction(
          "ObjectVariablePush",
-         _("Append variable to an object array"),
-         _("Appends a variable to the end of an object array variable."),
-         _("Append variable _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Collections/Arrays"),
+         _("Add existing variable"),
+         _("Adds an existing variable to the end of an object array variable."),
+         _("Add variable _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("scenevar", _("Scene variable with the content to append"))
-      .SetParameterLongDescription(
-          _("The content of the variable will *be copied* and appended at the "
-            "end of the array."))
+      .AddParameter("scenevar", _("Scene variable with the content to add"))
+      .SetParameterLongDescription(_("The content of the object variable will "
+                                     "*be copied* and added at the "
+                                     "end of the array."))
       .MarkAsAdvanced();
 
   obj.AddAction(
          "ObjectVariablePushString",
-         _("Append a string to an object array"),
-         _("Appends a string to the end of an object array variable."),
-         _("Append string _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Collections/Arrays"),
+         _("Add text variable"),
+         _("Adds a text (string) to the end of an object array variable."),
+         _("Add text _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("string", _("String to append"))
+      .AddParameter("string", _("Text to add"))
       .MarkAsAdvanced();
 
-  obj.AddAction(
-         "ObjectVariablePushNumber",
-         _("Append a number to an object array"),
-         _("Appends a number to the end of an object array variable."),
-         _("Append number _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Collections/Arrays"),
-         "res/actions/var24.png",
-         "res/actions/var.png")
+  obj.AddAction("ObjectVariablePushNumber",
+                _("Add number variable"),
+                _("Adds a number to the end of an object array variable."),
+                _("Add number _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+                _("Variables/Arrays and structures"),
+                "res/actions/var24.png",
+                "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("expression", _("Number to append"))
+      .AddParameter("expression", _("Number to add"))
       .MarkAsAdvanced();
 
   obj.AddAction(
          "ObjectVariablePushBool",
-         _("Append a boolean to an object array"),
-         _("Appends a boolean to the end of an object array variable."),
-         _("Append boolean _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
-         _("Variables/Collections/Arrays"),
+         _("Add boolean variable"),
+         _("Adds a boolean to the end of an object array variable."),
+         _("Add boolean _PARAM2_ to array variable _PARAM1_ of _PARAM0_"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Array variable"))
-      .AddParameter("trueorfalse", _("Boolean to append"))
+      .AddParameter("trueorfalse", _("Boolean to add"))
       .MarkAsAdvanced();
 
   obj.AddAction(
          "ObjectVariableRemoveAt",
-         _("Remove variable from an object array (by index)"),
+         _("Remove variable by index"),
          _("Removes a variable at the specified index of an object array "
            "variable."),
          _("Remove variable at index _PARAM2_ from array variable _PARAM1_ of "
            "_PARAM0_"),
-         _("Variables/Collections/Arrays"),
+         _("Variables/Arrays and structures"),
          "res/actions/var24.png",
          "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
+      .AddParameter("objectvar", _("Array variable"))
       .AddParameter("expression", _("Index to remove"))
       .MarkAsAdvanced();
 
+  obj.AddCondition(
+         "ObjectVariableChildCount",
+         _("Number of children"),
+         _("Compare the number of children in an object array variable."),
+         _("The number of children in the array variable _PARAM1_"),
+         _("Variables/Arrays and structures"),
+         "res/conditions/var24.png",
+         "res/conditions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Variable"))
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
+      .MarkAsAdvanced();
+
+  obj.AddStrExpression(
+         "ArrayVariableFirstString",
+         _("First text child"),
+         _("Get the value of the first element of an object array variable, if "
+           "it is a text (string) variable."),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"));
+
+  obj.AddExpression(
+         "ArrayVariableFirstNumber",
+         _("First number child"),
+         _("Get the value of the first element of an object array variable, if "
+           "it is a number variable."),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"));
+
+  obj.AddStrExpression(
+         "ArrayVariableLastString",
+         _("Last text child"),
+         _("Get the value of the last element of an object array variable, if "
+           "it is a text (string) variable."),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"));
+
+  obj.AddExpression(
+         "ArrayVariableLastNumber",
+         _("Last number child"),
+         _("Get the value of the last element of an object array variable, if "
+           "it is a number variable."),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("objectvar", _("Array variable"));
+
   obj.AddCondition("BehaviorActivated",
                    _("Behavior activated"),
                    _("Check if the behavior is activated for the object."),
@@ -1098,23 +1174,24 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("expression", _("Target Y position"));
 
   obj.AddExpression("Variable",
-                    _("Value of an object variable"),
-                    _("Value of an object variable"),
+                    _("Number variable"),
+                    _("Number value of an object variable"),
                     _("Variables"),
                     "res/actions/var.png")
       .AddParameter("object", _("Object"))
       .AddParameter("objectvar", _("Variable"));
 
-  obj.AddExpression("VariableChildCount",
-                    _("Number of children of an object variable"),
-                    _("Number of children of an object variable"),
-                    _("Variables"),
-                    "res/actions/var.png")
+  obj.AddExpression(
+         "VariableChildCount",
+         _("Number of children"),
+         _("Number of children in an object array or structure variable"),
+         _("Variables/Arrays and structures"),
+         "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"));
+      .AddParameter("objectvar", _("Array or structure variable"));
 
   obj.AddStrExpression("VariableString",
-                       _("Text of an object variable"),
+                       _("Text variable"),
                        _("Text of an object variable"),
                        _("Variables"),
                        "res/actions/var.png")
@@ -1248,6 +1325,17 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .MarkAsSimple()
       .SetRequiresBaseObjectCapability("effect");
 
+  obj.AddAction("SetIncludedInParentCollisionMask",
+                _("Include in parent collision mask"),
+                _("Include or exclude a child from its parent collision mask."),
+                _("Include _PARAM0_ in parent object collision mask: _PARAM1_"),
+                _("Collision"),
+                "res/function32.png",
+                "res/function32.png")
+      .AddParameter("object", _("Object"))
+      .AddParameter("yesorno", "Include in parent collision mask")
+      .SetRelevantForCustomObjectEventsOnly();
+
   extension
       .AddAction("Create",
                  _("Create an object"),
@@ -1276,7 +1364,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                  "res/actions/create24.png",
                  "res/actions/create24.png")
       .AddCodeOnlyParameter("objectsContext", "")
-      .AddParameter("objectListOrEmptyIfJustDeclared", _("Group of potential objects"))
+      .AddParameter("objectListOrEmptyIfJustDeclared",
+                    _("Group of potential objects"))
       .SetParameterLongDescription(
           _("Group containing objects that can be created by the action."))
       .AddParameter("string", _("Name of the object to create"))
@@ -1423,34 +1512,39 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
           "res/conditions/nbObjet24.png",
           "res/conditions/nbObjet.png")
       .AddParameter("objectList", _("Object"))
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", ParameterOptions::MakeNewOptions())
       .MarkAsSimple()
       .SetHidden();
 
-  extension.AddExpressionAndCondition(
-      "number",
-      "SceneInstancesCount",
-      _("Number of object instances on the scene"),
-      _("the number of instances of the specified objects living on the scene"),
-      _("the number of _PARAM1_ living on the scene"),
-      _("Objects"),
-      "res/conditions/nbObjet24.png")
-    .AddCodeOnlyParameter("objectsContext", "")
-    .AddParameter("objectListOrEmptyWithoutPicking", _("Object"))
-    .UseStandardParameters("number")
-    .MarkAsSimple();
+  extension
+      .AddExpressionAndCondition(
+          "number",
+          "SceneInstancesCount",
+          _("Number of object instances on the scene"),
+          _("the number of instances of the specified objects living on the "
+            "scene"),
+          _("the number of _PARAM1_ living on the scene"),
+          _("Objects"),
+          "res/conditions/nbObjet24.png")
+      .AddCodeOnlyParameter("objectsContext", "")
+      .AddParameter("objectListOrEmptyWithoutPicking", _("Object"))
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .MarkAsSimple();
 
-  extension.AddExpressionAndCondition(
-      "number",
-      "PickedInstancesCount",
-      _("Number of object instances currently picked"),
-      _("the number of instances picked by the previous conditions (or actions)"),
-      _("the number of _PARAM0_ currently picked"),
-      _("Objects"),
-      "res/conditions/nbObjet24.png")
-    .AddParameter("objectListOrEmptyWithoutPicking", _("Object"))
-    .UseStandardParameters("number")
-    .MarkAsSimple();
+  extension
+      .AddExpressionAndCondition(
+          "number",
+          "PickedInstancesCount",
+          _("Number of object instances currently picked"),
+          _("the number of instances picked by the previous conditions (or "
+            "actions)"),
+          _("the number of _PARAM0_ currently picked"),
+          _("Objects"),
+          "res/conditions/nbObjet24.png")
+      .AddParameter("objectListOrEmptyWithoutPicking", _("Object"))
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
+      .MarkAsSimple();
 
   extension
       .AddCondition(
@@ -1559,7 +1653,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                      "",
                      "res/conditions/nbObjet.png")
       .AddParameter("objectList", _("Object"))
-      .SetHidden(); // Deprecated
+      .SetHidden();  // Deprecated
 
   obj.AddStrExpression("ObjectName",
                        _("Object name"),

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -26,6 +26,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .SetExtensionHelpPath("/interface/scene-editor/layers-and-cameras");
   extension.AddInstructionOrExpressionGroupMetadata(_("Layers and cameras"))
       .SetIcon("res/conditions/camera24.png");
+  extension.AddInstructionOrExpressionGroupMetadata(_("Effects"))
+      .SetIcon("res/actions/effect24.png");
 
   extension
       .AddExpressionAndConditionAndAction(
@@ -37,7 +39,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
@@ -69,7 +71,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
@@ -104,7 +106,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
@@ -120,7 +122,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
@@ -137,7 +139,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
@@ -154,7 +156,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
@@ -171,7 +173,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
@@ -188,7 +190,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number"), "", true)
-      .UseStandardParameters("number")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
@@ -201,7 +203,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
           "",
           "res/conditions/camera24.png")
       .AddCodeOnlyParameter("currentScene", "")
-      .UseStandardParameters("number")
+      .UseStandardParameters("number", ParameterOptions::MakeNewOptions())
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
@@ -453,8 +455,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Effects"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          "res/actions/effect24.png",
+          "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
@@ -472,8 +474,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Set _PARAM3_ to _PARAM4_ for effect _PARAM2_ of layer _PARAM1_"),
           _("Effects"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          "res/actions/effect24.png",
+          "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
@@ -491,8 +493,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                 "names) in the effects window."),
           _("Enable _PARAM3_ for effect _PARAM2_ of layer _PARAM1_: _PARAM4_"),
           _("Effects"),
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
+          "res/actions/effect24.png",
+          "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
@@ -506,9 +508,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                     _("Layer effect is enabled"),
                     _("The effect on a layer is enabled"),
                     _("Effect _PARAM2_ on layer _PARAM1_ is enabled"),
-                    _("Effects"),
-                    "res/conditions/camera24.png",
-                    "res/conditions/camera.png")
+                    _(""),
+                    "res/actions/effect24.png",
+                    "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
@@ -521,8 +523,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
                  _("Enable an effect on a layer"),
                  _("Enable effect _PARAM2_ on layer _PARAM1_: _PARAM3_"),
                  _("Effects"),
-                 "res/conditions/camera24.png",
-                 "res/conditions/camera.png")
+                 "res/actions/effect24.png",
+                 "res/actions/effect.png")
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
@@ -542,7 +544,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number",
+          gd::ParameterOptions::MakeNewOptions().SetDescription(
+              _("Time scale (1 by default)")))
       .MarkAsAdvanced();
 
   extension
@@ -572,7 +577,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("layer", _("Layer (base layer if empty)"), "", true)
       .SetDefaultValue("\"\"")
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", gd::ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced();
 
   extension
@@ -597,7 +603,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"),
+          _(""),
           "res/actions/color24.png",
           "res/actions/color.png")
       .AddCodeOnlyParameter("currentScene", "")

Core/GDCore/Extensions/Builtin/MouseExtension.cpp

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

Core/GDCore/Extensions/Builtin/SceneExtension.cpp

@@ -136,6 +136,20 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSceneExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .AddParameter("yesorno", _("Deactivate input when focus is lost"))
       .MarkAsAdvanced();
+
+  extension
+      .AddCondition(
+          "HasGameJustResumed",
+          _("Game has just resumed"),
+          _("Check if the game has just resumed from being hidden. It "
+            "happens when the game tab is selected, a minimized window is "
+            "restored or the application is put back on front."),
+          _("Game has just resumed"),
+          "",
+          "res/actions/window24.png",
+          "res/actions/window.png")
+      .SetHelpPath("/interface/scene-editor/events")
+      .AddCodeOnlyParameter("currentScene", "");
 }
 
 }  // namespace gd

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

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

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

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

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

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

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

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

Core/GDCore/Extensions/Builtin/StringInstructionsExtension.cpp

@@ -183,6 +183,26 @@ BuiltinExtensionsImplementer::ImplementsStringInstructionsExtension(
                     _("Position of the last character in the string to be "
                       "considered in the search"));
 
+  extension
+      .AddStrExpression("StrReplaceOne",
+                        _("Replace the first occurrence of a text by another."),
+                        _("Replace the first occurrence of a text by another."),
+                        "",
+                        "res/conditions/toujours24_black.png")
+      .AddParameter("string", _("Text in which the replacement must be done"))
+      .AddParameter("string", _("Text to find inside the first text"))
+      .AddParameter("string", _("Replacement to put instead of the text to find"));
+
+  extension
+      .AddStrExpression("StrReplaceAll",
+                        _("Replace all occurrences of a text by another."),
+                        _("Replace all occurrences of a text by another."),
+                        "",
+                        "res/conditions/toujours24_black.png")
+      .AddParameter("string", _("Text in which the replacement(s) must be done"))
+      .AddParameter("string", _("Text to find inside the first text"))
+      .AddParameter("string", _("Replacement to put instead of the text to find"));
+
 }
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/TimeExtension.cpp

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

Core/GDCore/Extensions/Builtin/VariablesExtension.cpp

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

Core/GDCore/Extensions/Metadata/ExpressionMetadata.cpp

@@ -23,7 +23,8 @@ ExpressionMetadata::ExpressionMetadata(const gd::String& returnType_,
       shown(true),
       smallIconFilename(smallicon_),
       extensionNamespace(extensionNamespace_),
-      isPrivate(false) {
+      isPrivate(false),
+      relevantContext("Any") {
 }
 
 ExpressionMetadata& ExpressionMetadata::SetHidden() {

Core/GDCore/Extensions/Metadata/ExpressionMetadata.h

@@ -137,7 +137,7 @@ class GD_CORE_API ExpressionMetadata {
    * to fulfill std::map requirements.
    */
   ExpressionMetadata()
-      : returnType("unknown"), shown(false), isPrivate(false){};
+      : returnType("unknown"), shown(false), isPrivate(false), relevantContext("Any"){};
 
   virtual ~ExpressionMetadata(){};
 
@@ -184,6 +184,67 @@ class GD_CORE_API ExpressionMetadata {
     return *this;
   }
 
+  /**
+   * Check if the instruction can be used in layouts or external events.
+   */
+  bool IsRelevantForLayoutEvents() const {
+    return relevantContext == "Any" || relevantContext == "Layout";
+  }
+
+  /**
+   * Check if the instruction can be used in function events.
+   */
+  bool IsRelevantForFunctionEvents() const {
+    return relevantContext == "Any" || relevantContext == "Function";
+  }
+
+  /**
+   * Check if the instruction can be used in asynchronous function events.
+   */
+  bool IsRelevantForAsynchronousFunctionEvents() const {
+    return relevantContext == "Any" || relevantContext == "Function" ||
+           relevantContext == "AsynchronousFunction";
+  }
+
+  /**
+   * Check if the instruction can be used in custom object events.
+   */
+  bool IsRelevantForCustomObjectEvents() const {
+    return relevantContext == "Any" || relevantContext == "Object";
+  }
+
+  /**
+   * Set that the instruction can be used in layouts or external events.
+   */
+  ExpressionMetadata &SetRelevantForLayoutEventsOnly() {
+    relevantContext = "Layout";
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in function events.
+   */
+  ExpressionMetadata &SetRelevantForFunctionEventsOnly() {
+    relevantContext = "Function";
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in asynchronous function events.
+   */
+  ExpressionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() {
+    relevantContext = "AsynchronousFunction";
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in custom object events.
+   */
+  ExpressionMetadata &SetRelevantForCustomObjectEventsOnly() {
+    relevantContext = "Object";
+    return *this;
+  }
+
   /**
    * \see gd::InstructionMetadata::AddParameter
    */
@@ -326,6 +387,7 @@ class GD_CORE_API ExpressionMetadata {
   gd::String extensionNamespace;
   bool isPrivate;
   gd::String requiredBaseObjectCapability;
+  gd::String relevantContext;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/InstructionMetadata.cpp

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

Core/GDCore/Extensions/Metadata/InstructionMetadata.h

@@ -14,6 +14,8 @@
 #include "GDCore/Events/Instruction.h"
 #include "GDCore/String.h"
 #include "ParameterMetadata.h"
+#include "ParameterOptions.h"
+
 namespace gd {
 class Project;
 class Layout;
@@ -99,6 +101,67 @@ class GD_CORE_API InstructionMetadata {
     return *this;
   }
 
+  /**
+   * Check if the instruction can be used in layouts or external events.
+   */
+  bool IsRelevantForLayoutEvents() const {
+    return relevantContext == "Any" || relevantContext == "Layout";
+  }
+
+  /**
+   * Check if the instruction can be used in function events.
+   */
+  bool IsRelevantForFunctionEvents() const {
+    return relevantContext == "Any" || relevantContext == "Function";
+  }
+
+  /**
+   * Check if the instruction can be used in asynchronous function events.
+   */
+  bool IsRelevantForAsynchronousFunctionEvents() const {
+    return relevantContext == "Any" || relevantContext == "Function" ||
+           relevantContext == "AsynchronousFunction";
+  }
+
+  /**
+   * Check if the instruction can be used in custom object events.
+   */
+  bool IsRelevantForCustomObjectEvents() const {
+    return relevantContext == "Any" || relevantContext == "Object";
+  }
+
+  /**
+   * Set that the instruction can be used in layouts or external events.
+   */
+  InstructionMetadata &SetRelevantForLayoutEventsOnly() {
+    relevantContext = "Layout";
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in function events.
+   */
+  InstructionMetadata &SetRelevantForFunctionEventsOnly() {
+    relevantContext = "Function";
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in asynchronous function events.
+   */
+  InstructionMetadata &SetRelevantForAsynchronousFunctionEventsOnly() {
+    relevantContext = "AsynchronousFunction";
+    return *this;
+  }
+
+  /**
+   * Set that the instruction can be used in custom object events.
+   */
+  InstructionMetadata &SetRelevantForCustomObjectEventsOnly() {
+    relevantContext = "Object";
+    return *this;
+  }
+
   /**
    * Check if the instruction is asynchronous - it will be running in the
    * background, executing the instructions following it before the frame after
@@ -109,8 +172,8 @@ class GD_CORE_API InstructionMetadata {
   }
 
   /**
-   * Check if the instruction asynchronicity is optional. If it is, it can either
-   * be used synchronously or asynchronously, with one function for each.
+   * Check if the instruction asynchronicity is optional. If it is, it can
+   * either be used synchronously or asynchronously, with one function for each.
    */
   bool IsOptionallyAsync() const {
     return IsAsync() && !codeExtraInformation.functionCallName.empty();
@@ -223,21 +286,22 @@ class GD_CORE_API InstructionMetadata {
   /**
    * \brief Add the default parameters for an instruction manipulating the
    * specified type ("string", "number") with the default operators.
-   * 
+   *
    * \note The type "string" can be declined in several subtypes.
    * \see ParameterMetadata
    */
-  InstructionMetadata &UseStandardOperatorParameters(const gd::String &type, const gd::String& typeExtraInfo = "");
+  InstructionMetadata &UseStandardOperatorParameters(
+      const gd::String &type, const ParameterOptions &options);
 
   /**
    * \brief Add the default parameters for an instruction comparing the
    * specified type ("string", "number") with the default relational operators.
-   * 
+   *
    * \note The type "string" can be declined in several subtypes.
    * \see ParameterMetadata
    */
   InstructionMetadata &UseStandardRelationalOperatorParameters(
-      const gd::String &type, const gd::String& typeExtraInfo = "");
+      const gd::String &type, const ParameterOptions &options);
 
   /**
    * \brief Mark the instruction as an object instruction. Automatically called
@@ -334,11 +398,12 @@ class GD_CORE_API InstructionMetadata {
     }
 
     /**
-     * Set the name of the function, doing asynchronous work, which will be called in
-     * the generated code. This function should return an asynchronous task
-     * (i.e: `gdjs.AsyncTask` in the JavaScript runtime).
+     * Set the name of the function, doing asynchronous work, which will be
+     * called in the generated code. This function should return an asynchronous
+     * task (i.e: `gdjs.AsyncTask` in the JavaScript runtime).
      *
-     * \param functionName the name of the function doing asynchronous work to call.
+     * \param functionName the name of the function doing asynchronous work to
+     * call.
      */
     ExtraInformation &SetAsyncFunctionName(const gd::String &functionName_) {
       asyncFunctionCallName = functionName_;
@@ -482,12 +547,12 @@ class GD_CORE_API InstructionMetadata {
   }
 
   /**
-   * Set the name of the function, doing asynchronous work, which will be called in
-   * the generated code. This function should return an asynchronous task
+   * Set the name of the function, doing asynchronous work, which will be called
+   * in the generated code. This function should return an asynchronous task
    * (i.e: `gdjs.AsyncTask` in the JavaScript runtime).
    *
-   * \param functionName the name of the function doing asynchronous work to call.
-   * \note Shortcut for `codeExtraInformation.SetAsyncFunctionName`.
+   * \param functionName the name of the function doing asynchronous work to
+   * call. \note Shortcut for `codeExtraInformation.SetAsyncFunctionName`.
    */
   ExtraInformation &SetAsyncFunctionName(const gd::String &functionName) {
     return codeExtraInformation.SetAsyncFunctionName(functionName);
@@ -512,7 +577,7 @@ class GD_CORE_API InstructionMetadata {
   /**
    * \brief Get the files that must be included to use the instruction.
    */
-  const std::vector<gd::String>& GetIncludeFiles() const {
+  const std::vector<gd::String> &GetIncludeFiles() const {
     return codeExtraInformation.GetIncludeFiles();
   };
 
@@ -535,6 +600,7 @@ class GD_CORE_API InstructionMetadata {
   bool isObjectInstruction;
   bool isBehaviorInstruction;
   gd::String requiredBaseObjectCapability;
+  gd::String relevantContext;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/MultipleInstructionMetadata.h

@@ -8,6 +8,8 @@
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/String.h"
+#include "ParameterOptions.h"
+
 namespace gd {}  // namespace gd
 
 namespace gd {
@@ -32,8 +34,7 @@ class GD_CORE_API MultipleInstructionMetadata {
     return MultipleInstructionMetadata(expression, condition, action);
   }
   static MultipleInstructionMetadata WithConditionAndAction(
-      gd::InstructionMetadata &condition,
-      gd::InstructionMetadata &action) {
+      gd::InstructionMetadata &condition, gd::InstructionMetadata &action) {
     return MultipleInstructionMetadata(condition, action);
   }
 
@@ -83,7 +84,8 @@ class GD_CORE_API MultipleInstructionMetadata {
   /**
    * \see gd::InstructionMetadata::SetParameterExtraInfo
    */
-  MultipleInstructionMetadata &SetParameterExtraInfo(const gd::String &defaultValue) {
+  MultipleInstructionMetadata &SetParameterExtraInfo(
+      const gd::String &defaultValue) {
     if (expression) expression->SetParameterExtraInfo(defaultValue);
     if (condition) condition->SetParameterExtraInfo(defaultValue);
     if (action) action->SetParameterExtraInfo(defaultValue);
@@ -126,9 +128,11 @@ class GD_CORE_API MultipleInstructionMetadata {
    * \see gd::InstructionMetadata::UseStandardOperatorParameters
    * \see gd::InstructionMetadata::UseStandardRelationalOperatorParameters
    */
-  MultipleInstructionMetadata &UseStandardParameters(const gd::String &type, const gd::String& typeExtraInfo = "") {
-    if (condition) condition->UseStandardRelationalOperatorParameters(type, typeExtraInfo);
-    if (action) action->UseStandardOperatorParameters(type, typeExtraInfo);
+  MultipleInstructionMetadata &UseStandardParameters(
+      const gd::String &type, const ParameterOptions &options) {
+    if (condition)
+      condition->UseStandardRelationalOperatorParameters(type, options);
+    if (action) action->UseStandardOperatorParameters(type, options);
     return *this;
   }
 
@@ -167,13 +171,12 @@ class GD_CORE_API MultipleInstructionMetadata {
   /**
    * \brief Get the files that must be included to use the instruction.
    */
-  const std::vector<gd::String>& GetIncludeFiles() const {
+  const std::vector<gd::String> &GetIncludeFiles() const {
     if (expression)
       return expression->GetCodeExtraInformation().GetIncludeFiles();
     if (condition)
       return condition->GetCodeExtraInformation().GetIncludeFiles();
-    if (action)
-      return action->GetCodeExtraInformation().GetIncludeFiles();
+    if (action) return action->GetCodeExtraInformation().GetIncludeFiles();
     // It can't actually happen.
     throw std::logic_error("no instruction metadata");
   }
@@ -182,12 +185,9 @@ class GD_CORE_API MultipleInstructionMetadata {
    * \see gd::InstructionMetadata::SetPrivate
    */
   MultipleInstructionMetadata &SetPrivate() {
-    if (expression)
-      expression->SetPrivate();
-    if (condition)
-      condition->SetPrivate();
-    if (action)
-      action->SetPrivate();
+    if (expression) expression->SetPrivate();
+    if (condition) condition->SetPrivate();
+    if (action) action->SetPrivate();
     return *this;
   }
 

Core/GDCore/Extensions/Metadata/ObjectMetadata.h

@@ -46,7 +46,7 @@ class GD_CORE_API ObjectMetadata {
                  std::shared_ptr<gd::ObjectConfiguration> blueprintObject_);
   /**
    * \brief Construct an object metadata, without "blueprint" object
-   * 
+   *
    * \note This is used by events based objects.
    */
   ObjectMetadata(const gd::String& extensionNamespace_,
@@ -295,6 +295,22 @@ class GD_CORE_API ObjectMetadata {
    */
   std::map<gd::String, gd::ExpressionMetadata>& GetAllStrExpressions() { return strExpressionsInfos; };
 
+  /**
+   * \brief Set the object to be hidden in the IDE.
+   *
+   * Used mainly when an object is deprecated.
+   */
+  ObjectMetadata &SetHidden() {
+    hidden = true;
+    return *this;
+  }
+
+
+  /**
+   * \brief Return true if the instruction must be hidden in the IDE.
+   */
+  bool IsHidden() const { return hidden; }
+
   std::map<gd::String, gd::InstructionMetadata> conditionsInfos;
   std::map<gd::String, gd::InstructionMetadata> actionsInfos;
   std::map<gd::String, gd::ExpressionMetadata> expressionsInfos;
@@ -314,6 +330,7 @@ class GD_CORE_API ObjectMetadata {
   gd::String iconFilename;
   gd::String categoryFullName;
   std::set<gd::String> unsupportedBaseObjectCapabilities;
+  bool hidden = false;
 
   std::shared_ptr<gd::ObjectConfiguration>
       blueprintObject;  ///< The "blueprint" object to be copied when a new

Core/GDCore/Extensions/Metadata/ParameterOptions.h

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

Core/GDCore/IDE/EventBasedBehaviorBrowser.cpp

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

Core/GDCore/IDE/EventBasedBehaviorBrowser.h

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

Core/GDCore/IDE/Events/BehaviorTypeRenamer.h

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

Core/GDCore/IDE/Events/CustomObjectTypeRenamer.h

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

Core/GDCore/IDE/Events/EventsIdentifiersFinder.cpp

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

Core/GDCore/IDE/Events/EventsRemover.h

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

Core/GDCore/IDE/Events/InstructionsCountEvaluator.cpp

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

Core/GDCore/IDE/Events/InstructionsCountEvaluator.h

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

Core/GDCore/IDE/Events/UsedExtensionsFinder.cpp

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

Core/GDCore/IDE/Events/UsedExtensionsFinder.h

@@ -21,18 +21,62 @@ class Behavior;
 
 namespace gd {
 
+class GD_CORE_API UsedExtensionsResult {
+public:
+  /**
+   * The extensions used by the project (or part of it).
+   */
+  const std::set<gd::String> &GetUsedExtensions() const {
+    return usedExtensions;
+  }
+
+  /**
+   * The include files used at runtime by the project (or part of it).
+   */
+  const std::set<gd::String> &GetUsedIncludeFiles() const {
+    return usedIncludeFiles;
+  }
+
+  /**
+   * The additional files required at runtime by the project (or part of it).
+   */
+  const std::set<gd::String> &GetUsedRequiredFiles() const {
+    return usedRequiredFiles;
+  }
+
+  /**
+   * The extensions used by the project (or part of it).
+   */
+  std::set<gd::String> &GetUsedExtensions() { return usedExtensions; }
+
+  /**
+   * The include files used at runtime by the project (or part of it).
+   */
+  std::set<gd::String> &GetUsedIncludeFiles() { return usedIncludeFiles; }
+
+  /**
+   * The additional files required at runtime by the project (or part of it).
+   */
+  std::set<gd::String> &GetUsedRequiredFiles() { return usedRequiredFiles; }
+
+private:
+  std::set<gd::String> usedExtensions;
+  std::set<gd::String> usedIncludeFiles;
+  std::set<gd::String> usedRequiredFiles;
+};
+
 class GD_CORE_API UsedExtensionsFinder
     : public ArbitraryObjectsWorker,
       public ArbitraryEventsWorkerWithContext,
       public ExpressionParser2NodeWorker {
  public:
-  static std::set<gd::String> ScanProject(gd::Project& project);
+  static const UsedExtensionsResult ScanProject(gd::Project& project);
 
  private:
   UsedExtensionsFinder(gd::Project& project_) : project(project_){};
   gd::Project& project;
   gd::String rootType;
-  std::set<gd::String> usedExtensions;
+  UsedExtensionsResult result;
 
   // Object Visitor
   void DoVisitObject(gd::Object& object) override;

Core/GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.cpp

@@ -0,0 +1,37 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "ArbitraryBehaviorSharedDataWorker.h"
+
+#include <iostream>
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/String.h"
+
+using namespace std;
+
+namespace gd {
+
+ArbitraryBehaviorSharedDataWorker::~ArbitraryBehaviorSharedDataWorker() {}
+
+void ArbitraryBehaviorSharedDataWorker::VisitSharedDatas(
+    const std::map<gd::String, std::unique_ptr<gd::BehaviorsSharedData>>
+        &sharedDatas) {
+  DoVisitSharedDatas(sharedDatas);
+
+  for (auto &behaviorSharedDataContent : sharedDatas) {
+    VisitSharedData(*behaviorSharedDataContent.second);
+  }
+}
+
+void ArbitraryBehaviorSharedDataWorker::VisitSharedData(
+    gd::BehaviorsSharedData &sharedData) {
+  DoVisitSharedData(sharedData);
+}
+
+} // namespace gd

Core/GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.h

@@ -0,0 +1,55 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#pragma once
+
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/String.h"
+#include "GDCore/Tools/SerializableWithNameList.h"
+
+namespace gd {
+class BehaviorsSharedData;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief ArbitraryBehaviorSharedDataWorker is an abstract class used to browse
+ * shared data and do some work on them. It can be used to implement
+ * refactoring for example.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API ArbitraryBehaviorSharedDataWorker {
+ public:
+  ArbitraryBehaviorSharedDataWorker(){};
+  virtual ~ArbitraryBehaviorSharedDataWorker();
+
+  /**
+   * \brief Launch the worker on the specified shared data.
+   */
+  void Launch(const std::map<gd::String, std::unique_ptr<gd::BehaviorsSharedData>>& sharedDatas) { VisitSharedDatas(sharedDatas); };
+
+ private:
+  void VisitSharedDatas(const std::map<gd::String, std::unique_ptr<gd::BehaviorsSharedData>>& sharedDatas);
+  void VisitSharedData(gd::BehaviorsSharedData& behavior);
+
+  /**
+   * Called to do some work on shared data.
+   */
+  virtual void DoVisitSharedDatas(const std::map<gd::String, std::unique_ptr<gd::BehaviorsSharedData>>& sharedDatas){};
+
+  /**
+   * Called to do some work on a shared data.
+   */
+  virtual void DoVisitSharedData(gd::BehaviorsSharedData& sharedData){};
+};
+
+}  // namespace gd
+

Core/GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.cpp

@@ -0,0 +1,34 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "ArbitraryEventBasedBehaviorsWorker.h"
+
+#include <iostream>
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/String.h"
+
+using namespace std;
+
+namespace gd {
+
+ArbitraryEventBasedBehaviorsWorker::~ArbitraryEventBasedBehaviorsWorker() {}
+
+void ArbitraryEventBasedBehaviorsWorker::VisitEventBasedBehaviors(gd::SerializableWithNameList<gd::EventsBasedBehavior>& behaviors) {
+  DoVisitEventBasedBehaviors(behaviors);
+
+    for (auto&& eventsBasedBehavior : behaviors.GetInternalVector()) {
+      VisitEventBasedBehavior(*eventsBasedBehavior);
+    }
+}
+
+void ArbitraryEventBasedBehaviorsWorker::VisitEventBasedBehavior(gd::EventsBasedBehavior& behavior) {
+  DoVisitEventBasedBehavior(behavior);
+}
+
+}  // namespace gd

Core/GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h

@@ -0,0 +1,59 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#pragma once
+
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/String.h"
+#include "GDCore/Tools/SerializableWithNameList.h"
+
+namespace gd {
+class EventsBasedBehavior;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief ArbitraryEventsFunctionsWorker is an abstract class used to browse
+ * event-based behaviors and do some work on them. It can be used to implement
+ * refactoring for example.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API ArbitraryEventBasedBehaviorsWorker {
+ public:
+  ArbitraryEventBasedBehaviorsWorker(){};
+  virtual ~ArbitraryEventBasedBehaviorsWorker();
+
+  /**
+   * \brief Launch the worker on the specified event-based behaviors.
+   */
+  void Launch(gd::SerializableWithNameList<gd::EventsBasedBehavior>& behaviors) { VisitEventBasedBehaviors(behaviors); };
+
+  /**
+   * \brief Launch the worker on the specified event-based behavior.
+   */
+  void Launch(EventsBasedBehavior& behavior) { VisitEventBasedBehavior(behavior); };
+
+ private:
+  void VisitEventBasedBehaviors(gd::SerializableWithNameList<gd::EventsBasedBehavior>& behaviors);
+  void VisitEventBasedBehavior(gd::EventsBasedBehavior& behavior);
+
+  /**
+   * Called to do some work on event-based behaviors.
+   */
+  virtual void DoVisitEventBasedBehaviors(gd::SerializableWithNameList<gd::EventsBasedBehavior>& behaviors){};
+
+  /**
+   * Called to do some work on an event-based behavior.
+   */
+  virtual void DoVisitEventBasedBehavior(gd::EventsBasedBehavior& behavior){};
+};
+
+}  // namespace gd

Core/GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.cpp

@@ -0,0 +1,37 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "ArbitraryEventsFunctionsWorker.h"
+
+#include <iostream>
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Project/EventsFunction.h"
+#include "GDCore/Project/EventsFunctionsContainer.h"
+#include "GDCore/Extensions/Metadata/ParameterMetadata.h"
+#include "GDCore/String.h"
+
+using namespace std;
+
+namespace gd {
+
+ArbitraryEventsFunctionsWorker::~ArbitraryEventsFunctionsWorker() {}
+
+void ArbitraryEventsFunctionsWorker::VisitEventsFunctionContainer(
+    gd::EventsFunctionsContainer& functions) {
+  DoVisitEventsFunctionsContainer(functions);
+
+  for (auto&& function : functions.GetInternalVector()) {
+    VisitEventsFunction(*function);
+  }
+}
+
+void ArbitraryEventsFunctionsWorker::VisitEventsFunction(gd::EventsFunction& eventsFunction) {
+  DoVisitEventsFunction(eventsFunction);
+}
+
+}  // namespace gd

Core/GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.h

@@ -0,0 +1,55 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#pragma once
+
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/String.h"
+
+namespace gd {
+class EventsFunction;
+class EventsFunctionsContainer;
+class ParameterMetadata;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief ArbitraryEventsFunctionsWorker is an abstract class used to browse
+ * functions signatures and do some work on them. It can be used to implement
+ * refactoring for example.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API ArbitraryEventsFunctionsWorker {
+ public:
+  ArbitraryEventsFunctionsWorker(){};
+  virtual ~ArbitraryEventsFunctionsWorker();
+
+  /**
+   * \brief Launch the worker on the specified function container.
+   */
+  void Launch(gd::EventsFunctionsContainer& functions) { VisitEventsFunctionContainer(functions); };
+
+ private:
+  void VisitEventsFunctionContainer(gd::EventsFunctionsContainer& functions);
+  void VisitEventsFunction(gd::EventsFunction& eventsFunction);
+
+  /**
+   * Called to do some work on an function container.
+   */
+  virtual void DoVisitEventsFunctionsContainer(gd::EventsFunctionsContainer& functions){};
+
+  /**
+   * Called to do some work on a function.
+   */
+  virtual void DoVisitEventsFunction(gd::EventsFunction& eventsFunction){};
+};
+
+}  // namespace gd

Core/GDCore/IDE/Project/ArbitraryObjectsWorker.h

@@ -33,7 +33,7 @@ class GD_CORE_API ArbitraryObjectsWorker {
   virtual ~ArbitraryObjectsWorker();
 
   /**
-   * \brief Launch the worker on the specified events list.
+   * \brief Launch the worker on the specified object container.
    */
   void Launch(gd::ObjectsContainer& objects) { VisitObjectContainer(objects); };
 

Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp

@@ -35,6 +35,16 @@ void ArbitraryResourceWorker::ExposeJson(gd::String& jsonName){
     // do.
 };
 
+void ArbitraryResourceWorker::ExposeTilemap(gd::String& tilemapName){
+    // Nothing to do by default - each child class can define here the action to
+    // do.
+};
+
+void ArbitraryResourceWorker::ExposeTileset(gd::String& tilesetName){
+    // 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.
@@ -92,6 +102,67 @@ void ArbitraryResourceWorker::ExposeResources(
   }
 }
 
+void ArbitraryResourceWorker::ExposeEmbeddeds(gd::String& resourceName) {
+  if (resourcesManagers.empty()) return;
+  gd::ResourcesManager* resourcesManager = resourcesManagers[0];
+
+  gd::Resource& resource = resourcesManager->GetResource(resourceName);
+
+  if (!resource.GetMetadata().empty()) {
+    gd::SerializerElement serializerElement =
+        gd::Serializer::FromJSON(resource.GetMetadata());
+
+    if (serializerElement.HasChild("embeddedResourcesMapping")) {
+      bool anyEmbeddedResourceNameWasRenamed = false;
+      gd::SerializerElement& embeddedResourcesMappingElement =
+          serializerElement.GetChild("embeddedResourcesMapping");
+
+      for (const auto& child :
+           embeddedResourcesMappingElement.GetAllChildren()) {
+        const gd::String& targetResourceName =
+            child.second->GetValue().GetString();
+
+        if (resourcesManager->HasResource(targetResourceName)) {
+          std::cout << targetResourceName << std::endl;
+          gd::Resource& targetResource =
+              resourcesManager->GetResource(targetResourceName);
+          const gd::String& targetResourceKind = targetResource.GetKind();
+
+          gd::String potentiallyUpdatedTargetResourceName = targetResourceName;
+
+          if (targetResourceKind == "audio") {
+            ExposeAudio(potentiallyUpdatedTargetResourceName);
+          } else if (targetResourceKind == "bitmapFont") {
+            ExposeBitmapFont(potentiallyUpdatedTargetResourceName);
+          } else if (targetResourceKind == "font") {
+            ExposeFont(potentiallyUpdatedTargetResourceName);
+          } else if (targetResourceKind == "image") {
+            ExposeImage(potentiallyUpdatedTargetResourceName);
+          } else if (targetResourceKind == "json") {
+            ExposeJson(potentiallyUpdatedTargetResourceName);
+          } else if (targetResourceKind == "tilemap") {
+            ExposeTilemap(potentiallyUpdatedTargetResourceName);
+          } else if (targetResourceKind == "tileset") {
+            ExposeTileset(potentiallyUpdatedTargetResourceName);
+          } else if (targetResourceKind == "video") {
+            ExposeVideo(potentiallyUpdatedTargetResourceName);
+          }
+
+          if (potentiallyUpdatedTargetResourceName != targetResourceName) {
+            // The resource name was renamed. Also update the mapping.
+            child.second->SetStringValue(potentiallyUpdatedTargetResourceName);
+            anyEmbeddedResourceNameWasRenamed = true;
+          }
+        }
+      }
+
+      if (anyEmbeddedResourceNameWasRenamed) {
+        resource.SetMetadata(gd::Serializer::ToJSON(serializerElement));
+      }
+    }
+  }
+}
+
 void ArbitraryResourceWorker::ExposeResource(gd::Resource& resource) {
   if (!resource.UseFile()) return;
 
@@ -154,6 +225,14 @@ class ResourceWorkerInEventsWorker : public ArbitraryEventsWorker {
             gd::String updatedParameterValue = parameterValue;
             worker.ExposeJson(updatedParameterValue);
             instruction.SetParameter(parameterIndex, updatedParameterValue);
+          } else if (parameterMetadata.GetType() == "tilemapResource") {
+            gd::String updatedParameterValue = parameterValue;
+            worker.ExposeTilemap(updatedParameterValue);
+            instruction.SetParameter(parameterIndex, updatedParameterValue);
+          } else if (parameterMetadata.GetType() == "tilesetResource") {
+            gd::String updatedParameterValue = parameterValue;
+            worker.ExposeTileset(updatedParameterValue);
+            instruction.SetParameter(parameterIndex, updatedParameterValue);
           }
         });
 

Core/GDCore/IDE/Project/ArbitraryResourceWorker.h

@@ -75,6 +75,16 @@ class GD_CORE_API ArbitraryResourceWorker {
    */
   virtual void ExposeJson(gd::String &jsonName);
 
+  /**
+   * \brief Expose a Tilemap, which is always a reference to a "tilemap" resource.
+   */
+  virtual void ExposeTilemap(gd::String &tilemapName);
+
+  /**
+   * \brief Expose a Tileset, which is always a reference to a "tileset" resource.
+   */
+  virtual void ExposeTileset(gd::String &tilesetName);
+
   /**
    * \brief Expose a video, which is always a reference to a "video" resource.
    */
@@ -96,6 +106,11 @@ class GD_CORE_API ArbitraryResourceWorker {
    */
   virtual void ExposeFile(gd::String &resourceFileName) = 0;
 
+  /**
+   * \brief Expose the embedded resources of the specified resource.
+   */
+  virtual void ExposeEmbeddeds(gd::String &resourceName);
+
  protected:
   const std::vector<gd::ResourcesManager *> &GetResources() {
     return resourcesManagers;

Core/GDCore/IDE/Project/BehaviorObjectTypeRenamer.cpp

@@ -0,0 +1,25 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "BehaviorObjectTypeRenamer.h"
+
+#include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+
+void BehaviorObjectTypeRenamer::DoVisitEventBasedBehavior(
+    gd::EventsBasedBehavior &eventsBasedBehavior) {
+  if (eventsBasedBehavior.GetObjectType() == oldObjectType) {
+    eventsBasedBehavior.SetObjectType(newObjectType);
+  }
+}
+
+BehaviorObjectTypeRenamer::~BehaviorObjectTypeRenamer() {}
+
+} // namespace gd

Core/GDCore/IDE/Project/BehaviorObjectTypeRenamer.h

@@ -0,0 +1,45 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_BEHAVIOROBJECTTYPERENAMER_H
+#define GDCORE_BEHAVIOROBJECTTYPERENAMER_H
+
+#include "GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h"
+
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+namespace gd {
+class BaseEvent;
+class Project;
+class EventsList;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Rename the object type in event-based behaviors.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API BehaviorObjectTypeRenamer
+    : public ArbitraryEventBasedBehaviorsWorker {
+public:
+  BehaviorObjectTypeRenamer(const gd::String &oldObjectType_,
+                            const gd::String &newObjectType_)
+      : oldObjectType(oldObjectType_), newObjectType(newObjectType_){};
+  virtual ~BehaviorObjectTypeRenamer();
+
+private:
+  void DoVisitEventBasedBehavior(gd::EventsBasedBehavior &behavior) override;
+
+  gd::String oldObjectType;
+  gd::String newObjectType;
+};
+
+} // namespace gd
+
+#endif // GDCORE_BEHAVIOROBJECTTYPERENAMER_H

Core/GDCore/IDE/Project/BehaviorsSharedDataBehaviorTypeRenamer.cpp

@@ -0,0 +1,24 @@
+/*
+ * 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/Project/BehaviorsSharedDataBehaviorTypeRenamer.h"
+#include "GDCore/Project/BehaviorsSharedData.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+
+void BehaviorsSharedDataBehaviorTypeRenamer::DoVisitSharedData(
+    gd::BehaviorsSharedData &sharedData) {
+  if (sharedData.GetTypeName() == oldBehaviorType) {
+    sharedData.SetTypeName(newBehaviorType);
+  }
+}
+
+BehaviorsSharedDataBehaviorTypeRenamer::~BehaviorsSharedDataBehaviorTypeRenamer() {}
+
+} // namespace gd

Core/GDCore/IDE/Project/BehaviorsSharedDataBehaviorTypeRenamer.h

@@ -0,0 +1,42 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#pragma once
+
+#include <map>
+#include <memory>
+#include <vector>
+#include "GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.h"
+#include "GDCore/String.h"
+
+namespace gd {
+class BaseEvent;
+class Project;
+class EventsList;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Rename the behavior type of shared data.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API BehaviorsSharedDataBehaviorTypeRenamer : public ArbitraryBehaviorSharedDataWorker {
+ public:
+  BehaviorsSharedDataBehaviorTypeRenamer(const gd::String& oldBehaviorType_,
+                                       const gd::String& newBehaviorType_)
+      : oldBehaviorType(oldBehaviorType_), newBehaviorType(newBehaviorType_){};
+  virtual ~BehaviorsSharedDataBehaviorTypeRenamer();
+
+ private:
+  void DoVisitSharedData(gd::BehaviorsSharedData& behavior) override;
+
+  gd::String oldBehaviorType;
+  gd::String newBehaviorType;
+};
+
+}  // namespace gd

Core/GDCore/IDE/Project/FunctionParameterBehaviorTypeRenamer.cpp

@@ -0,0 +1,28 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "FunctionParameterBehaviorTypeRenamer.h"
+
+#include "GDCore/Project/EventsFunction.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+
+void FunctionParameterBehaviorTypeRenamer::DoVisitEventsFunction(
+    gd::EventsFunction &eventsFunction) {
+  for (auto &&parameter : eventsFunction.GetParameters()) {
+    if (gd::ParameterMetadata::IsBehavior(parameter.GetType()) &&
+        parameter.GetExtraInfo() == oldBehaviorType) {
+      parameter.SetExtraInfo(newBehaviorType);
+    }
+  }
+}
+
+FunctionParameterBehaviorTypeRenamer::~FunctionParameterBehaviorTypeRenamer() {}
+
+} // namespace gd

Core/GDCore/IDE/Project/FunctionParameterBehaviorTypeRenamer.h

@@ -0,0 +1,42 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+#include "GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+class BaseEvent;
+class Project;
+class EventsList;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Rename the type of behavior parameters in functions.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API FunctionParameterBehaviorTypeRenamer
+    : public ArbitraryEventsFunctionsWorker {
+public:
+  FunctionParameterBehaviorTypeRenamer(const gd::String &oldBehaviorType_,
+                                       const gd::String &newBehaviorType_)
+      : oldBehaviorType(oldBehaviorType_), newBehaviorType(newBehaviorType_){};
+  virtual ~FunctionParameterBehaviorTypeRenamer();
+
+private:
+  virtual void DoVisitEventsFunction(gd::EventsFunction &eventsFunction) override;
+
+  gd::String oldBehaviorType;
+  gd::String newBehaviorType;
+};
+
+} // namespace gd

Core/GDCore/IDE/Project/FunctionParameterObjectTypeRenamer.cpp

@@ -0,0 +1,28 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "FunctionParameterObjectTypeRenamer.h"
+
+#include "GDCore/Project/EventsFunction.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+
+void FunctionParameterObjectTypeRenamer::DoVisitEventsFunction(
+    gd::EventsFunction &eventsFunction) {
+  for (auto &&parameter : eventsFunction.GetParameters()) {
+    if (gd::ParameterMetadata::IsObject(parameter.GetType()) &&
+        parameter.GetExtraInfo() == oldObjectType) {
+      parameter.SetExtraInfo(newObjectType);
+    }
+  }
+}
+
+FunctionParameterObjectTypeRenamer::~FunctionParameterObjectTypeRenamer() {}
+
+} // namespace gd

Core/GDCore/IDE/Project/FunctionParameterObjectTypeRenamer.h

@@ -0,0 +1,42 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+#include "GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.h"
+#include "GDCore/String.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace gd {
+class BaseEvent;
+class Project;
+class EventsList;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Rename the type of object parameters in functions.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API FunctionParameterObjectTypeRenamer
+    : public ArbitraryEventsFunctionsWorker {
+public:
+  FunctionParameterObjectTypeRenamer(const gd::String &oldObjectType_,
+                                     const gd::String &newObjectType_)
+      : oldObjectType(oldObjectType_), newObjectType(newObjectType_){};
+  virtual ~FunctionParameterObjectTypeRenamer();
+
+private:
+  virtual void DoVisitEventsFunction(gd::EventsFunction &eventsFunction) override;
+
+  gd::String oldObjectType;
+  gd::String newObjectType;
+};
+
+} // namespace gd

Core/GDCore/IDE/Project/RequiredBehaviorRenamer.cpp

@@ -0,0 +1,35 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "GDCore/IDE/Project/RequiredBehaviorRenamer.h"
+#include <map>
+#include <memory>
+#include <vector>
+#include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/String.h"
+
+namespace gd {
+
+void RequiredBehaviorRenamer::DoVisitEventBasedBehavior(gd::EventsBasedBehavior& eventsBasedBehavior) {
+  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;
+          }
+        }
+  }
+}
+
+RequiredBehaviorRenamer::~RequiredBehaviorRenamer() {}
+
+}  // namespace gd

Core/GDCore/IDE/Project/RequiredBehaviorRenamer.h

@@ -0,0 +1,42 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef GDCORE_REQUIREDBEHAVIORRENAMER_H
+#define GDCORE_REQUIREDBEHAVIORRENAMER_H
+#include <map>
+#include <memory>
+#include <vector>
+#include "GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h"
+#include "GDCore/String.h"
+namespace gd {
+class BaseEvent;
+class Project;
+class EventsList;
+}  // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Rename the type of required behavior in event-based behaviors.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API RequiredBehaviorRenamer : public ArbitraryEventBasedBehaviorsWorker {
+ public:
+  RequiredBehaviorRenamer(const gd::String& oldBehaviorType_,
+                                       const gd::String& newBehaviorType_)
+      : oldBehaviorType(oldBehaviorType_), newBehaviorType(newBehaviorType_){};
+  virtual ~RequiredBehaviorRenamer();
+
+ private:
+  void DoVisitEventBasedBehavior(gd::EventsBasedBehavior& behavior) override;
+
+  gd::String oldBehaviorType;
+  gd::String newBehaviorType;
+};
+
+}  // namespace gd
+
+#endif  // GDCORE_REQUIREDBEHAVIORRENAMER_H

Core/GDCore/IDE/Project/ResourcesInUseHelper.h

@@ -40,6 +40,8 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
   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>& GetAllTilemaps() { return GetAll("tilemap"); };
+  std::set<gd::String>& GetAllTilesets() { return GetAll("tileset"); };
   std::set<gd::String>& GetAllVideos() { return GetAll("video"); };
   std::set<gd::String>& GetAllBitmapFonts() { return GetAll("bitmapFont"); };
   std::set<gd::String>& GetAll(const gd::String& resourceType) {
@@ -47,6 +49,8 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
     if (resourceType == "audio") return allAudios;
     if (resourceType == "font") return allFonts;
     if (resourceType == "json") return allJsons;
+    if (resourceType == "tilemap") return allTilemaps;
+    if (resourceType == "tileset") return allTilesets;
     if (resourceType == "video") return allVideos;
     if (resourceType == "bitmapFont") return allBitmapFonts;
 
@@ -68,6 +72,12 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
   virtual void ExposeJson(gd::String& jsonResourceName) override {
     allJsons.insert(jsonResourceName);
   };
+  virtual void ExposeTilemap(gd::String& tilemapResourceName) override {
+    allTilemaps.insert(tilemapResourceName);
+  };
+  virtual void ExposeTileset(gd::String& tilesetResourceName) override {
+    allTilesets.insert(tilesetResourceName);
+  };
   virtual void ExposeVideo(gd::String& videoResourceName) override {
     allVideos.insert(videoResourceName);
   };
@@ -80,6 +90,8 @@ class ResourcesInUseHelper : public gd::ArbitraryResourceWorker {
   std::set<gd::String> allAudios;
   std::set<gd::String> allFonts;
   std::set<gd::String> allJsons;
+  std::set<gd::String> allTilemaps;
+  std::set<gd::String> allTilesets;
   std::set<gd::String> allVideos;
   std::set<gd::String> allBitmapFonts;
   std::set<gd::String> emptyResources;

Core/GDCore/IDE/Project/ResourcesRenamer.h

@@ -4,9 +4,7 @@
  * reserved. This project is released under the MIT License.
  */
 
-#if defined(GD_IDE_ONLY)
-#ifndef GDCORE_RESOURCESRENAMER_H
-#define GDCORE_RESOURCESRENAMER_H
+#pragma once
 
 #include <set>
 #include <vector>
@@ -49,6 +47,12 @@ class ResourcesRenamer : public gd::ArbitraryResourceWorker {
   virtual void ExposeJson(gd::String& jsonResourceName) override {
     RenameIfNeeded(jsonResourceName);
   };
+  virtual void ExposeTilemap(gd::String& tilemapResourceName) override {
+    RenameIfNeeded(tilemapResourceName);
+  };
+  virtual void ExposeTileset(gd::String& tilesetResourceName) override {
+    RenameIfNeeded(tilesetResourceName);
+  };
   virtual void ExposeVideo(gd::String& videoResourceName) override {
     RenameIfNeeded(videoResourceName);
   };
@@ -66,6 +70,3 @@ class ResourcesRenamer : public gd::ArbitraryResourceWorker {
 };
 
 }  // namespace gd
-
-#endif  // GDCORE_RESOURCESRENAMER_H
-#endif

Core/GDCore/IDE/ProjectBrowser.h

@@ -0,0 +1,89 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#pragma once
+
+namespace gd {
+class Project;
+class String;
+class EventsFunctionsExtension;
+class EventsFunction;
+class EventsBasedBehavior;
+class EventsBasedObject;
+class ArbitraryEventsWorker;
+class ArbitraryEventsWorkerWithContext;
+class ArbitraryEventsFunctionsWorker;
+class ArbitraryObjectsWorker;
+class ArbitraryEventBasedBehaviorsWorker;
+class ArbitraryBehaviorSharedDataWorker;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Expose a subset of the project to workers.
+ */
+class GD_CORE_API ProjectBrowser {
+public:
+  /**
+   * \brief Call the specified worker on all events of a project subset.
+   *
+   * This should be the preferred way to traverse events of a project.
+   */
+  virtual void ExposeEvents(gd::Project &project,
+                            gd::ArbitraryEventsWorker &worker) const = 0;
+  /**
+   * \brief Call the specified worker on all events of a project subset.
+   *
+   * This should be the preferred way to traverse events of a project.
+   */
+  virtual void
+  ExposeEvents(gd::Project &project,
+               gd::ArbitraryEventsWorkerWithContext &worker) const = 0;
+
+  /**
+   * \brief Call the specified worker on all ObjectContainer of a project subset
+   *
+   * This should be the preferred way to traverse all the objects of a project.
+   */
+  virtual void ExposeObjects(gd::Project &project,
+                             gd::ArbitraryObjectsWorker &worker) const = 0;
+
+  /**
+   * \brief Call the specified worker on all FunctionsContainer of a project
+   * subset.
+   *
+   * This should be the preferred way to traverse all the function signatures
+   * of a project.
+   */
+  virtual void ExposeFunctions(gd::Project &project,
+                               gd::ArbitraryEventsFunctionsWorker &worker) const = 0;
+
+  /**
+   * \brief Call the specified worker on all EventBasedBehavior of a project
+   * subset.
+   *
+   * This should be the preferred way to traverse all the event-based behavior
+   * of a project.
+   */
+  virtual void ExposeEventBasedBehaviors(
+      gd::Project &project,
+      gd::ArbitraryEventBasedBehaviorsWorker &worker) const = 0;
+
+  /**
+   * \brief Call the specified worker on all SharedData of a project subset.
+   *
+   * This should be the preferred way to traverse all the shared data
+   * of a project.
+   */
+  virtual void
+  ExposeBehaviorSharedDatas(gd::Project &project,
+                    gd::ArbitraryBehaviorSharedDataWorker &worker) const = 0;
+
+  virtual ~ProjectBrowser(){};
+};
+
+} // namespace gd

Core/GDCore/IDE/ProjectBrowserHelper.cpp

@@ -0,0 +1,224 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "ProjectBrowserHelper.h"
+
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/IDE/EventsFunctionTools.h"
+#include "GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.h"
+#include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/Project/EventsBasedObject.h"
+#include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/ExternalEvents.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/String.h"
+
+namespace gd {
+
+void ProjectBrowserHelper::ExposeProjectEvents(
+    gd::Project &project, gd::ArbitraryEventsWorker &worker) {
+  // See also gd::Project::ExposeResources for a method that traverses the whole
+  // project (this time for resources).
+
+  ExposeProjectEventsWithoutExtensions(project, worker);
+
+  // Add events based extensions
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+       e++) {
+    // Add (free) events functions
+    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+    for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
+      worker.Launch(eventsFunction->GetEvents());
+    }
+
+    // Add (behavior) events functions
+    for (auto &&eventsBasedBehavior :
+         eventsFunctionsExtension.GetEventsBasedBehaviors()
+             .GetInternalVector()) {
+      ExposeEventsBasedBehaviorEvents(project, *eventsBasedBehavior, worker);
+    }
+
+    // Add (object) events functions
+    for (auto &&eventsBasedObject :
+         eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
+      auto &objectEventsFunctions = eventsBasedObject->GetEventsFunctions();
+      for (auto &&eventsFunction : objectEventsFunctions.GetInternalVector()) {
+        worker.Launch(eventsFunction->GetEvents());
+      }
+    }
+  }
+}
+
+void ProjectBrowserHelper::ExposeProjectEventsWithoutExtensions(
+    gd::Project& project, gd::ArbitraryEventsWorker& worker) {
+  // Add layouts events
+  for (std::size_t s = 0; s < project.GetLayoutsCount(); s++) {
+    worker.Launch(project.GetLayout(s).GetEvents());
+  }
+  // Add external events events
+  for (std::size_t s = 0; s < project.GetExternalEventsCount(); s++) {
+    worker.Launch(project.GetExternalEvents(s).GetEvents());
+  }
+}
+
+void ProjectBrowserHelper::ExposeProjectEvents(
+    gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) {
+  // See also gd::Project::ExposeResources for a method that traverse the whole
+  // project (this time for resources) and ExposeProjectEffects (this time for
+  // effects).
+
+  // Add layouts events
+  for (std::size_t s = 0; s < project.GetLayoutsCount(); s++) {
+    auto &layout = project.GetLayout(s);
+    worker.Launch(layout.GetEvents(), project, layout);
+  }
+  // Add external events events
+  for (std::size_t s = 0; s < project.GetExternalEventsCount(); s++) {
+    const auto &externalEvents = project.GetExternalEvents(s);
+    const gd::String &associatedLayout = externalEvents.GetAssociatedLayout();
+    if (project.HasLayoutNamed(associatedLayout)) {
+      worker.Launch(project.GetExternalEvents(s).GetEvents(), project,
+                    project.GetLayout(associatedLayout));
+    }
+  }
+  // Add events based extensions
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+       e++) {
+    // Add (free) events functions
+    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+    for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
+      gd::ObjectsContainer globalObjectsAndGroups;
+      gd::ObjectsContainer objectsAndGroups;
+      gd::EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
+          project, eventsFunctionsExtension, *eventsFunction,
+          globalObjectsAndGroups, objectsAndGroups);
+
+      worker.Launch(eventsFunction->GetEvents(), globalObjectsAndGroups,
+                    objectsAndGroups);
+    }
+
+    // Add (behavior) events functions
+    for (auto &&eventsBasedBehavior :
+         eventsFunctionsExtension.GetEventsBasedBehaviors()
+             .GetInternalVector()) {
+      ExposeEventsBasedBehaviorEvents(project, *eventsBasedBehavior, worker);
+    }
+
+    // Add (object) events functions
+    for (auto &&eventsBasedObject :
+         eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
+      ExposeEventsBasedObjectEvents(project, *eventsBasedObject, worker);
+    }
+  }
+}
+
+void ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
+    gd::Project &project, const gd::EventsBasedBehavior &eventsBasedBehavior,
+    gd::ArbitraryEventsWorker &worker) {
+  auto &behaviorEventsFunctions = eventsBasedBehavior.GetEventsFunctions();
+  for (auto &&eventsFunction : behaviorEventsFunctions.GetInternalVector()) {
+    worker.Launch(eventsFunction->GetEvents());
+  }
+}
+
+void ProjectBrowserHelper::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 ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
+    gd::Project &project, const gd::EventsBasedObject &eventsBasedObject,
+    gd::ArbitraryEventsWorkerWithContext &worker) {
+  auto &objectEventsFunctions = eventsBasedObject.GetEventsFunctions();
+  for (auto &&eventsFunction : objectEventsFunctions.GetInternalVector()) {
+    gd::ObjectsContainer globalObjectsAndGroups;
+    gd::ObjectsContainer objectsAndGroups;
+    gd::EventsFunctionTools::ObjectEventsFunctionToObjectsContainer(
+        project, eventsBasedObject, *eventsFunction, globalObjectsAndGroups,
+        objectsAndGroups);
+
+    worker.Launch(eventsFunction->GetEvents(), globalObjectsAndGroups,
+                  objectsAndGroups);
+  }
+}
+
+void ProjectBrowserHelper::ExposeProjectObjects(
+    gd::Project &project, gd::ArbitraryObjectsWorker &worker) {
+
+  // Global objects
+  worker.Launch(project);
+
+  // Layers objects
+  for (size_t i = 0; i < project.GetLayoutsCount(); i++) {
+    worker.Launch(project.GetLayout(i));
+  }
+
+  // Event based objects children
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+       e++) {
+    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+
+    for (auto &&eventsBasedObjectUniquePtr :
+         eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
+      auto eventsBasedObject = eventsBasedObjectUniquePtr.get();
+      worker.Launch(*eventsBasedObject);
+    }
+  }
+};
+
+void ProjectBrowserHelper::ExposeProjectFunctions(
+    gd::Project &project, gd::ArbitraryEventsFunctionsWorker &worker) {
+
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+       e++) {
+    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+    worker.Launch(eventsFunctionsExtension);
+
+    for (auto &&eventsBasedBehavior :
+         eventsFunctionsExtension.GetEventsBasedBehaviors()
+             .GetInternalVector()) {
+      worker.Launch(eventsBasedBehavior->GetEventsFunctions());
+    }
+
+    for (auto &&eventsBasedObject :
+         eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
+      worker.Launch(eventsBasedObject->GetEventsFunctions());
+    }
+  }
+};
+
+void ProjectBrowserHelper::ExposeProjectEventBasedBehaviors(
+    gd::Project &project, gd::ArbitraryEventBasedBehaviorsWorker &worker) {
+  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
+       e++) {
+    auto &eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+    worker.Launch(eventsFunctionsExtension.GetEventsBasedBehaviors());
+  }
+}
+
+void ProjectBrowserHelper::ExposeProjectSharedDatas(
+    gd::Project &project, gd::ArbitraryBehaviorSharedDataWorker &worker) {
+  for (std::size_t i = 0; i < project.GetLayoutsCount(); ++i) {
+    gd::Layout &layout = project.GetLayout(i);
+    worker.Launch(layout.GetAllBehaviorSharedData());
+  }
+}
+
+} // namespace gd

Core/GDCore/IDE/ProjectBrowserHelper.h

@@ -0,0 +1,130 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+namespace gd {
+class Project;
+class String;
+class EventsFunctionsExtension;
+class EventsFunction;
+class EventsBasedBehavior;
+class EventsBasedObject;
+class ArbitraryEventsWorker;
+class ArbitraryEventsWorkerWithContext;
+class ArbitraryEventsFunctionsWorker;
+class ArbitraryObjectsWorker;
+class ArbitraryEventBasedBehaviorsWorker;
+class ArbitraryBehaviorSharedDataWorker;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Expose a subset of the project to workers.
+ */
+class GD_CORE_API ProjectBrowserHelper {
+public:
+  /**
+   * \brief Call the specified worker on all events of the project (layout,
+   * external events, events functions...)
+   *
+   * This should be the preferred way to traverse all the events of a project.
+   */
+  static void ExposeProjectEvents(gd::Project &project,
+                                  gd::ArbitraryEventsWorker &worker);
+
+  /**
+   * \brief Call the specified worker on all events of the project (layout,
+   * external events, events functions...)
+   *
+   * This should be the preferred way to traverse all the events of a project.
+   */
+  static void ExposeProjectEvents(gd::Project &project,
+                                  gd::ArbitraryEventsWorkerWithContext &worker);
+
+  /**
+   * \brief Call the specified worker on all events of the project (layout and
+   * external events) but not events from extensions.
+   *
+   * Only use this for stats.
+   */
+  static void
+  ExposeProjectEventsWithoutExtensions(gd::Project &project,
+                                       gd::ArbitraryEventsWorker &worker);
+
+  /**
+   * \brief Call the specified worker on all events of the event-based
+   * behavior
+   *
+   * This should be the preferred way to traverse all the events of an events
+   * based behavior.
+   */
+  static void ExposeEventsBasedBehaviorEvents(
+      gd::Project &project, const gd::EventsBasedBehavior &eventsBasedBehavior,
+      gd::ArbitraryEventsWorker &worker);
+
+  /**
+   * \brief Call the specified worker on all events of the event-based
+   * behavior.
+   *
+   * This should be the preferred way to traverse all the events of an
+   * event-based behavior.
+   */
+  static void ExposeEventsBasedBehaviorEvents(
+      gd::Project &project, const gd::EventsBasedBehavior &eventsBasedBehavior,
+      gd::ArbitraryEventsWorkerWithContext &worker);
+
+  /**
+   * \brief Call the specified worker on all events of the event-based
+   * behavior.
+   *
+   * This should be the preferred way to traverse all the events of an
+   * event-based behavior.
+   */
+  static void
+  ExposeEventsBasedObjectEvents(gd::Project &project,
+                                const gd::EventsBasedObject &eventsBasedObject,
+                                gd::ArbitraryEventsWorkerWithContext &worker);
+
+  /**
+   * \brief Call the specified worker on all ObjectContainers of the project
+   * (global, layouts...)
+   *
+   * This should be the preferred way to traverse all the objects of a project.
+   */
+  static void ExposeProjectObjects(gd::Project &project,
+                                   gd::ArbitraryObjectsWorker &worker);
+
+  /**
+   * \brief Call the specified worker on all FunctionsContainers of the project
+   * (global, layouts...)
+   *
+   * This should be the preferred way to traverse all the function signatures
+   * of a project.
+   */
+  static void ExposeProjectFunctions(gd::Project &project,
+                                     gd::ArbitraryEventsFunctionsWorker &worker);
+
+  /**
+   * \brief Call the specified worker on all EventBasedBehavior of a project.
+   *
+   * This should be the preferred way to traverse all the event-based behavior
+   * of a project.
+   */
+  static void ExposeProjectEventBasedBehaviors(
+      gd::Project &project, gd::ArbitraryEventBasedBehaviorsWorker &worker);
+
+  /**
+   * \brief Call the specified worker on all SharedData of a project.
+   *
+   * This should be the preferred way to traverse all the shared data
+   * of a project.
+   */
+  static void ExposeProjectSharedDatas(gd::Project &project,
+                                       gd::ArbitraryBehaviorSharedDataWorker &worker);
+};
+
+} // namespace gd

Core/GDCore/IDE/PropertyFunctionGenerator.cpp

@@ -12,6 +12,7 @@
 #include "GDCore/Project/EventsBasedBehavior.h"
 #include "GDCore/Project/EventsBasedObject.h"
 #include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/EventsFunction.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Project/PropertyDescriptor.h"
 #include "GDCore/String.h"
@@ -298,4 +299,16 @@ PropertyFunctionGenerator::UnCapitalizeFirstLetter(const gd::String &string) {
   return string.substr(0, 1).LowerCase() + string.substr(1);
 }
 
+void PropertyFunctionGenerator::GenerateConditionSkeleton(
+    gd::Project &project, gd::EventsFunction &eventFunction) {
+  auto &event = dynamic_cast<gd::StandardEvent &>(
+      eventFunction.GetEvents().InsertNewEvent(
+          project, "BuiltinCommonInstructions::Standard", 0));
+
+  gd::Instruction action;
+  action.SetType("SetReturnBoolean");
+  action.AddParameter("True");
+  event.GetActions().Insert(action, 0);
+}
+
 } // namespace gd

Core/GDCore/IDE/PropertyFunctionGenerator.h

@@ -10,6 +10,7 @@ namespace gd {
 class String;
 class Project;
 class EventsFunctionsExtension;
+class EventsFunction;
 class EventsBasedBehavior;
 class EventsBasedObject;
 class AbstractEventsBasedEntity;
@@ -43,6 +44,12 @@ public:
       const gd::AbstractEventsBasedEntity &eventsBasedEntity,
       const gd::NamedPropertyDescriptor &property);
 
+  /**
+   * \brief Generate an event with a "return" action.
+   */
+  static void GenerateConditionSkeleton(gd::Project &project,
+                                        gd::EventsFunction &eventFunction);
+
   ~PropertyFunctionGenerator();
 
 private:

Core/GDCore/IDE/WholeProjectBrowser.cpp

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

Core/GDCore/IDE/WholeProjectBrowser.h

@@ -0,0 +1,90 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#pragma once
+
+#include "GDCore/IDE/ProjectBrowser.h"
+
+namespace gd {
+class Project;
+class String;
+class EventsFunctionsExtension;
+class EventsFunction;
+class EventsBasedBehavior;
+class EventsBasedObject;
+class ArbitraryEventsWorker;
+class ArbitraryEventsWorkerWithContext;
+class ArbitraryEventsFunctionsWorker;
+class ArbitraryObjectsWorker;
+class ArbitraryEventBasedBehaviorsWorker;
+class ArbitraryBehaviorSharedDataWorker;
+} // namespace gd
+
+namespace gd {
+
+/**
+ * \brief Expose the whole project to workers.
+ */
+class GD_CORE_API WholeProjectBrowser : public ProjectBrowser {
+public:
+  /**
+   * \brief Call the specified worker on all events of the project (layout,
+   * external events, events functions...)
+   *
+   * This should be the preferred way to traverse all the events of a project.
+   */
+  void ExposeEvents(gd::Project &project,
+                    gd::ArbitraryEventsWorker &worker) const override;
+
+  /**
+   * \brief Call the specified worker on all events of the project (layout,
+   * external events, events functions...)
+   *
+   * This should be the preferred way to traverse all the events of a project.
+   */
+  void
+  ExposeEvents(gd::Project &project,
+               gd::ArbitraryEventsWorkerWithContext &worker) const override;
+
+  /**
+   * \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.
+   */
+  void ExposeObjects(gd::Project &project,
+                     gd::ArbitraryObjectsWorker &worker) const override;
+
+  /**
+   * \brief Call the specified worker on all FunctionsContainers of the project
+   * (global, layouts...)
+   *
+   * This should be the preferred way to traverse all the function signatures
+   * of a project.
+   */
+  void ExposeFunctions(gd::Project &project,
+                       gd::ArbitraryEventsFunctionsWorker &worker) const override;
+
+  /**
+   * \brief Call the specified worker on all EventBasedBehavior of a project.
+   *
+   * This should be the preferred way to traverse all the event-based behavior
+   * of a project.
+   */
+  void ExposeEventBasedBehaviors(
+      gd::Project &project,
+      gd::ArbitraryEventBasedBehaviorsWorker &worker) const override;
+
+  /**
+   * \brief Call the specified worker on all SharedData of a project.
+   *
+   * This should be the preferred way to traverse all the shared data
+   * of a project.
+   */
+  void ExposeBehaviorSharedDatas(gd::Project &project,
+                         gd::ArbitraryBehaviorSharedDataWorker &worker) const override;
+};
+
+} // namespace gd

Core/GDCore/IDE/WholeProjectRefactorer.cpp

@@ -18,8 +18,20 @@
 #include "GDCore/IDE/Events/ExpressionsRenamer.h"
 #include "GDCore/IDE/Events/InstructionsParameterMover.h"
 #include "GDCore/IDE/Events/InstructionsTypeRenamer.h"
+#include "GDCore/IDE/ProjectBrowser.h"
+#include "GDCore/IDE/ProjectBrowserHelper.h"
+#include "GDCore/IDE/WholeProjectBrowser.h"
+#include "GDCore/IDE/EventBasedBehaviorBrowser.h"
 #include "GDCore/IDE/EventsFunctionTools.h"
 #include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.h"
+#include "GDCore/IDE/Project/RequiredBehaviorRenamer.h"
+#include "GDCore/IDE/Project/BehaviorObjectTypeRenamer.h"
+#include "GDCore/IDE/Project/BehaviorsSharedDataBehaviorTypeRenamer.h"
+#include "GDCore/IDE/Project/FunctionParameterBehaviorTypeRenamer.h"
+#include "GDCore/IDE/Project/FunctionParameterObjectTypeRenamer.h"
 #include "GDCore/IDE/UnfilledRequiredBehaviorPropertyProblem.h"
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/BehaviorConfigurationContainer.h"
@@ -44,174 +56,6 @@ const gd::String WholeProjectRefactorer::behaviorObjectParameterName = "Object";
 // always called "Object".
 const gd::String WholeProjectRefactorer::parentObjectParameterName = "Object";
 
-void WholeProjectRefactorer::ExposeProjectEvents(
-    gd::Project& project, gd::ArbitraryEventsWorker& worker) {
-  // See also gd::Project::ExposeResources for a method that traverse the whole
-  // project (this time for resources).
-
-  // Add layouts events
-  for (std::size_t s = 0; s < project.GetLayoutsCount(); s++) {
-    worker.Launch(project.GetLayout(s).GetEvents());
-  }
-  // Add external events events
-  for (std::size_t s = 0; s < project.GetExternalEventsCount(); s++) {
-    worker.Launch(project.GetExternalEvents(s).GetEvents());
-  }
-  // Add events based extensions
-  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
-       e++) {
-    // Add (free) events functions
-    auto& eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    for (auto&& eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
-      worker.Launch(eventsFunction->GetEvents());
-    }
-
-    // Add (behavior) events functions
-    for (auto&& eventsBasedBehavior :
-         eventsFunctionsExtension.GetEventsBasedBehaviors()
-             .GetInternalVector()) {
-      auto& behaviorEventsFunctions = eventsBasedBehavior->GetEventsFunctions();
-      for (auto&& eventsFunction :
-           behaviorEventsFunctions.GetInternalVector()) {
-        worker.Launch(eventsFunction->GetEvents());
-      }
-    }
-
-    // Add (object) events functions
-    for (auto&& eventsBasedObject :
-         eventsFunctionsExtension.GetEventsBasedObjects()
-             .GetInternalVector()) {
-      auto& objectEventsFunctions = eventsBasedObject->GetEventsFunctions();
-      for (auto&& eventsFunction :
-           objectEventsFunctions.GetInternalVector()) {
-        worker.Launch(eventsFunction->GetEvents());
-      }
-    }
-  }
-}
-
-void WholeProjectRefactorer::ExposeProjectEvents(
-    gd::Project& project, gd::ArbitraryEventsWorkerWithContext& worker) {
-  // See also gd::Project::ExposeResources for a method that traverse the whole
-  // project (this time for resources) and ExposeProjectEffects (this time for
-  // effects).
-
-  // Add layouts events
-  for (std::size_t s = 0; s < project.GetLayoutsCount(); s++) {
-    auto& layout = project.GetLayout(s);
-    worker.Launch(layout.GetEvents(), project, layout);
-  }
-  // Add external events events
-  for (std::size_t s = 0; s < project.GetExternalEventsCount(); s++) {
-    const auto& externalEvents = project.GetExternalEvents(s);
-    const gd::String& associatedLayout = externalEvents.GetAssociatedLayout();
-    if (project.HasLayoutNamed(associatedLayout)) {
-      worker.Launch(project.GetExternalEvents(s).GetEvents(),
-                    project,
-                    project.GetLayout(associatedLayout));
-    }
-  }
-  // Add events based extensions
-  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
-       e++) {
-    // Add (free) events functions
-    auto& eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    for (auto&& eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
-      gd::ObjectsContainer globalObjectsAndGroups;
-      gd::ObjectsContainer objectsAndGroups;
-      gd::EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
-          project,
-          eventsFunctionsExtension,
-          *eventsFunction,
-          globalObjectsAndGroups,
-          objectsAndGroups);
-
-      worker.Launch(eventsFunction->GetEvents(),
-                    globalObjectsAndGroups,
-                    objectsAndGroups);
-    }
-
-    // Add (behavior) events functions
-    for (auto&& eventsBasedBehavior :
-         eventsFunctionsExtension.GetEventsBasedBehaviors()
-             .GetInternalVector()) {
-      ExposeEventsBasedBehaviorEvents(project, *eventsBasedBehavior, worker);
-    }
-
-    // Add (object) events functions
-    for (auto&& eventsBasedObject :
-         eventsFunctionsExtension.GetEventsBasedObjects()
-             .GetInternalVector()) {
-      ExposeEventsBasedObjectEvents(project, *eventsBasedObject, worker);
-    }
-  }
-}
-
-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::ExposeEventsBasedObjectEvents(
-    gd::Project& project,
-    const gd::EventsBasedObject& eventsBasedObject,
-    gd::ArbitraryEventsWorkerWithContext& worker) {
-  auto& objectEventsFunctions = eventsBasedObject.GetEventsFunctions();
-  for (auto&& eventsFunction : objectEventsFunctions.GetInternalVector()) {
-    gd::ObjectsContainer globalObjectsAndGroups;
-    gd::ObjectsContainer objectsAndGroups;
-    gd::EventsFunctionTools::ObjectEventsFunctionToObjectsContainer(
-        project,
-        eventsBasedObject,
-        *eventsFunction,
-        globalObjectsAndGroups,
-        objectsAndGroups);
-
-    worker.Launch(
-        eventsFunction->GetEvents(), globalObjectsAndGroups, objectsAndGroups);
-  }
-}
-
-void WholeProjectRefactorer::ExposeProjectObjects(
-    gd::Project& project, gd::ArbitraryObjectsWorker& worker) {
-
-  // Global objects
-  worker.Launch(project);
-
-  // Layers objects
-  for (size_t i = 0; i < project.GetLayoutsCount(); i++) {
-    worker.Launch(project.GetLayout(i));
-  }
-
-  // Event based objects children
-  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
-      e++) {
-    auto& eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-
-    for (auto&& eventsBasedObjectUniquePtr :
-        eventsFunctionsExtension.GetEventsBasedObjects()
-            .GetInternalVector()) {
-      auto eventsBasedObject = eventsBasedObjectUniquePtr.get();
-      worker.Launch(*eventsBasedObject);
-    }
-  }
-};
-
 std::set<gd::String>
 WholeProjectRefactorer::GetAllObjectTypesUsingEventsBasedBehavior(
     const gd::Project& project,
@@ -286,22 +130,48 @@ void WholeProjectRefactorer::EnsureObjectEventsFunctionsProperParameters(
   }
 }
 
+void WholeProjectRefactorer::UpdateExtensionNameInEventsBasedBehavior(
+      gd::Project& project,
+      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
+      gd::EventsBasedBehavior& eventsBasedBehavior,
+      const gd::String& sourceExtensionName) {
+  const EventBasedBehaviorBrowser eventBasedBehaviorExposer(eventsBasedBehavior);
+  WholeProjectRefactorer::RenameEventsFunctionsExtension(
+    project,
+    eventsFunctionsExtension,
+    sourceExtensionName,
+    eventsFunctionsExtension.GetName(),
+    eventBasedBehaviorExposer);
+}
+
+void WholeProjectRefactorer::RenameEventsFunctionsExtension(
+    gd::Project &project,
+    const gd::EventsFunctionsExtension &eventsFunctionsExtension,
+    const gd::String &oldName, const gd::String &newName) {
+  const WholeProjectBrowser wholeProjectExposer;
+  RenameEventsFunctionsExtension(project, eventsFunctionsExtension, oldName,
+                                 newName, wholeProjectExposer);
+}
+
 void WholeProjectRefactorer::RenameEventsFunctionsExtension(
     gd::Project& project,
     const gd::EventsFunctionsExtension& eventsFunctionsExtension,
     const gd::String& oldName,
-    const gd::String& newName) {
+    const gd::String& newName,
+    const gd::ProjectBrowser& projectBrowser
+    ) {
   auto renameEventsFunction =
-      [&project, &oldName, &newName](const gd::EventsFunction& eventsFunction) {
+      [&project, &oldName, &newName, &projectBrowser](const gd::EventsFunction& eventsFunction) {
         DoRenameEventsFunction(
             project,
             eventsFunction,
             gd::PlatformExtension::GetEventsFunctionFullType(oldName, eventsFunction.GetName()),
-            gd::PlatformExtension::GetEventsFunctionFullType(newName, eventsFunction.GetName()));
+            gd::PlatformExtension::GetEventsFunctionFullType(newName, eventsFunction.GetName()),
+            projectBrowser);
       };
 
   auto renameBehaviorEventsFunction =
-      [&project, &oldName, &newName](
+      [&project, &oldName, &newName, &projectBrowser](
           const gd::EventsBasedBehavior& eventsBasedBehavior,
           const gd::EventsFunction& eventsFunction) {
         if (eventsFunction.IsExpression()) {
@@ -316,12 +186,12 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
               gd::PlatformExtension::GetBehaviorEventsFunctionFullType(newName,
                                                 eventsBasedBehavior.GetName(),
                                                 eventsFunction.GetName()));
-          ExposeProjectEvents(project, renamer);
+          projectBrowser.ExposeEvents(project, renamer);
         }
       };
 
   auto renameBehaviorPropertyFunctions =
-      [&project, &oldName, &newName](
+      [&project, &oldName, &newName, &projectBrowser](
           const gd::EventsBasedBehavior& eventsBasedBehavior,
           const gd::NamedPropertyDescriptor& property) {
         gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
@@ -336,7 +206,7 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
                 eventsBasedBehavior.GetName(),
                 gd::EventsBasedBehavior::GetPropertyActionName(
                     property.GetName())));
-        ExposeProjectEvents(project, actionRenamer);
+        projectBrowser.ExposeEvents(project, actionRenamer);
 
         gd::InstructionsTypeRenamer conditionRenamer =
             gd::InstructionsTypeRenamer(
@@ -351,14 +221,14 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
                     eventsBasedBehavior.GetName(),
                     gd::EventsBasedBehavior::GetPropertyConditionName(
                         property.GetName())));
-        ExposeProjectEvents(project, conditionRenamer);
+        projectBrowser.ExposeEvents(project, conditionRenamer);
 
         // Nothing to do for expressions, expressions are not including the
         // extension name
       };
 
   auto renameBehaviorSharedPropertyFunctions =
-      [&project, &oldName, &newName](
+      [&project, &oldName, &newName, &projectBrowser](
           const gd::EventsBasedBehavior& eventsBasedBehavior,
           const gd::NamedPropertyDescriptor& property) {
         gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
@@ -373,7 +243,7 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
                 eventsBasedBehavior.GetName(),
                 gd::EventsBasedBehavior::GetSharedPropertyActionName(
                     property.GetName())));
-        ExposeProjectEvents(project, actionRenamer);
+        projectBrowser.ExposeEvents(project, actionRenamer);
 
         gd::InstructionsTypeRenamer conditionRenamer =
             gd::InstructionsTypeRenamer(
@@ -388,14 +258,14 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
                     eventsBasedBehavior.GetName(),
                     gd::EventsBasedBehavior::GetSharedPropertyConditionName(
                         property.GetName())));
-        ExposeProjectEvents(project, conditionRenamer);
+        projectBrowser.ExposeEvents(project, conditionRenamer);
 
         // Nothing to do for expressions, expressions are not including the
         // extension name
       };
 
   auto renameObjectEventsFunction =
-      [&project, &oldName, &newName](
+      [&project, &oldName, &newName, &projectBrowser](
           const gd::EventsBasedObject& eventsBasedObject,
           const gd::EventsFunction& eventsFunction) {
         if (eventsFunction.IsExpression()) {
@@ -410,12 +280,12 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
               gd::PlatformExtension::GetObjectEventsFunctionFullType(newName,
                                                 eventsBasedObject.GetName(),
                                                 eventsFunction.GetName()));
-          ExposeProjectEvents(project, renamer);
+          projectBrowser.ExposeEvents(project, renamer);
         }
       };
 
   auto renameObjectPropertyFunctions =
-      [&project, &oldName, &newName](
+      [&project, &oldName, &newName, &projectBrowser](
           const gd::EventsBasedObject& eventsBasedObject,
           const gd::NamedPropertyDescriptor& property) {
         gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
@@ -430,7 +300,7 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
                 eventsBasedObject.GetName(),
                 gd::EventsBasedObject::GetPropertyActionName(
                     property.GetName())));
-        ExposeProjectEvents(project, actionRenamer);
+        projectBrowser.ExposeEvents(project, actionRenamer);
 
         gd::InstructionsTypeRenamer conditionRenamer =
             gd::InstructionsTypeRenamer(
@@ -445,7 +315,7 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
                     eventsBasedObject.GetName(),
                     gd::EventsBasedObject::GetPropertyConditionName(
                         property.GetName())));
-        ExposeProjectEvents(project, conditionRenamer);
+        projectBrowser.ExposeEvents(project, conditionRenamer);
 
         // Nothing to do for expressions, expressions are not including the
         // extension name
@@ -533,7 +403,8 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
     DoRenameBehavior(
         project,
         gd::PlatformExtension::GetBehaviorFullType(oldName, eventsBasedBehavior->GetName()),
-        gd::PlatformExtension::GetBehaviorFullType(newName, eventsBasedBehavior->GetName()));
+        gd::PlatformExtension::GetBehaviorFullType(newName, eventsBasedBehavior->GetName()),
+        projectBrowser);
   }
 
   // Finally, rename custom objects type
@@ -542,7 +413,8 @@ void WholeProjectRefactorer::RenameEventsFunctionsExtension(
     DoRenameObject(
         project,
         gd::PlatformExtension::GetObjectFullType(oldName, eventsBasedObject->GetName()),
-        gd::PlatformExtension::GetObjectFullType(newName, eventsBasedObject->GetName()));
+        gd::PlatformExtension::GetObjectFullType(newName, eventsBasedObject->GetName()),
+        projectBrowser);
   }
 }
 
@@ -556,13 +428,15 @@ void WholeProjectRefactorer::RenameEventsFunction(
   const gd::EventsFunction& eventsFunction =
       eventsFunctionsExtension.GetEventsFunction(oldFunctionName);
 
+  const WholeProjectBrowser wholeProjectExposer;
   DoRenameEventsFunction(
       project,
       eventsFunction,
       gd::PlatformExtension::GetEventsFunctionFullType(eventsFunctionsExtension.GetName(),
                                 oldFunctionName),
       gd::PlatformExtension::GetEventsFunctionFullType(eventsFunctionsExtension.GetName(),
-                                newFunctionName));
+                                newFunctionName),
+      wholeProjectExposer);
   
   if (eventsFunction.GetFunctionType() == gd::EventsFunction::ExpressionAndCondition) {
     for (auto&& otherFunction : eventsFunctionsExtension.GetInternalVector())
@@ -598,7 +472,7 @@ void WholeProjectRefactorer::RenameBehaviorEventsFunction(
                             eventsBasedBehavior.GetName()),
         oldFunctionName,
         newFunctionName);
-    ExposeProjectEvents(project, renamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, renamer);
   }
   if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
     gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
@@ -609,7 +483,7 @@ void WholeProjectRefactorer::RenameBehaviorEventsFunction(
         gd::PlatformExtension::GetBehaviorEventsFunctionFullType(eventsFunctionsExtension.GetName(),
                                           eventsBasedBehavior.GetName(),
                                           newFunctionName));
-    ExposeProjectEvents(project, renamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, renamer);
   }
   if (eventsFunction.GetFunctionType() == gd::EventsFunction::ExpressionAndCondition) {
     for (auto&& otherFunction : eventsBasedBehavior.GetEventsFunctions().GetInternalVector())
@@ -642,7 +516,7 @@ void WholeProjectRefactorer::RenameObjectEventsFunction(
                             eventsBasedObject.GetName()),
         oldFunctionName,
         newFunctionName);
-    ExposeProjectEvents(project, renamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, renamer);
   }
   if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
     gd::InstructionsTypeRenamer renamer = gd::InstructionsTypeRenamer(
@@ -653,7 +527,7 @@ void WholeProjectRefactorer::RenameObjectEventsFunction(
         gd::PlatformExtension::GetObjectEventsFunctionFullType(eventsFunctionsExtension.GetName(),
                                           eventsBasedObject.GetName(),
                                           newFunctionName));
-    ExposeProjectEvents(project, renamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, renamer);
   }
   if (eventsFunction.GetFunctionType() == gd::EventsFunction::ExpressionAndCondition) {
     for (auto&& otherFunction : eventsBasedObject.GetEventsFunctions().GetInternalVector())
@@ -685,7 +559,7 @@ void WholeProjectRefactorer::MoveEventsFunctionParameter(
         gd::ExpressionsParameterMover(project.GetCurrentPlatform());
     mover.SetFreeExpressionMovedParameter(
         eventsFunctionType, oldIndex, newIndex);
-    ExposeProjectEvents(project, mover);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, mover);
   }
   if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
     const int operatorIndexOffset = eventsFunction.IsExpression() ? 2 : 0;
@@ -694,7 +568,7 @@ void WholeProjectRefactorer::MoveEventsFunctionParameter(
         eventsFunctionType,
         oldIndex + operatorIndexOffset,
         newIndex + operatorIndexOffset);
-    ExposeProjectEvents(project, mover);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, mover);
   }
 }
 
@@ -725,7 +599,7 @@ void WholeProjectRefactorer::MoveBehaviorEventsFunctionParameter(
         functionName,
         oldIndex,
         newIndex);
-    ExposeProjectEvents(project, mover);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, mover);
   }
   if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
     const int operatorIndexOffset = eventsFunction.IsExpression() ? 2 : 0;
@@ -734,7 +608,7 @@ void WholeProjectRefactorer::MoveBehaviorEventsFunctionParameter(
         eventsFunctionType,
         oldIndex + operatorIndexOffset,
         newIndex + operatorIndexOffset);
-    ExposeProjectEvents(project, mover);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, mover);
   }
 }
 
@@ -765,7 +639,7 @@ void WholeProjectRefactorer::MoveObjectEventsFunctionParameter(
         functionName,
         oldIndex,
         newIndex);
-    ExposeProjectEvents(project, mover);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, mover);
   }
   if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
     const int operatorIndexOffset = eventsFunction.IsExpression() ? 2 : 0;
@@ -774,7 +648,7 @@ void WholeProjectRefactorer::MoveObjectEventsFunctionParameter(
         eventsFunctionType,
         oldIndex + operatorIndexOffset,
         newIndex + operatorIndexOffset);
-    ExposeProjectEvents(project, mover);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, mover);
   }
 }
 
@@ -800,7 +674,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
                                               oldPropertyName,
                                               newPropertyName);
 
-    ExposeEventsBasedBehaviorEvents(
+    gd::ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
         project, eventsBasedBehavior, behaviorRenamer);
   } else {
     // Properties that represent primitive values will be used through
@@ -816,7 +690,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
                             eventsBasedBehavior.GetName()),
         EventsBasedBehavior::GetPropertyExpressionName(oldPropertyName),
         EventsBasedBehavior::GetPropertyExpressionName(newPropertyName));
-    ExposeProjectEvents(project, expressionRenamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, expressionRenamer);
 
     gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
         project,
@@ -828,7 +702,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
             eventsFunctionsExtension.GetName(),
             eventsBasedBehavior.GetName(),
             EventsBasedBehavior::GetPropertyActionName(newPropertyName)));
-    ExposeProjectEvents(project, actionRenamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, actionRenamer);
 
     gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
         project,
@@ -840,7 +714,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorProperty(
             eventsFunctionsExtension.GetName(),
             eventsBasedBehavior.GetName(),
             EventsBasedBehavior::GetPropertyConditionName(newPropertyName)));
-    ExposeProjectEvents(project, conditionRenamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, conditionRenamer);
   }
 }
 
@@ -866,7 +740,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorSharedProperty(
                                               oldPropertyName,
                                               newPropertyName);
 
-    ExposeEventsBasedBehaviorEvents(
+    gd::ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
         project, eventsBasedBehavior, behaviorRenamer);
   } else {
     // Properties that represent primitive values will be used through
@@ -882,7 +756,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorSharedProperty(
                             eventsBasedBehavior.GetName()),
         EventsBasedBehavior::GetSharedPropertyExpressionName(oldPropertyName),
         EventsBasedBehavior::GetSharedPropertyExpressionName(newPropertyName));
-    ExposeProjectEvents(project, expressionRenamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, expressionRenamer);
 
     gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
         project,
@@ -894,7 +768,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorSharedProperty(
             eventsFunctionsExtension.GetName(),
             eventsBasedBehavior.GetName(),
             EventsBasedBehavior::GetSharedPropertyActionName(newPropertyName)));
-    ExposeProjectEvents(project, actionRenamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, actionRenamer);
 
     gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
         project,
@@ -906,7 +780,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehaviorSharedProperty(
             eventsFunctionsExtension.GetName(),
             eventsBasedBehavior.GetName(),
             EventsBasedBehavior::GetSharedPropertyConditionName(newPropertyName)));
-    ExposeProjectEvents(project, conditionRenamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, conditionRenamer);
   }
 }
 
@@ -932,7 +806,7 @@ void WholeProjectRefactorer::RenameEventsBasedObjectProperty(
                           eventsBasedObject.GetName()),
       EventsBasedObject::GetPropertyExpressionName(oldPropertyName),
       EventsBasedObject::GetPropertyExpressionName(newPropertyName));
-  ExposeProjectEvents(project, expressionRenamer);
+  gd::ProjectBrowserHelper::ExposeProjectEvents(project, expressionRenamer);
 
   gd::InstructionsTypeRenamer actionRenamer = gd::InstructionsTypeRenamer(
       project,
@@ -944,7 +818,7 @@ void WholeProjectRefactorer::RenameEventsBasedObjectProperty(
           eventsFunctionsExtension.GetName(),
           eventsBasedObject.GetName(),
           EventsBasedObject::GetPropertyActionName(newPropertyName)));
-  ExposeProjectEvents(project, actionRenamer);
+  gd::ProjectBrowserHelper::ExposeProjectEvents(project, actionRenamer);
 
   gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
       project,
@@ -956,7 +830,7 @@ void WholeProjectRefactorer::RenameEventsBasedObjectProperty(
           eventsFunctionsExtension.GetName(),
           eventsBasedObject.GetName(),
           EventsBasedObject::GetPropertyConditionName(newPropertyName)));
-  ExposeProjectEvents(project, conditionRenamer);
+  gd::ProjectBrowserHelper::ExposeProjectEvents(project, conditionRenamer);
 }
 
 void WholeProjectRefactorer::AddBehaviorAndRequiredBehaviors(
@@ -1197,7 +1071,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
                   eventsFunctionsExtension.GetName(),
                   newBehaviorName,
                   eventsFunction.GetName()));
-          ExposeProjectEvents(project, renamer);
+          gd::ProjectBrowserHelper::ExposeProjectEvents(project, renamer);
         }
       };
 
@@ -1217,7 +1091,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
             eventsFunctionsExtension.GetName(),
             newBehaviorName,
             EventsBasedBehavior::GetPropertyActionName(property.GetName())));
-    ExposeProjectEvents(project, actionRenamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, actionRenamer);
 
     gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
         project,
@@ -1229,7 +1103,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
             eventsFunctionsExtension.GetName(),
             newBehaviorName,
             EventsBasedBehavior::GetPropertyConditionName(property.GetName())));
-    ExposeProjectEvents(project, conditionRenamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, conditionRenamer);
 
     // Nothing to do for expression, expressions are not including the name of
     // the behavior
@@ -1251,7 +1125,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
             eventsFunctionsExtension.GetName(),
             newBehaviorName,
             EventsBasedBehavior::GetSharedPropertyActionName(property.GetName())));
-    ExposeProjectEvents(project, actionRenamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, actionRenamer);
 
     gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
         project,
@@ -1263,7 +1137,7 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
             eventsFunctionsExtension.GetName(),
             newBehaviorName,
             EventsBasedBehavior::GetSharedPropertyConditionName(property.GetName())));
-    ExposeProjectEvents(project, conditionRenamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, conditionRenamer);
 
     // Nothing to do for expression, expressions are not including the name of
     // the behavior
@@ -1296,10 +1170,12 @@ void WholeProjectRefactorer::RenameEventsBasedBehavior(
     renameBehaviorSharedProperty(*property);
   }
 
+  const WholeProjectBrowser wholeProjectExposer;
   DoRenameBehavior(
       project,
       gd::PlatformExtension::GetBehaviorFullType(eventsFunctionsExtension.GetName(), oldBehaviorName),
-      gd::PlatformExtension::GetBehaviorFullType(eventsFunctionsExtension.GetName(), newBehaviorName));
+      gd::PlatformExtension::GetBehaviorFullType(eventsFunctionsExtension.GetName(), newBehaviorName),
+      wholeProjectExposer);
 }
 
 void WholeProjectRefactorer::RenameEventsBasedObject(
@@ -1336,7 +1212,7 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
                   eventsFunctionsExtension.GetName(),
                   newObjectName,
                   eventsFunction.GetName()));
-          ExposeProjectEvents(project, renamer);
+          gd::ProjectBrowserHelper::ExposeProjectEvents(project, renamer);
         }
       };
 
@@ -1356,7 +1232,7 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
             eventsFunctionsExtension.GetName(),
             newObjectName,
             EventsBasedObject::GetPropertyActionName(property.GetName())));
-    ExposeProjectEvents(project, actionRenamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, actionRenamer);
 
     gd::InstructionsTypeRenamer conditionRenamer = gd::InstructionsTypeRenamer(
         project,
@@ -1368,7 +1244,7 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
             eventsFunctionsExtension.GetName(),
             newObjectName,
             EventsBasedObject::GetPropertyConditionName(property.GetName())));
-    ExposeProjectEvents(project, conditionRenamer);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, conditionRenamer);
 
     // Nothing to do for expression, expressions are not including the name of
     // the object
@@ -1399,17 +1275,20 @@ void WholeProjectRefactorer::RenameEventsBasedObject(
     renameObjectProperty(*property);
   }
 
+  const WholeProjectBrowser wholeProjectExposer;
   DoRenameObject(
       project,
       gd::PlatformExtension::GetObjectFullType(eventsFunctionsExtension.GetName(), oldObjectName),
-      gd::PlatformExtension::GetObjectFullType(eventsFunctionsExtension.GetName(), newObjectName));
+      gd::PlatformExtension::GetObjectFullType(eventsFunctionsExtension.GetName(), newObjectName),
+      wholeProjectExposer);
 }
 
 void WholeProjectRefactorer::DoRenameEventsFunction(
     gd::Project& project,
     const gd::EventsFunction& eventsFunction,
     const gd::String& oldFullType,
-    const gd::String& newFullType) {
+    const gd::String& newFullType,
+    const gd::ProjectBrowser& projectBrowser) {
   // 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.
@@ -1417,165 +1296,61 @@ void WholeProjectRefactorer::DoRenameEventsFunction(
     gd::ExpressionsRenamer renamer =
         gd::ExpressionsRenamer(project.GetCurrentPlatform());
     renamer.SetReplacedFreeExpression(oldFullType, newFullType);
-    ExposeProjectEvents(project, renamer);
+    projectBrowser.ExposeEvents(project, renamer);
   }
   if (eventsFunction.IsAction() || eventsFunction.IsCondition()) {
     gd::InstructionsTypeRenamer renamer =
         gd::InstructionsTypeRenamer(project, oldFullType, newFullType);
-    ExposeProjectEvents(project, renamer);
+    projectBrowser.ExposeEvents(project, renamer);
   }
 }
 
 void WholeProjectRefactorer::DoRenameBehavior(
-    gd::Project& project,
-    const gd::String& oldBehaviorType,
-    const gd::String& newBehaviorType) {
-  auto renameBehaviorTypeInBehaviorContent =
-      [&oldBehaviorType,
-       &newBehaviorType](gd::BehaviorConfigurationContainer& behavior) {
-        if (behavior.GetTypeName() == oldBehaviorType) {
-          behavior.SetTypeName(newBehaviorType);
-        }
-      };
-  auto renameBehaviorTypeInParameters =
-      [&oldBehaviorType, &newBehaviorType](gd::EventsFunction& eventsFunction) {
-        for (auto& parameter : eventsFunction.GetParameters()) {
-          if (gd::ParameterMetadata::IsBehavior(parameter.GetType()) &&
-              parameter.GetExtraInfo() == oldBehaviorType) {
-            parameter.SetExtraInfo(newBehaviorType);
-          }
-        }
-      };
+    gd::Project &project, const gd::String &oldBehaviorType,
+    const gd::String &newBehaviorType,
+    const gd::ProjectBrowser &projectBrowser) {
 
   // Rename behavior in required behavior properties
-  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
-       e++) {
-    auto& eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
+  auto requiredBehaviorRenamer =
+      gd::RequiredBehaviorRenamer(oldBehaviorType, newBehaviorType);
+  projectBrowser.ExposeEventBasedBehaviors(project, requiredBehaviorRenamer);
 
-    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 objects lists.
-  auto behaviorTypeRenamer = gd::BehaviorTypeRenamer(
-          project,
-          oldBehaviorType,
-          newBehaviorType);
-  ExposeProjectObjects(project, behaviorTypeRenamer);
+  auto behaviorTypeRenamer =
+      gd::BehaviorTypeRenamer(oldBehaviorType, newBehaviorType);
+  projectBrowser.ExposeObjects(project, behaviorTypeRenamer);
 
   // Rename behavior in layout behavior shared data.
-  for (std::size_t i = 0; i < project.GetLayoutsCount(); ++i) {
-    gd::Layout& layout = project.GetLayout(i);
-
-    for (auto& behaviorSharedDataContent : layout.GetAllBehaviorSharedData()) {
-      renameBehaviorTypeInBehaviorContent(*behaviorSharedDataContent.second);
-    }
-  }
+  auto sharedDataBehaviorTypeRenamer =
+      gd::BehaviorsSharedDataBehaviorTypeRenamer(oldBehaviorType, newBehaviorType);
+  projectBrowser.ExposeBehaviorSharedDatas(project, sharedDataBehaviorTypeRenamer);
 
   // Rename in parameters of (free/behavior) events function
-  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
-       e++) {
-    auto& eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-    for (auto&& eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
-      renameBehaviorTypeInParameters(*eventsFunction);
-    }
-
-    for (auto&& eventsBasedBehavior :
-         eventsFunctionsExtension.GetEventsBasedBehaviors()
-             .GetInternalVector()) {
-      auto& behaviorEventsFunctions = eventsBasedBehavior->GetEventsFunctions();
-      for (auto&& eventsFunction :
-           behaviorEventsFunctions.GetInternalVector()) {
-        renameBehaviorTypeInParameters(*eventsFunction);
-      }
-    }
-
-    for (auto&& eventsBasedObject :
-         eventsFunctionsExtension.GetEventsBasedObjects()
-             .GetInternalVector()) {
-      auto& behaviorEventsFunctions = eventsBasedObject->GetEventsFunctions();
-      for (auto&& eventsFunction :
-           behaviorEventsFunctions.GetInternalVector()) {
-        renameBehaviorTypeInParameters(*eventsFunction);
-      }
-    }
-  }
+  auto behaviorParameterRenamer = gd::FunctionParameterBehaviorTypeRenamer(
+      oldBehaviorType, newBehaviorType);
+  projectBrowser.ExposeFunctions(project, behaviorParameterRenamer);
 }
 
 void WholeProjectRefactorer::DoRenameObject(
     gd::Project& project,
     const gd::String& oldObjectType,
-    const gd::String& newObjectType) {
+    const gd::String& newObjectType,
+    const gd::ProjectBrowser& projectBrowser) {
 
-  auto customObjectTypeRenamer = gd::CustomObjectTypeRenamer(
-          project,
-          oldObjectType,
-          newObjectType);
-  ExposeProjectObjects(project, customObjectTypeRenamer);
+  // Rename object type in objects lists.
+  auto customObjectTypeRenamer =
+      gd::CustomObjectTypeRenamer(oldObjectType, newObjectType);
+  projectBrowser.ExposeObjects(project, customObjectTypeRenamer);
 
-  auto renameObjectTypeInParameters =
-      [&oldObjectType, &newObjectType](gd::EventsFunction& eventsFunction) {
-        for (auto& parameter : eventsFunction.GetParameters()) {
-          if (gd::ParameterMetadata::IsObject(parameter.GetType()) &&
-              parameter.GetExtraInfo() == oldObjectType) {
-            parameter.SetExtraInfo(newObjectType);
-          }
-        }
-      };
+  // Rename in behaviors object type.
+  auto behaviorObjectTypeRenamer =
+      gd::BehaviorObjectTypeRenamer(oldObjectType, newObjectType);
+  projectBrowser.ExposeEventBasedBehaviors(project, behaviorObjectTypeRenamer);
 
   // Rename in parameters of (free/behavior) events function
-  for (std::size_t e = 0; e < project.GetEventsFunctionsExtensionsCount();
-       e++) {
-    auto& eventsFunctionsExtension = project.GetEventsFunctionsExtension(e);
-
-    // Behavior object types
-    for (auto&& eventsBasedBehavior :
-        eventsFunctionsExtension.GetEventsBasedBehaviors().GetInternalVector()) {
-      if (eventsBasedBehavior->GetObjectType() == oldObjectType) {
-        eventsBasedBehavior->SetObjectType(newObjectType);
-      }
-    }
-
-    for (auto&& eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
-      renameObjectTypeInParameters(*eventsFunction);
-    }
-
-    for (auto&& eventsBasedBehavior :
-         eventsFunctionsExtension.GetEventsBasedBehaviors()
-             .GetInternalVector()) {
-      auto& behaviorEventsFunctions = eventsBasedBehavior->GetEventsFunctions();
-      for (auto&& eventsFunction :
-           behaviorEventsFunctions.GetInternalVector()) {
-        renameObjectTypeInParameters(*eventsFunction);
-      }
-    }
-
-    for (auto&& eventsBasedObject :
-         eventsFunctionsExtension.GetEventsBasedObjects()
-             .GetInternalVector()) {
-      auto& behaviorEventsFunctions = eventsBasedObject->GetEventsFunctions();
-      for (auto&& eventsFunction :
-           behaviorEventsFunctions.GetInternalVector()) {
-        renameObjectTypeInParameters(*eventsFunction);
-      }
-    }
-  }
+  auto objectParameterRenamer =
+      gd::FunctionParameterObjectTypeRenamer(oldObjectType, newObjectType);
+  projectBrowser.ExposeFunctions(project, objectParameterRenamer);
 }
 
 void WholeProjectRefactorer::ObjectOrGroupRemovedInLayout(

Core/GDCore/IDE/WholeProjectRefactorer.h

@@ -3,8 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#ifndef GDCORE_WHOLEPROJECTREFACTORER_H
-#define GDCORE_WHOLEPROJECTREFACTORER_H
+#pragma once
+
 #include <set>
 #include <unordered_set>
 #include <vector>
@@ -21,10 +21,14 @@ class EventsBasedBehavior;
 class EventsBasedObject;
 class ArbitraryEventsWorker;
 class ArbitraryObjectsWorker;
+class ArbitraryEventsFunctionsWorker;
 class ArbitraryEventsWorkerWithContext;
+class ArbitraryEventBasedBehaviorsWorker;
+class ArbitraryBehaviorSharedDataWorker;
 class Behavior;
 class BehaviorMetadata;
 class UnfilledRequiredBehaviorPropertyProblem;
+class ProjectBrowser;
 }  // namespace gd
 
 namespace gd {
@@ -39,54 +43,6 @@ namespace gd {
  */
 class GD_CORE_API WholeProjectRefactorer {
  public:
-  /**
-   * \brief Call the specified worker on all events of the project (layout,
-   * external events, events functions...)
-   *
-   * This should be the preferred way to traverse all the events of a project.
-   */
-  static void ExposeProjectEvents(gd::Project& project,
-                                  gd::ArbitraryEventsWorker& worker);
-
-  /**
-   * \brief Call the specified worker on all events of the project (layout,
-   * external events, events functions...)
-   *
-   * This should be the preferred way to traverse all the events of a project.
-   */
-  static void ExposeProjectEvents(gd::Project& project,
-                                  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 events of the events based object
-   *
-   * This should be the preferred way to traverse all the events of an events
-   * based object.
-   */
-  static void ExposeEventsBasedObjectEvents(
-      gd::Project& project,
-      const gd::EventsBasedObject& eventsBasedObject,
-      gd::ArbitraryEventsWorkerWithContext& worker);
-
-  /**
-   * \brief Call the specified worker on all ObjectContainers of the project
-   * (global, layouts...)
-   *
-   * This should be the preferred way to traverse all the objects of a project.
-   */
-  static void ExposeProjectObjects(gd::Project& project,
-                                   gd::ArbitraryObjectsWorker& worker);
 
   /**
    * \brief Refactor the project **before** an events function extension is
@@ -102,6 +58,16 @@ class GD_CORE_API WholeProjectRefactorer {
       const gd::String& oldName,
       const gd::String& newName);
 
+  /**
+   * \brief Refactor behavior events after the extension was placed in a new
+   * extension.
+   */
+  static void UpdateExtensionNameInEventsBasedBehavior(
+      gd::Project& project,
+      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
+      gd::EventsBasedBehavior& eventsBasedBehavior,
+      const gd::String& sourceExtensionName);
+
   /**
    * \brief Refactor the project **before** an events function is renamed.
    *
@@ -439,15 +405,33 @@ class GD_CORE_API WholeProjectRefactorer {
   static void DoRenameEventsFunction(gd::Project& project,
                                      const gd::EventsFunction& eventsFunction,
                                      const gd::String& oldFullType,
-                                     const gd::String& newFullType);
+                                     const gd::String& newFullType,
+                                     const gd::ProjectBrowser& projectBrowser);
 
   static void DoRenameBehavior(gd::Project& project,
                                const gd::String& oldBehaviorType,
-                               const gd::String& newBehaviorType);
+                               const gd::String& newBehaviorType,
+                               const gd::ProjectBrowser& projectBrowser);
 
   static void DoRenameObject(gd::Project& project,
                              const gd::String& oldObjectType,
-                             const gd::String& newObjectType);
+                             const gd::String& newObjectType,
+                             const gd::ProjectBrowser& projectBrowser);
+
+  /**
+   * \brief Refactor the project **before** an events function extension is
+   * renamed.
+   *
+   * \warning Do the renaming of the specified extension after calling this.
+   * This is because the extension is expected to have its old name for the
+   * refactoring.
+   */
+  static void RenameEventsFunctionsExtension(
+      gd::Project& project,
+      const gd::EventsFunctionsExtension& eventsFunctionsExtension,
+      const gd::String& oldName,
+      const gd::String& newName,
+      const gd::ProjectBrowser& projectBrowser);
 
   static void FindDependentBehaviorNames(
       const gd::Project& project,
@@ -462,5 +446,3 @@ class GD_CORE_API WholeProjectRefactorer {
 };
 
 }  // namespace gd
-
-#endif  // GDCORE_WHOLEPROJECTREFACTORER_H

Core/GDCore/Project/AbstractEventsBasedEntity.h

@@ -125,6 +125,11 @@ class GD_CORE_API AbstractEventsBasedEntity {
    */
   static gd::String GetPropertyExpressionName(const gd::String& propertyName) { return "Property" + propertyName; };
 
+  /**
+   * \brief Get the name of the action to toggle a boolean property.
+   */
+  static gd::String GetPropertyToggleActionName(const gd::String& propertyName) { return "ToggleProperty" + propertyName; };
+
   /** \name Serialization
    */
   ///@{
@@ -146,6 +151,7 @@ class GD_CORE_API AbstractEventsBasedEntity {
   gd::String description;
   gd::EventsFunctionsContainer eventsFunctionsContainer;
   SerializableWithNameList<NamedPropertyDescriptor> propertyDescriptors;
+  gd::String extensionName;
 };
 
 }  // namespace gd

Core/GDCore/Project/CustomConfigurationHelper.cpp

@@ -43,18 +43,10 @@ std::map<gd::String, gd::PropertyDescriptor> CustomConfigurationHelper::GetPrope
     const auto &propertyName = property->GetName();
     const auto &propertyType = property->GetType();
 
-    // TODO Move this into a PropertyDescriptor copy method.
-    auto &newProperty = behaviorProperties[propertyName]
-                            .SetType(property->GetType())
-                            .SetDescription(property->GetDescription())
-                            .SetGroup(property->GetGroup())
-                            .SetLabel(property->GetLabel())
-                            .SetValue(property->GetValue())
-                            .SetHidden(property->IsHidden());
+    // Copy the property
+    behaviorProperties[propertyName] = *property;
 
-    for (auto &extraInfo : property->GetExtraInfo()) {
-      newProperty.AddExtraInfo(extraInfo);
-    }
+    auto &newProperty = behaviorProperties[propertyName];
 
     if (configurationContent.HasChild(propertyName)) {
       if (propertyType == "String" || propertyType == "Choice" ||

Core/GDCore/Project/CustomObjectConfiguration.cpp

@@ -38,7 +38,7 @@ gd::ObjectConfiguration &CustomObjectConfiguration::GetChildObjectConfiguration(
     return badObjectConfiguration;
   }
   const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
-  
+
   if (!eventsBasedObject.HasObjectNamed(objectName)) {
     gd::LogError("Tried to get the configuration of a child-object:" + objectName
                 + " that doesn't exist in the event-based object: " + GetType());
@@ -78,7 +78,7 @@ bool CustomObjectConfiguration::UpdateProperty(const gd::String& propertyName,
     }
     const auto &eventsBasedObject = project->GetEventsBasedObject(GetType());
     const auto &properties = eventsBasedObject.GetPropertyDescriptors();
-    
+
     return gd::CustomConfigurationHelper::UpdateProperty(
         properties,
         objectContent,
@@ -125,8 +125,7 @@ void CustomObjectConfiguration::DoUnserializeFrom(Project& project,
   }
 }
 
-void CustomObjectConfiguration::ExposeResources(
-    gd::ArbitraryResourceWorker& worker) {
+void CustomObjectConfiguration::ExposeResources(gd::ArbitraryResourceWorker& worker) {
   std::map<gd::String, gd::PropertyDescriptor> properties = GetProperties();
 
   for (auto& property : properties) {
@@ -148,6 +147,10 @@ void CustomObjectConfiguration::ExposeResources(
         worker.ExposeVideo(newPropertyValue);
       } else if (resourceType == "json") {
         worker.ExposeJson(newPropertyValue);
+      } else if (resourceType == "tilemap") {
+        worker.ExposeTilemap(newPropertyValue);
+      } else if (resourceType == "tileset") {
+        worker.ExposeTileset(newPropertyValue);
       } else if (resourceType == "bitmapFont") {
         worker.ExposeBitmapFont(newPropertyValue);
       }

Core/GDCore/Project/CustomObjectConfiguration.h

@@ -87,9 +87,9 @@ class CustomObjectConfiguration : public gd::ObjectConfiguration {
   /**
    * Initialize configuration using another configuration. Used by copy-ctor
    * and assign-op.
-   * 
+   *
    * Don't forget to update me if members were changed!
-   * 
+   *
    * It's needed because there is no default copy for childObjectConfigurations
    * and it must be a deep copy.
    */

Core/GDCore/Project/EventsBasedBehavior.h

@@ -125,6 +125,13 @@ class GD_CORE_API EventsBasedBehavior: public AbstractEventsBasedEntity {
     return "SharedProperty" + propertyName;
   };
 
+  /**
+   * \brief Get the name of the action to toggle a boolean shared property.
+   */
+  static gd::String GetSharedPropertyToggleActionName(const gd::String &propertyName) {
+    return "ToggleSharedProperty" + propertyName;
+  };
+
   void SerializeTo(SerializerElement& element) const override;
 
   void UnserializeFrom(gd::Project& project,

Core/GDCore/Project/EventsFunction.cpp

@@ -72,6 +72,9 @@ void EventsFunction::SerializeTo(SerializerElement& element) const {
   if (isPrivate) {
     element.SetBoolAttribute("private", isPrivate);
   }
+  if (isAsync) {
+    element.SetBoolAttribute("async", isAsync);
+  }
   events.SerializeTo(element.AddChild("events"));
 
   gd::String functionTypeStr = "Action";
@@ -115,6 +118,7 @@ void EventsFunction::UnserializeFrom(gd::Project& project,
   group = element.GetStringAttribute("group");
   getterName = element.GetStringAttribute("getterName");
   isPrivate = element.GetBoolAttribute("private");
+  isAsync = element.GetBoolAttribute("async");
   events.UnserializeFrom(project, element.GetChild("events"));
 
   gd::String functionTypeStr = element.GetStringAttribute("functionType");

Core/GDCore/Project/EventsFunction.h

@@ -211,6 +211,19 @@ class GD_CORE_API EventsFunction {
     return *this;
   }
 
+  /**
+   * \brief Returns true if the function is async.
+   */
+  bool IsAsync() const { return isAsync; }
+
+  /**
+   * \brief Sets the asycronity of the function.
+   */
+  EventsFunction& SetAsync(bool _isAsync) {
+    isAsync = _isAsync;
+    return *this;
+  }
+
   /**
    * \brief Return the events.
    */
@@ -291,6 +304,7 @@ class GD_CORE_API EventsFunction {
   mutable std::vector<gd::ParameterMetadata> actionWithOperationParameters;
   gd::ObjectGroupsContainer objectGroups;
   bool isPrivate = false;
+  bool isAsync = false;
 };
 
 }  // namespace gd

Core/GDCore/Project/InitialInstance.h

@@ -7,13 +7,14 @@
 #ifndef GDCORE_INITIALINSTANCE_H
 #define GDCORE_INITIALINSTANCE_H
 #include <map>
+
 #include "GDCore/Project/VariablesContainer.h"
 #include "GDCore/String.h"
 namespace gd {
 class PropertyDescriptor;
 class Project;
 class Layout;
-}
+}  // namespace gd
 
 namespace gd {
 
@@ -127,7 +128,8 @@ class GD_CORE_API InitialInstance {
   void SetCustomHeight(double height_) { height = height_; }
 
   /**
-   * \brief Return true if the instance is locked and cannot be moved in the IDE.
+   * \brief Return true if the instance is locked and cannot be moved in the
+   * IDE.
    */
   bool IsLocked() const { return locked; };
 
@@ -240,7 +242,7 @@ class GD_CORE_API InitialInstance {
    * \brief Set the value of a string property stored in the instance.
    */
   void SetRawStringProperty(const gd::String& name, const gd::String& value);
-///@}
+  ///@}
 
   /** \name Saving and loading
    * Members functions related to serialization.
@@ -272,18 +274,19 @@ class GD_CORE_API InitialInstance {
       stringProperties;  ///< More data which can be used by the object
 
   gd::String objectName;  ///< Object name
-  double x;                ///< Object initial X position
-  double y;                ///< Object initial Y position
-  double angle;            ///< Object initial angle
+  double x;               ///< Object initial X position
+  double y;               ///< Object initial Y position
+  double angle;           ///< Object initial angle
   int zOrder;             ///< Object initial Z order
   gd::String layer;       ///< Object initial layer
   bool personalizedSize;  ///< True if object has a custom size
-  double width;            ///< Object custom width
-  double height;           ///< Object custom height
+  double width;           ///< Object custom width
+  double height;          ///< Object custom height
   gd::VariablesContainer initialVariables;  ///< Instance specific variables
   bool locked;                              ///< True if the instance is locked
   bool sealed;                              ///< True if the instance is sealed
-  mutable gd::String persistentUuid; ///< A persistent random version 4 UUID, useful for hot reloading.
+  mutable gd::String persistentUuid;  ///< A persistent random version 4 UUID,
+                                      ///< useful for hot reloading.
 
   static gd::String*
       badStringProperyValue;  ///< Empty string returned by GetRawStringProperty

Core/GDCore/Project/LoadingScreen.cpp

@@ -11,7 +11,7 @@
 namespace gd {
 
 LoadingScreen::LoadingScreen()
-    : showGDevelopSplash(true),
+    : showGDevelopLogoDuringLoadingScreen(true),
       gdevelopLogoStyle("light"),
       backgroundImageResourceName(""),
       backgroundColor(0),
@@ -27,16 +27,18 @@ LoadingScreen::LoadingScreen()
       progressBarColor(0xFFFFFF){};
 
 void LoadingScreen::SerializeTo(SerializerElement& element) const {
-  element.SetAttribute("showGDevelopSplash", showGDevelopSplash);
-  element.SetAttribute("gdevelopLogoStyle",
-                       gdevelopLogoStyle);
+  element.SetAttribute("showGDevelopSplash",
+                       showGDevelopLogoDuringLoadingScreen);
+  element.SetAttribute("gdevelopLogoStyle", gdevelopLogoStyle);
   element.SetAttribute("backgroundImageResourceName",
                        backgroundImageResourceName);
   element.SetAttribute("backgroundColor", backgroundColor);
   element.SetAttribute("backgroundFadeInDuration", backgroundFadeInDuration);
   element.SetAttribute("minDuration", minDuration);
-  element.SetAttribute("logoAndProgressFadeInDuration", logoAndProgressFadeInDuration);
-  element.SetAttribute("logoAndProgressLogoFadeInDelay", logoAndProgressLogoFadeInDelay);
+  element.SetAttribute("logoAndProgressFadeInDuration",
+                       logoAndProgressFadeInDuration);
+  element.SetAttribute("logoAndProgressLogoFadeInDelay",
+                       logoAndProgressLogoFadeInDelay);
   element.SetAttribute("showProgressBar", showProgressBar);
   element.SetAttribute("progressBarMinWidth", progressBarMinWidth);
   element.SetAttribute("progressBarMaxWidth", progressBarMaxWidth);
@@ -46,21 +48,24 @@ void LoadingScreen::SerializeTo(SerializerElement& element) const {
 }
 
 void LoadingScreen::UnserializeFrom(const SerializerElement& element) {
-  showGDevelopSplash = element.GetBoolAttribute("showGDevelopSplash", true);
-  gdevelopLogoStyle =
-      element.GetStringAttribute("gdevelopLogoStyle", "light");
+  showGDevelopLogoDuringLoadingScreen =
+      element.GetBoolAttribute("showGDevelopSplash", true);
+  gdevelopLogoStyle = element.GetStringAttribute("gdevelopLogoStyle", "light");
   backgroundImageResourceName =
       element.GetStringAttribute("backgroundImageResourceName");
   backgroundColor = element.GetIntAttribute("backgroundColor", 0);
   backgroundFadeInDuration =
       element.GetDoubleAttribute("backgroundFadeInDuration", 0.2);
   minDuration = element.GetDoubleAttribute("minDuration", 1.5);
-  logoAndProgressFadeInDuration = element.GetDoubleAttribute("logoAndProgressFadeInDuration", 0.2);
-  logoAndProgressLogoFadeInDelay = element.GetDoubleAttribute("logoAndProgressLogoFadeInDelay", 0.2);
+  logoAndProgressFadeInDuration =
+      element.GetDoubleAttribute("logoAndProgressFadeInDuration", 0.2);
+  logoAndProgressLogoFadeInDelay =
+      element.GetDoubleAttribute("logoAndProgressLogoFadeInDelay", 0.2);
   showProgressBar = element.GetBoolAttribute("showProgressBar", true);
   progressBarMinWidth = element.GetDoubleAttribute("progressBarMinWidth", 40);
   progressBarMaxWidth = element.GetDoubleAttribute("progressBarMaxWidth", 200);
-  progressBarWidthPercent = element.GetDoubleAttribute("progressBarWidthPercent", 30);
+  progressBarWidthPercent =
+      element.GetDoubleAttribute("progressBarWidthPercent", 30);
   progressBarHeight = element.GetDoubleAttribute("progressBarHeight", 20);
   progressBarColor = element.GetIntAttribute("progressBarColor", 0xFFFFFF);
 }

Core/GDCore/Project/LoadingScreen.h

@@ -29,13 +29,13 @@ class GD_CORE_API LoadingScreen {
    * \brief Return true if the GDevelop logo should be shown while loading
    * assets.
    */
-  bool IsGDevelopSplashShown() const { return showGDevelopSplash; };
+  bool IsGDevelopLogoShownDuringLoadingScreen() const { return showGDevelopLogoDuringLoadingScreen; };
 
   /**
    * \brief Set if the GDevelop logo should be shown while loading assets.
    */
-  LoadingScreen& ShowGDevelopSplash(bool show) {
-    showGDevelopSplash = show;
+  LoadingScreen& ShowGDevelopLogoDuringLoadingScreen(bool show) {
+    showGDevelopLogoDuringLoadingScreen = show;
     return *this;
   };
 
@@ -157,7 +157,7 @@ class GD_CORE_API LoadingScreen {
   ///@}
 
  private:
-  bool showGDevelopSplash;
+  bool showGDevelopLogoDuringLoadingScreen;
   gd::String gdevelopLogoStyle;
   gd::String backgroundImageResourceName;
   int backgroundColor;

Core/GDCore/Project/MeasurementUnit.cpp

@@ -7,6 +7,7 @@
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/String.h"
 #include <vector>
+#include <algorithm>
 
 namespace gd {
 
@@ -22,6 +23,49 @@ gd::MeasurementUnit MeasurementUnit::pixelAcceleration =
     CreatePixelAcceleration();
 gd::MeasurementUnit MeasurementUnit::newton = CreateNewton();
 gd::MeasurementUnit MeasurementUnit::angularSpeed = CreateAngularSpeed();
+std::vector<const gd::MeasurementUnit*> MeasurementUnit::defaultMeasurementUnits;
+
+const std::vector<const gd::MeasurementUnit*> &
+MeasurementUnit::GetDefaultMeasurementUnits() {
+  if (defaultMeasurementUnits.size() == 0) {
+    defaultMeasurementUnits.push_back(&undefined);
+    defaultMeasurementUnits.push_back(&dimensionless);
+    defaultMeasurementUnits.push_back(&degreeAngle);
+    defaultMeasurementUnits.push_back(&second);
+    defaultMeasurementUnits.push_back(&pixel);
+    defaultMeasurementUnits.push_back(&pixelSpeed);
+    defaultMeasurementUnits.push_back(&pixelAcceleration);
+    defaultMeasurementUnits.push_back(&angularSpeed);
+    defaultMeasurementUnits.push_back(&newton);
+  }
+  return defaultMeasurementUnits;
+}
+
+std::size_t MeasurementUnit::GetDefaultMeasurementUnitsCount() {
+  return GetDefaultMeasurementUnits().size();
+}
+
+const gd::MeasurementUnit &
+MeasurementUnit::GetDefaultMeasurementUnitAtIndex(std::size_t index) {
+  return *GetDefaultMeasurementUnits().at(index);
+}
+
+bool MeasurementUnit::HasDefaultMeasurementUnitNamed(const gd::String &name) {
+  auto units = GetDefaultMeasurementUnits();
+  return std::find_if(units.begin(), units.end(),
+                      [name](const gd::MeasurementUnit *unit) -> bool {
+                        return unit->GetName() == name;
+                      }) != units.end();
+}
+
+const gd::MeasurementUnit &
+MeasurementUnit::GetDefaultMeasurementUnitByName(const gd::String &name) {
+  auto units = GetDefaultMeasurementUnits();
+  return **std::find_if(units.begin(), units.end(),
+                        [name](const gd::MeasurementUnit *unit) -> bool {
+                          return unit->GetName() == name;
+                        });
+}
 
 void MeasurementUnit::ApplyTranslation() {
   undefined = CreateUndefined();
@@ -33,6 +77,7 @@ void MeasurementUnit::ApplyTranslation() {
   pixelAcceleration = CreatePixelAcceleration();
   newton = CreateNewton();
   angularSpeed = CreateAngularSpeed();
+  defaultMeasurementUnits.clear();
 }
 
 } // namespace gd

Core/GDCore/Project/MeasurementUnit.h

@@ -74,31 +74,40 @@ public:
     return elements.at(elementIndex).GetBaseUnit();
   }
 
-  bool IsUndefined() const { return this == &gd::MeasurementUnit::undefined; }
+  bool IsUndefined() const {
+    return this == &gd::MeasurementUnit::undefined || name == "Undefined";
+  }
 
   static void ApplyTranslation();
 
-  static gd::MeasurementUnit &GetUndefined() { return undefined; }
+  static const gd::MeasurementUnit &GetUndefined() { return undefined; }
 
-  static gd::MeasurementUnit &GetDimensionless() { return dimensionless; }
+  static const gd::MeasurementUnit &GetDimensionless() { return dimensionless; }
 
-  static gd::MeasurementUnit &GetDegreeAngle() { return degreeAngle; }
+  static const gd::MeasurementUnit &GetDegreeAngle() { return degreeAngle; }
 
-  static gd::MeasurementUnit &GetSecond() { return second; }
+  static const gd::MeasurementUnit &GetSecond() { return second; }
 
-  static gd::MeasurementUnit &GetPixel() { return pixel; }
+  static const gd::MeasurementUnit &GetPixel() { return pixel; }
 
-  static gd::MeasurementUnit &GetPixelSpeed() { return pixelSpeed; }
+  static const gd::MeasurementUnit &GetPixelSpeed() { return pixelSpeed; }
 
-  static gd::MeasurementUnit &GetPixelAcceleration() {
+  static const gd::MeasurementUnit &GetPixelAcceleration() {
     return pixelAcceleration;
   }
 
-  static gd::MeasurementUnit &GetAngularSpeed() { return angularSpeed; }
+  static const gd::MeasurementUnit &GetAngularSpeed() { return angularSpeed; }
 
-  static gd::MeasurementUnit &GetNewton() { return newton; }
+  static const gd::MeasurementUnit &GetNewton() { return newton; }
+
+  static const std::vector<const gd::MeasurementUnit*> &GetDefaultMeasurementUnits();
+  static std::size_t GetDefaultMeasurementUnitsCount();
+  static const gd::MeasurementUnit &GetDefaultMeasurementUnitAtIndex(std::size_t index);
+  static bool HasDefaultMeasurementUnitNamed(const gd::String &name);
+  static const gd::MeasurementUnit &GetDefaultMeasurementUnitByName(const gd::String &name);
 
 private:
+  static std::vector<const gd::MeasurementUnit*> defaultMeasurementUnits;
   static gd::MeasurementUnit undefined;
   static gd::MeasurementUnit dimensionless;
   static gd::MeasurementUnit degreeAngle;

Core/GDCore/Project/ObjectConfiguration.h

@@ -12,6 +12,7 @@
 
 #include "GDCore/Project/Behavior.h"
 #include "GDCore/Project/EffectsContainer.h"
+#include "GDCore/Project/ResourcesManager.h"
 #include "GDCore/Project/VariablesContainer.h"
 #include "GDCore/String.h"
 #include "GDCore/Tools/MakeUnique.h"

Core/GDCore/Project/Project.cpp

@@ -22,8 +22,8 @@
 #include "GDCore/IDE/Events/UsedExtensionsFinder.h"
 #include "GDCore/IDE/PlatformManager.h"
 #include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
-#include "GDCore/Project/EventsFunctionsExtension.h"
 #include "GDCore/Project/CustomObjectConfiguration.h"
+#include "GDCore/Project/EventsFunctionsExtension.h"
 #include "GDCore/Project/ExternalEvents.h"
 #include "GDCore/Project/ExternalLayout.h"
 #include "GDCore/Project/Layout.h"
@@ -347,6 +347,49 @@ void Project::RemoveExternalEvents(const gd::String& name) {
   externalEvents.erase(events);
 }
 
+void Project::MoveLayout(std::size_t oldIndex, std::size_t newIndex) {
+  if (oldIndex >= scenes.size() || newIndex >= scenes.size()) return;
+
+  std::unique_ptr<gd::Layout> scene = std::move(scenes[oldIndex]);
+  scenes.erase(scenes.begin() + oldIndex);
+  scenes.insert(scenes.begin() + newIndex, std::move(scene));
+};
+
+void Project::MoveExternalEvents(std::size_t oldIndex, std::size_t newIndex) {
+  if (oldIndex >= externalEvents.size() || newIndex >= externalEvents.size())
+    return;
+
+  std::unique_ptr<gd::ExternalEvents> externalEventsItem =
+      std::move(externalEvents[oldIndex]);
+  externalEvents.erase(externalEvents.begin() + oldIndex);
+  externalEvents.insert(externalEvents.begin() + newIndex,
+                        std::move(externalEventsItem));
+};
+
+void Project::MoveExternalLayout(std::size_t oldIndex, std::size_t newIndex) {
+  if (oldIndex >= externalLayouts.size() || newIndex >= externalLayouts.size())
+    return;
+
+  std::unique_ptr<gd::ExternalLayout> externalLayout =
+      std::move(externalLayouts[oldIndex]);
+  externalLayouts.erase(externalLayouts.begin() + oldIndex);
+  externalLayouts.insert(externalLayouts.begin() + newIndex,
+                         std::move(externalLayout));
+};
+
+void Project::MoveEventsFunctionsExtension(std::size_t oldIndex,
+                                          std::size_t newIndex) {
+  if (oldIndex >= eventsFunctionsExtensions.size() ||
+      newIndex >= eventsFunctionsExtensions.size())
+    return;
+
+  std::unique_ptr<gd::EventsFunctionsExtension> eventsFunctionsExtension =
+      std::move(eventsFunctionsExtensions[oldIndex]);
+  eventsFunctionsExtensions.erase(eventsFunctionsExtensions.begin() + oldIndex);
+  eventsFunctionsExtensions.insert(eventsFunctionsExtensions.begin() + newIndex,
+                                   std::move(eventsFunctionsExtension));
+};
+
 void Project::SwapExternalEvents(std::size_t first, std::size_t second) {
   if (first >= externalEvents.size() || second >= externalEvents.size()) return;
 
@@ -593,6 +636,7 @@ void Project::UnserializeFrom(const SerializerElement& element) {
   platformSpecificAssets.UnserializeFrom(
       propElement.GetChild("platformSpecificAssets"));
   loadingScreen.UnserializeFrom(propElement.GetChild("loadingScreen"));
+  watermark.UnserializeFrom(propElement.GetChild("watermark"));
 
   useExternalSourceFiles =
       propElement.GetBoolAttribute("useExternalSourceFiles");
@@ -603,6 +647,13 @@ void Project::UnserializeFrom(const SerializerElement& element) {
   for (std::size_t i = 0; i < authorIdsElement.GetChildrenCount(); ++i) {
     authorIds.push_back(authorIdsElement.GetChild(i).GetStringValue());
   }
+  authorUsernames.clear();
+  auto& authorUsernamesElement = propElement.GetChild("authorUsernames");
+  authorUsernamesElement.ConsiderAsArray();
+  for (std::size_t i = 0; i < authorUsernamesElement.GetChildrenCount(); ++i) {
+    authorUsernames.push_back(
+        authorUsernamesElement.GetChild(i).GetStringValue());
+  }
 
   categories.clear();
   auto& categoriesElement = propElement.GetChild("categories");
@@ -832,6 +883,7 @@ void Project::SerializeTo(SerializerElement& element) const {
   platformSpecificAssets.SerializeTo(
       propElement.AddChild("platformSpecificAssets"));
   loadingScreen.SerializeTo(propElement.AddChild("loadingScreen"));
+  watermark.SerializeTo(propElement.AddChild("watermark"));
   propElement.SetAttribute("useExternalSourceFiles", useExternalSourceFiles);
 
   auto& authorIdsElement = propElement.AddChild("authorIds");
@@ -839,6 +891,11 @@ void Project::SerializeTo(SerializerElement& element) const {
   for (const auto& authorId : authorIds) {
     authorIdsElement.AddChild("").SetStringValue(authorId);
   }
+  auto& authorUsernamesElement = propElement.AddChild("authorUsernames");
+  authorUsernamesElement.ConsiderAsArray();
+  for (const auto& authorUsername : authorUsernames) {
+    authorUsernamesElement.AddChild("").SetStringValue(authorUsername);
+  }
 
   auto& categoriesElement = propElement.AddChild("categories");
   categoriesElement.ConsiderAsArray();
@@ -934,13 +991,15 @@ bool Project::ValidateName(const gd::String& name) {
 }
 
 void Project::ExposeResources(gd::ArbitraryResourceWorker& worker) {
-  // See also gd::WholeProjectRefactorer::ExposeProjectEvents for a method that
+  // See also gd::ProjectBrowserHelper::ExposeProjectEvents for a method that
   // traverse the whole project (this time for events) and ExposeProjectEffects
   // (this time for effects). Ideally, this method could be moved outside of
   // gd::Project.
 
+  gd::ResourcesManager* resourcesManager = &GetResourcesManager();
+
   // Add project resources
-  worker.ExposeResources(&GetResourcesManager());
+  worker.ExposeResources(resourcesManager);
   platformSpecificAssets.ExposeResources(worker);
 
   // Add layouts resources
@@ -1052,6 +1111,7 @@ void Project::Init(const gd::Project& game) {
 
   author = game.author;
   authorIds = game.authorIds;
+  authorUsernames = game.authorUsernames;
   isPlayableWithKeyboard = game.isPlayableWithKeyboard;
   isPlayableWithGamepad = game.isPlayableWithGamepad;
   isPlayableWithMobile = game.isPlayableWithMobile;
@@ -1062,6 +1122,7 @@ void Project::Init(const gd::Project& game) {
   latestCompilationDirectory = game.latestCompilationDirectory;
   platformSpecificAssets = game.platformSpecificAssets;
   loadingScreen = game.loadingScreen;
+  watermark = game.watermark;
   objectGroups = game.objectGroups;
 
   extensionProperties = game.extensionProperties;

Core/GDCore/Project/Project.h

@@ -11,6 +11,7 @@
 
 #include "GDCore/Project/ExtensionProperties.h"
 #include "GDCore/Project/LoadingScreen.h"
+#include "GDCore/Project/Watermark.h"
 #include "GDCore/Project/ObjectGroupsContainer.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/PlatformSpecificAssets.h"
@@ -120,6 +121,16 @@ class GD_CORE_API Project : public ObjectsContainer {
    */
   std::vector<gd::String>& GetAuthorIds() { return authorIds; };
 
+  /**
+   * \brief Get the author usernames of the project.
+   */
+  const std::vector<gd::String>& GetAuthorUsernames() const { return authorUsernames; };
+
+  /**
+   * \brief Get the author usernames of the project, to modify them (non-const).
+   */
+  std::vector<gd::String>& GetAuthorUsernames() { return authorUsernames; };
+
   /**
    * Define the project as playable with a keyboard.
    * \param enable True to define the project as playable with a keyboard.
@@ -165,7 +176,7 @@ class GD_CORE_API Project : public ObjectsContainer {
    */
   const gd::String& GetPackageName() const { return packageName; }
 
-    /**
+  /**
    * \brief Change the slug of the template from which the project is created.
    */
   void SetTemplateSlug(const gd::String& templateSlug_) {
@@ -256,6 +267,16 @@ class GD_CORE_API Project : public ObjectsContainer {
    */
   const gd::LoadingScreen& GetLoadingScreen() const { return loadingScreen; }
 
+  /**
+   * \brief Return a reference to watermark setup for the project
+   */
+  gd::Watermark& GetWatermark() { return watermark; }
+
+  /**
+   * \brief Return a reference to watermark setup for the project
+   */
+  const gd::Watermark& GetWatermark() const { return watermark; }
+
   /**
    * Change game's main window default width.
    *
@@ -458,7 +479,7 @@ class GD_CORE_API Project : public ObjectsContainer {
 
   /**
    * Create an object of the given type with the specified name.
-   * 
+   *
    * \param type The type of the object
    * \param name The name of the object
    */
@@ -467,7 +488,7 @@ class GD_CORE_API Project : public ObjectsContainer {
 
   /**
    * Create an object configuration of the given type.
-   * 
+   *
    * \param type The type of the object
    */
   std::unique_ptr<gd::ObjectConfiguration> CreateObjectConfiguration(
@@ -525,6 +546,11 @@ class GD_CORE_API Project : public ObjectsContainer {
    */
   std::size_t GetLayoutPosition(const gd::String& name) const;
 
+  /**
+   * Change the position of the specified layout.
+   */
+  void MoveLayout(std::size_t oldIndex, std::size_t newIndex);
+
   /**
    * \brief Swap the specified layouts.
    *
@@ -628,6 +654,11 @@ class GD_CORE_API Project : public ObjectsContainer {
    */
   std::size_t GetExternalEventsPosition(const gd::String& name) const;
 
+  /**
+   * Change the position of the specified external events.
+   */
+  void MoveExternalEvents(std::size_t oldIndex, std::size_t newIndex);
+
   /**
    * \brief Swap the specified external events.
    *
@@ -702,6 +733,11 @@ class GD_CORE_API Project : public ObjectsContainer {
    */
   std::size_t GetExternalLayoutPosition(const gd::String& name) const;
 
+  /**
+   * Change the position of the specified external layout.
+   */
+  void MoveExternalLayout(std::size_t oldIndex, std::size_t newIndex);
+
   /**
    * \brief Swap the specified external layouts.
    *
@@ -791,6 +827,11 @@ class GD_CORE_API Project : public ObjectsContainer {
    */
   std::size_t GetEventsFunctionsExtensionPosition(const gd::String& name) const;
 
+  /**
+   * Change the position of the specified events function extension.
+   */
+  void MoveEventsFunctionsExtension(std::size_t oldIndex, std::size_t newIndex);
+
   /**
    * \brief Swap the specified events functions extensions.
    *
@@ -1023,6 +1064,8 @@ class GD_CORE_API Project : public ObjectsContainer {
   gd::String author;        ///< Game author name, for publishing purpose.
   std::vector<gd::String>
       authorIds;           ///< Game author ids, from GDevelop users DB.
+  std::vector<gd::String>
+      authorUsernames;     ///< Game author usernames, from GDevelop users DB.
   std::vector<gd::String>
       categories;           ///< Game categories
   bool isPlayableWithKeyboard; ///< The project is playable with a keyboard.
@@ -1042,6 +1085,7 @@ class GD_CORE_API Project : public ObjectsContainer {
       currentPlatform;  ///< The platform being used to edit the project.
   gd::PlatformSpecificAssets platformSpecificAssets;
   gd::LoadingScreen loadingScreen;
+  gd::Watermark watermark;
   std::vector<std::unique_ptr<gd::ExternalEvents> >
       externalEvents;  ///< List of all externals events
   ExtensionProperties

Core/GDCore/Project/PropertyDescriptor.cpp

@@ -17,6 +17,9 @@ PropertyDescriptor::~PropertyDescriptor() {}
 void PropertyDescriptor::SerializeTo(SerializerElement& element) const {
   element.AddChild("value").SetStringValue(currentValue);
   element.AddChild("type").SetStringValue(type);
+  if (type == "Number" && !measurementUnit.IsUndefined()) {
+    element.AddChild("unit").SetStringValue(measurementUnit.GetName());
+  }
   element.AddChild("label").SetStringValue(label);
   element.AddChild("description").SetStringValue(description);
   element.AddChild("group").SetStringValue(group);
@@ -32,6 +35,14 @@ void PropertyDescriptor::SerializeTo(SerializerElement& element) const {
 void PropertyDescriptor::UnserializeFrom(const SerializerElement& element) {
   currentValue = element.GetChild("value").GetStringValue();
   type = element.GetChild("type").GetStringValue();
+  if (type == "Number") {
+    gd::String unitName = element.GetChild("unit").GetStringValue();
+    measurementUnit =
+        gd::MeasurementUnit::HasDefaultMeasurementUnitNamed(unitName)
+            ? measurementUnit =
+                  gd::MeasurementUnit::GetDefaultMeasurementUnitByName(unitName)
+            : gd::MeasurementUnit::GetUndefined();
+  }
   label = element.GetChild("label").GetStringValue();
   description = element.GetChild("description").GetStringValue();
   group = element.GetChild("group").GetStringValue();

Core/GDCore/Project/ResourcesManager.cpp

@@ -85,6 +85,10 @@ std::shared_ptr<Resource> ResourcesManager::CreateResource(
     return std::make_shared<VideoResource>();
   else if (kind == "json")
     return std::make_shared<JsonResource>();
+  else if (kind == "tilemap")
+    return std::make_shared<TilemapResource>();
+  else if (kind == "tileset")
+    return std::make_shared<TilesetResource>();
   else if (kind == "bitmapFont")
     return std::make_shared<BitmapFontResource>();
 
@@ -650,6 +654,74 @@ bool JsonResource::UpdateProperty(const gd::String& name,
   return true;
 }
 
+void TilemapResource::SetFile(const gd::String& newFile) {
+  file = NormalizePathSeparator(newFile);
+}
+
+void TilemapResource::UnserializeFrom(const SerializerElement& element) {
+  SetUserAdded(element.GetBoolAttribute("userAdded"));
+  SetFile(element.GetStringAttribute("file"));
+  DisablePreload(element.GetBoolAttribute("disablePreload", false));
+}
+
+void TilemapResource::SerializeTo(SerializerElement& element) const {
+  element.SetAttribute("userAdded", IsUserAdded());
+  element.SetAttribute("file", GetFile());
+  element.SetAttribute("disablePreload", IsPreloadDisabled());
+}
+
+std::map<gd::String, gd::PropertyDescriptor> TilemapResource::GetProperties()
+    const {
+  std::map<gd::String, gd::PropertyDescriptor> properties;
+  properties["disablePreload"]
+      .SetValue(disablePreload ? "true" : "false")
+      .SetType("Boolean")
+      .SetLabel(_("Disable preloading at game startup"));
+
+  return properties;
+}
+
+bool TilemapResource::UpdateProperty(const gd::String& name,
+                                  const gd::String& value) {
+  if (name == "disablePreload") disablePreload = value == "1";
+
+  return true;
+}
+
+void TilesetResource::SetFile(const gd::String& newFile) {
+  file = NormalizePathSeparator(newFile);
+}
+
+void TilesetResource::UnserializeFrom(const SerializerElement& element) {
+  SetUserAdded(element.GetBoolAttribute("userAdded"));
+  SetFile(element.GetStringAttribute("file"));
+  DisablePreload(element.GetBoolAttribute("disablePreload", false));
+}
+
+void TilesetResource::SerializeTo(SerializerElement& element) const {
+  element.SetAttribute("userAdded", IsUserAdded());
+  element.SetAttribute("file", GetFile());
+  element.SetAttribute("disablePreload", IsPreloadDisabled());
+}
+
+std::map<gd::String, gd::PropertyDescriptor> TilesetResource::GetProperties()
+    const {
+  std::map<gd::String, gd::PropertyDescriptor> properties;
+  properties["disablePreload"]
+      .SetValue(disablePreload ? "true" : "false")
+      .SetType("Boolean")
+      .SetLabel(_("Disable preloading at game startup"));
+
+  return properties;
+}
+
+bool TilesetResource::UpdateProperty(const gd::String& name,
+                                  const gd::String& value) {
+  if (name == "disablePreload") disablePreload = value == "1";
+
+  return true;
+}
+
 void BitmapFontResource::SetFile(const gd::String& newFile) {
   file = NormalizePathSeparator(newFile);
 }

Core/GDCore/Project/ResourcesManager.h

@@ -373,6 +373,88 @@ class GD_CORE_API JsonResource : public Resource {
   gd::String file;
 };
 
+/**
+ * \brief Describe a tilemap file used by a project.
+ *
+ * \see Resource
+ * \ingroup ResourcesManagement
+ */
+class GD_CORE_API TilemapResource : public Resource {
+ public:
+  TilemapResource() : Resource(), disablePreload(false) { SetKind("tilemap"); };
+  virtual ~TilemapResource(){};
+  virtual TilemapResource* Clone() const override {
+    return new TilemapResource(*this);
+  }
+
+  virtual const gd::String& GetFile() const override { return file; };
+  virtual void SetFile(const gd::String& newFile) override;
+
+  virtual bool UseFile() const override { return true; }
+
+  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
+  bool UpdateProperty(const gd::String& name, const gd::String& value) override;
+
+  void SerializeTo(SerializerElement& element) const override;
+
+  void UnserializeFrom(const SerializerElement& element) override;
+
+  /**
+   * \brief Return true if the loading at game startup must be disabled
+   */
+  bool IsPreloadDisabled() const { return disablePreload; }
+
+  /**
+   * \brief Set if the tilemap preload at game startup must be disabled
+   */
+  void DisablePreload(bool disable = true) { disablePreload = disable; }
+
+ private:
+  bool disablePreload;  ///< If "true", don't load the tilemap at game startup
+  gd::String file;
+};
+
+/**
+ * \brief Describe a tileset file used by a project.
+ *
+ * \see Resource
+ * \ingroup ResourcesManagement
+ */
+class GD_CORE_API TilesetResource : public Resource {
+ public:
+  TilesetResource() : Resource(), disablePreload(false) { SetKind("tileset"); };
+  virtual ~TilesetResource(){};
+  virtual TilesetResource* Clone() const override {
+    return new TilesetResource(*this);
+  }
+
+  virtual const gd::String& GetFile() const override { return file; };
+  virtual void SetFile(const gd::String& newFile) override;
+
+  virtual bool UseFile() const override { return true; }
+
+  std::map<gd::String, gd::PropertyDescriptor> GetProperties() const override;
+  bool UpdateProperty(const gd::String& name, const gd::String& value) override;
+
+  void SerializeTo(SerializerElement& element) const override;
+
+  void UnserializeFrom(const SerializerElement& element) override;
+
+  /**
+   * \brief Return true if the loading at game startup must be disabled
+   */
+  bool IsPreloadDisabled() const { return disablePreload; }
+
+  /**
+   * \brief Set if the tilemap preload at game startup must be disabled
+   */
+  void DisablePreload(bool disable = true) { disablePreload = disable; }
+
+ private:
+  bool disablePreload;  ///< If "true", don't load the tilemap at game startup
+  gd::String file;
+};
+
 /**
  * \brief Describe a bitmap font file used by a project.
  *

Core/GDCore/Project/Watermark.cpp

@@ -0,0 +1,24 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2018 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#include "Watermark.h"
+
+#include "GDCore/Serialization/SerializerElement.h"
+
+namespace gd {
+
+Watermark::Watermark() : showWatermark(true), placement("bottom-left"){};
+
+void Watermark::SerializeTo(SerializerElement& element) const {
+  element.SetAttribute("showWatermark", showWatermark);
+  element.SetAttribute("placement", placement);
+}
+
+void Watermark::UnserializeFrom(const SerializerElement& element) {
+  showWatermark = element.GetBoolAttribute("showWatermark", true);
+  placement = element.GetStringAttribute("placement", "bottom-left");
+}
+}  // namespace gd

Core/GDCore/Project/Watermark.h

@@ -0,0 +1,70 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2018 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+
+#ifndef GDCORE_WATERMARK_H
+#define GDCORE_WATERMARK_H
+#include "GDCore/String.h"
+namespace gd {
+class SerializerElement;
+}
+
+namespace gd {
+
+/**
+ * \brief Describe the content and set up of the watermark
+ *
+ * \see gd::Watermark
+ *
+ * \ingroup PlatformDefinition
+ */
+class GD_CORE_API Watermark {
+ public:
+  Watermark();
+  virtual ~Watermark(){};
+
+  /**
+   * \brief Return true if the GDevelop watermark should be shown after
+   * the game has loaded its assets.
+   */
+  bool IsGDevelopWatermarkShown() const { return showWatermark; };
+
+  /**
+   * \brief Set if the GDevelop watermark should be shown after the game
+   * has loaded its assets.
+   */
+  Watermark& ShowGDevelopWatermark(bool show) {
+    showWatermark = show;
+    return *this;
+  };
+
+  const gd::String& GetPlacement() const { return placement; };
+
+  Watermark& SetPlacement(const gd::String& value) {
+    placement = value;
+    return *this;
+  }
+
+  /** \name Saving and loading
+   */
+  ///@{
+  /**
+   * \brief Serialize the watermark setup.
+   */
+  void SerializeTo(SerializerElement& element) const;
+
+  /**
+   * \brief Unserialize the watermark setup.
+   */
+  void UnserializeFrom(const SerializerElement& element);
+  ///@}
+
+ private:
+  bool showWatermark;
+  gd::String placement;
+};
+}  // namespace gd
+
+#endif  // GDCORE_WATERMARK_H

Core/GDCore/Vector2.h

@@ -3,8 +3,7 @@
 #ifndef GDCORE_VECTOR2_H
 #define GDCORE_VECTOR2_H
 
-namespace gd
-{
+namespace gd {
 
 ////////////////////////////////////////////////////////////
 //
@@ -12,11 +11,12 @@ namespace gd
 // Copyright (C) 2007-2016 Laurent Gomila (laurent@sfml-dev.org)
 //
 // This software is provided 'as-is', without any express or implied warranty.
-// In no event will the authors be held liable for any damages arising from the use of this software.
+// In no event will the authors be held liable for any damages arising from the
+// use of this software.
 //
 // Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it freely,
-// subject to the following restrictions:
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
 //
 // 1. The origin of this software must not be misrepresented;
 //    you must not claim that you wrote the original software.

Core/tests/DummyPlatform.cpp

@@ -187,7 +187,7 @@ void SetupProjectWithDummyPlatform(gd::Project& project,
       .SetDefaultValue("\"\"")
       .AddParameter("camera", _("Camera"), "", true)
       .SetDefaultValue("0")
-      .SetFunctionName("getMouseX");
+      .SetFunctionName("getCursorX");
   extension
       ->AddExpression("GetGlobalVariableAsNumber",
                       "Get me a global variable value",

Core/tests/ExpressionCodeGenerator.cpp

@@ -217,7 +217,7 @@ TEST_CASE("ExpressionCodeGenerator", "[common][events]") {
       REQUIRE(node);
       node->Visit(expressionCodeGenerator);
       REQUIRE(expressionCodeGenerator.GetOutput() ==
-              "getMouseX(\"\", \"layer1\", 2 + 2)");
+              "getCursorX(\"\", \"layer1\", 2 + 2)");
       // (first argument is the currentScene)
     }
     SECTION("with last optional parameter omit") {
@@ -231,7 +231,7 @@ TEST_CASE("ExpressionCodeGenerator", "[common][events]") {
       REQUIRE(node);
       node->Visit(expressionCodeGenerator);
       REQUIRE(expressionCodeGenerator.GetOutput() ==
-              "getMouseX(\"\", \"layer1\", 0)");
+              "getCursorX(\"\", \"layer1\", 0)");
       // (first argument is the currentScene)
     }
     SECTION("with last optional parameter omit (deprecated way)") {
@@ -245,7 +245,7 @@ TEST_CASE("ExpressionCodeGenerator", "[common][events]") {
       REQUIRE(node);
       node->Visit(expressionCodeGenerator);
       REQUIRE(expressionCodeGenerator.GetOutput() ==
-              "getMouseX(\"\", \"layer1\", 0)");
+              "getCursorX(\"\", \"layer1\", 0)");
       // (first argument is the currentScene)
     }
     SECTION("with explicit comma (deprecated way)") {
@@ -258,7 +258,7 @@ TEST_CASE("ExpressionCodeGenerator", "[common][events]") {
       REQUIRE(node);
       node->Visit(expressionCodeGenerator);
       REQUIRE(expressionCodeGenerator.GetOutput() ==
-              "getMouseX(\"\", \"\", 0)");
+              "getCursorX(\"\", \"\", 0)");
       // (first argument is the currentScene)
     }
   }
@@ -624,7 +624,7 @@ TEST_CASE("ExpressionCodeGenerator", "[common][events]") {
       REQUIRE(node);
       node->Visit(expressionCodeGenerator);
       REQUIRE(expressionCodeGenerator.GetOutput() ==
-              "-(+(-(getMouseX(\"\", \"\", 0))))");
+              "-(+(-(getCursorX(\"\", \"\", 0))))");
       // (first argument is the currentScene)
     }
   }

Core/tests/InstructionCountEvaluator.cpp

@@ -0,0 +1,40 @@
+/*
+ * 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/InstructionsCountEvaluator.h"
+
+#include <algorithm>
+
+#include "DummyPlatform.h"
+#include "GDCore/Events/Builtin/StandardEvent.h"
+#include "GDCore/Events/Event.h"
+#include "GDCore/Extensions/Platform.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "catch.hpp"
+
+namespace {
+
+TEST_CASE("InstructionsCountEvaluator", "[events]") {
+
+  SECTION("Can count 1 action in a layout") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &layout1 = project.InsertNewLayout("Layout1", 0);
+
+    // Add an event with an action.
+    gd::StandardEvent event;
+    gd::Instruction instruction;
+    instruction.SetType("MyExtension::DoSomething");
+    instruction.SetParametersCount(1);
+    event.GetActions().Insert(instruction);
+    layout1.GetEvents().InsertEvent(event);
+
+    REQUIRE(gd::InstructionsCountEvaluator::ScanProject(project) == 1);
+  }
+}
+
+} // namespace

Core/tests/InstructionsParameterMover.cpp

@@ -15,6 +15,7 @@
 #include "GDCore/Events/Builtin/StandardEvent.h"
 #include "GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h"
 #include "GDCore/Extensions/Platform.h"
+#include "GDCore/IDE/ProjectBrowserHelper.h"
 #include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
 #include "GDCore/IDE/Project/ProjectResourcesAdder.h"
 #include "GDCore/IDE/WholeProjectRefactorer.h"
@@ -51,7 +52,7 @@ TEST_CASE("InstructionsParameterMover", "[common][events]") {
     gd::InstructionsParameterMover mover(
         project, "MyExtension::DoSomething", 0, 2);
 
-    gd::WholeProjectRefactorer::ExposeProjectEvents(project, mover);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, mover);
     REQUIRE(insertedInstruction.GetParameter(0).GetPlainString() == "Param2");
     REQUIRE(insertedInstruction.GetParameter(1).GetPlainString() == "Param3");
     REQUIRE(insertedInstruction.GetParameter(2).GetPlainString() == "Param1");
@@ -60,7 +61,7 @@ TEST_CASE("InstructionsParameterMover", "[common][events]") {
     gd::InstructionsParameterMover mover(
         project, "MyExtension::DoSomething", 0, 99);
 
-    gd::WholeProjectRefactorer::ExposeProjectEvents(project, mover);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, mover);
     REQUIRE(insertedInstruction.GetParameter(0).GetPlainString() == "Param2");
     REQUIRE(insertedInstruction.GetParameter(1).GetPlainString() == "Param3");
     REQUIRE(insertedInstruction.GetParameter(2).GetPlainString() == "Param1");
@@ -69,7 +70,7 @@ TEST_CASE("InstructionsParameterMover", "[common][events]") {
     gd::InstructionsParameterMover mover(
         project, "MyExtension::DoSomething", 99, 2);
 
-    gd::WholeProjectRefactorer::ExposeProjectEvents(project, mover);
+    gd::ProjectBrowserHelper::ExposeProjectEvents(project, mover);
     REQUIRE(insertedInstruction.GetParameter(0).GetPlainString() == "Param1");
     REQUIRE(insertedInstruction.GetParameter(1).GetPlainString() == "Param2");
     REQUIRE(insertedInstruction.GetParameter(2).GetPlainString() == "Param3");

Core/tests/ResourcesRenamer.cpp

@@ -19,15 +19,77 @@ TEST_CASE("ResourcesRenamer", "[common]") {
     gd::ResourcesRenamer resourcesRenamer(renamings);
 
     gd::Project project;
+
+    // Add "classic", plain resources.
+    gd::ImageResource resource1;
+    resource1.SetName("Resource1");
+    project.GetResourcesManager().AddResource(resource1);
+    gd::ImageResource resource2;
+    resource2.SetName("Resource2");
+    project.GetResourcesManager().AddResource(resource2);
+
+    // Add usage of some resources.
     project.GetPlatformSpecificAssets().Set(
         "android", "some-icon", "Resource1");
     project.GetPlatformSpecificAssets().Set(
         "android", "some-other-icon", "Resource2");
 
     project.ExposeResources(resourcesRenamer);
+
+    // Check that resources were renamed were used.
     REQUIRE(project.GetPlatformSpecificAssets().Get("android", "some-icon") ==
             "RenamedResource1");
     REQUIRE(project.GetPlatformSpecificAssets().Get(
                 "android", "some-other-icon") == "Resource2");
   }
+
+  SECTION("It renames embedded resources") {
+    std::map<gd::String, gd::String> renamings = {
+        {"Resource1", "RenamedResource1"}};
+    gd::ResourcesRenamer resourcesRenamer(renamings);
+
+    gd::Project project;
+
+    // Add "classic", plain resources.
+    gd::ImageResource resource1;
+    resource1.SetName("Resource1");
+    project.GetResourcesManager().AddResource(resource1);
+    gd::ImageResource resource2;
+    resource2.SetName("Resource2");
+    project.GetResourcesManager().AddResource(resource2);
+
+    // Add a resource containing a mapping to other resources.
+    gd::JsonResource jsonResourceWithEmbeddeds;
+    jsonResourceWithEmbeddeds.SetName("Resource3");
+    jsonResourceWithEmbeddeds.SetMetadata(
+        "{ \"embeddedResourcesMapping\": {\"some-resource-name\": "
+        "\"Resource1\", \"some-other-resource-name\": \"Resource2\"} }");
+    project.GetResourcesManager().AddResource(jsonResourceWithEmbeddeds);
+
+    // Add usage of some resources.
+    project.GetPlatformSpecificAssets().Set(
+        "android", "some-icon", "Resource1");
+    project.GetPlatformSpecificAssets().Set(
+        "android", "some-other-icon", "Resource2");
+
+    project.ExposeResources(resourcesRenamer);
+
+    // TODO: This should not be necessary, but for now not all resources support embeddeds,
+    // so we must call it manually:
+    gd::String resource3Name = "Resource3";
+    resourcesRenamer.ExposeEmbeddeds(resource3Name);
+
+    // Check that resources were renamed were used.
+    REQUIRE(project.GetPlatformSpecificAssets().Get("android", "some-icon") ==
+            "RenamedResource1");
+    REQUIRE(project.GetPlatformSpecificAssets().Get(
+                "android", "some-other-icon") == "Resource2");
+
+    // Check that the names were also updated in the embedded resources mapping.
+    REQUIRE(project.GetResourcesManager().HasResource("Resource3") == true);
+    REQUIRE(
+        project.GetResourcesManager().GetResource("Resource3").GetMetadata() ==
+        "{\"embeddedResourcesMapping\":{\"some-resource-name\":"
+        "\"RenamedResource1\",\"some-other-resource-name\":\"Resource2\"}}");
+  }
 }

Core/tests/WholeProjectRefactorer.cpp

@@ -30,6 +30,9 @@
 #include "GDCore/Project/Variable.h"
 #include "catch.hpp"
 
+// TODO Extract test data in another file to allow to read them side by side
+// with the test cases more easily.
+
 // TODO EBO Add a test where a child is removed form the EventsBasedObject
 // and check the configuration still gives access to other child configuration.
 namespace {
@@ -109,16 +112,27 @@ const std::vector<const gd::EventsList *> GetEventsLists(gd::Project &project) {
   auto &scene = project.GetLayout("Scene").GetEvents();
   auto &externalEvents =
       project.GetExternalEvents("ExternalEvents").GetEvents();
+  auto &eventsExtension = project.GetEventsFunctionsExtension("MyEventsExtension");
   auto &objectFunctionEvents =
-      project.GetEventsFunctionsExtension("MyEventsExtension")
+      eventsExtension
           .GetEventsBasedObjects()
           .Get("MyOtherEventsBasedObject")
           .GetEventsFunctions()
           .GetEventsFunction("MyObjectEventsFunction")
           .GetEvents();
+  auto &behaviorFunctionEvents =
+      eventsExtension.GetEventsBasedBehaviors()
+          .Get("MyOtherEventsBasedBehavior")
+          .GetEventsFunctions()
+          .GetEventsFunction("MyBehaviorEventsFunction")
+          .GetEvents();
+  auto &freeFunctionEvents =
+      eventsExtension.GetEventsFunction("MyOtherEventsFunction").GetEvents();
   eventLists.push_back(&scene);
   eventLists.push_back(&externalEvents);
   eventLists.push_back(&objectFunctionEvents);
+  eventLists.push_back(&behaviorFunctionEvents);
+  eventLists.push_back(&freeFunctionEvents);
   return eventLists;
 }
 
@@ -930,6 +944,48 @@ SetupProjectWithEventsFunctionExtension(gd::Project &project) {
         .SetType("Number");
   }
 
+  // Add another events based behavior that uses previously defined events based
+  // object and behavior.
+  {
+    auto &eventsBasedBehavior =
+        eventsExtension.GetEventsBasedBehaviors().InsertNew(
+            "MyOtherEventsBasedBehavior", 0);
+    eventsBasedBehavior.SetFullName("My events based behavior");
+    eventsBasedBehavior.SetDescription("An events based behavior for test");
+    eventsBasedBehavior.SetObjectType("MyEventsExtension::MyEventsBasedObject");
+
+    // Add functions, and parameters that should be there by convention.
+    auto &behaviorEventsFunctions = eventsBasedBehavior.GetEventsFunctions();
+    auto &behaviorAction = behaviorEventsFunctions.InsertNewEventsFunction(
+        "MyBehaviorEventsFunction", 0);
+    behaviorAction.GetParameters().push_back(
+        gd::ParameterMetadata()
+            .SetName("Object")
+            .SetType("object")
+            .SetExtraInfo("MyEventsExtension::MyEventsBasedObject"));
+    behaviorAction.GetParameters().push_back(
+        gd::ParameterMetadata()
+            .SetName("Behavior")
+            .SetType("behavior")
+            .SetExtraInfo("MyEventsExtension::MyEventsBasedBehavior"));
+    // Define the same objects as in the layout to be consistent with events.
+    behaviorAction.GetParameters().push_back(
+        gd::ParameterMetadata()
+            .SetName("ObjectWithMyBehavior")
+            .SetType("object")
+            .SetExtraInfo("MyExtension::Sprite"));
+    behaviorAction.GetParameters().push_back(
+        gd::ParameterMetadata()
+            .SetName("MyBehavior")
+            .SetType("behavior")
+            .SetExtraInfo("MyEventsExtension::MyEventsBasedBehavior"));
+    behaviorAction.GetParameters().push_back(
+        gd::ParameterMetadata()
+            .SetName("MyCustomObject")
+            .SetType("object")
+            .SetExtraInfo("MyEventsExtension::MyEventsBasedObject"));
+  }
+
   // Add an other events based object that uses previously defined events based
   // object and behavior.
   {
@@ -1001,6 +1057,30 @@ SetupProjectWithEventsFunctionExtension(gd::Project &project) {
         .SetGetterName("MyEventsFunctionExpressionAndCondition");
   }
 
+  // Add another free function that uses previously defined events based
+  // object and behavior.
+  {
+    // Add functions, and parameters that should be there by convention.
+    auto &action =
+        eventsExtension.InsertNewEventsFunction("MyOtherEventsFunction", 0);
+    // Define the same objects as in the layout to be consistent with events.
+    action.GetParameters().push_back(
+        gd::ParameterMetadata()
+            .SetName("ObjectWithMyBehavior")
+            .SetType("object")
+            .SetExtraInfo("MyExtension::Sprite"));
+    action.GetParameters().push_back(
+        gd::ParameterMetadata()
+            .SetName("MyBehavior")
+            .SetType("behavior")
+            .SetExtraInfo("MyEventsExtension::MyEventsBasedBehavior"));
+    action.GetParameters().push_back(
+        gd::ParameterMetadata()
+            .SetName("MyCustomObject")
+            .SetType("object")
+            .SetExtraInfo("MyEventsExtension::MyEventsBasedObject"));
+  }
+
   // Add some usages in events
   {
     auto &layout = project.InsertNewLayout("Scene", 0);
@@ -1030,6 +1110,13 @@ SetupProjectWithEventsFunctionExtension(gd::Project &project) {
                     .GetEventsFunctions()
                     .GetEventsFunction("MyObjectEventsFunction")
                     .GetEvents());
+    SetupEvents(eventsExtension.GetEventsBasedBehaviors()
+                    .Get("MyOtherEventsBasedBehavior")
+                    .GetEventsFunctions()
+                    .GetEventsFunction("MyBehaviorEventsFunction")
+                    .GetEvents());
+    SetupEvents(eventsExtension.GetEventsFunction("MyOtherEventsFunction")
+                    .GetEvents());
   }
 
   return eventsExtension;
@@ -1556,6 +1643,50 @@ TEST_CASE("WholeProjectRefactorer", "[common]") {
     }
   }
 
+  SECTION("Events extension renamed in instructions scoped to one behavior") {
+    gd::Project project;
+    gd::Platform platform;
+    SetupProjectWithDummyPlatform(project, platform);
+    auto &eventsExtension = SetupProjectWithEventsFunctionExtension(project);
+
+    // A behavior is copied from one extension to another.
+
+    auto &destinationExtension =
+        project.InsertNewEventsFunctionsExtension("DestinationExtension", 0);
+    // Add the function used by the instruction that is checked in this test.
+    // When the function doesn't exist the destination extension, the
+    // instruction keeps pointing to the old extension.
+    destinationExtension.InsertNewEventsFunction("MyEventsFunction", 0);
+
+    auto &copiedBehavior =
+        destinationExtension.GetEventsBasedBehaviors().InsertNew(
+            "MyOtherEventsBasedBehavior", 0);
+    copiedBehavior.SetFullName("My events based behavior");
+    copiedBehavior.SetDescription("An events based behavior for test");
+    copiedBehavior.SetObjectType("MyEventsExtension::MyEventsBasedObject");
+
+    // Add the copied events.
+    auto &behaviorEventsFunctions = copiedBehavior.GetEventsFunctions();
+    auto &behaviorAction = behaviorEventsFunctions.InsertNewEventsFunction(
+        "MyBehaviorEventsFunction", 0);
+    SetupEvents(behaviorAction.GetEvents());
+
+    gd::WholeProjectRefactorer::UpdateExtensionNameInEventsBasedBehavior(
+        project, destinationExtension, copiedBehavior, "MyEventsExtension");
+
+    // Check that events function calls in instructions have been renamed
+    REQUIRE(GetEventFirstActionType(behaviorAction.GetEvents().GetEvent(
+                FreeFunctionAction)) == "DestinationExtension::MyEventsFunction");
+
+    for (auto *eventsList : GetEventsLists(project)) {
+      // Check that events function calls in instructions have NOT been renamed
+      // outside of the copied behavior.
+      REQUIRE(
+          GetEventFirstActionType(eventsList->GetEvent(FreeFunctionAction)) ==
+          "MyEventsExtension::MyEventsFunction");
+    }
+  }
+
   SECTION("Events extension renamed in parameters") {
     gd::Project project;
     gd::Platform platform;

Extensions/AdMob/JsExtension.js

@@ -30,7 +30,7 @@ module.exports = {
         'AdMob',
         _('AdMob'),
         _(
-          'Allow to display AdMob banners, interstitials and reward video ads.'
+          'Allow to display AdMob banners, app open, interstitials, rewarded interstitials and rewarded video ads.'
         ),
         'Florian Rival',
         'MIT'
@@ -57,8 +57,8 @@ module.exports = {
       .addDependency()
       .setName('AdMob Cordova plugin')
       .setDependencyType('cordova')
-      .setExportName('gdevelop-cordova-admob-plus')
-      .setVersion('0.45.0')
+      .setExportName('admob-plus-cordova')
+      .setVersion('1.28.0')
       .setExtraSetting(
         'APP_ID_ANDROID',
         new gd.PropertyDescriptor('AdMobAppIdAndroid').setType(
@@ -100,23 +100,120 @@ module.exports = {
       .setIncludeFile('Extensions/AdMob/admobtools.js')
       .setFunctionName('gdjs.adMob.setTestMode');
 
-    // Banner
+    // App Open
     extension
       .addCondition(
-        'BannerLoading',
-        _('Banner loading'),
-        _(
-          'Check if a banner is currently loading. It will be shown automatically when loaded.'
-        ),
-        _('Banner is loading'),
+        'AppOpenLoading',
+        _('App open loading'),
+        _('Check if an app open is currently loading.'),
+        _('App open is loading'),
         '',
         'JsPlatform/Extensions/admobicon24.png',
         'JsPlatform/Extensions/admobicon16.png'
       )
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/AdMob/admobtools.js')
-      .setFunctionName('gdjs.adMob.isBannerLoading');
+      .setFunctionName('gdjs.adMob.isAppOpenLoading');
 
+    extension
+      .addCondition(
+        'AppOpenReady',
+        _('App open ready'),
+        _('Check if an app open is ready to be displayed.'),
+        _('App open is ready'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isAppOpenReady');
+
+    extension
+      .addCondition(
+        'AppOpenShowing',
+        _('App open showing'),
+        _('Check if there is an app open being displayed.'),
+        _('App open is showing'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isAppOpenShowing');
+
+    extension
+      .addCondition(
+        'AppOpenErrored',
+        _('App open errored'),
+        _('Check if there was a error while loading the app open.'),
+        _('App open had an error'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isAppOpenErrored');
+
+    extension
+      .addAction(
+        'LoadAppOpen',
+        _('Load app open'),
+        _(
+          'Start loading an app open (that can be displayed automatically when the loading is finished).\nIf test mode is set, a test app open will be displayed.'
+        ),
+        _(
+          'Load app open with Android ad unit ID: _PARAM0_, iOS ad unit ID: _PARAM1_ (landscape: _PARAM2_, display automatically when loaded: _PARAM3_)'
+        ),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .addParameter('string', _('Android app open ID'), '', false)
+      .setParameterLongDescription(
+        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/3419835294"` for loading a test app open.'
+      )
+      .addParameter('string', _('iOS app open ID'), '', false)
+      .setParameterLongDescription(
+        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/5662855259"` for loading a test app open.'
+      )
+      .addParameter(
+        'yesorno',
+        _('Display in landscape? (portait otherwise)'),
+        '',
+        false
+      )
+      .setDefaultValue('false')
+      .addParameter(
+        'yesorno',
+        _('Displayed automatically when loading is finished?'),
+        '',
+        false
+      )
+      .setDefaultValue('true')
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.loadAppOpen');
+
+    extension
+      .addAction(
+        'ShowAppOpen',
+        _('Show app open'),
+        _(
+          'Show the app open that was loaded. Will work only when the app open is fully loaded.'
+        ),
+        _('Show the loaded app open'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.showAppOpen');
+
+    // Banner
     extension
       .addCondition(
         'BannerShowing',
@@ -131,6 +228,34 @@ module.exports = {
       .setIncludeFile('Extensions/AdMob/admobtools.js')
       .setFunctionName('gdjs.adMob.isBannerShowing');
 
+    extension
+      .addCondition(
+        'BannerConfigured',
+        _('Banner configured'),
+        _('Check if there is a banner correctly configured ready to be shown.'),
+        _('Banner is configured'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isBannerConfigured');
+
+    extension
+      .addCondition(
+        'BannerLoaded',
+        _('Banner loaded'),
+        _('Check if there is a banner correctly loaded ready to be shown.'),
+        _('Banner is loaded'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isBannerLoaded');
+
     extension
       .addCondition(
         'BannerErrored',
@@ -149,6 +274,9 @@ module.exports = {
     extension
       .addDuplicatedCondition('BannerReady', 'BannerShowing')
       .setHidden();
+    extension
+      .addDuplicatedCondition('Bannerloading', 'BannerShowing')
+      .setHidden();
     extension
       .addDuplicatedCondition('BannerExists', 'BannerShowing')
       .setHidden();
@@ -158,7 +286,7 @@ module.exports = {
         'SetupBanner',
         _('Configure the banner'),
         _(
-          "Configure a banner, which can then be displayed.\nIf test mode is set, a test banner will be displayed.\n\nOnce a banner is positioned (at the top or bottom of the game), it can't be moved anymore."
+          "Configure a banner, which can then be displayed.\nIf a banner is already displayed, it will be removed\nIf test mode is set, a test banner will be displayed.\n\nOnce a banner is positioned (at the top or bottom of the game), it can't be moved anymore."
         ),
         _(
           'Configure the banner with Android ad unit ID: _PARAM0_, iOS ad unit ID: _PARAM1_, display at top: _PARAM2_'
@@ -173,7 +301,7 @@ module.exports = {
       )
       .addParameter('string', _('iOS banner ID'), '', false)
       .setParameterLongDescription(
-        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/6300978111"` for showing a test banner.'
+        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/2934735716"` for showing a test banner.'
       )
       .addParameter(
         'yesorno',
@@ -298,7 +426,7 @@ module.exports = {
       )
       .addParameter('string', _('iOS interstitial ID'), '', false)
       .setParameterLongDescription(
-        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/1033173712"` for loading a test interstitial.'
+        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/4411468910"` for loading a test interstitial.'
       )
       .addParameter(
         'yesorno',
@@ -327,90 +455,266 @@ module.exports = {
       .setIncludeFile('Extensions/AdMob/admobtools.js')
       .setFunctionName('gdjs.adMob.showInterstitial');
 
-    // Reward video
+    // Rewarded Interstitial
     extension
       .addCondition(
-        'VideoLoading',
-        _('Video loading'),
-        _('Check if a reward video is currently loading.'),
-        _('Reward video is loading'),
+        'RewardedInterstitialLoading',
+        _('Rewarded interstitial loading'),
+        _('Check if a rewarded interstitial is currently loading.'),
+        _('Rewarded interstitial is loading'),
         '',
         'JsPlatform/Extensions/admobicon24.png',
         'JsPlatform/Extensions/admobicon16.png'
       )
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/AdMob/admobtools.js')
-      .setFunctionName('gdjs.adMob.isVideoLoading');
+      .setFunctionName('gdjs.adMob.isRewardedInterstitialLoading');
 
     extension
       .addCondition(
-        'VideoReady',
-        _('Video ready'),
-        _('Check if a reward video is ready to be displayed.'),
-        _('Reward video is ready'),
+        'RewardedInterstitialReady',
+        _('Rewarded interstitial ready'),
+        _('Check if a rewarded interstitial is ready to be displayed.'),
+        _('Rewarded interstitial is ready'),
         '',
         'JsPlatform/Extensions/admobicon24.png',
         'JsPlatform/Extensions/admobicon16.png'
       )
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/AdMob/admobtools.js')
-      .setFunctionName('gdjs.adMob.isVideoReady');
+      .setFunctionName('gdjs.adMob.isRewardedInterstitialReady');
 
     extension
       .addCondition(
-        'VideoShowing',
-        _('Video showing'),
-        _('Check if there is a reward video being displayed.'),
-        _('Reward video is showing'),
+        'RewardedInterstitialShowing',
+        _('Rewarded interstitial showing'),
+        _('Check if there is a rewarded interstitial being displayed.'),
+        _('Rewarded interstitial is showing'),
         '',
         'JsPlatform/Extensions/admobicon24.png',
         'JsPlatform/Extensions/admobicon16.png'
       )
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/AdMob/admobtools.js')
-      .setFunctionName('gdjs.adMob.isVideoShowing');
+      .setFunctionName('gdjs.adMob.isRewardedInterstitialShowing');
 
     extension
       .addCondition(
-        'VideoErrored',
-        _('Video had an error'),
-        _('Check if there was a error while loading the rewarded video.'),
-        _('Video ad had an error'),
-        '',
-        'JsPlatform/Extensions/admobicon24.png',
-        'JsPlatform/Extensions/admobicon16.png'
-      )
-      .getCodeExtraInformation()
-      .setIncludeFile('Extensions/AdMob/admobtools.js')
-      .setFunctionName('gdjs.adMob.isVideoErrored');
-
-    extension
-      .addCondition(
-        'VideoReward',
-        _('Video reward received'),
+        'RewardedInterstitialErrored',
+        _('Rewarded interstitial had an error'),
         _(
-          'Check if the reward of the video was given to the user.\nYou can mark this reward as cleared, so that the condition will be false and you can show later another reward video.'
+          'Check if there was a error while loading the rewarded interstitial.'
+        ),
+        _('Rewarded Interstitial had an error'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isRewardedInterstitialErrored');
+
+    extension
+      .addCondition(
+        'RewardedInterstitialRewardReceived',
+        _('Rewarded Interstitial reward received'),
+        _(
+          'Check if the reward of the rewarded interstitial was given to the user.\nYou can mark this reward as cleared, so that the condition will be false and you can show later another rewarded interstitial.'
+        ),
+        _(
+          'User got the reward of the rewarded interstitial (and clear this reward: _PARAM0_)'
         ),
-        _('User got the reward of the video (and clear this reward: _PARAM0_)'),
         '',
         'JsPlatform/Extensions/admobicon24.png',
         'JsPlatform/Extensions/admobicon16.png'
       )
       .addParameter(
         'yesorno',
-        _('Clear the reward (needed to show another video)'),
+        _('Clear the reward (needed to show another rewarded interstitial)'),
         '',
         false
       )
       .setDefaultValue('true')
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/AdMob/admobtools.js')
-      .setFunctionName('gdjs.adMob.wasVideoRewardReceived');
+      .setFunctionName('gdjs.adMob.wasRewardedInterstitialRewardReceived');
 
     extension
       .addAction(
-        'LoadVideo',
-        _('Load video'),
+        'LoadRewardedInterstitial',
+        _('Load rewarded interstitial'),
+        _(
+          'Start loading a rewarded interstitial (that can be displayed automatically when the loading is finished).\nIf test mode is set, a test rewarded interstitial will be displayed.\nThis is similar to a rewarded video, but can be displayed at any time, and the user can close it.'
+        ),
+        _(
+          'Load rewarded interstitial with Android ad unit ID: _PARAM0_, iOS ad unit ID: _PARAM1_ (display automatically when loaded: _PARAM2_)'
+        ),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .addParameter('string', _('Android rewarded interstitial ID'), '', false)
+      .setParameterLongDescription(
+        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/5354046379"` for loading a test rewarded interstitial.'
+      )
+      .addParameter('string', _('iOS interstitial ID'), '', false)
+      .setParameterLongDescription(
+        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/6978759866"` for loading a test rewarded interstitial.'
+      )
+      .addParameter(
+        'yesorno',
+        _('Displayed automatically when loading is finished?'),
+        '',
+        false
+      )
+      .setDefaultValue('true')
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.loadRewardedInterstitial');
+
+    extension
+      .addAction(
+        'ShowRewardedInterstitial',
+        _('Show rewarded interstitial'),
+        _(
+          'Show the rewarded interstitial that was loaded. Will work only when the rewarded interstitial is fully loaded.'
+        ),
+        _('Show the loaded rewarded interstitial'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.showRewardedInterstitial');
+
+    extension
+      .addAction(
+        'ClaimRewardedInterstitialReward',
+        _('Mark the reward of the rewarded interstitial as claimed'),
+        _(
+          'Mark the rewarded interstitial reward as claimed. Useful if you used the condition to check if the reward was given to the user without clearing the reward.'
+        ),
+        _('Mark the reward of the rewarded interstitial as claimed'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.markRewardedInterstitialRewardAsClaimed');
+
+    // Rewarded video
+    extension
+      .addCondition(
+        'RewardedVideoLoading',
+        _('Rewarded video loading'),
+        _('Check if a rewarded video is currently loading.'),
+        _('Rewarded video is loading'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isRewardedVideoLoading');
+
+    // Deprecated condition (was renamed):
+    extension
+      .addDuplicatedCondition('VideoLoading', 'RewardedVideoLoading')
+      .setHidden();
+
+    extension
+      .addCondition(
+        'RewardedVideoReady',
+        _('Rewarded video ready'),
+        _('Check if a rewarded video is ready to be displayed.'),
+        _('Rewarded video is ready'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isRewardedVideoReady');
+
+    // Deprecated condition (was renamed):
+    extension
+      .addDuplicatedCondition('VideoReady', 'RewardedVideoReady')
+      .setHidden();
+
+    extension
+      .addCondition(
+        'RewardedVideoShowing',
+        _('Rewarded video showing'),
+        _('Check if there is a rewarded video being displayed.'),
+        _('Rewarded video is showing'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isRewardedVideoShowing');
+
+    // Deprecated condition (was renamed):
+    extension
+      .addDuplicatedCondition('VideoShowing', 'RewardedVideoShowing')
+      .setHidden();
+
+    extension
+      .addCondition(
+        'RewardedVideoErrored',
+        _('Rewarded video had an error'),
+        _('Check if there was a error while loading the rewarded video.'),
+        _('Rewarded video ad had an error'),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.isRewardedVideoErrored');
+
+    // Deprecated condition (was renamed):
+    extension
+      .addDuplicatedCondition('VideoErrored', 'RewardedVideoErrored')
+      .setHidden();
+
+    extension
+      .addCondition(
+        'RewardedVideoRewardReceived',
+        _('Rewarded Video reward received'),
+        _(
+          'Check if the reward of the rewarded video was given to the user.\nYou can mark this reward as cleared, so that the condition will be false and you can show later another rewarded video.'
+        ),
+        _(
+          'User got the reward of the rewarded video (and clear this reward: _PARAM0_)'
+        ),
+        '',
+        'JsPlatform/Extensions/admobicon24.png',
+        'JsPlatform/Extensions/admobicon16.png'
+      )
+      .addParameter(
+        'yesorno',
+        _('Clear the reward (needed to show another rewarded video)'),
+        '',
+        false
+      )
+      .setDefaultValue('true')
+      .getCodeExtraInformation()
+      .setIncludeFile('Extensions/AdMob/admobtools.js')
+      .setFunctionName('gdjs.adMob.wasRewardedVideoRewardReceived');
+
+    // Deprecated condition (was renamed):
+    extension
+      .addDuplicatedCondition('VideoReward', 'RewardedVideoRewardReceived')
+      .setHidden();
+
+    extension
+      .addAction(
+        'LoadRewardedVideo',
+        _('Load rewarded video'),
         _(
           'Start loading a reward video (that can be displayed automatically when the loading is finished).\nIf test mode is set, a test video will be displayed.'
         ),
@@ -427,7 +731,7 @@ module.exports = {
       )
       .addParameter('string', _('iOS reward video ID'), '', false)
       .setParameterLongDescription(
-        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/5224354917"` for loading a test rewarded video.'
+        'Get it from your AdMob account. You can use `"ca-app-pub-3940256099942544/1712485313"` for loading a test rewarded video.'
       )
       .addParameter(
         'yesorno',
@@ -438,12 +742,15 @@ module.exports = {
       .setDefaultValue('true')
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/AdMob/admobtools.js')
-      .setFunctionName('gdjs.adMob.loadVideo');
+      .setFunctionName('gdjs.adMob.loadRewardedVideo');
+
+    // Deprecated action (was renamed):
+    extension.addDuplicatedAction('LoadVideo', 'LoadRewardedVideo').setHidden();
 
     extension
       .addAction(
-        'ShowVideo',
-        _('Show video'),
+        'ShowRewardedVideo',
+        _('Show rewarded video'),
         _(
           'Show the reward video that was loaded. Will work only when the video is fully loaded.'
         ),
@@ -454,23 +761,31 @@ module.exports = {
       )
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/AdMob/admobtools.js')
-      .setFunctionName('gdjs.adMob.showVideo');
+      .setFunctionName('gdjs.adMob.showRewardedVideo');
+
+    // Deprecated action (was renamed):
+    extension.addDuplicatedAction('ShowVideo', 'ShowRewardedVideo').setHidden();
 
     extension
       .addAction(
-        'ClaimReward',
-        _('Mark the reward of the video as claimed'),
+        'ClaimRewardedVideoReward',
+        _('Mark the reward of the rewarded video as claimed'),
         _(
-          'Mark the video reward as claimed. Useful if you used the condition to check if the reward was given to the user without clearing the reward.'
+          'Mark the rewarded video reward as claimed. Useful if you used the condition to check if the reward was given to the user without clearing the reward.'
         ),
-        _('Mark the reward of the video as claimed'),
+        _('Mark the reward of the rewarded video as claimed'),
         '',
         'JsPlatform/Extensions/admobicon24.png',
         'JsPlatform/Extensions/admobicon16.png'
       )
       .getCodeExtraInformation()
       .setIncludeFile('Extensions/AdMob/admobtools.js')
-      .setFunctionName('gdjs.adMob.markVideoRewardAsClaimed');
+      .setFunctionName('gdjs.adMob.markRewardedVideoRewardAsClaimed');
+
+    // Deprecated action (was renamed):
+    extension
+      .addDuplicatedAction('ClaimReward', 'ClaimRewardedVideoReward')
+      .setHidden();
 
     return extension;
   },

Extensions/AdMob/admobtools.ts

@@ -1,10 +1,46 @@
 namespace gdjs {
   declare var admob: any;
+  declare var cordova: any;
 
   export namespace adMob {
     const logger = new gdjs.Logger('AdMob');
 
-    export enum AdSizeType {
+    const testAdIds = {
+      appOpen: {
+        android: 'ca-app-pub-3940256099942544/3419835294',
+        ios: 'ca-app-pub-3940256099942544/5662855259',
+      },
+      banner: {
+        android: 'ca-app-pub-3940256099942544/6300978111',
+        ios: 'ca-app-pub-3940256099942544/2934735716',
+      },
+      interstitial: {
+        android: 'ca-app-pub-3940256099942544/1033173712',
+        ios: 'ca-app-pub-3940256099942544/4411468910',
+      },
+      interstitialVideo: {
+        android: 'ca-app-pub-3940256099942544/8691691433',
+        ios: 'ca-app-pub-3940256099942544/5135589807',
+      },
+      rewarded: {
+        android: 'ca-app-pub-3940256099942544/5224354917',
+        ios: 'ca-app-pub-3940256099942544/1712485313',
+      },
+      rewardedInterstitial: {
+        android: 'ca-app-pub-3940256099942544/5354046379',
+        ios: 'ca-app-pub-3940256099942544/6978759866',
+      },
+      native: {
+        android: 'ca-app-pub-3940256099942544/2247696110',
+        ios: 'ca-app-pub-3940256099942544/3986624511',
+      },
+      nativeVideo: {
+        android: 'ca-app-pub-3940256099942544/1044960115',
+        ios: 'ca-app-pub-3940256099942544/2521693316',
+      },
+    };
+
+    enum AdSizeType {
       BANNER,
       LARGE_BANNER,
       MEDIUM_RECTANGLE,
@@ -13,31 +49,113 @@ namespace gdjs {
       SMART_BANNER,
     }
 
-    // Banner
-    let bannerAndroidId = '';
-    let bannerIosId = '';
-    let bannerPosition: 'top' | 'bottom' = 'top';
-    let bannerRequestedAdSizeType: AdSizeType = AdSizeType.SMART_BANNER;
+    const adSizeTypes = {
+      BANNER: AdSizeType.BANNER,
+      LARGE_BANNER: AdSizeType.LARGE_BANNER,
+      MEDIUM_RECTANGLE: AdSizeType.MEDIUM_RECTANGLE,
+      FULL_BANNER: AdSizeType.FULL_BANNER,
+      LEADERBOARD: AdSizeType.LEADERBOARD,
+      SMART_BANNER: AdSizeType.SMART_BANNER,
+    };
 
-    let bannerLoading = false;
-    let bannerErrored = false;
-    let bannerShowing = false;
+    enum AppOpenAdOrientation {
+      Portrait = 1,
+      PortraitUpsideDown = 2,
+      LandscapeRight = 3,
+      LandscapeLeft = 4,
+    }
+
+    // Admob does not initialize automatically, so we store a flag to know if it's initialized.
+    let admobStarted = false;
+    let isUsingTestAds = false;
+
+    // Banner
+    let banner;
+    let bannerRequestedAdSizeType: AdSizeType = AdSizeType.SMART_BANNER;
+    let bannerConfigured = false; // Becomes true when the user configures the ad id and the position of the banner.
+    let bannerLoaded = false; // Becomes true when the banner is loaded by loaded.
+    let bannerShowing = false; // Becomes true when loaded or when the user shows/hides the banner.
+    let bannerErrored = false; // Becomes true when the banner fails to load.
 
     // Interstitial
-    let interstitialLoading = false;
-    let interstitialReady = false;
-    let interstitialErrored = false;
-    let interstitialShowing = false;
+    let interstitial;
+    let interstitialLoading = false; // Becomes true when the interstitial is loading.
+    let interstitialReady = false; // Becomes true when the interstitial is loaded and ready to be shown.
+    let interstitialShowing = false; // Becomes true when the interstitial is showing.
+    let interstitialErrored = false; // Becomes true when the interstitial fails to load.
 
-    // Reward video
-    let videoLoading = false;
-    let videoReady = false;
-    let videoErrored = false;
-    let videoShowing = false;
-    let videoRewardReceived = false;
+    // App Open
+    let appOpen;
+    let appOpenLoading = false; // Becomes true when the appOpen is loading.
+    let appOpenReady = false; // Becomes true when the appOpen is loaded and ready to be shown.
+    let appOpenShowing = false; // Becomes true when the appOpen is showing.
+    let appOpenErrored = false; // Becomes true when the appOpen fails to load.
+
+    // Rewarded interstitial
+    let rewardedInterstitial;
+    let rewardedInterstitialLoading = false; // Becomes true when the interstitial is loading.
+    let rewardedInterstitialReady = false; // Becomes true when the interstitial is loaded and ready to be shown.
+    let rewardedInterstitialShowing = false; // Becomes true when the interstitial is showing.
+    let rewardedInterstitialRewardReceived = false; // Becomes true when the interstitial is closed and the reward is received.
+    let rewardedInterstitialErrored = false; // Becomes true when the interstitial fails to load.
+
+    // Rewarded video
+    let rewardedVideo;
+    let rewardedVideoLoading = false; // Becomes true when the video is loading.
+    let rewardedVideoReady = false; // Becomes true when the video is loaded and ready to be shown.
+    let rewardedVideoShowing = false; // Becomes true when the video is showing.
+    let rewardedVideoRewardReceived = false; // Becomes true when the video is closed and the reward is received.
+    let rewardedVideoErrored = false; // Becomes true when the video fails to load.
 
     let npaValue = '0'; // TODO: expose an API to change this and also an automatic way using the consent SDK.
 
+    // Admob initialization listener
+    document.addEventListener(
+      'deviceready',
+      async () => {
+        // Obtain user consent ?
+
+        await admob.start();
+
+        logger.info('AdMob succesfully started.');
+        admobStarted = true;
+      },
+      false
+    );
+
+    /**
+     * Helper to know if we are on mobile and admob is correctly initialized.
+     */
+    const checkIfAdMobIsAvailable = () => {
+      if (typeof cordova === 'undefined') {
+        logger.warn('We are not on mobile, AdMob will not be available.');
+        return false;
+      }
+      if (typeof admob === 'undefined' || !admobStarted) {
+        logger.warn('AdMob has not been configured or started properly.');
+        return false;
+      }
+      return true;
+    };
+
+    /**
+     * Helper to get the correct ad id depending on the platform. Android and iOS use different ids.
+     */
+    const getAdUnitId = (androidAdUnitId, iosAdUnitId, type) => {
+      if (typeof cordova === 'undefined') {
+        logger.warn('Cordova is not available.');
+        return;
+      }
+      if (cordova.platformId === 'android') {
+        return isUsingTestAds ? testAdIds[type].android : androidAdUnitId;
+      } else if (cordova.platformId === 'ios') {
+        return isUsingTestAds ? testAdIds[type].ios : iosAdUnitId;
+      }
+
+      logger.error('Unsupported platform: ', cordova.platformId);
+      return null;
+    };
+
     /**
      * Activate or deactivate the test mode ("development" mode).
      * When activated, tests ads will be served instead of real ones.
@@ -47,43 +165,116 @@ namespace gdjs {
      * account being flagged for invalid activity.
      */
     export const setTestMode = (enable: boolean) => {
-      if (typeof admob === 'undefined') {
+      if (!checkIfAdMobIsAvailable()) return;
+
+      isUsingTestAds = enable;
+    };
+
+    // -------------------
+    // ---- App Open -----
+    // -------------------
+    export const isAppOpenLoading = () => appOpenLoading;
+    export const isAppOpenReady = () => appOpenReady;
+    export const isAppOpenShowing = () => appOpenShowing;
+    export const isAppOpenErrored = () => appOpenErrored;
+
+    /** Load an AppOpen. */
+    export const loadAppOpen = async (
+      androidAdUnitId,
+      iosAdUnitId,
+      displayLandscape,
+      displayWhenLoaded
+    ) => {
+      if (!checkIfAdMobIsAvailable()) return;
+      // If an appOpen is already loading or showing, we don't stop it.
+      if (appOpenLoading || appOpenShowing) {
         return;
       }
 
-      admob.setDevMode(enable);
+      const adUnitId = getAdUnitId(androidAdUnitId, iosAdUnitId, 'appOpen');
+      if (!adUnitId) return;
+
+      appOpenLoading = true;
+      appOpenReady = false;
+      appOpenErrored = false;
+
+      appOpen = new admob.AppOpenAd({
+        adUnitId,
+        orientation: displayLandscape
+          ? AppOpenAdOrientation.LandscapeLeft
+          : AppOpenAdOrientation.Portrait,
+      });
+
+      appOpen.on('load', () => {
+        appOpenReady = true;
+        appOpenLoading = false;
+      });
+      appOpen.on('loadfail', () => {
+        appOpenLoading = false;
+        appOpenErrored = true;
+      });
+      appOpen.on('show', () => {
+        appOpenShowing = true;
+        appOpenReady = false;
+      });
+      appOpen.on('showfail', () => {
+        appOpenShowing = false;
+        appOpenErrored = true;
+      });
+      appOpen.on('dismiss', () => {
+        appOpenShowing = false;
+      });
+
+      try {
+        logger.info('Loading Admob App Open.');
+        await appOpen.load();
+        logger.info('AdMob App Open successfully loaded.');
+        appOpenLoading = false;
+        appOpenReady = true;
+        if (displayWhenLoaded) showAppOpen();
+      } catch (error) {
+        logger.error('Error while loading an App Open:', error);
+        appOpenLoading = false;
+        appOpenReady = false;
+        appOpenErrored = true;
+      }
     };
 
-    // Banner
-    /** Check if a banner is loading. */
-    export const isBannerLoading = () => {
-      return bannerLoading;
-    };
-    /** Check if a banner is being shown on screen. */
-    export const isBannerShowing = () => {
-      return bannerShowing;
-    };
-    /** Check if the banner had an error while loading it. */
-    export const isBannerErrored = () => {
-      return bannerErrored;
-    };
+    /** Show the loaded appOpen. */
+    export const showAppOpen = async () => {
+      if (!checkIfAdMobIsAvailable()) return;
 
-    /**
-     * Set up a banner that can then be displayed by calling `showBanner`.
-     */
-    export const setupBanner = function (androidID, iosID, atTop) {
-      if (typeof admob === 'undefined') {
+      if (!appOpen) {
+        logger.warn('App Open has not been set up, call loadAppOpen first.');
         return;
       }
+      if (!appOpenReady) {
+        logger.info('App Open not loaded yet, cannot display it.');
+        return;
+      }
+      appOpenErrored = false;
 
-      bannerAndroidId = androidID;
-      bannerIosId = iosID;
-      bannerPosition = atTop ? 'top' : 'bottom';
+      try {
+        logger.info('Showing AdMob App Open.');
+        await appOpen.show();
+        // AppOpen will be shown and
+        // `appOpenShowing` will be updated thanks to events
+        // (but it's too early to change it now).
+      } catch (error) {
+        logger.error('Error while showing an AdMob App Open:', error);
+        appOpenShowing = false;
+        appOpenErrored = true;
+      }
     };
-    /**
-     * Set the size of the banner to be shown when `showBanner` is called.
-     * @param bannerAdSizeType The type of the banner to displayed
-     */
+
+    // -----------------
+    // ---- Banner -----
+    // -----------------
+    export const isBannerConfigured = () => bannerConfigured;
+    export const isBannerLoaded = () => bannerLoaded;
+    export const isBannerShowing = () => bannerShowing;
+    export const isBannerErrored = () => bannerErrored;
+
     export const setBannerAdSizeType = (
       bannerAdSizeType:
         | 'BANNER'
@@ -93,288 +284,421 @@ namespace gdjs {
         | 'LEADERBOARD'
         | 'SMART_BANNER'
     ) => {
-      const adSizeTypes = {
-        BANNER: AdSizeType.BANNER,
-        LARGE_BANNER: AdSizeType.LARGE_BANNER,
-        MEDIUM_RECTANGLE: AdSizeType.MEDIUM_RECTANGLE,
-        FULL_BANNER: AdSizeType.FULL_BANNER,
-        LEADERBOARD: AdSizeType.LEADERBOARD,
-        SMART_BANNER: AdSizeType.SMART_BANNER,
-      };
-
       bannerRequestedAdSizeType =
         adSizeTypes[bannerAdSizeType] || AdSizeType.SMART_BANNER;
     };
+
     /**
-     * Display the banner that was set up with `loadBanner` (and `setBannerAdSizeType`).
+     * Set up a banner that can then be displayed by calling `showBanner`.
+     * If a banner is already set up, it will be hidden and replaced by the new one.
      */
-    export const showBanner = () => {
-      if (typeof admob === 'undefined') {
-        return;
+    export const setupBanner = async (androidAdUnitId, iosAdUnitId, atTop) => {
+      if (!checkIfAdMobIsAvailable()) return;
+      const adUnitId = getAdUnitId(androidAdUnitId, iosAdUnitId, 'banner');
+      if (!adUnitId) return;
+
+      if (banner && bannerShowing) {
+        logger.info('Banner already visible, hiding it to display new one.');
+        await hideBanner();
       }
 
-      bannerLoading = true;
-      bannerShowing = false;
-      bannerErrored = false;
-      admob.banner
-        .show({
-          id: {
-            android: bannerAndroidId,
-            ios: bannerIosId,
-          },
-          position: bannerPosition,
-          size: bannerRequestedAdSizeType,
-        })
-        .then(
-          () => {
-            bannerShowing = true;
-            bannerLoading = false;
-            logger.info('AdMob banner successfully shown.');
-          },
-          (error) => {
-            bannerShowing = false;
-            bannerLoading = false;
-            bannerErrored = true;
-            logger.error('Error while showing an AdMob banner:', error);
-          }
-        );
-    };
-    /** Hide the banner shown on screen. */
-    export const hideBanner = () => {
-      if (typeof admob === 'undefined') {
-        return;
-      }
+      bannerConfigured = false;
+      bannerLoaded = false;
 
-      bannerShowing = false;
-      admob.banner.hide({
-        android: bannerAndroidId,
-        ios: bannerIosId,
+      banner = new admob.BannerAd({
+        adUnitId,
+        position: atTop ? 'top' : 'bottom',
+        size: bannerRequestedAdSizeType,
       });
+
+      banner.on('load', () => {
+        bannerShowing = true;
+        bannerLoaded = true;
+      });
+      banner.on('loadfail', () => {
+        bannerShowing = false;
+        bannerLoaded = false;
+        bannerErrored = true;
+      });
+
+      bannerConfigured = true;
     };
 
-    // Interstitial
-    /** Check if the interstitial is loading. */
-    export const isInterstitialLoading = () => {
-      return interstitialLoading;
+    /**
+     * Display a banner that was set up with `setupBanner` (and `setBannerAdSizeType`).
+     */
+    export const showBanner = async () => {
+      if (!banner) {
+        logger.info('Banner not configured, use setupBanner first.');
+        return;
+      }
+      if (bannerShowing) {
+        logger.info('Banner already visible. Ignoring.');
+        return;
+      }
+      bannerErrored = false;
+
+      try {
+        logger.info('Showing AdMob banner.');
+        await banner.show();
+        if (bannerLoaded) {
+          // Banner is already loaded, so it will be shown immediately.
+          bannerShowing = true;
+        }
+      } catch (error) {
+        bannerShowing = false;
+        bannerErrored = true;
+        logger.error('Error while showing an AdMob banner:', error);
+      }
     };
-    /** Check if the interstitial is ready to display. */
-    export const isInterstitialReady = () => {
-      return interstitialReady;
-    };
-    /** Check if the interstitial is shown on screen. */
-    export const isInterstitialShowing = () => {
-      return interstitialShowing;
-    };
-    /** Check if the interstitial had an error while loading it. */
-    export const isInterstitialErrored = () => {
-      return interstitialErrored;
+
+    /** Hide the banner shown on screen. */
+    export const hideBanner = async () => {
+      if (!checkIfAdMobIsAvailable()) return;
+
+      if (!banner || !bannerShowing) {
+        logger.warn('No banner is being shown.');
+        return;
+      }
+
+      await banner.hide();
+      bannerShowing = false;
+      // Note that the banner is still loaded, which is why bannerLoaded is not set to false.
+      // We hide the banner, but keep it configured to display it again if needed.
     };
 
+    // -----------------------
+    // ---- Interstitial -----
+    // -----------------------
+    export const isInterstitialLoading = () => interstitialLoading;
+    export const isInterstitialReady = () => interstitialReady;
+    export const isInterstitialShowing = () => interstitialShowing;
+    export const isInterstitialErrored = () => interstitialErrored;
+
     /** Load an interstitial. */
-    export const loadInterstitial = (androidID, iosID, displayWhenLoaded) => {
-      if (typeof admob === 'undefined') {
-        return;
-      }
-      if (interstitialLoading || interstitialReady || interstitialShowing) {
+    export const loadInterstitial = async (
+      androidAdUnitId,
+      iosAdUnitId,
+      displayWhenLoaded
+    ) => {
+      if (!checkIfAdMobIsAvailable()) return;
+      // If an interstitial is already loading or showing, we don't stop it.
+      if (interstitialLoading || interstitialShowing) {
         return;
       }
 
+      const adUnitId = getAdUnitId(
+        androidAdUnitId,
+        iosAdUnitId,
+        'interstitial'
+      );
+      if (!adUnitId) return;
+
       interstitialLoading = true;
       interstitialReady = false;
       interstitialErrored = false;
-      admob.interstitial
-        .load({
-          id: {
-            android: androidID,
-            ios: iosID,
-          },
-          npa: npaValue,
-        })
-        .then(
-          () => {
-            logger.info('AdMob interstitial successfully loaded.');
-            if (displayWhenLoaded) showInterstitial();
-          },
-          (error) => {
-            interstitialLoading = false;
-            interstitialReady = false;
-            interstitialErrored = true;
-            logger.error('Error while loading a interstitial:', error);
-          }
-        );
+
+      interstitial = new admob.InterstitialAd({
+        adUnitId,
+        npa: npaValue,
+      });
+
+      interstitial.on('load', () => {
+        interstitialReady = true;
+        interstitialLoading = false;
+      });
+      interstitial.on('loadfail', () => {
+        interstitialLoading = false;
+        interstitialErrored = true;
+      });
+      interstitial.on('show', () => {
+        interstitialShowing = true;
+        interstitialReady = false;
+      });
+      interstitial.on('showfail', () => {
+        interstitialShowing = false;
+        interstitialErrored = true;
+      });
+      interstitial.on('dismiss', () => {
+        interstitialShowing = false;
+      });
+
+      try {
+        logger.info('Loading Admob interstitial.');
+        await interstitial.load();
+        logger.info('AdMob interstitial successfully loaded.');
+        interstitialLoading = false;
+        interstitialReady = true;
+        if (displayWhenLoaded) showInterstitial();
+      } catch (error) {
+        logger.error('Error while loading a interstitial:', error);
+        interstitialLoading = false;
+        interstitialReady = false;
+        interstitialErrored = true;
+      }
     };
 
     /** Show the loaded interstitial. */
-    export const showInterstitial = () => {
-      if (typeof admob === 'undefined') {
+    export const showInterstitial = async () => {
+      if (!checkIfAdMobIsAvailable()) return;
+
+      if (!interstitial) {
+        logger.warn(
+          'Interstitial has not been set up, call loadInterstitial first.'
+        );
         return;
       }
-      admob.interstitial.show().then(
-        () => {
-          // Interstitial will be shown and
-          // `interstitialShowing` will be updated thanks to events
-          // (but it's too early to change it now).
-        },
-        (error) => {
-          interstitialShowing = false;
-          interstitialErrored = true;
-          logger.error('Error while trying to show an interstitial:', error);
-        }
-      );
+      if (!interstitialReady) {
+        logger.info('Interstitial not loaded yet, cannot display it.');
+        return;
+      }
+      interstitialErrored = false;
+
+      try {
+        logger.info('Showing AdMob interstitial.');
+        await interstitial.show();
+        // Interstitial will be shown and
+        // `interstitialShowing` will be updated thanks to events
+        // (but it's too early to change it now).
+      } catch (error) {
+        logger.error('Error while showing an AdMob interstitial:', error);
+        interstitialShowing = false;
+        interstitialErrored = true;
+      }
     };
 
-    // Reward video
-    /** Check if the video is loading. */
-    export const isVideoLoading = () => {
-      return videoLoading;
-    };
-    /** Check if the video is ready to display. */
-    export const isVideoReady = () => {
-      return videoReady;
-    };
-    /** Check if the video is shown on screen. */
-    export const isVideoShowing = () => {
-      return videoShowing;
-    };
-    /** Check if the video had an error while loading it. */
-    export const isVideoErrored = () => {
-      return videoErrored;
-    };
+    // --------------------------------
+    // ---- Rewarded Interstitial -----
+    // --------------------------------
+    export const isRewardedInterstitialLoading = () =>
+      rewardedInterstitialLoading;
+    export const isRewardedInterstitialReady = () => rewardedInterstitialReady;
+    export const isRewardedInterstitialShowing = () =>
+      rewardedInterstitialShowing;
+    export const isRewardedInterstitialErrored = () =>
+      rewardedInterstitialErrored;
 
-    /** Check if the reward of the video was received. */
-    export const wasVideoRewardReceived = function (markAsClaimed) {
-      const reward = videoRewardReceived;
+    /** Check if the reward of the rewarded interstitial was received. */
+    export const wasRewardedInterstitialRewardReceived = function (
+      markAsClaimed
+    ) {
+      const reward = rewardedInterstitialRewardReceived;
       if (markAsClaimed) {
-        videoRewardReceived = false;
+        rewardedInterstitialRewardReceived = false;
       }
       return reward;
     };
 
-    /** Load a reward video. */
-    export const loadVideo = function (androidID, iosID, displayWhenLoaded) {
-      if (typeof admob === 'undefined') {
-        return;
-      }
-      if (videoLoading || videoReady || videoShowing) {
+    /** Load a rewarded interstitial. */
+    export const loadRewardedInterstitial = async (
+      androidAdUnitID,
+      iosAdUnitID,
+      displayWhenLoaded
+    ) => {
+      if (!checkIfAdMobIsAvailable()) return;
+      if (rewardedInterstitialLoading || rewardedInterstitialShowing) {
         return;
       }
 
-      videoLoading = true;
-      videoReady = false;
-      videoErrored = false;
-      admob.rewardVideo
-        .load({
-          id: {
-            android: androidID,
-            ios: iosID,
-          },
-          npa: npaValue,
-        })
-        .then(
-          () => {
-            logger.info('AdMob reward video successfully loaded.');
+      const adUnitId = getAdUnitId(
+        androidAdUnitID,
+        iosAdUnitID,
+        'rewardedInterstitial'
+      );
+      if (!adUnitId) return;
 
-            if (displayWhenLoaded) showVideo();
-          },
-          (error) => {
-            videoLoading = false;
-            videoReady = false;
-            videoErrored = true;
-            logger.error('Error while loading a reward video:', error);
-          }
+      rewardedInterstitialLoading = true;
+      rewardedInterstitialReady = false;
+      rewardedInterstitialErrored = false;
+
+      rewardedInterstitial = new admob.RewardedInterstitialAd({
+        adUnitId,
+        npa: npaValue,
+      });
+
+      // Rewarded video event listeners
+      rewardedInterstitial.on('load', () => {
+        rewardedInterstitialReady = true;
+        rewardedInterstitialLoading = false;
+      });
+      rewardedInterstitial.on('loadfail', () => {
+        rewardedInterstitialLoading = false;
+        rewardedInterstitialErrored = true;
+      });
+      rewardedInterstitial.on('show', () => {
+        rewardedInterstitialShowing = true;
+        rewardedInterstitialReady = false;
+      });
+      rewardedInterstitial.on('showfail', () => {
+        rewardedInterstitialShowing = false;
+        rewardedInterstitialErrored = true;
+      });
+      rewardedInterstitial.on('dismiss', () => {
+        rewardedInterstitialShowing = false;
+      });
+      rewardedInterstitial.on('reward', () => {
+        rewardedInterstitialRewardReceived = true;
+      });
+
+      try {
+        logger.info('Loading AdMob rewarded interstitial.');
+        await rewardedInterstitial.load();
+        logger.info('AdMob rewarded interstitial successfully loaded.');
+        rewardedInterstitialLoading = false;
+        rewardedInterstitialReady = true;
+        if (displayWhenLoaded) showRewardedInterstitial();
+      } catch (error) {
+        rewardedInterstitialLoading = false;
+        rewardedInterstitialReady = false;
+        rewardedInterstitialErrored = true;
+        logger.error('Error while loading a rewarded interstitial:', error);
+      }
+    };
+
+    /** Show the loaded reward interstitial. */
+    export const showRewardedInterstitial = async () => {
+      if (!checkIfAdMobIsAvailable()) return;
+
+      if (!rewardedInterstitial) {
+        logger.warn(
+          'interstitial has not been set up, call loadRewardedInterstitial first.'
         );
+        return;
+      }
+      if (!rewardedInterstitialReady) {
+        logger.info('Rewarded interstitial not loaded yet, cannot display it.');
+      }
+      rewardedInterstitialErrored = false;
+
+      try {
+        logger.info('Showing AdMob rewarded interstitial.');
+        await rewardedInterstitial.show();
+        // Rewarded interstitial will be shown and
+        // `rewardedInterstitialShowing` will be updated thanks to events
+        // (but it's too early to change it now).
+      } catch (error) {
+        logger.error(
+          'Error while showing an AdMob rewarded interstitial:',
+          error
+        );
+        rewardedInterstitialShowing = false;
+        rewardedInterstitialErrored = true;
+      }
+    };
+
+    /** Mark the reward of the interstitial as claimed. */
+    export const markRewardedInterstitialRewardAsClaimed = () => {
+      rewardedInterstitialRewardReceived = false;
+    };
+
+    // -------------------------
+    // ---- Rewarded Video -----
+    // -------------------------
+    export const isRewardedVideoLoading = () => rewardedVideoLoading;
+    export const isRewardedVideoReady = () => rewardedVideoReady;
+    export const isRewardedVideoShowing = () => rewardedVideoShowing;
+    export const isRewardedVideoErrored = () => rewardedVideoErrored;
+
+    /** Check if the reward of the rewarded video was received. */
+    export const wasRewardedVideoRewardReceived = function (markAsClaimed) {
+      const reward = rewardedVideoRewardReceived;
+      if (markAsClaimed) {
+        rewardedVideoRewardReceived = false;
+      }
+      return reward;
+    };
+
+    /** Load a rewarded video. */
+    export const loadRewardedVideo = async (
+      androidAdUnitID,
+      iosAdUnitID,
+      displayWhenLoaded
+    ) => {
+      if (!checkIfAdMobIsAvailable()) return;
+      if (rewardedVideoLoading || rewardedVideoShowing) {
+        return;
+      }
+
+      const adUnitId = getAdUnitId(androidAdUnitID, iosAdUnitID, 'rewarded');
+      if (!adUnitId) return;
+
+      rewardedVideoLoading = true;
+      rewardedVideoReady = false;
+      rewardedVideoErrored = false;
+
+      rewardedVideo = new admob.RewardedAd({
+        adUnitId,
+        npa: npaValue,
+      });
+
+      // Rewarded video event listeners
+      rewardedVideo.on('load', () => {
+        rewardedVideoReady = true;
+        rewardedVideoLoading = false;
+      });
+      rewardedVideo.on('loadfail', () => {
+        rewardedVideoLoading = false;
+        rewardedVideoErrored = true;
+      });
+      rewardedVideo.on('show', () => {
+        rewardedVideoShowing = true;
+        rewardedVideoReady = false;
+      });
+      rewardedVideo.on('showfail', () => {
+        rewardedVideoShowing = false;
+        rewardedVideoErrored = true;
+      });
+      rewardedVideo.on('dismiss', () => {
+        rewardedVideoShowing = false;
+      });
+      rewardedVideo.on('reward', () => {
+        rewardedVideoRewardReceived = true;
+      });
+
+      try {
+        logger.info('Loading AdMob rewarded video.');
+        await rewardedVideo.load();
+        logger.info('AdMob rewarded video successfully loaded.');
+        rewardedVideoLoading = false;
+        rewardedVideoReady = true;
+        if (displayWhenLoaded) showRewardedVideo();
+      } catch (error) {
+        rewardedVideoLoading = false;
+        rewardedVideoReady = false;
+        rewardedVideoErrored = true;
+        logger.error('Error while loading a rewarded video:', error);
+      }
     };
 
     /** Show the loaded reward video. */
-    export const showVideo = () => {
-      if (typeof admob === 'undefined') {
+    export const showRewardedVideo = async () => {
+      if (!checkIfAdMobIsAvailable()) return;
+
+      if (!rewardedVideo) {
+        logger.warn('Video has not been set up, call loadRewardedVideo first.');
         return;
       }
+      if (!rewardedVideoReady) {
+        logger.info('Rewarded video not loaded yet, cannot display it.');
+      }
+      rewardedVideoErrored = false;
 
-      admob.rewardVideo.show().then(
-        () => {
-          // Video will be shown and
-          // `videoShowing` will be updated thanks to events
-          // (but it's too early to change it now).
-        },
-        (error) => {
-          videoShowing = false;
-          videoErrored = true;
-          logger.error('Error while trying to show a reward video:', error);
-        }
-      );
+      try {
+        logger.info('Showing AdMob rewarded video.');
+        await rewardedVideo.show();
+        // Rewarded video will be shown and
+        // `rewardedVideoShowing` will be updated thanks to events
+        // (but it's too early to change it now).
+      } catch (error) {
+        logger.error('Error while showing an AdMob rewarded video:', error);
+        rewardedVideoShowing = false;
+        rewardedVideoErrored = true;
+      }
     };
 
     /** Mark the reward of the video as claimed. */
-    export const markVideoRewardAsClaimed = () => {
-      videoRewardReceived = false;
+    export const markRewardedVideoRewardAsClaimed = () => {
+      rewardedVideoRewardReceived = false;
     };
-
-    // Banner event listeners:
-    document.addEventListener('admob.banner.load', () => {
-      bannerShowing = true;
-      bannerLoading = false;
-    });
-    document.addEventListener('admob.banner.load_fail', () => {
-      bannerLoading = false;
-    });
-
-    document.addEventListener('admob.banner.open', () => {
-      // Not implemented.
-    });
-
-    document.addEventListener('admob.banner.exit_app', () => {
-      // Not implemented.
-    });
-    document.addEventListener('admob.banner.close', () => {
-      // Not implemented.
-    });
-
-    // Interstitial event listeners
-    document.addEventListener('admob.interstitial.load', () => {
-      interstitialReady = true;
-      interstitialLoading = false;
-    });
-    document.addEventListener('admob.interstitial.load_fail', () => {
-      interstitialLoading = false;
-    });
-    document.addEventListener('admob.interstitial.open', () => {
-      interstitialShowing = true;
-      interstitialReady = false;
-    });
-    document.addEventListener('admob.interstitial.close', () => {
-      interstitialShowing = false;
-    });
-    document.addEventListener('admob.interstitial.exit_app', () => {
-      // Not implemented.
-    });
-
-    // Reward video event listeners
-    document.addEventListener('admob.reward_video.load', () => {
-      videoReady = true;
-      videoLoading = false;
-    });
-    document.addEventListener('admob.reward_video.load_fail', () => {
-      videoLoading = false;
-    });
-    document.addEventListener('admob.reward_video.open', () => {
-      videoShowing = true;
-      videoReady = false;
-    });
-    document.addEventListener('admob.reward_video.close', () => {
-      videoShowing = false;
-    });
-    document.addEventListener('admob.reward_video.start', () => {
-      // Not implemented.
-    });
-    document.addEventListener('admob.reward_video.complete', () => {
-      // Not implemented.
-    });
-    document.addEventListener('admob.reward_video.reward', () => {
-      videoRewardReceived = true;
-    });
-    document.addEventListener('admob.reward_video.exit_app', () => {
-      // Not implemented.
-    });
   }
 }

Extensions/AnchorBehavior/tests/anchorruntimebehavior.spec.js

@@ -1,10 +1,7 @@
 // @ts-check
 describe('gdjs.AnchorRuntimeBehavior', function () {
-  const runtimeGame = new gdjs.RuntimeGame({
-    variables: [],
-    resources: { resources: [] },
-    // @ts-ignore
-    properties: { windowWidth: 1000, windowHeight: 1000 },
+  const runtimeGame = gdjs.getPixiRuntimeGame({
+    propertiesOverrides: { windowHeight: 1000, windowWidth: 1000 },
   });
   const anchorBehaviorName = 'Anchor';
   const runtimeScene = new gdjs.RuntimeScene(runtimeGame);

Extensions/BBText/JsExtension.js

@@ -19,6 +19,8 @@
 import { type ObjectsRenderingService, type ObjectsEditorService } from '../JsExtensionTypes.flow.js'
 */
 
+const stringifyOptions = (options) => '["' + options.join('","') + '"]';
+
 module.exports = {
   createExtension: function (
     _ /*: (string) => string */,
@@ -34,9 +36,10 @@ module.exports = {
         'Open source (MIT License)'
       )
       .setExtensionHelpPath('/objects/bbtext')
-      .setCategory('User interface');
-    extension.addInstructionOrExpressionGroupMetadata(_("BBCode Text Object"))
-        .setIcon("JsPlatform/Extensions/bbcode32.png");
+      .setCategory('Text');
+    extension
+      .addInstructionOrExpressionGroupMetadata(_('BBCode Text Object'))
+      .setIcon('JsPlatform/Extensions/bbcode32.png');
 
     var objectBBText = new gd.ObjectJsImplementation();
     // $FlowExpectedError
@@ -171,7 +174,7 @@ module.exports = {
       .addIncludeFile(
         'Extensions/BBText/pixi-multistyle-text/dist/pixi-multistyle-text.umd.js'
       )
-      .setCategoryFullName(_('User interface'));
+      .setCategoryFullName(_('Text'));
 
     /**
      * Utility function to add both a setter and a getter to a property from a list.
@@ -195,7 +198,10 @@ module.exports = {
             .addParameter('object', objectName, objectName, false)
             .getCodeExtraInformation()
             .setFunctionName(`get${property.functionName}`);
-        } else if (parameterType === 'string') {
+        } else if (
+          parameterType === 'string' ||
+          parameterType === 'stringWithSelector'
+        ) {
           gdObject
             .addStrExpression(
               `Get${property.functionName}`,
@@ -210,13 +216,24 @@ module.exports = {
         }
 
         // Add the action
-        if (parameterType === 'number' || parameterType === 'string') {
-          const expressionType =
-            parameterType === 'number' ? 'expression' : 'string';
+        if (
+          parameterType === 'number' ||
+          parameterType === 'string' ||
+          parameterType === 'stringWithSelector'
+        ) {
+          const parameterOptions =
+            gd.ParameterOptions.makeNewOptions().setDescription(
+              property.paramLabel
+            );
+          if (property.options) {
+            parameterOptions.setTypeExtraInfo(
+              stringifyOptions(property.options)
+            );
+          }
           gdObject
             .addAction(
               `Set${property.functionName}`,
-              property.paramLabel,
+              property.instructionLabel,
               property.actionDescription,
               property.actionSentence,
               '',
@@ -224,7 +241,7 @@ module.exports = {
               property.iconPath
             )
             .addParameter('object', objectName, objectName, false)
-            .useStandardOperatorParameters(parameterType)
+            .useStandardOperatorParameters(parameterType, parameterOptions)
             .getCodeExtraInformation()
             .setFunctionName(`set${property.functionName}`)
             .setGetter(`get${property.functionName}`);
@@ -232,7 +249,7 @@ module.exports = {
           gdObject
             .addAction(
               `Set${property.functionName}`,
-              property.paramLabel,
+              property.instructionLabel,
               property.actionDescription,
               property.actionSentence,
               '',
@@ -243,9 +260,7 @@ module.exports = {
             .addParameter(
               parameterType,
               property.paramLabel,
-              property.options
-                ? '["' + property.options.join('", "') + '"]'
-                : '',
+              '', // There should not be options for the property if it's not a stringWithSelector
               false
             )
             .getCodeExtraInformation()
@@ -254,13 +269,24 @@ module.exports = {
         }
 
         // Add condition
-        if (parameterType === 'string' || parameterType === 'number') {
-          const propExpressionType =
-            parameterType === 'string' ? 'string' : 'expression';
+        if (
+          parameterType === 'string' ||
+          parameterType === 'number' ||
+          parameterType === 'stringWithSelector'
+        ) {
+          const parameterOptions =
+            gd.ParameterOptions.makeNewOptions().setDescription(
+              property.paramLabel
+            );
+          if (property.options) {
+            parameterOptions.setTypeExtraInfo(
+              stringifyOptions(property.options)
+            );
+          }
           gdObject
             .addCondition(
               `Is${property.functionName}`,
-              property.paramLabel,
+              property.instructionLabel,
               property.conditionDescription,
               property.conditionSentence,
               '',
@@ -268,14 +294,17 @@ module.exports = {
               property.iconPath
             )
             .addParameter('object', objectName, objectName, false)
-            .useStandardRelationalOperatorParameters(parameterType)
+            .useStandardRelationalOperatorParameters(
+              parameterType,
+              parameterOptions
+            )
             .getCodeExtraInformation()
             .setFunctionName(`get${property.functionName}`);
         } else if (parameterType === 'yesorno') {
           gdObject
             .addCondition(
               `Is${property.functionName}`,
-              property.paramLabel,
+              property.instructionLabel,
               property.conditionDescription,
               property.conditionSentence,
               '',
@@ -294,7 +323,8 @@ module.exports = {
         functionName: 'BBText',
         iconPath: 'res/actions/text24_black.png',
         type: 'string',
-        paramLabel: _('BBCode text'),
+        instructionLabel: _('BBCode text'),
+        paramLabel: _('Text'),
         conditionDescription: _('Compare the value of the BBCode text.'),
         conditionSentence: _('the BBCode text'),
         actionDescription: _('Set BBCode text'),
@@ -306,7 +336,8 @@ module.exports = {
         functionName: 'Color',
         iconPath: 'res/actions/color24.png',
         type: 'color',
-        paramLabel: _('Color'),
+        instructionLabel: _('Color'),
+        paramLabel: _('Color (R;G;B)'),
         conditionDescription: '', // No conditions for a "color" property
         conditionSentence: '', // No conditions for a "color" property
         actionDescription: _('Set base color'),
@@ -318,7 +349,8 @@ module.exports = {
         functionName: 'Opacity',
         iconPath: 'res/actions/opacity24.png',
         type: 'number',
-        paramLabel: _('Opacity'),
+        instructionLabel: _('Opacity'),
+        paramLabel: _('Opacity (0-255)'),
         conditionDescription: _(
           'Compare the value of the base opacity of the text.'
         ),
@@ -332,6 +364,7 @@ module.exports = {
         functionName: 'FontSize',
         iconPath: 'res/actions/characterSize24.png',
         type: 'number',
+        instructionLabel: _('Font size'),
         paramLabel: _('Font size'),
         conditionDescription: _('Compare the base font size of the text.'),
         conditionSentence: _('the base font size'),
@@ -344,6 +377,7 @@ module.exports = {
         functionName: 'FontFamily',
         iconPath: 'res/actions/font24.png',
         type: 'string',
+        instructionLabel: _('Font family'),
         paramLabel: _('Font family'),
         conditionDescription: _('Compare the value of font family'),
         conditionSentence: _('the base font family'),
@@ -356,6 +390,7 @@ module.exports = {
         functionName: 'Alignment',
         iconPath: 'res/actions/textAlign24.png',
         type: 'stringWithSelector',
+        instructionLabel: _('Alignment'),
         paramLabel: _('Alignment'),
         options: ['left', 'right', 'center'],
         conditionDescription: _('Check the current text alignment.'),
@@ -369,6 +404,7 @@ module.exports = {
         functionName: 'WordWrap',
         iconPath: 'res/actions/scaleWidth24_black.png',
         type: 'boolean',
+        instructionLabel: _('Word wrap'),
         paramLabel: _('Word wrap'),
         conditionDescription: _('Check if word wrap is enabled.'),
         conditionSentence: _('Word wrap is enabled'),
@@ -381,6 +417,7 @@ module.exports = {
         functionName: 'WrappingWidth',
         iconPath: 'res/actions/scaleWidth24_black.png',
         type: 'number',
+        instructionLabel: _('Wrapping width'),
         paramLabel: _('Wrapping width'),
         conditionDescription: _(
           'Compare the width, in pixels, after which the text is wrapped on next line.'
@@ -510,8 +547,7 @@ module.exports = {
      * This is called to update the PIXI object on the scene editor
      */
     RenderedBBTextInstance.prototype.update = function () {
-      const properties = this._associatedObjectConfiguration
-        .getProperties();
+      const properties = this._associatedObjectConfiguration.getProperties();
 
       const rawText = properties.get('text').getValue();
       if (rawText !== this._pixiObject.text) {

Extensions/BitmapText/JsExtension.js

@@ -36,9 +36,10 @@ module.exports = {
         'Open source (MIT License)'
       )
       .setExtensionHelpPath('/objects/bitmap_text')
-      .setCategory('User interface');
-    extension.addInstructionOrExpressionGroupMetadata(_("Bitmap Text"))
-        .setIcon("JsPlatform/Extensions/bitmapfont32.png");
+      .setCategory('Text');
+    extension
+      .addInstructionOrExpressionGroupMetadata(_('Bitmap Text'))
+      .setIcon('JsPlatform/Extensions/bitmapfont32.png');
 
     const bitmapTextObject = new gd.ObjectJsImplementation();
     // $FlowExpectedError
@@ -91,7 +92,7 @@ module.exports = {
         .setType('resource')
         .addExtraInfo('bitmapFont') //fnt or xml files
         .setLabel(_('Bitmap Font'))
-        .setGroup(_("Font"));
+        .setGroup(_('Font'));
 
       objectProperties
         .getOrCreate('textureAtlasResourceName')
@@ -99,7 +100,7 @@ module.exports = {
         .setType('resource')
         .addExtraInfo('image')
         .setLabel(_('Bitmap atlas image'))
-        .setGroup(_("Font"));
+        .setGroup(_('Font'));
 
       objectProperties
         .getOrCreate('scale')
@@ -113,7 +114,7 @@ module.exports = {
         .setValue(objectContent.tint)
         .setType('color')
         .setLabel(_('Font tint'))
-        .setGroup(_("Font"));
+        .setGroup(_('Font'));
 
       objectProperties
         .getOrCreate('wordWrap')
@@ -174,7 +175,7 @@ module.exports = {
       .addIncludeFile(
         'Extensions/BitmapText/bitmaptextruntimeobject-pixi-renderer.js'
       )
-      .setCategoryFullName(_('User interface'));
+      .setCategoryFullName(_('Text'));
 
     object
       .addExpressionAndConditionAndAction(
@@ -187,7 +188,7 @@ module.exports = {
         'res/conditions/text24_black.png'
       )
       .addParameter('object', _('Bitmap text'), 'BitmapTextObject', false)
-      .useStandardParameters('string')
+      .useStandardParameters('string', gd.ParameterOptions.makeNewOptions())
       .setFunctionName('setText')
       .setGetter('getText');
 
@@ -202,7 +203,12 @@ module.exports = {
         'res/conditions/opacity24.png'
       )
       .addParameter('object', _('Bitmap text'), 'BitmapTextObject', false)
-      .useStandardParameters('number')
+      .useStandardParameters(
+        'number',
+        gd.ParameterOptions.makeNewOptions().setDescription(
+          _('Opacity (0-255)')
+        )
+      )
       .setFunctionName('setOpacity')
       .setGetter('getOpacity');
 
@@ -217,7 +223,7 @@ module.exports = {
         'res/conditions/characterSize24.png'
       )
       .addParameter('object', _('Bitmap text'), 'BitmapTextObject', false)
-      .useStandardParameters('number')
+      .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
       .setFunctionName('getFontSize');
 
     object
@@ -231,7 +237,12 @@ module.exports = {
         'res/actions/scale24_black.png'
       )
       .addParameter('object', _('Bitmap text'), 'BitmapTextObject', false)
-      .useStandardParameters('number')
+      .useStandardParameters(
+        'number',
+        gd.ParameterOptions.makeNewOptions().setDescription(
+          _('Scale (1 by default)')
+        )
+      )
       .setFunctionName('setScale')
       .setGetter('getScale');
 
@@ -246,7 +257,7 @@ module.exports = {
         'res/conditions/font24.png'
       )
       .addParameter('object', _('Bitmap text'), 'BitmapTextObject', false)
-      .useStandardParameters('string')
+      .useStandardParameters('string', gd.ParameterOptions.makeNewOptions())
       .setFunctionName('getFontName');
 
     object
@@ -304,7 +315,12 @@ module.exports = {
         'res/actions/textAlign24.png'
       )
       .addParameter('object', _('Bitmap text'), 'BitmapTextObject', false)
-      .useStandardParameters('string')
+      .useStandardParameters(
+        'string',
+        gd.ParameterOptions.makeNewOptions().setDescription(
+          _('Alignment ("left", "right" or "center")')
+        )
+      )
       .setFunctionName('getAlignment');
 
     object
@@ -367,7 +383,7 @@ module.exports = {
         'res/actions/scaleWidth24_black.png'
       )
       .addParameter('object', _('Bitmap text'), 'BitmapTextObject', false)
-      .useStandardParameters('number')
+      .useStandardParameters('number', gd.ParameterOptions.makeNewOptions())
       .setFunctionName('setWrappingWidth')
       .setGetter('getWrappingWidth');
 
@@ -637,8 +653,7 @@ module.exports = {
 
     // This is called to update the PIXI object on the scene editor
     RenderedBitmapTextInstance.prototype.update = function () {
-      const properties = this._associatedObjectConfiguration
-        .getProperties();
+      const properties = this._associatedObjectConfiguration.getProperties();
 
       // Update the rendered text properties (note: Pixi is only
       // applying changes if there were changed).

Extensions/DestroyOutsideBehavior/Extension.cpp

@@ -45,7 +45,8 @@ void DeclareDestroyOutsideBehaviorExtension(gd::PlatformExtension& extension) {
                    "CppPlatform/Extensions/destroyoutsideicon16.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "DestroyOutside")
-      .UseStandardRelationalOperatorParameters("number")
+      .UseStandardRelationalOperatorParameters(
+          "number", gd::ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced()
       .SetFunctionName("GetExtraBorder");
 
@@ -59,7 +60,8 @@ void DeclareDestroyOutsideBehaviorExtension(gd::PlatformExtension& extension) {
                 "CppPlatform/Extensions/destroyoutsideicon16.png")
       .AddParameter("object", _("Object"))
       .AddParameter("behavior", _("Behavior"), "DestroyOutside")
-      .UseStandardOperatorParameters("number")
+      .UseStandardOperatorParameters("number",
+                                     gd::ParameterOptions::MakeNewOptions())
       .MarkAsAdvanced()
       .SetFunctionName("SetExtraBorder")
       .SetGetter("GetExtraBorder");

Extensions/DialogueTree/JsExtension.js

@@ -28,7 +28,7 @@ module.exports = {
     extension
       .setExtensionInformation(
         'DialogueTree',
-        _('Dialogue Tree (experimental)'),
+        _('Dialogue Tree'),
         'Handle dialogue trees, made using Yarn Spinner. Useful to make complex dialogues with multiple choices. The Yarn Spinner editor is embedded in GDevelop so you can edit your dialogues without leaving GDevelop.',
         'Todor Imreorov',
         'Open source (MIT License)'
@@ -36,7 +36,7 @@ module.exports = {
       .setExtensionHelpPath('/all-features/dialogue-tree')
       .setCategory('Game mechanic');
     extension
-      .addInstructionOrExpressionGroupMetadata(_('Dialogue Tree (experimental)'))
+      .addInstructionOrExpressionGroupMetadata(_('Dialogue Tree'))
       .setIcon('JsPlatform/Extensions/yarn32.png');
 
     extension

Extensions/DraggableBehavior/draggableruntimebehavior.ts

@@ -57,35 +57,18 @@ namespace gdjs {
       }
       const inputManager = instanceContainer.getGame().getInputManager();
 
-      //Try mouse
-      const mouseDraggableManager = DraggableManager.getMouseManager(
-        instanceContainer
-      );
-      if (
-        inputManager.isMouseButtonPressed(0) &&
-        !mouseDraggableManager.isDragging(this)
-      ) {
-        if (mouseDraggableManager.tryAndTakeDragging(instanceContainer, this)) {
-          this._draggedByDraggableManager = mouseDraggableManager;
-          return true;
+      const touchIds = inputManager.getStartedTouchIdentifiers();
+      for (let i = 0; i < touchIds.length; ++i) {
+        const touchDraggableManager = DraggableManager.getTouchManager(
+          instanceContainer,
+          touchIds[i]
+        );
+        if (touchDraggableManager.isDragging(this)) {
+          continue;
         }
-      } else {
-        //Try touches
-        const touchIds = inputManager.getStartedTouchIdentifiers();
-        for (let i = 0; i < touchIds.length; ++i) {
-          const touchDraggableManager = DraggableManager.getTouchManager(
-            instanceContainer,
-            touchIds[i]
-          );
-          if (touchDraggableManager.isDragging(this)) {
-            continue;
-          }
-          if (
-            touchDraggableManager.tryAndTakeDragging(instanceContainer, this)
-          ) {
-            this._draggedByDraggableManager = touchDraggableManager;
-            return true;
-          }
+        if (touchDraggableManager.tryAndTakeDragging(instanceContainer, this)) {
+          this._draggedByDraggableManager = touchDraggableManager;
+          return true;
         }
       }
       return false;
@@ -121,14 +104,6 @@ namespace gdjs {
     }
 
     doStepPostEvents(instanceContainer: gdjs.RuntimeInstanceContainer) {
-      const mouseDraggableManager = DraggableManager.getMouseManager(
-        instanceContainer
-      );
-      mouseDraggableManager.leftPressedLastFrame = instanceContainer
-        .getGame()
-        .getInputManager()
-        .isMouseButtonPressed(0);
-
       this._justDropped = false;
     }
 
@@ -144,7 +119,8 @@ namespace gdjs {
   /**
    * Handle the dragging
    */
-  abstract class DraggableManager {
+  class DraggableManager {
+    private _touchId: integer;
     /**
      * The object has left its original position.
      * When true, the search for the best object to drag has ended.
@@ -157,24 +133,11 @@ namespace gdjs {
     protected _xOffset: number = 0;
     protected _yOffset: number = 0;
 
-    constructor(instanceContainer: gdjs.RuntimeInstanceContainer) {}
-
-    /**
-     * Get the platforms manager of an instance container.
-     */
-    static getMouseManager(
-      instanceContainer: gdjs.RuntimeInstanceContainer
-    ): MouseDraggableManager {
-      // @ts-ignore
-      if (!instanceContainer.mouseDraggableManager) {
-        //Create the shared manager if necessary.
-        // @ts-ignore
-        instanceContainer.mouseDraggableManager = new MouseDraggableManager(
-          instanceContainer
-        );
-      }
-      // @ts-ignore
-      return instanceContainer.mouseDraggableManager;
+    constructor(
+      instanceContainer: gdjs.RuntimeInstanceContainer,
+      touchId: integer
+    ) {
+      this._touchId = touchId;
     }
 
     /**
@@ -196,7 +159,7 @@ namespace gdjs {
         // @ts-ignore
         instanceContainer.touchDraggableManagers[
           touchId
-        ] = new TouchDraggableManager(instanceContainer, touchId);
+        ] = new DraggableManager(instanceContainer, touchId);
       }
       // @ts-ignore
       return instanceContainer.touchDraggableManagers[touchId];
@@ -263,75 +226,6 @@ namespace gdjs {
       this._draggableBehavior = null;
     }
 
-    abstract isDragging(
-      draggableRuntimeBehavior: DraggableRuntimeBehavior
-    ): boolean;
-    abstract shouldEndDrag(
-      instanceContainer: gdjs.RuntimeInstanceContainer,
-      draggableRuntimeBehavior: DraggableRuntimeBehavior
-    ): boolean;
-    abstract getPosition(
-      instanceContainer: gdjs.RuntimeInstanceContainer,
-      draggableRuntimeBehavior: DraggableRuntimeBehavior
-    ): FloatPoint;
-  }
-
-  /**
-   * Handle the dragging by mouse
-   */
-  class MouseDraggableManager extends DraggableManager {
-    /** Used to only start dragging when clicking. */
-    leftPressedLastFrame = false;
-
-    constructor(instanceContainer: gdjs.RuntimeInstanceContainer) {
-      super(instanceContainer);
-    }
-
-    isDragging(draggableRuntimeBehavior: DraggableRuntimeBehavior): boolean {
-      return this.leftPressedLastFrame || this._draggingSomething;
-    }
-
-    getPosition(
-      instanceContainer: gdjs.RuntimeInstanceContainer,
-      draggableRuntimeBehavior: DraggableRuntimeBehavior
-    ): FloatPoint {
-      const workingPoint: FloatPoint = gdjs.staticArray(
-        MouseDraggableManager.prototype.getPosition
-      ) as FloatPoint;
-      const inputManager = instanceContainer.getGame().getInputManager();
-      return instanceContainer
-        .getLayer(draggableRuntimeBehavior.owner.getLayer())
-        .convertCoords(
-          inputManager.getMouseX(),
-          inputManager.getMouseY(),
-          0,
-          workingPoint
-        );
-    }
-
-    shouldEndDrag(
-      instanceContainer: gdjs.RuntimeInstanceContainer,
-      draggableRuntimeBehavior: DraggableRuntimeBehavior
-    ): boolean {
-      const inputManager = instanceContainer.getGame().getInputManager();
-      return !inputManager.isMouseButtonPressed(0);
-    }
-  }
-
-  /**
-   * Handle the dragging by touch
-   */
-  class TouchDraggableManager extends DraggableManager {
-    private _touchId: integer;
-
-    constructor(
-      instanceContainer: gdjs.RuntimeInstanceContainer,
-      touchId: integer
-    ) {
-      super(instanceContainer);
-      this._touchId = touchId;
-    }
-
     isDragging(draggableRuntimeBehavior: DraggableRuntimeBehavior): boolean {
       return this._draggingSomething;
     }
@@ -341,7 +235,7 @@ namespace gdjs {
       draggableRuntimeBehavior: DraggableRuntimeBehavior
     ): FloatPoint {
       const workingPoint: FloatPoint = gdjs.staticArray(
-        TouchDraggableManager.prototype.getPosition
+        DraggableManager.prototype.getPosition
       ) as FloatPoint;
       const inputManager = instanceContainer.getGame().getInputManager();
       return instanceContainer
@@ -359,9 +253,7 @@ namespace gdjs {
       draggableRuntimeBehavior: DraggableRuntimeBehavior
     ): boolean {
       const inputManager = instanceContainer.getGame().getInputManager();
-      return (
-        inputManager.getAllTouchIdentifiers().indexOf(this._touchId) === -1
-      );
+      return inputManager.hasTouchEnded(this._touchId);
     }
   }