From 1aef51b5d64944a614ea8f4c2cac7298cf6f23a1 Mon Sep 17 00:00:00 2001 From: D8H Date: Mon, 20 Nov 2023 11:15:26 +0100 Subject: [PATCH] Move some actions and conditions into groups (#1094) * Don't show in changelog --- extensions/community/Raycaster3D.json | 6 +- extensions/reviewed/ExtendedVariables.json | 10 +- extensions/reviewed/FirstPersonCamera.json | 7 +- .../reviewed/FollowObjectsWithCamera.json | 27 +- extensions/reviewed/LinkTools.json | 22 +- extensions/reviewed/ObjectStack.json | 6 +- .../reviewed/RoomBasedCameraMovement.json | 535 ++++-------------- extensions/reviewed/ThirdPersonCamera.json | 3 +- 8 files changed, 162 insertions(+), 454 deletions(-) diff --git a/extensions/community/Raycaster3D.json b/extensions/community/Raycaster3D.json index c61d25ff1..519fb64ca 100644 --- a/extensions/community/Raycaster3D.json +++ b/extensions/community/Raycaster3D.json @@ -8,7 +8,7 @@ "name": "Raycaster3D", "previewIconUrl": "https://asset-resources.gdevelop.io/public-resources/Icons/8419f46b76bce482c14b4c03b4141a64d457e4cdc92686f3470381f5d2694abd_ray-start-arrow.svg", "shortDescription": "Find 3D objects that cross a line.", - "version": "0.1.2", + "version": "0.1.3", "description": [ "It can be useful to:", "- Find 3D objects under the pointer", @@ -273,6 +273,7 @@ "description": "Sends a ray from the given source position and angle, intersecting the closest object. The intersected object will become the only one taken into account.", "fullName": "Raycast", "functionType": "Condition", + "group": "Collision", "name": "RaycastWithAngle", "sentence": "Cast a ray from _PARAM2_; _PARAM3_; _PARAM4_ toward a rotation of _PARAM5_°, an elevation of _PARAM6_° and max distance of _PARAM7_ against _PARAM1_", "events": [ @@ -340,6 +341,7 @@ "description": "Sends a ray from the given source position to the final point, intersecting the closest object. The intersected object will become the only one taken into account.", "fullName": "Raycast to a position", "functionType": "Condition", + "group": "Collision", "name": "RaycastBetweenPosition", "sentence": "Cast a ray from _PARAM2_; _PARAM3_; _PARAM4_ to _PARAM5_; _PARAM6_; _PARAM7_ against _PARAM1_", "events": [ @@ -407,6 +409,7 @@ "description": "Sends a ray from the center of the camera, intersecting the closest object. The intersected object will become the only one taken into account.", "fullName": "Raycast from camera center", "functionType": "Condition", + "group": "Collision", "name": "RaycastFromCameraCenter", "sentence": "Cast a ray from the camera center to a maximum distance of _PARAM2_ against _PARAM1_", "events": [ @@ -446,6 +449,7 @@ "description": "Sends a ray from the given source point on the camera screen, intersecting the closest object. The intersected object will become the only one taken into account.", "fullName": "Raycast from a camera point", "functionType": "Condition", + "group": "Collision", "name": "RaycastFromCameraPoint", "sentence": "Cast a ray from the camera point _PARAM2_; _PARAM3_ to a maximum distance of _PARAM4_ against _PARAM1_", "events": [ diff --git a/extensions/reviewed/ExtendedVariables.json b/extensions/reviewed/ExtendedVariables.json index 720b2d2e6..2595123c4 100644 --- a/extensions/reviewed/ExtendedVariables.json +++ b/extensions/reviewed/ExtendedVariables.json @@ -8,7 +8,7 @@ "name": "ExtendedVariables", "previewIconUrl": "https://resources.gdevelop-app.com/assets/Icons/variable-box.svg", "shortDescription": "Add conditions, actions and expressions to check for the existence of a variable, copy variables, delete existing ones from memory, and create dynamic variables.", - "version": "1.0.2", + "version": "1.0.3", "description": [ "This extension provides: ", "- Conditions to check if a global/scene/object variable exists.", @@ -282,7 +282,7 @@ "description": "Check if an object variable exists.", "fullName": "Object variable exists", "functionType": "Condition", - "group": "Object variables", + "group": "Variables", "name": "ObjectVariableExist", "sentence": "Object _PARAM1_ has object variable _PARAM2_", "events": [ @@ -799,7 +799,7 @@ "description": "Copy the object variable from one object to another.", "fullName": "Copy an object variable", "functionType": "Action", - "group": "Object variables", + "group": "Variables", "name": "CopyObjectVariable", "sentence": "Copy the variable _PARAM2_ of _PARAM1_ to the variable _PARAM4_ of _PARAM3_ (clear destination first: _PARAM5_)", "events": [ @@ -908,7 +908,7 @@ "description": "Copy all object variables from one object to another.", "fullName": "Copy all object variables", "functionType": "Action", - "group": "Object variables", + "group": "Variables", "name": "CopyAllObjectVariables", "sentence": "Copy all variables from object _PARAM1_ to object _PARAM2_ (clear destination first: _PARAM3_)", "events": [ @@ -961,7 +961,7 @@ "description": "Delete an object variable, removing it from memory.", "fullName": "Delete object variable", "functionType": "Action", - "group": "Object variables", + "group": "Variables", "name": "DeleteObjectVariable", "sentence": "Delete for the object _PARAM1_ the object variable _PARAM2_ from the memory", "events": [ diff --git a/extensions/reviewed/FirstPersonCamera.json b/extensions/reviewed/FirstPersonCamera.json index 126ad9196..56386c0a4 100644 --- a/extensions/reviewed/FirstPersonCamera.json +++ b/extensions/reviewed/FirstPersonCamera.json @@ -8,12 +8,16 @@ "name": "FirstPersonCamera", "previewIconUrl": "https://asset-resources.gdevelop.io/public-resources/Icons/Line Hero Pack/Master/SVG/Security and Protection/e8248ffd504c314e6a9d9d560c3a0fdad3398a5f125ae6a4c0654d4e68c86376_Security and Protection_security_protection_eye_scan_lock.svg", "shortDescription": "Move the camera to look though objects eyes.", - "version": "1.0.0", + "version": "1.0.1", "description": [ "Move the camera to look though objects eyes.", "", "This extension can be used with the \"Mouse pointer lock\" or \"Gamepad\" extension to build a first person camera." ], + "origin": { + "identifier": "FirstPersonCamera", + "name": "gdevelop-extension-store" + }, "tags": [ "3d", "camera", @@ -28,6 +32,7 @@ "description": "Move the camera to look though _PARAM1_ eyes. The object must look to the right when all its angles are 0 and the top of its head be toward Z+.", "fullName": "Look through object eyes", "functionType": "Action", + "group": "Layers and cameras", "name": "LookFromObjectEyes", "sentence": "Move the camera of _PARAM2_ to look though _PARAM1_ eyes", "events": [ diff --git a/extensions/reviewed/FollowObjectsWithCamera.json b/extensions/reviewed/FollowObjectsWithCamera.json index aa2f87fed..940aacd27 100644 --- a/extensions/reviewed/FollowObjectsWithCamera.json +++ b/extensions/reviewed/FollowObjectsWithCamera.json @@ -8,7 +8,7 @@ "name": "FollowObjectsWithCamera", "previewIconUrl": "https://resources.gdevelop-app.com/assets/Icons/camera-switch-outline.svg", "shortDescription": "Change the zoom and position of the camera to keep all instances of an object (or object group) on the screen.", - "version": "1.0.0", + "version": "1.0.1", "description": [ "Use the \"Follow multiple objects with camera\" action on every frame that you want the camera to move. ", "If you want to select which object instances are tracked by the camera, add conditions to that event.", @@ -44,6 +44,7 @@ "description": "Change the zoom and position of the camera to keep all instances of an object (or object group) on the screen.", "fullName": "Follow multiple objects with camera", "functionType": "Action", + "group": "Layers and cameras", "name": "FollowMultipleObjectsWithCamera", "sentence": "Move camera to keep instances of _PARAM1_ on the screen. Use a margin of _PARAM2_px horizontally and _PARAM3_px vertically. Max zoom: _PARAM4_. Move the camera at a speed of _PARAM5_", "events": [ @@ -57,8 +58,7 @@ "textG": 0, "textR": 0 }, - "comment": "Set default values if nothing is entered", - "comment2": "" + "comment": "Set default values if nothing is entered" }, { "type": "BuiltinCommonInstructions::Standard", @@ -167,8 +167,7 @@ "textG": 0, "textR": 0 }, - "comment": "Set initial values based on an object instance. This is used as a valid starting point for comparisons, so it doesn't matter which instance is used.", - "comment2": "" + "comment": "Set initial values based on an object instance. This is used as a valid starting point for comparisons, so it doesn't matter which instance is used." }, { "type": "BuiltinCommonInstructions::Standard", @@ -226,8 +225,7 @@ "textG": 0, "textR": 0 }, - "comment": "Loop through every instance of object (or object group) and determine the max position values used for left, right, top and bottom.\nRecord the height and width of the objects that are on the edges. These values will be used to increase the camera viewport to include the entire object.", - "comment2": "" + "comment": "Loop through every instance of object (or object group) and determine the max position values used for left, right, top and bottom.\nRecord the height and width of the objects that are on the edges. These values will be used to increase the camera viewport to include the entire object." }, { "type": "BuiltinCommonInstructions::ForEach", @@ -311,8 +309,7 @@ "textG": 0, "textR": 0 }, - "comment": "Move camera to the center location", - "comment2": "" + "comment": "Move camera to the center location" }, { "type": "BuiltinCommonInstructions::Standard", @@ -360,8 +357,7 @@ "textG": 0, "textR": 0 }, - "comment": "Zoom in or out to keep all object instances on screen", - "comment2": "" + "comment": "Zoom in or out to keep all object instances on screen" }, { "type": "BuiltinCommonInstructions::Standard", @@ -409,8 +405,7 @@ "textG": 0, "textR": 0 }, - "comment": "Adjust zoom to stay within min/max values", - "comment2": "" + "comment": "Adjust zoom to stay within min/max values" }, { "type": "BuiltinCommonInstructions::Standard", @@ -438,8 +433,7 @@ "textG": 0, "textR": 0 }, - "comment": "Change camera zoom", - "comment2": "" + "comment": "Change camera zoom" }, { "type": "BuiltinCommonInstructions::Standard", @@ -510,8 +504,7 @@ "textG": 255, "textR": 255 }, - "comment": "DEPRECATED: Use the new function that replaces this one", - "comment2": "" + "comment": "DEPRECATED: Use the new function that replaces this one" }, { "type": "BuiltinCommonInstructions::Standard", diff --git a/extensions/reviewed/LinkTools.json b/extensions/reviewed/LinkTools.json index c60aa103d..b2524e799 100644 --- a/extensions/reviewed/LinkTools.json +++ b/extensions/reviewed/LinkTools.json @@ -8,7 +8,7 @@ "name": "LinkTools", "previewIconUrl": "https://resources.gdevelop-app.com/assets/Icons/graph-outline.svg", "shortDescription": "Conditions to use Linked Objects as a graph and a path finding movement behavior.", - "version": "1.2.2", + "version": "1.2.3", "description": [ "This provides:", "* \"Can reach through links\" conditions, useful to check if an object is linked to another through one or more other linked objects.", @@ -42,6 +42,7 @@ "description": "Link to neighbors on a rectangular grid.", "fullName": "Link to neighbors on a rectangular grid", "functionType": "Action", + "group": "Objects", "name": "LinkRectangularNeighbors", "sentence": "Link _PARAM1_ and its neighbors _PARAM2_ on a rectangular grid with cell dimensions: _PARAM3_; _PARAM4_", "events": [ @@ -320,6 +321,7 @@ "description": "Link to neighbors on a hexagonal grid.", "fullName": "Link to neighbors on a hexagonal grid", "functionType": "Action", + "group": "Objects", "name": "LinkHexagonalNeighbors", "sentence": "Link _PARAM1_ and its neighbors _PARAM2_ on a hexagonal grid with cell dimensions: _PARAM3_; _PARAM4_", "events": [ @@ -523,6 +525,7 @@ "description": "Link to neighbors on an isometric grid.", "fullName": "Link to neighbors on an isometric grid", "functionType": "Action", + "group": "Objects", "name": "LinkIsometricRectangularNeighbors", "sentence": "Link _PARAM1_ and its neighbors _PARAM2_ on an isometric grid with cell dimensions: _PARAM3_; _PARAM4_", "events": [ @@ -801,13 +804,13 @@ "description": "Can reach through a given cost sum.", "fullName": "Can reach with links limited by cost", "functionType": "Condition", + "group": "Objects", "name": "CanReachWithMaxWeight", "sentence": "Take into account all \"_PARAM1_\" that can reach _PARAM2_ with initial value from the variable _PARAM3_ through at most a cost of: _PARAM4_ according to cost class: _PARAM5_ and at most _PARAM6_ links depth", "events": [ { "type": "BuiltinCommonInstructions::JsCode", "inlineCode": [ - "", "/**", " * Insert a node in an array sorted by farest 1st", " * @param {gdjs.RuntimeObject[]} objects", @@ -989,6 +992,7 @@ "description": "Can reach through a given number of links.", "fullName": "Can reach with links limited by length", "functionType": "Condition", + "group": "Objects", "name": "CanReachWithMaxLength", "sentence": "Take into account all \"_PARAM1_\" that can reach _PARAM2_ through at most _PARAM3_ links according to cost class: _PARAM4_", "events": [ @@ -1127,6 +1131,7 @@ "description": "Can reach through links.", "fullName": "Can reach", "functionType": "Condition", + "group": "Objects", "name": "CanReach", "sentence": "Take into account all \"_PARAM1_\" that can reach _PARAM2_ through links", "events": [ @@ -1265,8 +1270,7 @@ "textG": 0, "textR": 0 }, - "comment": "Move the object along the path", - "comment2": "" + "comment": "Move the object along the path" }, { "type": "BuiltinCommonInstructions::Standard", @@ -1491,13 +1495,11 @@ "textG": 0, "textR": 0 }, - "comment": "Search the path and set the result in the path variable.\nThis variable is use by doStepPreEvent to move the object along the path.", - "comment2": "" + "comment": "Search the path and set the result in the path variable.\nThis variable is use by doStepPreEvent to move the object along the path." }, { "type": "BuiltinCommonInstructions::JsCode", "inlineCode": [ - "", "/**", " * Insert a node in an array sorted by farest 1st", " * @param {gdjs.RuntimeObject[]} objects", @@ -1853,8 +1855,7 @@ "textG": 0, "textR": 0 }, - "comment": "No more nodes", - "comment2": "" + "comment": "No more nodes" }, { "type": "BuiltinCommonInstructions::Standard", @@ -1905,8 +1906,7 @@ "textG": 0, "textR": 0 }, - "comment": "Update the next target", - "comment2": "" + "comment": "Update the next target" }, { "type": "BuiltinCommonInstructions::Standard", diff --git a/extensions/reviewed/ObjectStack.json b/extensions/reviewed/ObjectStack.json index d70f8e4fa..6ad6d7b9b 100644 --- a/extensions/reviewed/ObjectStack.json +++ b/extensions/reviewed/ObjectStack.json @@ -8,7 +8,7 @@ "name": "ObjectStack", "previewIconUrl": "https://resources.gdevelop-app.com/assets/Icons/Line Hero Pack/Master/SVG/Videogames/Videogames_cards_game_solitaire_poker_blackjack_casino.svg", "shortDescription": "An ordered list of objects and a shuffle action.", - "version": "0.1.0", + "version": "0.1.1", "description": [ "It provides:", "* Actions to modify a stack of objects", @@ -44,6 +44,7 @@ "description": "Check if the stack contains the object between a range. The lower and upper bounds are included.", "fullName": "Contain between a range", "functionType": "Condition", + "group": "Object Stack", "name": "ContainsBetween", "sentence": "_PARAM3_ is into the stack of _PARAM1_ between _PARAM4_ and _PARAM5_", "events": [ @@ -115,6 +116,7 @@ "description": "Check if the stack contains the object at a height.", "fullName": "Contain at", "functionType": "Condition", + "group": "Object Stack", "name": "ContainsAt", "sentence": "_PARAM3_ is into the stack of _PARAM1_ at _PARAM4_ ", "events": [ @@ -183,6 +185,7 @@ "description": "Check if an object is on the stack top.", "fullName": "Stack top", "functionType": "Condition", + "group": "Object Stack", "name": "HasOnTop", "sentence": "_PARAM3_ is on top of the stack of _PARAM1_", "events": [ @@ -237,6 +240,7 @@ "description": "Check if the stack contains the object.", "fullName": "Contain", "functionType": "Condition", + "group": "Object Stack", "name": "Contains", "sentence": "_PARAM3_ is into the stack of _PARAM1_", "events": [ diff --git a/extensions/reviewed/RoomBasedCameraMovement.json b/extensions/reviewed/RoomBasedCameraMovement.json index 69a28176c..85345b334 100644 --- a/extensions/reviewed/RoomBasedCameraMovement.json +++ b/extensions/reviewed/RoomBasedCameraMovement.json @@ -1,7 +1,6 @@ { "author": "", "category": "Camera", - "description": "Move camera to the room that contains the trigger object (usually the player). If desired, change zoom to show the entire room or keep zoom static.\n\nHow to use:\n- Place room objects on scene\n- Select camera zoom limits, how fast the camera should move, and the visible buffer around each room\n- Run the \"Move and zoom camera\" action on every frame\n- Move the trigger object (player) between rooms and the camera will center on the room that contains the trigger object.\n\nTips:\n- Use these conditions for custom logic when changing rooms : \"Camera moving\", \"Camera zooming\", and \"Room changed\"\n- Set \"Lerp Speed\" to \"1\" to change the camera instantly", "extensionNamespace": "", "fullName": "Room-based camera movement", "helpPath": "https://victrisgames.itch.io/room-based-camera-movement", @@ -9,7 +8,24 @@ "name": "RoomBasedCameraMovement", "previewIconUrl": "https://resources.gdevelop-app.com/assets/Icons/Glyphster Pack/Master/SVG/Applications and Programming/Applications and Programming_app_apps_applications_tiles.svg", "shortDescription": "Move and zoom camera to the room object that contains the trigger object (usually the player).", - "version": "1.0.2", + "version": "1.0.3", + "description": [ + "Move camera to the room that contains the trigger object (usually the player). If desired, change zoom to show the entire room or keep zoom static.", + "", + "How to use:", + "- Place room objects on scene", + "- Select camera zoom limits, how fast the camera should move, and the visible buffer around each room", + "- Run the \"Move and zoom camera\" action on every frame", + "- Move the trigger object (player) between rooms and the camera will center on the room that contains the trigger object.", + "", + "Tips:", + "- Use these conditions for custom logic when changing rooms : \"Camera moving\", \"Camera zooming\", and \"Room changed\"", + "- Set \"Lerp Speed\" to \"1\" to change the camera instantly" + ], + "origin": { + "identifier": "RoomBasedCameraMovement", + "name": "gdevelop-extension-store" + }, "tags": [ "camera", "follow", @@ -30,8 +46,8 @@ "description": "Move and zoom camera to the room object that contains the trigger object (usually the player).", "fullName": "Move and zoom camera to the room object that contains the trigger object (player)", "functionType": "Action", + "group": "Layers and cameras", "name": "MoveCameraToActiveRoom", - "private": false, "sentence": "Move camera to room object _PARAM1_ that contains trigger object _PARAM2_ (Layer: _PARAM3_, Lerp speed: _PARAM4_, Max zoom: _PARAM5_, Min zoom: _PARAM6_, Border buffer: _PARAM7_px)", "events": [ { @@ -39,15 +55,11 @@ "colorG": 176, "colorR": 74, "creationTime": 0, - "disabled": false, - "folded": false, "name": "Initialize", "source": "", "type": "BuiltinCommonInstructions::Group", "events": [ { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -57,54 +69,41 @@ "textG": 0, "textR": 0 }, - "comment": "Save input values", - "comment2": "" + "comment": "Save input values" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [], "actions": [ { "type": { - "inverted": false, "value": "ModVarScene" }, "parameters": [ "__RoomBasedCameraMovement.MaxZoom", "=", "GetArgumentAsNumber(\"MaxZoom\")" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [], "actions": [ { "type": { - "inverted": false, "value": "ModVarScene" }, "parameters": [ "__RoomBasedCameraMovement.LerpSpeed", "=", "GetArgumentAsNumber(\"LerpSpeed\")" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -114,76 +113,61 @@ "textG": 0, "textR": 0 }, - "comment": "Set default values if none provided", - "comment2": "" + "comment": "Set default values if none provided" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "VarScene" }, "parameters": [ "__RoomBasedCameraMovement.MaxZoom", "<=", "0" - ], - "subInstructions": [] + ] } ], "actions": [ { "type": { - "inverted": false, "value": "ModVarScene" }, "parameters": [ "__RoomBasedCameraMovement.MaxZoom", "=", "1" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "VarScene" }, "parameters": [ "__RoomBasedCameraMovement.LerpSpeed", "<=", "0" - ], - "subInstructions": [] + ] } ], "actions": [ { "type": { - "inverted": false, "value": "ModVarScene" }, "parameters": [ "__RoomBasedCameraMovement.LerpSpeed", "=", "0.1" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] } ], "parameters": [] @@ -193,8 +177,6 @@ "colorG": 176, "colorR": 74, "creationTime": 0, - "disabled": false, - "folded": false, "name": "Main", "source": "", "type": "BuiltinCommonInstructions::Group", @@ -204,15 +186,11 @@ "colorG": 176, "colorR": 74, "creationTime": 0, - "disabled": false, - "folded": false, "name": "Identify the current room", "source": "", "type": "BuiltinCommonInstructions::Group", "events": [ { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -222,32 +200,25 @@ "textG": 0, "textR": 0 }, - "comment": "Detect which room is the current one", - "comment2": "" + "comment": "Detect which room is the current one" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "CollisionPoint" }, "parameters": [ "RoomObject", "TriggerObject.CenterX()", "TriggerObject.CenterY()" - ], - "subInstructions": [] + ] } ], "actions": [], "events": [ { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -257,17 +228,13 @@ "textG": 0, "textR": 0 }, - "comment": "Room has NOT changed", - "comment2": "" + "comment": "Room has NOT changed" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "VarObjet" }, "parameters": [ @@ -275,29 +242,23 @@ "__RoomBasedCameraMovement.CurrentRoomID", "=", "RoomObject.Variable(__RoomBasedCameraMovement.RoomID)" - ], - "subInstructions": [] + ] } ], "actions": [ { "type": { - "inverted": false, "value": "SetObjectVariableAsBoolean" }, "parameters": [ "TriggerObject", "__RoomBasedCameraMovement.RoomChanged", "False" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -307,17 +268,13 @@ "textG": 0, "textR": 0 }, - "comment": "Room has changed", - "comment2": "" + "comment": "Room has changed" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "VarObjet" }, "parameters": [ @@ -325,29 +282,23 @@ "__RoomBasedCameraMovement.CurrentRoomID", "!=", "RoomObject.Variable(__RoomBasedCameraMovement.RoomID)" - ], - "subInstructions": [] + ] } ], "actions": [ { "type": { - "inverted": false, "value": "SetObjectVariableAsBoolean" }, "parameters": [ "TriggerObject", "__RoomBasedCameraMovement.RoomChanged", "True" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -357,18 +308,14 @@ "textG": 0, "textR": 0 }, - "comment": "Update CurrentRoomID variable", - "comment2": "" + "comment": "Update CurrentRoomID variable" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [], "actions": [ { "type": { - "inverted": false, "value": "ModVarObjet" }, "parameters": [ @@ -376,11 +323,9 @@ "__RoomBasedCameraMovement.CurrentRoomID", "=", "RoomObject.Variable(__RoomBasedCameraMovement.RoomID)" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] } ] } @@ -392,23 +337,17 @@ "colorG": 176, "colorR": 74, "creationTime": 0, - "disabled": false, - "folded": false, "name": "Move camera", "source": "", "type": "BuiltinCommonInstructions::Group", "events": [ { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::ForEach", "object": "RoomObject", "conditions": [], "actions": [], "events": [ { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -418,17 +357,13 @@ "textG": 0, "textR": 0 }, - "comment": "Assign each room a unique ID if they don't have one yet", - "comment2": "" + "comment": "Assign each room a unique ID if they don't have one yet" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "VarObjet" }, "parameters": [ @@ -436,26 +371,22 @@ "__RoomBasedCameraMovement.RoomID", "=", "0" - ], - "subInstructions": [] + ] } ], "actions": [ { "type": { - "inverted": false, "value": "ModVarScene" }, "parameters": [ "__RoomBasedCameraMovement.MaxRoomID", "+", "1" - ], - "subInstructions": [] + ] }, { "type": { - "inverted": false, "value": "ModVarObjet" }, "parameters": [ @@ -463,15 +394,11 @@ "__RoomBasedCameraMovement.RoomID", "=", "Variable(__RoomBasedCameraMovement.MaxRoomID)" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -481,17 +408,13 @@ "textG": 0, "textR": 0 }, - "comment": "Check if this room is the current room", - "comment2": "" + "comment": "Check if this room is the current room" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "VarObjet" }, "parameters": [ @@ -499,8 +422,7 @@ "__RoomBasedCameraMovement.RoomID", "=", "TriggerObject.Variable(__RoomBasedCameraMovement.CurrentRoomID)" - ], - "subInstructions": [] + ] } ], "actions": [], @@ -510,15 +432,11 @@ "colorG": 176, "colorR": 74, "creationTime": 0, - "disabled": false, - "folded": false, "name": "Change zoom", "source": "", "type": "BuiltinCommonInstructions::Group", "events": [ { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -528,57 +446,45 @@ "textG": 0, "textR": 0 }, - "comment": "Calculate the camera dimensions", - "comment2": "" + "comment": "Calculate the camera dimensions" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [], "actions": [ { "type": { - "inverted": false, "value": "ModVarScene" }, "parameters": [ "__RoomBasedCameraMovement.CameraWidth", "=", "RoomObject.Width()+2*GetArgumentAsNumber(\"OutsideBuffer\")" - ], - "subInstructions": [] + ] }, { "type": { - "inverted": false, "value": "ModVarScene" }, "parameters": [ "__RoomBasedCameraMovement.CameraHeight", "=", "RoomObject.Height()+2*GetArgumentAsNumber(\"OutsideBuffer\")" - ], - "subInstructions": [] + ] }, { "type": { - "inverted": false, "value": "ModVarScene" }, "parameters": [ "__RoomBasedCameraMovement.CameraZoom", "=", "min(SceneWindowHeight() / Variable(__RoomBasedCameraMovement.CameraHeight), SceneWindowWidth() / Variable(__RoomBasedCameraMovement.CameraWidth))" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -588,33 +494,25 @@ "textG": 0, "textR": 0 }, - "comment": "Adjust zoom to stay within min/max values", - "comment2": "" + "comment": "Adjust zoom to stay within min/max values" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [], "actions": [ { "type": { - "inverted": false, "value": "ModVarScene" }, "parameters": [ "__RoomBasedCameraMovement.CameraZoom", "=", "clamp(Variable(__RoomBasedCameraMovement.CameraZoom),GetArgumentAsNumber(\"MinZoom\"),Variable(__RoomBasedCameraMovement.MaxZoom))" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -624,18 +522,14 @@ "textG": 0, "textR": 0 }, - "comment": "Change camera zoom", - "comment2": "" + "comment": "Change camera zoom" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [], "actions": [ { "type": { - "inverted": false, "value": "ZoomCamera" }, "parameters": [ @@ -643,11 +537,9 @@ "ceil(lerp(CameraZoom(GetArgumentAsString(\"Layer\"),GetArgumentAsNumber(\"Camera\")),Variable(__RoomBasedCameraMovement.CameraZoom),Variable(__RoomBasedCameraMovement.LerpSpeed))*1000)/1000", "GetArgumentAsString(\"Layer\")", "GetArgumentAsNumber(\"Camera\")" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] } ], "parameters": [] @@ -657,15 +549,11 @@ "colorG": 176, "colorR": 74, "creationTime": 0, - "disabled": false, - "folded": false, "name": "Move camera position", "source": "", "type": "BuiltinCommonInstructions::Group", "events": [ { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -675,31 +563,25 @@ "textG": 0, "textR": 0 }, - "comment": "For rooms smaller than the viewable screen, center the camera on the center of the room", - "comment2": "" + "comment": "For rooms smaller than the viewable screen, center the camera on the center of the room" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "VarScene" }, "parameters": [ "__RoomBasedCameraMovement.CameraWidth", "<=", "SceneWindowWidth()" - ], - "subInstructions": [] + ] } ], "actions": [ { "type": { - "inverted": false, "value": "SetCameraX" }, "parameters": [ @@ -708,34 +590,27 @@ "ceil(lerp(CameraX(GetArgumentAsString(\"Layer\"),GetArgumentAsNumber(\"Camera\")), RoomObject.CenterX(), Variable(__RoomBasedCameraMovement.LerpSpeed))*100)/100", "GetArgumentAsString(\"Layer\")", "GetArgumentAsNumber(\"Camera\")" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "VarScene" }, "parameters": [ "__RoomBasedCameraMovement.CameraHeight", "<=", "SceneWindowHeight()" - ], - "subInstructions": [] + ] } ], "actions": [ { "type": { - "inverted": false, "value": "SetCameraY" }, "parameters": [ @@ -744,15 +619,11 @@ "ceil(lerp(CameraY(GetArgumentAsString(\"Layer\"),GetArgumentAsNumber(\"Camera\")), RoomObject.CenterY(), Variable(__RoomBasedCameraMovement.LerpSpeed))*100)/100", "GetArgumentAsString(\"Layer\")", "GetArgumentAsNumber(\"Camera\")" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -762,31 +633,25 @@ "textG": 0, "textR": 0 }, - "comment": "For rooms larger than the viewable screen, center the camera on the TriggerObject and clamp camera so it only shows the room + buffer", - "comment2": "" + "comment": "For rooms larger than the viewable screen, center the camera on the TriggerObject and clamp camera so it only shows the room + buffer" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "VarScene" }, "parameters": [ "__RoomBasedCameraMovement.CameraWidth", ">", "SceneWindowWidth()" - ], - "subInstructions": [] + ] } ], "actions": [ { "type": { - "inverted": false, "value": "SetCameraX" }, "parameters": [ @@ -795,34 +660,27 @@ "ceil(lerp(CameraX(GetArgumentAsString(\"Layer\"),GetArgumentAsNumber(\"Camera\")), clamp(TriggerObject.CenterX(), \nRoomObject.CenterX() - RoomObject.Width()/2 + SceneWindowWidth()/2 - GetArgumentAsNumber(\"OutsideBuffer\"), RoomObject.CenterX() + RoomObject.Width()/2 - SceneWindowWidth()/2 + GetArgumentAsNumber(\"OutsideBuffer\")), Variable(__RoomBasedCameraMovement.LerpSpeed))*100)/100", "GetArgumentAsString(\"Layer\")", "GetArgumentAsNumber(\"Camera\")" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "VarScene" }, "parameters": [ "__RoomBasedCameraMovement.CameraHeight", ">", "SceneWindowHeight()" - ], - "subInstructions": [] + ] } ], "actions": [ { "type": { - "inverted": false, "value": "SetCameraY" }, "parameters": [ @@ -831,11 +689,9 @@ "ceil(lerp(CameraY(GetArgumentAsString(\"Layer\"),GetArgumentAsNumber(\"Camera\")), clamp(TriggerObject.CenterY(), \nRoomObject.CenterY() - RoomObject.Height()/2 + SceneWindowHeight()/2 - GetArgumentAsNumber(\"OutsideBuffer\"), RoomObject.CenterY() + RoomObject.Height()/2 - SceneWindowHeight()/2 + GetArgumentAsNumber(\"OutsideBuffer\")), Variable(__RoomBasedCameraMovement.LerpSpeed))*100)/100", "GetArgumentAsString(\"Layer\")", "GetArgumentAsNumber(\"Camera\")" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] } ], "parameters": [] @@ -855,8 +711,6 @@ "colorG": 176, "colorR": 74, "creationTime": 0, - "disabled": false, - "folded": false, "name": "Calculate \"IsCameraMoving\" condition", "source": "", "type": "BuiltinCommonInstructions::Group", @@ -866,69 +720,56 @@ "colorG": 176, "colorR": 74, "creationTime": 0, - "disabled": false, - "folded": false, "name": "Initialize", "source": "", "type": "BuiltinCommonInstructions::Group", "events": [ { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "VarScene" }, "parameters": [ "__RoomBasedCameraMovement.PrevCameraX", "=", "0" - ], - "subInstructions": [] + ] }, { "type": { - "inverted": false, "value": "VarScene" }, "parameters": [ "__RoomBasedCameraMovement.PrevCameraY", "=", "0" - ], - "subInstructions": [] + ] } ], "actions": [ { "type": { - "inverted": false, "value": "ModVarScene" }, "parameters": [ "__RoomBasedCameraMovement.PrevCameraX", "=", "CameraX(GetArgumentAsString(\"Layer\"), GetArgumentAsNumber(\"Camera\"))" - ], - "subInstructions": [] + ] }, { "type": { - "inverted": false, "value": "ModVarScene" }, "parameters": [ "__RoomBasedCameraMovement.PrevCameraY", "=", "CameraY(GetArgumentAsString(\"Layer\"), GetArgumentAsNumber(\"Camera\"))" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] } ], "parameters": [] @@ -938,15 +779,11 @@ "colorG": 176, "colorR": 74, "creationTime": 0, - "disabled": false, - "folded": false, "name": "Check if camera position changed", "source": "", "type": "BuiltinCommonInstructions::Group", "events": [ { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -956,57 +793,45 @@ "textG": 0, "textR": 0 }, - "comment": "Camera has NOT moved", - "comment2": "" + "comment": "Camera has NOT moved" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "VarScene" }, "parameters": [ "__RoomBasedCameraMovement.PrevCameraX", "=", "CameraX(GetArgumentAsString(\"Layer\"),GetArgumentAsNumber(\"Camera\"))" - ], - "subInstructions": [] + ] }, { "type": { - "inverted": false, "value": "VarScene" }, "parameters": [ "__RoomBasedCameraMovement.PrevCameraY", "=", "CameraY(GetArgumentAsString(\"Layer\"),GetArgumentAsNumber(\"Camera\"))" - ], - "subInstructions": [] + ] } ], "actions": [ { "type": { - "inverted": false, "value": "SetSceneVariableAsBoolean" }, "parameters": [ "__RoomBasedCameraMovement.CameraMoving", "False" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -1016,44 +841,36 @@ "textG": 0, "textR": 0 }, - "comment": "Camera has moved", - "comment2": "" + "comment": "Camera has moved" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "BuiltinCommonInstructions::Or" }, "parameters": [], "subInstructions": [ { "type": { - "inverted": false, "value": "VarScene" }, "parameters": [ "__RoomBasedCameraMovement.PrevCameraX", "!=", "CameraX(GetArgumentAsString(\"Layer\"),GetArgumentAsNumber(\"Camera\"))" - ], - "subInstructions": [] + ] }, { "type": { - "inverted": false, "value": "VarScene" }, "parameters": [ "__RoomBasedCameraMovement.PrevCameraY", "!=", "CameraY(GetArgumentAsString(\"Layer\"),GetArgumentAsNumber(\"Camera\"))" - ], - "subInstructions": [] + ] } ] } @@ -1061,20 +878,16 @@ "actions": [ { "type": { - "inverted": false, "value": "SetSceneVariableAsBoolean" }, "parameters": [ "__RoomBasedCameraMovement.CameraMoving", "True" - ], - "subInstructions": [] + ] } ], "events": [ { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -1084,41 +897,33 @@ "textG": 0, "textR": 0 }, - "comment": "Update with current camera position", - "comment2": "" + "comment": "Update with current camera position" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [], "actions": [ { "type": { - "inverted": false, "value": "ModVarScene" }, "parameters": [ "__RoomBasedCameraMovement.PrevCameraX", "=", "CameraX(GetArgumentAsString(\"Layer\"), GetArgumentAsNumber(\"Camera\"))" - ], - "subInstructions": [] + ] }, { "type": { - "inverted": false, "value": "ModVarScene" }, "parameters": [ "__RoomBasedCameraMovement.PrevCameraY", "=", "CameraY(GetArgumentAsString(\"Layer\"), GetArgumentAsNumber(\"Camera\"))" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] } ] } @@ -1133,8 +938,6 @@ "colorG": 176, "colorR": 74, "creationTime": 0, - "disabled": false, - "folded": false, "name": "Calculate \"IsCameraZooming\" condition", "source": "", "type": "BuiltinCommonInstructions::Group", @@ -1144,45 +947,36 @@ "colorG": 176, "colorR": 74, "creationTime": 0, - "disabled": false, - "folded": false, "name": "Initialize", "source": "", "type": "BuiltinCommonInstructions::Group", "events": [ { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "VarScene" }, "parameters": [ "__RoomBasedCameraMovement.PreviousZoom", "=", "0" - ], - "subInstructions": [] + ] } ], "actions": [ { "type": { - "inverted": false, "value": "ModVarScene" }, "parameters": [ "__RoomBasedCameraMovement.PreviousZoom", "=", "CameraZoom(GetArgumentAsString(\"Layer\"), GetArgumentAsNumber(\"Camera\"))" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] } ], "parameters": [] @@ -1192,15 +986,11 @@ "colorG": 176, "colorR": 74, "creationTime": 0, - "disabled": false, - "folded": false, "name": "Check if camera zoom changed", "source": "", "type": "BuiltinCommonInstructions::Group", "events": [ { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -1210,45 +1000,35 @@ "textG": 0, "textR": 0 }, - "comment": "Camera zoom has NOT changed", - "comment2": "" + "comment": "Camera zoom has NOT changed" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "VarScene" }, "parameters": [ "__RoomBasedCameraMovement.PreviousZoom", "=", "CameraZoom(GetArgumentAsString(\"Layer\"),GetArgumentAsNumber(\"Camera\"))" - ], - "subInstructions": [] + ] } ], "actions": [ { "type": { - "inverted": false, "value": "SetSceneVariableAsBoolean" }, "parameters": [ "__RoomBasedCameraMovement.CameraZooming", "False" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -1258,44 +1038,35 @@ "textG": 0, "textR": 0 }, - "comment": "Camera zoom has changed", - "comment2": "" + "comment": "Camera zoom has changed" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "VarScene" }, "parameters": [ "__RoomBasedCameraMovement.PreviousZoom", "!=", "CameraZoom(GetArgumentAsString(\"Layer\"),GetArgumentAsNumber(\"Camera\"))" - ], - "subInstructions": [] + ] } ], "actions": [ { "type": { - "inverted": false, "value": "SetSceneVariableAsBoolean" }, "parameters": [ "__RoomBasedCameraMovement.CameraZooming", "True" - ], - "subInstructions": [] + ] } ], "events": [ { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Comment", "color": { "b": 109, @@ -1305,29 +1076,23 @@ "textG": 0, "textR": 0 }, - "comment": "Update with current camera zoom", - "comment2": "" + "comment": "Update with current camera zoom" }, { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [], "actions": [ { "type": { - "inverted": false, "value": "ModVarScene" }, "parameters": [ "__RoomBasedCameraMovement.PreviousZoom", "=", "CameraZoom(GetArgumentAsString(\"Layer\"), GetArgumentAsNumber(\"Camera\"))" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] } ] } @@ -1340,83 +1105,47 @@ ], "parameters": [ { - "codeOnly": false, - "defaultValue": "", "description": "Room object", "longDescription": "Room objects are used to mark areas that should be seen by the camera.", "name": "RoomObject", - "optional": false, - "supplementaryInformation": "", "type": "objectList" }, { - "codeOnly": false, - "defaultValue": "", "description": "Trigger object (player)", "longDescription": "When the Trigger Object touches a new Room Object, the camera will move to the new room", "name": "TriggerObject", - "optional": false, - "supplementaryInformation": "", "type": "objectList" }, { - "codeOnly": false, - "defaultValue": "", "description": "Layer", - "longDescription": "", "name": "Layer", - "optional": false, - "supplementaryInformation": "", "type": "layer" }, { - "codeOnly": false, - "defaultValue": "", "description": "Lerp speed", "longDescription": "Range: 0 to 1", "name": "LerpSpeed", - "optional": false, - "supplementaryInformation": "", "type": "expression" }, { - "codeOnly": false, - "defaultValue": "", "description": "Maximum zoom", - "longDescription": "", "name": "MaxZoom", - "optional": false, - "supplementaryInformation": "", "type": "expression" }, { - "codeOnly": false, - "defaultValue": "", "description": "Minimum zoom", - "longDescription": "", "name": "MinZoom", - "optional": false, - "supplementaryInformation": "", "type": "expression" }, { - "codeOnly": false, - "defaultValue": "", "description": "Outside buffer (pixels)", "longDescription": "Minimum extra space displayed around each side the room", "name": "OutsideBuffer", - "optional": false, - "supplementaryInformation": "", "type": "expression" }, { - "codeOnly": false, - "defaultValue": "", "description": "Camera", - "longDescription": "", "name": "Camera", - "optional": false, - "supplementaryInformation": "", "type": "expression" } ], @@ -1427,51 +1156,38 @@ "fullName": "Check if trigger object (player) has entered a new room", "functionType": "Condition", "name": "ActiveRoomChanged", - "private": false, "sentence": "_PARAM1_ has just entered a new room", "events": [ { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "ObjectVariableAsBoolean" }, "parameters": [ "TriggerObject", "__RoomBasedCameraMovement.RoomChanged", "True" - ], - "subInstructions": [] + ] } ], "actions": [ { "type": { - "inverted": false, "value": "SetReturnBoolean" }, "parameters": [ "True" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] } ], "parameters": [ { - "codeOnly": false, - "defaultValue": "", "description": "Trigger object (player)", - "longDescription": "", "name": "TriggerObject", - "optional": false, - "supplementaryInformation": "", "type": "objectList" } ], @@ -1482,39 +1198,31 @@ "fullName": "Check if camera is zooming", "functionType": "Condition", "name": "IsCameraZooming", - "private": false, "sentence": "Camera is zooming", "events": [ { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "SceneVariableAsBoolean" }, "parameters": [ "__RoomBasedCameraMovement.CameraZooming", "True" - ], - "subInstructions": [] + ] } ], "actions": [ { "type": { - "inverted": false, "value": "SetReturnBoolean" }, "parameters": [ "True" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] } ], "parameters": [], @@ -1525,44 +1233,37 @@ "fullName": "Check if camera is moving", "functionType": "Condition", "name": "IsCameraMoving", - "private": false, "sentence": "Camera is moving", "events": [ { - "disabled": false, - "folded": false, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "inverted": false, "value": "SceneVariableAsBoolean" }, "parameters": [ "__RoomBasedCameraMovement.CameraMoving", "True" - ], - "subInstructions": [] + ] } ], "actions": [ { "type": { - "inverted": false, "value": "SetReturnBoolean" }, "parameters": [ "True" - ], - "subInstructions": [] + ] } - ], - "events": [] + ] } ], "parameters": [], "objectGroups": [] } ], - "eventsBasedBehaviors": [] + "eventsBasedBehaviors": [], + "eventsBasedObjects": [] } \ No newline at end of file diff --git a/extensions/reviewed/ThirdPersonCamera.json b/extensions/reviewed/ThirdPersonCamera.json index ea345bc9e..d6be2ac68 100644 --- a/extensions/reviewed/ThirdPersonCamera.json +++ b/extensions/reviewed/ThirdPersonCamera.json @@ -8,7 +8,7 @@ "name": "ThirdPersonCamera", "previewIconUrl": "https://asset-resources.gdevelop.io/public-resources/Icons/Line Hero Pack/Master/SVG/Virtual Reality/94e95d2c318e1f3dc7151a351024e13c574e1e44669c6696aa107d60230073f6_Virtual Reality_3d_vision_eye_vr.svg", "shortDescription": "Move the camera to look at an object from a given distance.", - "version": "1.1.0", + "version": "1.1.1", "description": [ "Move the camera to look at an object from a given distance with a rotation and an elevation angles.", "", @@ -317,6 +317,7 @@ "description": "Move the camera to look at an object from a distance.", "fullName": "Look at an object from a distance", "functionType": "Action", + "group": "Layers and cameras", "name": "LookFromDistanceAtObject3D", "sentence": "Move the camera of _PARAM6_ to look at _PARAM1_ from _PARAM3_ pixels with a rotation of _PARAM4_° and an elevation of _PARAM5_°", "events": [