diff --git a/src/assets/character/Player/phone/phone_app.png b/src/assets/character/Player/phone/phone_app.png deleted file mode 100644 index dbc0a6df..00000000 Binary files a/src/assets/character/Player/phone/phone_app.png and /dev/null differ diff --git a/src/assets/character/Player/phone/phone_apps.png b/src/assets/character/Player/phone/phone_apps.png deleted file mode 100644 index df7cabea..00000000 Binary files a/src/assets/character/Player/phone/phone_apps.png and /dev/null differ diff --git a/src/assets/character/Player/phone/phone_battery_0.png b/src/assets/character/Player/phone/phone_battery_0.png deleted file mode 100644 index 23c8e76d..00000000 Binary files a/src/assets/character/Player/phone/phone_battery_0.png and /dev/null differ diff --git a/src/assets/character/Player/phone/phone_battery_1.png b/src/assets/character/Player/phone/phone_battery_1.png deleted file mode 100644 index 73b58105..00000000 Binary files a/src/assets/character/Player/phone/phone_battery_1.png and /dev/null differ diff --git a/src/assets/character/Player/phone/phone_battery_2.png b/src/assets/character/Player/phone/phone_battery_2.png deleted file mode 100644 index e5353868..00000000 Binary files a/src/assets/character/Player/phone/phone_battery_2.png and /dev/null differ diff --git a/src/assets/character/Player/phone/phone_battery_3.png b/src/assets/character/Player/phone/phone_battery_3.png deleted file mode 100644 index b3829a90..00000000 Binary files a/src/assets/character/Player/phone/phone_battery_3.png and /dev/null differ diff --git a/src/assets/character/Player/phone/phone_lock.png b/src/assets/character/Player/phone/phone_lock.png deleted file mode 100644 index af1e2a4c..00000000 Binary files a/src/assets/character/Player/phone/phone_lock.png and /dev/null differ diff --git a/src/assets/character/Player/phone/phone_lock_1.png b/src/assets/character/Player/phone/phone_lock_1.png deleted file mode 100644 index 4a19d23c..00000000 Binary files a/src/assets/character/Player/phone/phone_lock_1.png and /dev/null differ diff --git a/src/assets/character/Player/phone/phone_lock_2.png b/src/assets/character/Player/phone/phone_lock_2.png deleted file mode 100644 index 6bb185c8..00000000 Binary files a/src/assets/character/Player/phone/phone_lock_2.png and /dev/null differ diff --git a/src/assets/character/Player/phone/phone_lock_3.png b/src/assets/character/Player/phone/phone_lock_3.png deleted file mode 100644 index 043eaa4d..00000000 Binary files a/src/assets/character/Player/phone/phone_lock_3.png and /dev/null differ diff --git a/src/assets/character/Player/phone/phone_lock_4.png b/src/assets/character/Player/phone/phone_lock_4.png deleted file mode 100644 index 270dd765..00000000 Binary files a/src/assets/character/Player/phone/phone_lock_4.png and /dev/null differ diff --git a/src/assets/character/Player/phone/phone_lock_5.png b/src/assets/character/Player/phone/phone_lock_5.png deleted file mode 100644 index ea909e61..00000000 Binary files a/src/assets/character/Player/phone/phone_lock_5.png and /dev/null differ diff --git a/src/assets/character/Player/phone/phone_lock_6.png b/src/assets/character/Player/phone/phone_lock_6.png deleted file mode 100644 index b8bb3efb..00000000 Binary files a/src/assets/character/Player/phone/phone_lock_6.png and /dev/null differ diff --git a/src/assets/character/Player/phone/phone_off.png b/src/assets/character/Player/phone/phone_off.png deleted file mode 100644 index 048de408..00000000 Binary files a/src/assets/character/Player/phone/phone_off.png and /dev/null differ diff --git a/src/assets/character/Player/phone/phone_unlock.png b/src/assets/character/Player/phone/phone_unlock.png deleted file mode 100644 index 80782ca3..00000000 Binary files a/src/assets/character/Player/phone/phone_unlock.png and /dev/null differ diff --git a/src/assets/character/Player/phone/pointer.png b/src/assets/character/Player/phone/pointer.png deleted file mode 100644 index cd03c44e..00000000 Binary files a/src/assets/character/Player/phone/pointer.png and /dev/null differ diff --git a/src/assets/character/Player/phone/pointer_1.png b/src/assets/character/Player/phone/pointer_1.png deleted file mode 100644 index 63a68b77..00000000 Binary files a/src/assets/character/Player/phone/pointer_1.png and /dev/null differ diff --git a/src/assets/character/Player/phone/pointer_3.png b/src/assets/character/Player/phone/pointer_3.png deleted file mode 100644 index f12afc89..00000000 Binary files a/src/assets/character/Player/phone/pointer_3.png and /dev/null differ diff --git a/src/assets/character/Player/phone/pointer_4.png b/src/assets/character/Player/phone/pointer_4.png deleted file mode 100644 index 7863da40..00000000 Binary files a/src/assets/character/Player/phone/pointer_4.png and /dev/null differ diff --git a/src/assets/character/Player/phone/pointer_5.png b/src/assets/character/Player/phone/pointer_5.png deleted file mode 100644 index e4fc7c38..00000000 Binary files a/src/assets/character/Player/phone/pointer_5.png and /dev/null differ diff --git a/src/assets/character/Player/phone/pointer_6.png b/src/assets/character/Player/phone/pointer_6.png deleted file mode 100644 index 660b3ca0..00000000 Binary files a/src/assets/character/Player/phone/pointer_6.png and /dev/null differ diff --git a/src/assets/character/Player/phone/pointer_7.png b/src/assets/character/Player/phone/pointer_7.png deleted file mode 100644 index 151ea7b3..00000000 Binary files a/src/assets/character/Player/phone/pointer_7.png and /dev/null differ diff --git a/src/assets/character/Player/phone/thumb.png b/src/assets/character/Player/phone/thumb.png deleted file mode 100644 index e7ebe664..00000000 Binary files a/src/assets/character/Player/phone/thumb.png and /dev/null differ diff --git a/src/assets/character/Player/phone/thumb_1.png b/src/assets/character/Player/phone/thumb_1.png deleted file mode 100644 index 3d141ed3..00000000 Binary files a/src/assets/character/Player/phone/thumb_1.png and /dev/null differ diff --git a/src/assets/phone/apps/1.png b/src/assets/phone/apps/1.png new file mode 100644 index 00000000..63030f31 Binary files /dev/null and b/src/assets/phone/apps/1.png differ diff --git a/src/assets/phone/apps/2.png b/src/assets/phone/apps/2.png new file mode 100644 index 00000000..5248fec9 Binary files /dev/null and b/src/assets/phone/apps/2.png differ diff --git a/src/assets/phone/apps/3.png b/src/assets/phone/apps/3.png new file mode 100644 index 00000000..725d78ed Binary files /dev/null and b/src/assets/phone/apps/3.png differ diff --git a/src/assets/phone/battery/1_g14.png b/src/assets/phone/battery/1_g14.png new file mode 100644 index 00000000..402ee6ae Binary files /dev/null and b/src/assets/phone/battery/1_g14.png differ diff --git a/src/assets/phone/battery/1_g15.png b/src/assets/phone/battery/1_g15.png new file mode 100644 index 00000000..5b66b779 Binary files /dev/null and b/src/assets/phone/battery/1_g15.png differ diff --git a/src/assets/phone/battery/1_g16.png b/src/assets/phone/battery/1_g16.png new file mode 100644 index 00000000..7fbce77a Binary files /dev/null and b/src/assets/phone/battery/1_g16.png differ diff --git a/src/assets/phone/frame/1.png b/src/assets/phone/frame/1.png new file mode 100644 index 00000000..370e8336 Binary files /dev/null and b/src/assets/phone/frame/1.png differ diff --git a/src/assets/phone/frame/2.png b/src/assets/phone/frame/2.png new file mode 100644 index 00000000..779cbf0d Binary files /dev/null and b/src/assets/phone/frame/2.png differ diff --git a/src/assets/phone/wallpaper/1.png b/src/assets/phone/wallpaper/1.png new file mode 100644 index 00000000..107d276d Binary files /dev/null and b/src/assets/phone/wallpaper/1.png differ diff --git a/src/assets/phone/wallpaper/2.png b/src/assets/phone/wallpaper/2.png new file mode 100644 index 00000000..5ce4ad66 Binary files /dev/null and b/src/assets/phone/wallpaper/2.png differ diff --git a/src/assets/phone/wallpaper/3.png b/src/assets/phone/wallpaper/3.png new file mode 100644 index 00000000..68cc7c5f Binary files /dev/null and b/src/assets/phone/wallpaper/3.png differ diff --git a/src/assets/phone/wallpaper/4.png b/src/assets/phone/wallpaper/4.png new file mode 100644 index 00000000..f335acf0 Binary files /dev/null and b/src/assets/phone/wallpaper/4.png differ diff --git a/src/eventsFunctionsExtensions/ellipsemovement.json b/src/eventsFunctionsExtensions/ellipsemovement.json new file mode 100644 index 00000000..55259248 --- /dev/null +++ b/src/eventsFunctionsExtensions/ellipsemovement.json @@ -0,0 +1,1455 @@ +{ + "author": "@4ian, Tristan Rhodes (https://victrisgames.itch.io/)", + "category": "Movement", + "extensionNamespace": "", + "fullName": "Ellipse movement", + "helpPath": "", + "iconUrl": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0ibWRpLXNpbmUtd2F2ZSIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiB2aWV3Qm94PSIwIDAgMjQgMjQiPjxwYXRoIGQ9Ik0xNi41LDIxQzEzLjUsMjEgMTIuMzEsMTYuNzYgMTEuMDUsMTIuMjhDMTAuMTQsOS4wNCA5LDUgNy41LDVDNC4xMSw1IDQsMTEuOTMgNCwxMkgyQzIsMTEuNjMgMi4wNiwzIDcuNSwzQzEwLjUsMyAxMS43MSw3LjI1IDEyLjk3LDExLjc0QzEzLjgzLDE0LjggMTUsMTkgMTYuNSwxOUMxOS45NCwxOSAyMC4wMywxMi4wNyAyMC4wMywxMkgyMi4wM0MyMi4wMywxMi4zNyAyMS45NywyMSAxNi41LDIxWiIgLz48L3N2Zz4=", + "name": "EllipseMovement", + "previewIconUrl": "https://resources.gdevelop-app.com/assets/Icons/sine-wave.svg", + "shortDescription": "Move objects on ellipses or smoothly back and forth in one direction.", + "version": "1.0.2", + "description": [ + "It allows objects to move:", + "- on an ellipsis or arcs", + "- smoothly vertically or horizontally (by setting one radius to 0)", + "- on a sine wave (by adding a force)", + "", + "It can be used for:", + "- Making objects float, such as powerups or coins", + "- Moving platforms", + "- Enemy movement patterns", + "- Making a player constantly turn right or left ([open the project online](https://editor.gdevelop.io/?project=example://star-seeker))" + ], + "origin": { + "identifier": "EllipseMovement", + "name": "gdevelop-extension-store" + }, + "tags": [ + "sine", + "ellipse", + "movement", + "circular", + "circle", + "floating", + "platform", + "enemy" + ], + "authorIds": [ + "wWP8BSlAW0UP4NeaHa2LcmmDzmH2", + "gqDaZjCfevOOxBYkK6zlhtZnXCg1", + "IWykYNRvhCZBN3vEgKEbBPOR3Oc2" + ], + "dependencies": [], + "eventsFunctions": [], + "eventsBasedBehaviors": [ + { + "description": "Move objects on ellipses or smoothly back and forth in one direction.", + "fullName": "Ellipse movement", + "name": "EllipseMovement", + "objectType": "", + "eventsFunctions": [ + { + "fullName": "", + "functionType": "Action", + "name": "onCreated", + "sentence": "", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyOldX" + }, + "parameters": [ + "Object", + "Behavior", + "=", + "Object.X()" + ] + }, + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyOldY" + }, + "parameters": [ + "Object", + "Behavior", + "=", + "Object.Y()" + ] + } + ] + }, + { + "type": "BuiltinCommonInstructions::Comment", + "color": { + "b": 109, + "g": 230, + "r": 255, + "textB": 0, + "textG": 0, + "textR": 0 + }, + "comment": "Evaluate the center of movement from the object position and properties." + }, + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::PropertyInitialTurningLeft" + }, + "parameters": [ + "Object", + "Behavior" + ] + } + ], + "actions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyLoopDuration" + }, + "parameters": [ + "Object", + "Behavior", + "*", + "-1" + ] + } + ] + }, + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::PropertyLoopDuration" + }, + "parameters": [ + "Object", + "Behavior", + "<", + "0" + ] + } + ], + "actions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyMovementAngle" + }, + "parameters": [ + "Object", + "Behavior", + "=", + "Object.Behavior::PropertyInitialDirectionAngle() + 90" + ] + } + ] + }, + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::PropertyLoopDuration" + }, + "parameters": [ + "Object", + "Behavior", + ">=", + "0" + ] + } + ], + "actions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyMovementAngle" + }, + "parameters": [ + "Object", + "Behavior", + "=", + "Object.Behavior::PropertyInitialDirectionAngle() - 90" + ] + } + ] + }, + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyCenterX" + }, + "parameters": [ + "Object", + "Behavior", + "=", + "Object.X() - Object.Behavior::DeltaX()" + ] + }, + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyCenterY" + }, + "parameters": [ + "Object", + "Behavior", + "=", + "Object.Y() - Object.Behavior::DeltaY()" + ] + } + ] + } + ], + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + } + ], + "objectGroups": [] + }, + { + "fullName": "", + "functionType": "Action", + "name": "doStepPreEvents", + "sentence": "", + "events": [ + { + "type": "BuiltinCommonInstructions::Comment", + "color": { + "b": 109, + "g": 230, + "r": 255, + "textB": 0, + "textG": 0, + "textR": 0 + }, + "comment": "Update the center when the object is moved outside of the behavior." + }, + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyCenterX" + }, + "parameters": [ + "Object", + "Behavior", + "+", + "Object.X() - Object.Behavior::PropertyOldX()" + ] + }, + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyCenterY" + }, + "parameters": [ + "Object", + "Behavior", + "+", + "Object.Y() - Object.Behavior::PropertyOldY()" + ] + } + ] + }, + { + "type": "BuiltinCommonInstructions::Comment", + "color": { + "b": 109, + "g": 230, + "r": 255, + "textB": 0, + "textG": 0, + "textR": 0 + }, + "comment": "Place the object according to the movement angle." + }, + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::PropertyRadiusX" + }, + "parameters": [ + "Object", + "Behavior", + "!=", + "0" + ] + } + ], + "actions": [ + { + "type": { + "value": "MettreX" + }, + "parameters": [ + "Object", + "=", + "Object.Behavior::PropertyCenterX() + Object.Behavior::DeltaX()" + ] + } + ] + }, + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::PropertyRadiusY" + }, + "parameters": [ + "Object", + "Behavior", + "!=", + "0" + ] + } + ], + "actions": [ + { + "type": { + "value": "MettreY" + }, + "parameters": [ + "Object", + "=", + "Object.Behavior::PropertyCenterY() + Object.Behavior::DeltaY()" + ] + } + ] + }, + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::PropertyShouldRotate" + }, + "parameters": [ + "Object", + "Behavior" + ] + } + ], + "actions": [ + { + "type": { + "value": "SetAngle" + }, + "parameters": [ + "Object", + "=", + "Object.Behavior::DirectionAngle() + Object.Behavior::PropertyRotationOffset()" + ] + } + ] + }, + { + "type": "BuiltinCommonInstructions::Comment", + "color": { + "b": 109, + "g": 230, + "r": 255, + "textB": 0, + "textG": 0, + "textR": 0 + }, + "comment": "Save the position to detect when the object is moved outside of the behavior." + }, + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyOldX" + }, + "parameters": [ + "Object", + "Behavior", + "=", + "Object.X()" + ] + }, + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyOldY" + }, + "parameters": [ + "Object", + "Behavior", + "=", + "Object.Y()" + ] + } + ] + } + ], + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + } + ], + "objectGroups": [] + }, + { + "fullName": "", + "functionType": "Action", + "name": "doStepPostEvents", + "sentence": "", + "events": [ + { + "type": "BuiltinCommonInstructions::Comment", + "color": { + "b": 109, + "g": 230, + "r": 255, + "textB": 0, + "textG": 0, + "textR": 0 + }, + "comment": "Update the movement angle for the next frame." + }, + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyMovementAngle" + }, + "parameters": [ + "Object", + "Behavior", + "+", + "360 * TimeDelta() / Object.Behavior::PropertyLoopDuration()" + ] + } + ] + } + ], + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + } + ], + "objectGroups": [] + }, + { + "description": "Change the turning direction (left or right).", + "fullName": "Turn the other way", + "functionType": "Action", + "name": "ToggleTurningLeft", + "sentence": "_PARAM0_ turn the other way", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyCenterX" + }, + "parameters": [ + "Object", + "Behavior", + "=", + "2 * Object.X() - Object.Behavior::CenterX()" + ] + }, + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyCenterY" + }, + "parameters": [ + "Object", + "Behavior", + "=", + "2 * Object.Y() - Object.Behavior::CenterY()" + ] + }, + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyMovementAngle" + }, + "parameters": [ + "Object", + "Behavior", + "+", + "180" + ] + }, + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyLoopDuration" + }, + "parameters": [ + "Object", + "Behavior", + "*", + "-1" + ] + } + ] + } + ], + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + } + ], + "objectGroups": [] + }, + { + "description": "Change the in which side the object is turning (left or right).", + "fullName": "Turn left or right", + "functionType": "Action", + "name": "SetTurningLeft", + "sentence": "_PARAM0_ turn left: _PARAM2_", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "value": "BuiltinCommonInstructions::Or" + }, + "parameters": [], + "subInstructions": [ + { + "type": { + "value": "BuiltinCommonInstructions::And" + }, + "parameters": [], + "subInstructions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::IsTurningLeft" + }, + "parameters": [ + "Object", + "Behavior", + "yes", + "" + ] + }, + { + "type": { + "inverted": true, + "value": "GetArgumentAsBoolean" + }, + "parameters": [ + "\"TurnLeft\"" + ] + } + ] + }, + { + "type": { + "value": "BuiltinCommonInstructions::And" + }, + "parameters": [], + "subInstructions": [ + { + "type": { + "inverted": true, + "value": "EllipseMovement::EllipseMovement::IsTurningLeft" + }, + "parameters": [ + "Object", + "Behavior", + "" + ] + }, + { + "type": { + "value": "GetArgumentAsBoolean" + }, + "parameters": [ + "\"TurnLeft\"" + ] + } + ] + } + ] + } + ], + "actions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::ToggleTurningLeft" + }, + "parameters": [ + "Object", + "Behavior", + "" + ] + } + ] + } + ], + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + }, + { + "description": "Turn left", + "name": "TurnLeft", + "type": "yesorno" + } + ], + "objectGroups": [] + }, + { + "description": "Check if the object is turning left.", + "fullName": "Is turning left", + "functionType": "Condition", + "name": "IsTurningLeft", + "sentence": "_PARAM0_ is turning left", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::PropertyLoopDuration" + }, + "parameters": [ + "Object", + "Behavior", + "<", + "0" + ] + } + ], + "actions": [ + { + "type": { + "value": "SetReturnBoolean" + }, + "parameters": [ + "True" + ] + } + ] + } + ], + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + } + ], + "objectGroups": [] + }, + { + "description": "Return the movement angle of the object.", + "fullName": "Movement angle", + "functionType": "Expression", + "name": "MovementAngle", + "sentence": "Set initial Y of _PARAM0_ to _PARAM2_", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "value": "SetReturnNumber" + }, + "parameters": [ + "Object.Behavior::PropertyMovementAngle()" + ] + } + ] + } + ], + "expressionType": { + "type": "expression" + }, + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + } + ], + "objectGroups": [] + }, + { + "description": "Return the loop duration (in seconds).", + "fullName": "Loop duration", + "functionType": "Expression", + "group": "Configuration", + "name": "LoopDuration", + "sentence": "Set initial Y of _PARAM0_ to _PARAM2_", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "value": "SetReturnNumber" + }, + "parameters": [ + "abs(Object.Behavior::PropertyLoopDuration())" + ] + } + ] + } + ], + "expressionType": { + "type": "expression" + }, + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + } + ], + "objectGroups": [] + }, + { + "description": "Return the ellipse radius on X axis.", + "fullName": "Radius X", + "functionType": "Expression", + "group": "Configuration", + "name": "RadiusX", + "sentence": "Set initial Y of _PARAM0_ to _PARAM2_", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "value": "SetReturnNumber" + }, + "parameters": [ + "Object.Behavior::PropertyRadiusX()" + ] + } + ] + } + ], + "expressionType": { + "type": "expression" + }, + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + } + ], + "objectGroups": [] + }, + { + "description": "Return the ellipse radius on X axis.", + "fullName": "Radius Y", + "functionType": "Expression", + "group": "Configuration", + "name": "RadiusY", + "sentence": "Set initial Y of _PARAM0_ to _PARAM2_", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "value": "SetReturnNumber" + }, + "parameters": [ + "Object.Behavior::PropertyRadiusY()" + ] + } + ] + } + ], + "expressionType": { + "type": "expression" + }, + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + } + ], + "objectGroups": [] + }, + { + "description": "Return the movement center position on X axis.", + "fullName": "Movement center X", + "functionType": "Expression", + "group": "Configuration", + "name": "CenterX", + "sentence": "Set initial Y of _PARAM0_ to _PARAM2_", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "value": "SetReturnNumber" + }, + "parameters": [ + "Object.Behavior::PropertyCenterX()" + ] + } + ] + } + ], + "expressionType": { + "type": "expression" + }, + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + } + ], + "objectGroups": [] + }, + { + "description": "Return the movement center position on Y axis.", + "fullName": "Movement center Y", + "functionType": "Expression", + "group": "Configuration", + "name": "CenterY", + "sentence": "Set initial Y of _PARAM0_ to _PARAM2_", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "value": "SetReturnNumber" + }, + "parameters": [ + "Object.Behavior::PropertyCenterY()" + ] + } + ] + } + ], + "expressionType": { + "type": "expression" + }, + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + } + ], + "objectGroups": [] + }, + { + "description": "Change the radius on X axis of the movement.", + "fullName": "Radius X", + "functionType": "Action", + "group": "Elliptical movement configuration", + "name": "SetRadiusX", + "sentence": "Change the radius on X axis of the movement of _PARAM0_ to _PARAM2_", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyRadiusX" + }, + "parameters": [ + "Object", + "Behavior", + "=", + "GetArgumentAsNumber(\"Value\")" + ] + } + ] + } + ], + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + }, + { + "description": "Radius X", + "name": "Value", + "type": "expression" + } + ], + "objectGroups": [] + }, + { + "description": "Change the radius on Y axis of the movement.", + "fullName": "Radius Y", + "functionType": "Action", + "group": "Elliptical movement configuration", + "name": "SetRadiusY", + "sentence": "Change the radius on Y axis of the movement of _PARAM0_ to _PARAM2_", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyRadiusY" + }, + "parameters": [ + "Object", + "Behavior", + "=", + "GetArgumentAsNumber(\"Value\")" + ] + } + ] + } + ], + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + }, + { + "description": "Radius Y", + "name": "Value", + "type": "expression" + } + ], + "objectGroups": [] + }, + { + "description": "Change the loop duration.", + "fullName": "Loop duration", + "functionType": "Action", + "group": "Elliptical movement configuration", + "name": "SetLoopDuration", + "sentence": "Change the loop duration of _PARAM0_ to _PARAM2_", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::IsTurningLeft" + }, + "parameters": [ + "Object", + "Behavior", + "" + ] + } + ], + "actions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyLoopDuration" + }, + "parameters": [ + "Object", + "Behavior", + "=", + "-GetArgumentAsNumber(\"Value\")" + ] + } + ] + }, + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "inverted": true, + "value": "EllipseMovement::EllipseMovement::IsTurningLeft" + }, + "parameters": [ + "Object", + "Behavior", + "" + ] + } + ], + "actions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyLoopDuration" + }, + "parameters": [ + "Object", + "Behavior", + "=", + "GetArgumentAsNumber(\"Value\")" + ] + } + ] + } + ], + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + }, + { + "description": "Speed (in degrees per second)", + "name": "Value", + "type": "expression" + } + ], + "objectGroups": [] + }, + { + "description": "Change the movement angle. The object is teleported according to the angle.", + "fullName": "Teleport at an angle", + "functionType": "Action", + "name": "SetMovementAngle", + "sentence": "Teleport _PARAM0_ on the ellipse at _PARAM2_°", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::SetPropertyMovementAngle" + }, + "parameters": [ + "Object", + "Behavior", + "=", + "GetArgumentAsNumber(\"Value\")" + ] + } + ] + } + ], + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + }, + { + "description": "Movement angle", + "name": "Value", + "type": "expression" + } + ], + "objectGroups": [] + }, + { + "fullName": "Delta X", + "functionType": "Expression", + "name": "DeltaX", + "private": true, + "sentence": "", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "value": "SetReturnNumber" + }, + "parameters": [ + "cos(ToRad(Object.Behavior::PropertyMovementAngle())) * Object.Behavior::PropertyRadiusX()" + ] + } + ] + } + ], + "expressionType": { + "type": "expression" + }, + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + } + ], + "objectGroups": [] + }, + { + "fullName": "Delta Y", + "functionType": "Expression", + "name": "DeltaY", + "private": true, + "sentence": "", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "value": "SetReturnNumber" + }, + "parameters": [ + "sin(ToRad(Object.Behavior::PropertyMovementAngle())) * Object.Behavior::PropertyRadiusY()" + ] + } + ] + } + ], + "expressionType": { + "type": "expression" + }, + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + } + ], + "objectGroups": [] + }, + { + "fullName": "Direction angle", + "functionType": "Expression", + "name": "DirectionAngle", + "private": true, + "sentence": "", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::PropertyLoopDuration" + }, + "parameters": [ + "Object", + "Behavior", + "<", + "0" + ] + } + ], + "actions": [ + { + "type": { + "value": "SetReturnNumber" + }, + "parameters": [ + "Object.Behavior::PropertyMovementAngle() + 90" + ] + } + ] + }, + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "value": "EllipseMovement::EllipseMovement::PropertyLoopDuration" + }, + "parameters": [ + "Object", + "Behavior", + ">=", + "0" + ] + } + ], + "actions": [ + { + "type": { + "value": "SetReturnNumber" + }, + "parameters": [ + "Object.Behavior::PropertyMovementAngle() - 90" + ] + } + ] + } + ], + "expressionType": { + "type": "expression" + }, + "parameters": [ + { + "description": "Object", + "name": "Object", + "type": "object" + }, + { + "description": "Behavior", + "name": "Behavior", + "supplementaryInformation": "EllipseMovement::EllipseMovement", + "type": "behavior" + } + ], + "objectGroups": [] + } + ], + "propertyDescriptors": [ + { + "value": "100", + "type": "Number", + "unit": "Pixel", + "label": "Radius of the movement on X axis", + "description": "", + "group": "Ellipse", + "extraInformation": [], + "name": "RadiusX" + }, + { + "value": "0", + "type": "Number", + "unit": "Pixel", + "label": "Radius of the movement on Y axis", + "description": "", + "group": "Ellipse", + "extraInformation": [], + "name": "RadiusY" + }, + { + "value": "6", + "type": "Number", + "unit": "Second", + "label": "Loop duration", + "description": "", + "group": "Speed", + "extraInformation": [], + "name": "LoopDuration" + }, + { + "value": "", + "type": "Boolean", + "label": "Turn left", + "description": "", + "group": "Speed", + "extraInformation": [], + "name": "InitialTurningLeft" + }, + { + "value": "0", + "type": "Number", + "unit": "DegreeAngle", + "label": "Initial direction", + "description": "", + "group": "Speed", + "extraInformation": [], + "name": "InitialDirectionAngle" + }, + { + "value": "", + "type": "Boolean", + "label": "Rotate", + "description": "", + "group": "Rotation", + "extraInformation": [], + "name": "ShouldRotate" + }, + { + "value": "0", + "type": "Number", + "unit": "DegreeAngle", + "label": "Rotation offset", + "description": "", + "group": "Rotation", + "extraInformation": [], + "name": "RotationOffset" + }, + { + "value": "0", + "type": "Number", + "label": "", + "description": "", + "group": "", + "extraInformation": [], + "hidden": true, + "name": "CenterX" + }, + { + "value": "0", + "type": "Number", + "label": "", + "description": "", + "group": "", + "extraInformation": [], + "hidden": true, + "name": "CenterY" + }, + { + "value": "0", + "type": "Number", + "label": "", + "description": "", + "group": "", + "extraInformation": [], + "hidden": true, + "name": "MovementAngle" + }, + { + "value": "", + "type": "Number", + "label": "", + "description": "", + "group": "", + "extraInformation": [], + "hidden": true, + "name": "OldX" + }, + { + "value": "", + "type": "Number", + "label": "", + "description": "", + "group": "", + "extraInformation": [], + "hidden": true, + "name": "OldY" + } + ], + "sharedPropertyDescriptors": [] + } + ], + "eventsBasedObjects": [] +} \ No newline at end of file diff --git a/src/eventsFunctionsExtensions/spritemasking.json b/src/eventsFunctionsExtensions/spritemasking.json new file mode 100644 index 00000000..37b79fd8 --- /dev/null +++ b/src/eventsFunctionsExtensions/spritemasking.json @@ -0,0 +1,145 @@ +{ + "author": "Arthur Pacaud (arthuro555)", + "category": "Visual effect", + "extensionNamespace": "", + "fullName": "Object Masking", + "helpPath": "", + "iconUrl": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0ibWRpLXRyYW5zaXRpb24tbWFza2VkIiB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCI+PHBhdGggZD0iTTE1LDJDMTYuOTQsMiAxOC41OSwyLjcgMTkuOTUsNC4wNUMyMS4zLDUuNDEgMjIsNy4wNiAyMiw5QzIyLDEwLjU2IDIxLjUsMTEuOTYgMjAuNTgsMTMuMkMxOS42NCwxNC40MyAxOC40NCwxNS4yNyAxNi45NywxNS43TDE3LDE1LjM4VjE1QzE3LDEyLjgxIDE2LjIzLDEwLjkzIDE0LjY1LDkuMzVDMTMuMDcsNy43NyAxMS4xOSw3IDksN0g4LjYzTDguMyw3LjAzQzguNzMsNS41NiA5LjU3LDQuMzYgMTAuOCwzLjQyQzEyLjA0LDIuNSAxMy40NCwyIDE1LDJNOSw4QTcsNyAwIDAsMSAxNiwxNUE3LDcgMCAwLDEgOSwyMkE3LDcgMCAwLDEgMiwxNUE3LDcgMCAwLDEgOSw4TTksMTBBNSw1IDAgMCwwIDQsMTVBNSw1IDAgMCwwIDksMjBBNSw1IDAgMCwwIDE0LDE1QTUsNSAwIDAsMCA5LDEwWiIgLz48L3N2Zz4=", + "name": "SpriteMasking", + "previewIconUrl": "https://resources.gdevelop-app.com/assets/Icons/transition-masked.svg", + "shortDescription": "Use a sprite or a shape painter to mask another object.", + "version": "2.1.1", + "description": "When masked, the masked object is only visible through the mask.", + "origin": { + "identifier": "SpriteMasking", + "name": "gdevelop-extension-store" + }, + "tags": [ + "masking", + "javascript", + "pixi", + "sprites" + ], + "authorIds": [ + "ZgrsWuRTAkXgeuPV9bo0zuEcA2w1" + ], + "dependencies": [], + "eventsFunctions": [ + { + "description": "Define a shape painter as a mask of an object.", + "fullName": "Mask an object with a shape painter", + "functionType": "Action", + "name": "MaskWithShapePainter", + "sentence": "Mask _PARAM1_ with mask _PARAM2_", + "events": [ + { + "type": "BuiltinCommonInstructions::JsCode", + "inlineCode": [ + "const maskObject = eventsFunctionContext.getObjects(\"Mask\")[0];", + "if (!maskObject) return;", + "", + "const maskedObjects = eventsFunctionContext.getObjects(\"Masked\");", + "for (const maskedObject of maskedObjects) {", + " const maskedRenderer = maskedObject.getRendererObject(); ", + " maskedRenderer.mask = maskObject.getRendererObject();", + "}", + "", + "" + ], + "parameterObjects": "masked", + "useStrict": true, + "eventsSheetExpanded": false + } + ], + "parameters": [ + { + "description": "Object to mask", + "name": "Masked", + "type": "objectList" + }, + { + "description": "Shape painter to use as a mask", + "name": "Mask", + "supplementaryInformation": "PrimitiveDrawing::Drawer", + "type": "objectList" + } + ], + "objectGroups": [] + }, + { + "description": "Define a sprite as a mask of an object.", + "fullName": "Mask an object with a sprite", + "functionType": "Action", + "name": "Mask", + "sentence": "Mask _PARAM1_ with mask _PARAM2_", + "events": [ + { + "type": "BuiltinCommonInstructions::JsCode", + "inlineCode": [ + "const maskObject = eventsFunctionContext.getObjects(\"Mask\")[0];", + "if (!maskObject) return;", + "", + "const maskedObjects = eventsFunctionContext.getObjects(\"Masked\");", + "for (const maskedObject of maskedObjects) {", + " const maskedRenderer = maskedObject.getRendererObject(); ", + " maskedRenderer.mask = maskObject.getRendererObject();", + "}", + "", + "" + ], + "parameterObjects": "masked", + "useStrict": true, + "eventsSheetExpanded": false + } + ], + "parameters": [ + { + "description": "Object to mask", + "name": "Masked", + "type": "objectList" + }, + { + "description": "Sprite object to use as a mask", + "name": "Mask", + "supplementaryInformation": "Sprite", + "type": "objectList" + } + ], + "objectGroups": [] + }, + { + "description": "Remove the mask of the specified object.", + "fullName": "Remove the mask", + "functionType": "Action", + "name": "Unmask", + "sentence": "Remove the mask of _PARAM1_", + "events": [ + { + "type": "BuiltinCommonInstructions::JsCode", + "inlineCode": [ + "const maskedObjects = eventsFunctionContext.getObjects(\"Masked\");", + "", + "for (const maskedObject of maskedObjects) {", + " const maskedRenderer = maskedObject.getRendererObject(); ", + " maskedRenderer.mask = null;", + "}", + "" + ], + "parameterObjects": "", + "useStrict": true, + "eventsSheetExpanded": false + } + ], + "parameters": [ + { + "description": "Object with a mask to remove", + "name": "Masked", + "type": "objectList" + } + ], + "objectGroups": [] + } + ], + "eventsBasedBehaviors": [], + "eventsBasedObjects": [] +} \ No newline at end of file diff --git a/src/externalEvents/game.json b/src/externalEvents/game.json index 4014758f..8f33fd7e 100644 --- a/src/externalEvents/game.json +++ b/src/externalEvents/game.json @@ -8,6 +8,7 @@ "colorG": 176, "colorR": 74, "creationTime": 0, + "folded": true, "name": "Links", "source": "", "type": "BuiltinCommonInstructions::Group", @@ -233,6 +234,7 @@ "colorG": 176, "colorR": 74, "creationTime": 0, + "folded": true, "name": "Global Time", "source": "", "type": "BuiltinCommonInstructions::Group", @@ -293,7 +295,7 @@ "parameters": [ "foliage", "Effect", - "\"Effect\"", + "\"Shadow\"", "\"rotation\"", "GlobalVariable(Game.globalTime.shadowTime)" ] diff --git a/src/externalEvents/phone.json b/src/externalEvents/phone.json index eca3ab94..4f72c717 100644 --- a/src/externalEvents/phone.json +++ b/src/externalEvents/phone.json @@ -82,7 +82,7 @@ }, "parameters": [ "", - "Phone", + "phoneFrame", "<", "1" ] @@ -138,10 +138,10 @@ "value": "Tween::TweenBehavior::AddObjectPositionYTween2" }, "parameters": [ - "Phone", + "phoneFrame", "Tween", "\"phone\"", - "SceneWindowHeight() - Phone.Height() - 30", + "SceneWindowHeight() - phoneFrame.Height() - 30", "\"easeOutQuad\"", "0.4", "" @@ -154,19 +154,27 @@ "parameters": [ "Phone_status_bar", "Sticker", - "Phone", + "phoneFrame", "" ] }, { "type": { - "value": "Sticker::Sticker::Stick" + "value": "AnimatableCapability::AnimatableBehavior::PauseAnimation" }, "parameters": [ - "Thumb", - "Sticker", - "Phone", - "" + "phoneWallpaper", + "Animation" + ] + }, + { + "type": { + "value": "ChangeSprite" + }, + "parameters": [ + "phoneWallpaper", + "=", + "Random(phoneWallpaper.AnimationFrameCount() - 1)" ] } ] @@ -177,90 +185,64 @@ "type": "BuiltinCommonInstructions::Standard", "conditions": [], "actions": [] - }, - { - "type": "BuiltinCommonInstructions::Standard", - "conditions": [ - { - "type": { - "value": "VarObjetTxt" - }, - "parameters": [ - "Phone", - "swipe", - "=", - "\"Right\"" - ] - } - ], - "actions": [ - { - "type": { - "value": "RotateTowardAngle" - }, - "parameters": [ - "Thumb", - "-15", - "90", - "" - ] - } - ] - }, + } + ], + "parameters": [] + }, + { + "colorB": 228, + "colorG": 176, + "colorR": 74, + "creationTime": 0, + "name": "Hide", + "source": "", + "type": "BuiltinCommonInstructions::Group", + "events": [ { "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "value": "VarObjetTxt" + "value": "KeyReleased" }, "parameters": [ - "Phone", - "swipe", - "=", - "\"Left\"" + "", + "Down" ] } ], "actions": [ { "type": { - "value": "RotateTowardAngle" + "value": "Tween::TweenBehavior::AddObjectPositionYTween2" }, "parameters": [ - "Thumb", - "15", - "90", - "" + "phoneFrame", + "Tween", + "\"phone\"", + "SceneWindowHeight() + 30", + "\"easeInQuad\"", + "0.4", + "yes" ] - } - ] - }, - { - "type": "BuiltinCommonInstructions::Standard", - "conditions": [ + }, { "type": { - "value": "VarObjetTxt" + "value": "SetGlobalVariableAsBoolean" }, "parameters": [ - "Phone", - "swipe", - "=", - "\"None\"" + "Game.Player.phone.active", + "False" ] - } - ], - "actions": [ + }, { "type": { - "value": "RotateTowardAngle" + "value": "SetObjectVariableAsBoolean" }, "parameters": [ - "Thumb", - "0", - "100", - "" + "Body", + "Phone.active", + "False" ] } ] @@ -270,89 +252,89 @@ "conditions": [ { "type": { - "value": "KeyReleased" + "value": "SceneInstancesCount" }, "parameters": [ "", - "Left" + "phoneFrame", + "<", + "1" ] } ], "actions": [ { "type": { - "value": "ModVarScene" + "value": "Delete" }, "parameters": [ - "phone_app", - "+", - "1" + "phoneIcons", + "" ] }, { "type": { - "value": "ResetObjectTimer" + "value": "Delete" }, "parameters": [ - "Thumb", - "\"Swipe_timer\"" + "phoneMask", + "" ] }, { "type": { - "value": "ModVarObjetTxt" + "value": "Delete" }, "parameters": [ - "Phone", - "swipe", - "=", - "\"Right\"" + "phoneWallpaper", + "" ] } ] }, { "type": "BuiltinCommonInstructions::Standard", - "conditions": [ - { - "type": { - "value": "KeyReleased" - }, - "parameters": [ - "", - "Right" - ] - } - ], + "conditions": [], + "actions": [] + } + ], + "parameters": [] + }, + { + "colorB": 228, + "colorG": 176, + "colorR": 74, + "creationTime": 0, + "name": "AppIcons", + "source": "", + "type": "BuiltinCommonInstructions::Group", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], "actions": [ { "type": { - "value": "ModVarScene" - }, - "parameters": [ - "phone_app", - "-", - "1" - ] - }, - { - "type": { - "value": "ResetObjectTimer" + "value": "MettreXY" }, "parameters": [ - "Thumb", - "\"Swipe_timer\"" + "phoneIcons", + "=", + "phoneFrame.PointX(phoneIcons.id)", + "=", + "phoneFrame.PointY(phoneIcons.id)" ] }, { "type": { - "value": "ModVarObjetTxt" + "value": "SetCenter" }, "parameters": [ - "Phone", - "swipe", + "phoneMask", "=", - "\"Left\"" + "phoneFrame.CenterX()", + "=", + "phoneFrame.CenterY()" ] } ] @@ -362,113 +344,51 @@ "conditions": [ { "type": { - "value": "BuiltinCommonInstructions::Or" + "value": "Tween::IsPlaying" }, - "parameters": [], - "subInstructions": [ - { - "type": { - "value": "Angle" - }, - "parameters": [ - "Thumb", - "=", - "-15" - ] - }, - { - "type": { - "value": "Angle" - }, - "parameters": [ - "Thumb", - "=", - "15" - ] - } + "parameters": [ + "phoneFrame", + "Tween", + "\"phone\"" ] } ], "actions": [ { "type": { - "value": "ModVarObjetTxt" + "value": "SetCenter" }, "parameters": [ - "Phone", - "swipe", + "phoneWallpaper", + "=", + "phoneFrame.CenterX()", "=", - "\"None\"" + "phoneFrame.CenterY() - 20" ] } ] - } - ], - "parameters": [] - }, - { - "colorB": 228, - "colorG": 176, - "colorR": 74, - "creationTime": 0, - "name": "Hide", - "source": "", - "type": "BuiltinCommonInstructions::Group", - "events": [ + }, { + "disabled": true, "type": "BuiltinCommonInstructions::Standard", - "conditions": [ - { - "type": { - "value": "KeyReleased" - }, - "parameters": [ - "", - "Down" - ] - } - ], + "conditions": [], + "actions": [] + }, + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], "actions": [ { "type": { - "value": "Tween::TweenBehavior::AddObjectPositionYTween2" + "value": "SpriteMasking::Mask" }, "parameters": [ - "Phone", - "Tween", - "\"phone\"", - "SceneWindowHeight() + 30", - "\"easeInQuad\"", - "0.4", - "yes" - ] - }, - { - "type": { - "value": "SetGlobalVariableAsBoolean" - }, - "parameters": [ - "Game.Player.phone.active", - "False" - ] - }, - { - "type": { - "value": "SetObjectVariableAsBoolean" - }, - "parameters": [ - "Body", - "Phone.active", - "False" + "", + "phoneWallpaper", + "phoneMask", + "" ] } - ], - "events": [ - { - "type": "BuiltinCommonInstructions::Standard", - "conditions": [], - "actions": [] - } ] } ], diff --git a/src/externalEvents/player.json b/src/externalEvents/player.json index 7fd0d274..7b828e28 100644 --- a/src/externalEvents/player.json +++ b/src/externalEvents/player.json @@ -143,6 +143,7 @@ "colorG": 176, "colorR": 74, "creationTime": 0, + "folded": true, "name": "Animation", "source": "", "type": "BuiltinCommonInstructions::Group", @@ -1069,7 +1070,6 @@ "colorG": 176, "colorR": 74, "creationTime": 0, - "folded": true, "name": "Camera", "source": "", "type": "BuiltinCommonInstructions::Group", @@ -1131,72 +1131,154 @@ "comment": "set the variable \"Game.Camera.Zoom\" to 1, the camera uses this to set it's zoom level" }, { - "folded": true, "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "value": "DepartScene" + "value": "GlobalVariableAsBoolean" }, "parameters": [ + "Game.intro", "" ] } ], - "actions": [ + "actions": [], + "events": [ { - "type": { - "value": "ModVarScene" - }, - "parameters": [ - "Game.Camera.Zoom", - "=", - "1" + "disabled": true, + "folded": true, + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "value": "DepartScene" + }, + "parameters": [ + "" + ] + } + ], + "actions": [ + { + "type": { + "value": "ModVarScene" + }, + "parameters": [ + "Game.Camera.Zoom", + "=", + "1" + ] + } ] - } - ] - }, - { - "folded": true, - "type": "BuiltinCommonInstructions::Comment", - "color": { - "b": 109, - "g": 230, - "r": 255, - "textB": 0, - "textG": 0, - "textR": 0 - }, - "comment": "Revert to the \"Game.Camera.Zoom\" variable if GodMode is not active" - }, - { - "folded": true, - "type": "BuiltinCommonInstructions::Standard", - "conditions": [ + }, { - "type": { - "value": "SceneVariableAsBoolean" - }, - "parameters": [ - "GodMode.active", - "False" + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "inverted": true, + "value": "TopDownMovementBehavior::IsMoving" + }, + "parameters": [ + "Body", + "TopDownMovement" + ] + } + ], + "actions": [ + { + "type": { + "value": "Tween::TweenSceneVariableNumber3" + }, + "parameters": [ + "", + "\"zoomOut\"", + "Game.Camera.Zoom", + "1", + "\"linear\"", + "1" + ] + } ] - } - ], - "actions": [ + }, { - "type": { - "value": "ZoomCamera" + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "value": "TopDownMovementBehavior::IsMoving" + }, + "parameters": [ + "Body", + "TopDownMovement" + ] + } + ], + "actions": [ + { + "type": { + "value": "Tween::TweenSceneVariableNumber3" + }, + "parameters": [ + "", + "\"zoomOut\"", + "Game.Camera.Zoom", + "0.9", + "\"linear\"", + "1" + ] + } + ] + }, + { + "folded": true, + "type": "BuiltinCommonInstructions::Comment", + "color": { + "b": 109, + "g": 230, + "r": 255, + "textB": 0, + "textG": 0, + "textR": 0 }, - "parameters": [ - "", - "Game.Camera.Zoom", - "", - "" + "comment": "Revert to the \"Game.Camera.Zoom\" variable if GodMode is not active" + }, + { + "folded": true, + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "value": "SceneVariableAsBoolean" + }, + "parameters": [ + "GodMode.active", + "False" + ] + } + ], + "actions": [ + { + "type": { + "value": "ZoomCamera" + }, + "parameters": [ + "", + "Game.Camera.Zoom", + "", + "" + ] + } ] } ] }, + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [] + }, { "folded": true, "type": "BuiltinCommonInstructions::Standard", diff --git a/src/externalLayouts/phone.json b/src/externalLayouts/phone.json index ecb3b7cd..29ec8a2a 100644 --- a/src/externalLayouts/phone.json +++ b/src/externalLayouts/phone.json @@ -6,18 +6,18 @@ "angle": 0, "customSize": true, "depth": 1, - "height": 419, + "height": 15, "layer": "UI", - "name": "Phone", - "persistentUuid": "47079388-0dca-46e7-8a7a-0e97e38abf1f", - "width": 229, - "x": 1657, - "y": 626, - "zOrder": 1, + "name": "phone_wifi", + "persistentUuid": "5cc4231a-bc19-4320-8c4f-0e7b0eac031b", + "width": 15, + "x": 1850, + "y": 649, + "zOrder": 200, "numberProperties": [ { "name": "animation", - "value": 1 + "value": 3 } ], "stringProperties": [], @@ -27,52 +27,148 @@ "angle": 0, "customSize": true, "depth": 1, - "height": 15, + "height": 22, "layer": "UI", - "name": "phone_wifi", - "persistentUuid": "5cc4231a-bc19-4320-8c4f-0e7b0eac031b", - "width": 15, - "x": 1829, - "y": 687, - "zOrder": 2, + "name": "phone_time", + "persistentUuid": "54fb08c4-adf2-4f4f-851b-490fe20f8b5b", + "width": 48, + "x": 1676, + "y": 634, + "zOrder": 200, + "numberProperties": [], + "stringProperties": [], + "initialVariables": [] + }, + { + "angle": 0, + "customSize": false, + "height": 0, + "keepRatio": true, + "layer": "UI", + "name": "phoneFrame", + "persistentUuid": "2db890bf-e540-4bbc-be81-3b4f42a17f9e", + "width": 0, + "x": 1656, + "y": 623, + "zOrder": 56, + "numberProperties": [], + "stringProperties": [], + "initialVariables": [] + }, + { + "angle": 0, + "customSize": false, + "height": 0, + "keepRatio": true, + "layer": "UI", + "name": "phoneMask", + "persistentUuid": "fa91c432-5baa-4035-b7b0-e0557b9b2868", + "width": 0, + "x": 2154, + "y": 652, + "zOrder": 5, + "numberProperties": [], + "stringProperties": [], + "initialVariables": [] + }, + { + "angle": 0, + "customSize": false, + "height": 0, + "keepRatio": true, + "layer": "UI", + "name": "phoneIcons", + "persistentUuid": "99878be0-df6b-4964-af72-9f9016bc445a", + "width": 0, + "x": 2338, + "y": 1033, + "zOrder": 53, "numberProperties": [ { "name": "animation", - "value": 3 + "value": 2 } ], "stringProperties": [], - "initialVariables": [] + "initialVariables": [ + { + "folded": true, + "name": "id", + "type": "number", + "value": 3 + } + ] }, { "angle": 0, - "customSize": true, - "depth": 1, - "height": 15, + "customSize": false, + "height": 0, + "keepRatio": true, "layer": "UI", - "name": "phone_battery", - "persistentUuid": "dcfc4f9b-3097-4216-8186-ed27184629e7", - "width": 30, - "x": 1848, - "y": 672, - "zOrder": 3, + "name": "phoneIcons", + "persistentUuid": "a4d0bdb8-d1f3-4cb4-9354-5098ba24de1a", + "width": 0, + "x": 2198, + "y": 1033, + "zOrder": 53, "numberProperties": [], "stringProperties": [], - "initialVariables": [] + "initialVariables": [ + { + "folded": true, + "name": "id", + "type": "number", + "value": 1 + } + ] }, { "angle": 0, + "customSize": false, + "height": 0, + "keepRatio": true, + "layer": "UI", + "name": "phoneIcons", + "persistentUuid": "c37195a3-88de-4744-b578-cbdd96a1119b", + "width": 0, + "x": 2274, + "y": 1033, + "zOrder": 53, + "numberProperties": [ + { + "name": "animation", + "value": 1 + } + ], + "stringProperties": [], + "initialVariables": [ + { + "folded": true, + "name": "id", + "type": "number", + "value": 2 + } + ] + }, + { + "angle": -90, "customSize": true, "depth": 1, - "height": 22, + "height": 11, + "keepRatio": true, "layer": "UI", - "name": "phone_time", - "persistentUuid": "54fb08c4-adf2-4f4f-851b-490fe20f8b5b", - "width": 48, - "x": 1666, - "y": 669, - "zOrder": 4, - "numberProperties": [], + "name": "phone_battery", + "persistentUuid": "140b8479-44e8-4e36-baaf-7fb7fef2ae94", + "width": 16, + "x": 1834, + "y": 636, + "zOrder": 201, + "numberProperties": [ + { + "name": "animation", + "value": 1 + } + ], "stringProperties": [], "initialVariables": [] }, @@ -80,13 +176,14 @@ "angle": 0, "customSize": false, "height": 0, + "keepRatio": true, "layer": "UI", - "name": "Thumb", - "persistentUuid": "f61cdfa5-c919-4d2f-958f-11caeaacba8b", + "name": "phoneWallpaper", + "persistentUuid": "68d0a48f-ed64-49b6-9873-b90b96b7956b", "width": 0, - "x": 1772, - "y": 1132, - "zOrder": 50, + "x": 2545, + "y": 165, + "zOrder": 2, "numberProperties": [], "stringProperties": [], "initialVariables": [] @@ -102,7 +199,7 @@ "gridColor": 10401023, "gridAlpha": 0.8, "snap": false, - "zoomFactor": 0.6846283916654102, + "zoomFactor": 3.3635792882521773, "windowMask": false } } \ No newline at end of file diff --git a/src/game.json b/src/game.json index a02635fd..2b899a12 100644 --- a/src/game.json +++ b/src/game.json @@ -1,5 +1,5 @@ { - "firstLayout": "City", + "firstLayout": "Intro", "gdVersion": { "build": 99, "major": 4, @@ -253,42 +253,6 @@ "smoothed": true, "userAdded": true }, - { - "alwaysLoaded": false, - "file": "assets/rooftop/roof_4.png", - "kind": "image", - "metadata": "", - "name": "assets\\rooftop\\roof_4.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/rooftop/roof_3.png", - "kind": "image", - "metadata": "", - "name": "assets\\rooftop\\roof_3.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/rooftop/roof_1.png", - "kind": "image", - "metadata": "", - "name": "assets\\rooftop\\roof_1.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/rooftop/roof_2.png", - "kind": "image", - "metadata": "", - "name": "assets\\rooftop\\roof_2.png", - "smoothed": true, - "userAdded": true - }, { "alwaysLoaded": false, "file": "assets/Road/sand/tile_06.png", @@ -334,15 +298,6 @@ "smoothed": true, "userAdded": true }, - { - "alwaysLoaded": false, - "file": "assets/weapons/bullet/BulletPlaceholder.png", - "kind": "image", - "metadata": "", - "name": "assets\\weapons\\bullet\\BulletPlaceholder.png", - "smoothed": true, - "userAdded": true - }, { "alwaysLoaded": false, "file": "assets/fence/element (21).png", @@ -460,105 +415,6 @@ "smoothed": true, "userAdded": true }, - { - "alwaysLoaded": false, - "file": "assets/sport/ball/ball_basket2.png", - "kind": "image", - "metadata": "", - "name": "assets\\sport\\ball\\ball_basket2.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/sport/ball/ball_basket4.png", - "kind": "image", - "metadata": "", - "name": "assets\\sport\\ball\\ball_basket4.png", - "smoothed": true, - "userAdded": false - }, - { - "alwaysLoaded": false, - "file": "assets/sport/post/element (77).png", - "kind": "image", - "metadata": "", - "name": "assets\\sport\\post\\element (77).png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/sport/post/element (65).png", - "kind": "image", - "metadata": "", - "name": "assets\\sport\\post\\element (65).png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/sprite_objects/fade_tiled_sprite-1.png", - "kind": "image", - "metadata": "", - "name": "assets\\sprite_objects\\fade_tiled_sprite-1.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/UI/buttons/beige/buttonLong_beige.png", - "kind": "image", - "metadata": "", - "name": "assets\\UI\\buttons\\beige\\buttonLong_beige.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/UI/buttons/beige/buttonLong_beige_pressed.png", - "kind": "image", - "metadata": "", - "name": "assets\\UI\\buttons\\beige\\buttonLong_beige_pressed.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/UI/buttons/beige/buttonSquare_beige.png", - "kind": "image", - "metadata": "", - "name": "assets\\UI\\buttons\\beige\\buttonSquare_beige.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/UI/buttons/beige/buttonSquare_beige_pressed.png", - "kind": "image", - "metadata": "", - "name": "assets\\UI\\buttons\\beige\\buttonSquare_beige_pressed.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/UI/buttons/beige/arrowBeige_right.png", - "kind": "image", - "metadata": "", - "name": "assets\\UI\\buttons\\beige\\arrowBeige_right.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/UI/buttons/beige/arrowBeige_left.png", - "kind": "image", - "metadata": "", - "name": "assets\\UI\\buttons\\beige\\arrowBeige_left.png", - "smoothed": true, - "userAdded": true - }, { "alwaysLoaded": false, "file": "assets/Interior/walls/tile_260.png", @@ -847,15 +703,6 @@ "smoothed": true, "userAdded": true }, - { - "alwaysLoaded": false, - "file": "assets/Interior/furniture/carpet/tile_511.png", - "kind": "image", - "metadata": "", - "name": "assets\\Interior\\furniture\\carpet\\tile_511.png", - "smoothed": true, - "userAdded": true - }, { "alwaysLoaded": false, "file": "assets/Interior/furniture/table/tile_483.png", @@ -1236,15 +1083,6 @@ "smoothed": true, "userAdded": true }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/manBlue_rocketlauncher.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\manBlue_rocketlauncher.png", - "smoothed": true, - "userAdded": true - }, { "alwaysLoaded": false, "file": "assets/character/Player/phone/phone_unlock.png", @@ -1353,24 +1191,6 @@ "smoothed": true, "userAdded": true }, - { - "alwaysLoaded": false, - "file": "assets/rooftop/roof_5.png", - "kind": "image", - "metadata": "", - "name": "assets\\rooftop\\roof_5.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/rooftop/roof_6.png", - "kind": "image", - "metadata": "", - "name": "assets\\rooftop\\roof_6.png", - "smoothed": true, - "userAdded": true - }, { "alwaysLoaded": false, "file": "assets/deco/deco_1.png", @@ -1380,24 +1200,6 @@ "smoothed": true, "userAdded": false }, - { - "alwaysLoaded": false, - "file": "assets/rooftop/roof_10.png", - "kind": "image", - "metadata": "", - "name": "assets\\rooftop\\roof_10.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/rooftop/roof_7.png", - "kind": "image", - "metadata": "", - "name": "assets\\rooftop\\roof_7.png", - "smoothed": true, - "userAdded": true - }, { "alwaysLoaded": false, "file": "assets/multipurpose/sandbagBeige.png", @@ -1614,15 +1416,6 @@ "smoothed": true, "userAdded": true }, - { - "alwaysLoaded": false, - "file": "assets/water/tile_73.png", - "kind": "image", - "metadata": "", - "name": "assets\\water\\tile_73.png", - "smoothed": true, - "userAdded": false - }, { "alwaysLoaded": false, "file": "assets/Road/road/tile_37-1.png", @@ -1938,42 +1731,6 @@ "smoothed": true, "userAdded": true }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/phone_battery_0.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\phone_battery_0.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/phone_battery_1.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\phone_battery_1.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/phone_battery_2.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\phone_battery_2.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/phone_battery_3.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\phone_battery_3.png", - "smoothed": true, - "userAdded": true - }, { "alwaysLoaded": false, "file": "assets/sprite_objects/mouse_point-1.png", @@ -2010,15 +1767,6 @@ "smoothed": true, "userAdded": true }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/knife_a2.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\knife_a2.png", - "smoothed": true, - "userAdded": true - }, { "alwaysLoaded": false, "file": "assets/weapons/gun/Rocket_launcher_item - rocket out.png", @@ -2028,13 +1776,6 @@ "smoothed": true, "userAdded": true }, - { - "file": "Kenney Rocket Square.ttf", - "kind": "font", - "metadata": "", - "name": "Kenney Rocket Square.ttf", - "userAdded": false - }, { "alwaysLoaded": false, "file": "assets/Interior/floor/tile_100.png", @@ -2044,15 +1785,6 @@ "smoothed": true, "userAdded": true }, - { - "alwaysLoaded": false, - "file": "assets/Interior/floor/tile_69.png", - "kind": "image", - "metadata": "", - "name": "assets/Interior/floor/tile_69.png", - "smoothed": true, - "userAdded": true - }, { "alwaysLoaded": false, "file": "assets/Interior/floor/tile_46.png", @@ -2080,495 +1812,144 @@ }, { "alwaysLoaded": false, - "file": "assets/rooftop/roof_9.png", + "file": "assets/character/Player/phone/thumb_1.png", "kind": "image", "metadata": "", - "name": "assets\\rooftop\\roof_9.png", + "name": "assets\\character\\Player\\phone\\thumb_1.png", "smoothed": true, "userAdded": true }, { "alwaysLoaded": false, - "file": "assets/rooftop/roof_11.png", + "file": "assets/character/Player/phone/pointer.png", "kind": "image", "metadata": "", - "name": "assets\\rooftop\\roof_11.png", + "name": "assets\\character\\Player\\phone\\pointer.png", "smoothed": true, "userAdded": true }, { "alwaysLoaded": false, - "file": "assets/rooftop/roof_12.png", + "file": "assets/character/Player/phone/pointer_3.png", "kind": "image", "metadata": "", - "name": "assets\\rooftop\\roof_12.png", + "name": "assets\\character\\Player\\phone\\pointer_3.png", "smoothed": true, "userAdded": true }, { "alwaysLoaded": false, - "file": "assets/rooftop/roof_13.png", + "file": "assets/character/Player/phone/pointer_4.png", "kind": "image", "metadata": "", - "name": "assets\\rooftop\\roof_13.png", + "name": "assets\\character\\Player\\phone\\pointer_4.png", "smoothed": true, "userAdded": true }, { "alwaysLoaded": false, - "file": "assets/rooftop/roof_14.png", + "file": "assets/character/Player/phone/pointer_5.png", "kind": "image", "metadata": "", - "name": "assets\\rooftop\\roof_14.png", + "name": "assets\\character\\Player\\phone\\pointer_5.png", "smoothed": true, "userAdded": true }, { "alwaysLoaded": false, - "file": "assets/rooftop/roof_14_horizontal.png", + "file": "assets/character/Player/phone/pointer_6.png", "kind": "image", "metadata": "", - "name": "assets\\rooftop\\roof_14_horizontal.png", + "name": "assets\\character\\Player\\phone\\pointer_6.png", "smoothed": true, - "userAdded": false + "userAdded": true }, { "alwaysLoaded": false, - "file": "assets/rooftop/roof_16.png", + "file": "assets/character/Player/phone/pointer_7.png", "kind": "image", "metadata": "", - "name": "assets\\rooftop\\roof_16.png", + "name": "assets\\character\\Player\\phone\\pointer_7.png", "smoothed": true, "userAdded": true }, { "alwaysLoaded": false, - "file": "assets/rooftop/roof_17.png", + "file": "assets/weapons/bullet/rocket_launcher_bullet.png", "kind": "image", "metadata": "", - "name": "assets\\rooftop\\roof_17.png", + "name": "assets\\weapons\\bullet\\rocket_launcher_bullet.png", "smoothed": true, "userAdded": true }, { "alwaysLoaded": false, - "file": "assets/rooftop/roof_18.png", + "file": "assets/placeholder/tiledGreen.png", "kind": "image", "metadata": "", - "name": "assets\\rooftop\\roof_18.png", + "name": "assets\\placeholder\\tiledGreen.png", "smoothed": true, "userAdded": true }, { "alwaysLoaded": false, - "file": "assets/rooftop/roof_19.png", + "file": "assets/Flat Bar Red Fill Bar.png", "kind": "image", "metadata": "", - "name": "assets\\rooftop\\roof_19.png", - "smoothed": true, - "userAdded": true + "name": "Flat Bar Red Fill Bar.png", + "smoothed": false, + "userAdded": false, + "origin": { + "identifier": "https://asset-resources.gdevelop.io/public-resources/Resource bars/pixel art/212e9679eaae4753beaa5d595d7c80ea66df3235485c6a3963e88b0d936a1798_Flat Bar Red Fill Bar.png", + "name": "Flat Bar Red Fill Bar.png" + } }, { "alwaysLoaded": false, - "file": "assets/rooftop/roof_20.png", + "file": "assets/Flat Bar White Border.png", "kind": "image", "metadata": "", - "name": "assets\\rooftop\\roof_20.png", - "smoothed": true, - "userAdded": false + "name": "Flat Bar White Border.png", + "smoothed": false, + "userAdded": false, + "origin": { + "identifier": "https://asset-resources.gdevelop.io/public-resources/Resource bars/pixel art/c090d31cafed0c8ef7bb4d5af75a7dbf7149bcc03a7d5d63ae997d59100e362e_Flat Bar White Border.png", + "name": "Flat Bar White Border.png" + } }, { "alwaysLoaded": false, - "file": "assets/rooftop/roof_21.png", + "file": "assets/character/test/characters_g499.png", "kind": "image", "metadata": "", - "name": "assets\\rooftop\\roof_21.png", + "name": "assets/character/test/characters_g499.png", "smoothed": true, "userAdded": true }, { "alwaysLoaded": false, - "file": "assets/rooftop/roof_22.png", + "file": "assets/character/test/characters_g574.png", "kind": "image", "metadata": "", - "name": "assets\\rooftop\\roof_22.png", + "name": "assets/character/test/characters_g574.png", "smoothed": true, "userAdded": true }, { "alwaysLoaded": false, - "file": "assets/rooftop/roof_23.png", + "file": "assets/character/test/characters_g571.png", "kind": "image", "metadata": "", - "name": "assets\\rooftop\\roof_23.png", + "name": "assets/character/test/characters_g571.png", "smoothed": true, "userAdded": false }, { "alwaysLoaded": false, - "file": "assets/rooftop/roof_24.png", + "file": "assets/character/test/characters_g527.png", "kind": "image", "metadata": "", - "name": "assets\\rooftop\\roof_24.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/rooftop/roof_25.png", - "kind": "image", - "metadata": "", - "name": "assets\\rooftop\\roof_25.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/phone_app.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\phone_app.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/phone_lock_1.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\phone_lock_1.png", - "smoothed": true, - "userAdded": false - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/phone_lock_2.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\phone_lock_2.png", - "smoothed": true, - "userAdded": false - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/phone_lock_3.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\phone_lock_3.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/phone_lock_4.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\phone_lock_4.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/phone_lock_5.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\phone_lock_5.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/phone_lock_6.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\phone_lock_6.png", - "smoothed": true, - "userAdded": false - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/phone_off.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\phone_off.png", - "smoothed": true, - "userAdded": false - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/thumb.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\thumb.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/thumb_1.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\thumb_1.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/pointer.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\pointer.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/pointer_3.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\pointer_3.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/pointer_4.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\pointer_4.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/pointer_5.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\pointer_5.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/pointer_6.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\pointer_6.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/phone/pointer_7.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\phone\\pointer_7.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/manBlue_walk_1.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\manBlue_walk_1.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/manBlue_walk_2.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\manBlue_walk_2.png", - "smoothed": true, - "userAdded": false - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/knife_a3.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\knife_a3.png", - "smoothed": true, - "userAdded": false - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/knife_a4.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\knife_a4.png", - "smoothed": true, - "userAdded": false - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/knife_a5.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\knife_a5.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/weapons/bullet/rocket_launcher_bullet.png", - "kind": "image", - "metadata": "", - "name": "assets\\weapons\\bullet\\rocket_launcher_bullet.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/Player/manBlue_phone_2.png", - "kind": "image", - "metadata": "", - "name": "assets\\character\\Player\\manBlue_phone_2.png", - "smoothed": true, - "userAdded": false - }, - { - "alwaysLoaded": false, - "file": "assets/placeholder/tiledGreen.png", - "kind": "image", - "metadata": "", - "name": "assets\\placeholder\\tiledGreen.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/Flat Bar Red Fill Bar.png", - "kind": "image", - "metadata": "", - "name": "Flat Bar Red Fill Bar.png", - "smoothed": false, - "userAdded": false, - "origin": { - "identifier": "https://asset-resources.gdevelop.io/public-resources/Resource bars/pixel art/212e9679eaae4753beaa5d595d7c80ea66df3235485c6a3963e88b0d936a1798_Flat Bar Red Fill Bar.png", - "name": "Flat Bar Red Fill Bar.png" - } - }, - { - "alwaysLoaded": false, - "file": "assets/Flat Bar White Border.png", - "kind": "image", - "metadata": "", - "name": "Flat Bar White Border.png", - "smoothed": false, - "userAdded": false, - "origin": { - "identifier": "https://asset-resources.gdevelop.io/public-resources/Resource bars/pixel art/c090d31cafed0c8ef7bb4d5af75a7dbf7149bcc03a7d5d63ae997d59100e362e_Flat Bar White Border.png", - "name": "Flat Bar White Border.png" - } - }, - { - "alwaysLoaded": false, - "file": "../../../../Downloads/kenney_sports-pack/PNG/Blue/characterBlue (1).png", - "kind": "image", - "metadata": "", - "name": "../../../../Downloads/kenney_sports-pack/PNG/Blue/characterBlue (1).png", - "smoothed": true, - "userAdded": false - }, - { - "alwaysLoaded": false, - "file": "assets/character/test/characterBlue (1).png", - "kind": "image", - "metadata": "", - "name": "assets/character/test/characterBlue (1).png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/test/characterBlue (13).png", - "kind": "image", - "metadata": "", - "name": "assets/character/test/characterBlue (13).png", - "smoothed": true, - "userAdded": false - }, - { - "alwaysLoaded": false, - "file": "assets/character/test/characterBlue (11).png", - "kind": "image", - "metadata": "", - "name": "assets/character/test/characterBlue (11).png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/test/characters_g499.png", - "kind": "image", - "metadata": "", - "name": "assets/character/test/characters_g499.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/test/characters_g572.png", - "kind": "image", - "metadata": "", - "name": "assets/character/test/characters_g572.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/test/characters_g656.png", - "kind": "image", - "metadata": "", - "name": "assets/character/test/characters_g656.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/test/characters_g656_copy_2.png", - "kind": "image", - "metadata": "", - "name": "assets/character/test/characters_g656_copy_2.png", - "smoothed": true, - "userAdded": false - }, - { - "alwaysLoaded": false, - "file": "assets/character/test/characters_g574.png", - "kind": "image", - "metadata": "", - "name": "assets/character/test/characters_g574.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/test/characters_g571.png", - "kind": "image", - "metadata": "", - "name": "assets/character/test/characters_g571.png", - "smoothed": true, - "userAdded": false - }, - { - "alwaysLoaded": false, - "file": "assets/character/test/characters_g493.png", - "kind": "image", - "metadata": "", - "name": "assets/character/test/characters_g493.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/test/characters_g527.png", - "kind": "image", - "metadata": "", - "name": "assets/character/test/characters_g527.png", + "name": "assets/character/test/characters_g527.png", "smoothed": true, "userAdded": true }, @@ -2599,24 +1980,6 @@ "smoothed": true, "userAdded": true }, - { - "alwaysLoaded": false, - "file": "assets/character/test/characters_g566.png", - "kind": "image", - "metadata": "", - "name": "assets/character/test/characters_g566.png", - "smoothed": true, - "userAdded": true - }, - { - "alwaysLoaded": false, - "file": "assets/character/test/characters_g577.png", - "kind": "image", - "metadata": "", - "name": "assets/character/test/characters_g577.png", - "smoothed": true, - "userAdded": true - }, { "alwaysLoaded": false, "file": "assets/character/test/characters_g575.png", @@ -2771,57 +2134,138 @@ }, { "alwaysLoaded": false, - "file": "assets/sport/post/elements_g354.png", + "file": "assets/sport/post/elements_g361_copy_1.png", "kind": "image", "metadata": "", - "name": "assets/sport/post/elements_g354.png", + "name": "assets/sport/post/elements_g361_copy_1.png", "smoothed": true, "userAdded": false }, { "alwaysLoaded": false, - "file": "assets/sport/post/elements_g348.png", + "file": "assets/sport/ball/charactersEquipment_g483.png", "kind": "image", "metadata": "", - "name": "assets/sport/post/elements_g348.png", + "name": "assets/sport/ball/charactersEquipment_g483.png", "smoothed": true, "userAdded": false }, { "alwaysLoaded": false, - "file": "assets/sport/post/elements_g361.png", + "file": "assets/sport/ball/charactersEquipment_g553.png", "kind": "image", "metadata": "", - "name": "assets/sport/post/elements_g361.png", + "name": "assets/sport/ball/charactersEquipment_g553.png", "smoothed": true, "userAdded": false }, { "alwaysLoaded": false, - "file": "assets/sport/post/elements_g361_copy_1.png", + "file": "assets/phone/apps/1.png", "kind": "image", "metadata": "", - "name": "assets/sport/post/elements_g361_copy_1.png", + "name": "assets/phone/apps/1.png", + "smoothed": true, + "userAdded": true + }, + { + "alwaysLoaded": false, + "file": "assets/phone/apps/2.png", + "kind": "image", + "metadata": "", + "name": "assets/phone/apps/2.png", + "smoothed": true, + "userAdded": true + }, + { + "alwaysLoaded": false, + "file": "assets/phone/apps/3.png", + "kind": "image", + "metadata": "", + "name": "assets/phone/apps/3.png", "smoothed": true, "userAdded": false }, { "alwaysLoaded": false, - "file": "assets/sport/ball/charactersEquipment_g483.png", + "file": "assets/phone/frame/1.png", "kind": "image", "metadata": "", - "name": "assets/sport/ball/charactersEquipment_g483.png", + "name": "assets/phone/frame/1.png", "smoothed": true, "userAdded": false }, { "alwaysLoaded": false, - "file": "assets/sport/ball/charactersEquipment_g553.png", + "file": "assets/phone/frame/2.png", "kind": "image", "metadata": "", - "name": "assets/sport/ball/charactersEquipment_g553.png", + "name": "assets/phone/frame/2.png", + "smoothed": true, + "userAdded": true + }, + { + "alwaysLoaded": false, + "file": "assets/phone/battery/1_g16.png", + "kind": "image", + "metadata": "", + "name": "assets/phone/battery/1_g16.png", + "smoothed": true, + "userAdded": true + }, + { + "alwaysLoaded": false, + "file": "assets/phone/battery/1_g15.png", + "kind": "image", + "metadata": "", + "name": "assets/phone/battery/1_g15.png", + "smoothed": true, + "userAdded": true + }, + { + "alwaysLoaded": false, + "file": "assets/phone/battery/1_g14.png", + "kind": "image", + "metadata": "", + "name": "assets/phone/battery/1_g14.png", + "smoothed": true, + "userAdded": true + }, + { + "alwaysLoaded": false, + "file": "assets/phone/wallpaper/1.png", + "kind": "image", + "metadata": "", + "name": "assets/phone/wallpaper/1.png", + "smoothed": true, + "userAdded": true + }, + { + "alwaysLoaded": false, + "file": "assets/phone/wallpaper/2.png", + "kind": "image", + "metadata": "", + "name": "assets/phone/wallpaper/2.png", "smoothed": true, "userAdded": false + }, + { + "alwaysLoaded": false, + "file": "assets/phone/wallpaper/3.png", + "kind": "image", + "metadata": "", + "name": "assets/phone/wallpaper/3.png", + "smoothed": true, + "userAdded": true + }, + { + "alwaysLoaded": false, + "file": "assets/phone/wallpaper/4.png", + "kind": "image", + "metadata": "", + "name": "assets/phone/wallpaper/4.png", + "smoothed": true, + "userAdded": true } ], "resourceFolders": [] @@ -3023,6 +2467,7 @@ "type": "structure", "children": [ { + "folded": true, "name": "Player", "type": "structure", "children": [ @@ -3077,6 +2522,12 @@ } ] }, + { + "folded": true, + "name": "intro", + "type": "boolean", + "value": true + }, { "folded": true, "name": "preloadScene", @@ -3164,6 +2615,10 @@ } ], "eventsFunctionsExtensions": [ + { + "__REFERENCE_TO_SPLIT_OBJECT": true, + "referenceTo": "/eventsFunctionsExtensions/spritemasking" + }, { "__REFERENCE_TO_SPLIT_OBJECT": true, "referenceTo": "/eventsFunctionsExtensions/toggleswitch" @@ -3176,6 +2631,10 @@ "__REFERENCE_TO_SPLIT_OBJECT": true, "referenceTo": "/eventsFunctionsExtensions/panelspriteslider" }, + { + "__REFERENCE_TO_SPLIT_OBJECT": true, + "referenceTo": "/eventsFunctionsExtensions/ellipsemovement" + }, { "__REFERENCE_TO_SPLIT_OBJECT": true, "referenceTo": "/eventsFunctionsExtensions/sticker" diff --git a/src/layouts/city.json b/src/layouts/city.json index 891ed89c..e5b9e9fa 100644 --- a/src/layouts/city.json +++ b/src/layouts/city.json @@ -18,7 +18,7 @@ "gridColor": 10401023, "gridAlpha": 0.8, "snap": false, - "zoomFactor": 0.8503034095585174, + "zoomFactor": 0.24113360125461827, "windowMask": false }, "objectsGroups": [ @@ -58198,111 +58198,6 @@ "color": "112;112;112" } }, - { - "adaptCollisionMaskAutomatically": false, - "assetStoreId": "", - "name": "Phone", - "type": "Sprite", - "updateIfNotVisible": false, - "variables": [ - { - "folded": true, - "name": "swipe", - "type": "string", - "value": "" - } - ], - "effects": [ - { - "effectType": "Outline", - "name": "Effect", - "doubleParameters": { - "padding": 0, - "thickness": 2 - }, - "stringParameters": { - "color": "0;0;0" - }, - "booleanParameters": {} - } - ], - "behaviors": [ - { - "name": "Anchor", - "type": "AnchorBehavior::AnchorBehavior", - "bottomEdgeAnchor": 0, - "leftEdgeAnchor": 0, - "relativeToOriginalWindowSize": true, - "rightEdgeAnchor": 2, - "topEdgeAnchor": 0, - "useLegacyBottomAndRightAnchors": false - }, - { - "name": "Tween", - "type": "Tween::TweenBehavior" - } - ], - "animations": [ - { - "name": "", - "useMultipleDirections": false, - "directions": [ - { - "looping": false, - "timeBetweenFrames": 1, - "sprites": [ - { - "hasCustomCollisionMask": false, - "image": "assets\\character\\Player\\phone\\phone_off.png", - "points": [], - "originPoint": { - "name": "origine", - "x": 0, - "y": 0 - }, - "centerPoint": { - "automatic": true, - "name": "centre", - "x": 0, - "y": 0 - }, - "customCollisionMask": [] - } - ] - } - ] - }, - { - "name": "", - "useMultipleDirections": false, - "directions": [ - { - "looping": false, - "timeBetweenFrames": 0.08, - "sprites": [ - { - "hasCustomCollisionMask": false, - "image": "assets\\character\\Player\\phone\\phone_app.png", - "points": [], - "originPoint": { - "name": "origine", - "x": 0, - "y": 0 - }, - "centerPoint": { - "automatic": true, - "name": "centre", - "x": 0, - "y": 0 - }, - "customCollisionMask": [] - } - ] - } - ] - } - ] - }, { "assetStoreId": "", "bold": false, @@ -59219,7 +59114,7 @@ "sprites": [ { "hasCustomCollisionMask": false, - "image": "assets\\character\\Player\\phone\\phone_battery_0.png", + "image": "assets/phone/battery/1_g14.png", "points": [], "originPoint": { "name": "origine", @@ -59248,7 +59143,7 @@ "sprites": [ { "hasCustomCollisionMask": false, - "image": "assets\\character\\Player\\phone\\phone_battery_1.png", + "image": "assets/phone/battery/1_g15.png", "points": [], "originPoint": { "name": "origine", @@ -59277,36 +59172,7 @@ "sprites": [ { "hasCustomCollisionMask": false, - "image": "assets\\character\\Player\\phone\\phone_battery_2.png", - "points": [], - "originPoint": { - "name": "origine", - "x": 0, - "y": 0 - }, - "centerPoint": { - "automatic": true, - "name": "centre", - "x": 0, - "y": 0 - }, - "customCollisionMask": [] - } - ] - } - ] - }, - { - "name": "", - "useMultipleDirections": false, - "directions": [ - { - "looping": false, - "timeBetweenFrames": 0.08, - "sprites": [ - { - "hasCustomCollisionMask": false, - "image": "assets\\character\\Player\\phone\\phone_battery_3.png", + "image": "assets/phone/battery/1_g16.png", "points": [], "originPoint": { "name": "origine", @@ -59329,7 +59195,7 @@ }, { "assetStoreId": "", - "bold": true, + "bold": false, "italic": false, "name": "phone_time", "smoothed": true, @@ -59362,14 +59228,14 @@ "string": "00:00", "font": "", "textAlignment": "", - "characterSize": 18, + "characterSize": 15, "color": { "b": 255, "g": 255, "r": 255 }, "content": { - "bold": true, + "bold": false, "isOutlineEnabled": false, "isShadowEnabled": false, "italic": false, @@ -59385,7 +59251,7 @@ "text": "00:00", "font": "", "textAlignment": "", - "characterSize": 18, + "characterSize": 15, "color": "255;255;255" } }, @@ -61244,6 +61110,531 @@ "characterSize": 20, "color": "0;0;0" } + }, + { + "adaptCollisionMaskAutomatically": true, + "assetStoreId": "", + "name": "phoneFrame", + "type": "Sprite", + "updateIfNotVisible": false, + "variables": [], + "effects": [ + { + "effectType": "Outline", + "name": "Effect", + "doubleParameters": { + "padding": 0, + "thickness": 1 + }, + "stringParameters": { + "color": "29;29;27" + }, + "booleanParameters": {} + } + ], + "behaviors": [ + { + "name": "Anchor", + "type": "AnchorBehavior::AnchorBehavior", + "bottomEdgeAnchor": 0, + "leftEdgeAnchor": 0, + "relativeToOriginalWindowSize": true, + "rightEdgeAnchor": 2, + "topEdgeAnchor": 0, + "useLegacyBottomAndRightAnchors": false + }, + { + "name": "Tween", + "type": "Tween::TweenBehavior" + } + ], + "animations": [ + { + "name": "", + "useMultipleDirections": false, + "directions": [ + { + "looping": false, + "timeBetweenFrames": 0.08, + "sprites": [ + { + "hasCustomCollisionMask": true, + "image": "assets/phone/frame/1.png", + "points": [ + { + "name": "1", + "x": 50, + "y": 370.5 + }, + { + "name": "2", + "x": 115, + "y": 370.5 + }, + { + "name": "3", + "x": 180, + "y": 370.5 + } + ], + "originPoint": { + "name": "origine", + "x": 0, + "y": 0 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [ + [ + { + "x": 0, + "y": 0 + }, + { + "x": 224, + "y": 0 + }, + { + "x": 224, + "y": 418 + }, + { + "x": 0, + "y": 418 + } + ] + ] + } + ] + } + ] + } + ] + }, + { + "adaptCollisionMaskAutomatically": true, + "assetStoreId": "", + "name": "phoneMask", + "type": "Sprite", + "updateIfNotVisible": false, + "variables": [], + "effects": [ + { + "effectType": "ColorReplace", + "name": "Effect", + "doubleParameters": { + "epsilon": 0.4 + }, + "stringParameters": { + "newColor": "0;0;0", + "originalColor": "255;255;255" + }, + "booleanParameters": {} + } + ], + "behaviors": [], + "animations": [ + { + "name": "", + "useMultipleDirections": false, + "directions": [ + { + "looping": false, + "timeBetweenFrames": 0.08, + "sprites": [ + { + "hasCustomCollisionMask": true, + "image": "assets/phone/frame/2.png", + "points": [], + "originPoint": { + "name": "origine", + "x": 0, + "y": 0 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [ + [ + { + "x": 0, + "y": 0 + }, + { + "x": 215, + "y": 0 + }, + { + "x": 215, + "y": 417 + }, + { + "x": 0, + "y": 417 + } + ] + ] + } + ] + } + ] + } + ] + }, + { + "adaptCollisionMaskAutomatically": true, + "assetStoreId": "", + "name": "phoneIcons", + "type": "Sprite", + "updateIfNotVisible": false, + "variables": [ + { + "folded": true, + "name": "id", + "type": "number", + "value": 0 + } + ], + "effects": [], + "behaviors": [], + "animations": [ + { + "name": "phone", + "useMultipleDirections": false, + "directions": [ + { + "looping": false, + "timeBetweenFrames": 0.08, + "sprites": [ + { + "hasCustomCollisionMask": true, + "image": "assets/phone/apps/1.png", + "points": [], + "originPoint": { + "name": "origine", + "x": 28, + "y": 28 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [ + [ + { + "x": 0, + "y": 0 + }, + { + "x": 56, + "y": 0 + }, + { + "x": 56, + "y": 56 + }, + { + "x": 0, + "y": 56 + } + ] + ] + } + ] + } + ] + }, + { + "name": "images", + "useMultipleDirections": false, + "directions": [ + { + "looping": false, + "timeBetweenFrames": 0.08, + "sprites": [ + { + "hasCustomCollisionMask": true, + "image": "assets/phone/apps/2.png", + "points": [], + "originPoint": { + "name": "origine", + "x": 28, + "y": 28 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [ + [ + { + "x": 0, + "y": 0 + }, + { + "x": 56, + "y": 0 + }, + { + "x": 56, + "y": 56 + }, + { + "x": 0, + "y": 56 + } + ] + ] + } + ] + } + ] + }, + { + "name": "camera", + "useMultipleDirections": false, + "directions": [ + { + "looping": false, + "timeBetweenFrames": 0.08, + "sprites": [ + { + "hasCustomCollisionMask": true, + "image": "assets/phone/apps/3.png", + "points": [], + "originPoint": { + "name": "origine", + "x": 28, + "y": 28 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [ + [ + { + "x": 0, + "y": 0 + }, + { + "x": 56, + "y": 0 + }, + { + "x": 56, + "y": 56 + }, + { + "x": 0, + "y": 56 + } + ] + ] + } + ] + } + ] + } + ] + }, + { + "adaptCollisionMaskAutomatically": true, + "assetStoreId": "", + "name": "phoneWallpaper", + "type": "Sprite", + "updateIfNotVisible": false, + "variables": [], + "effects": [], + "behaviors": [ + { + "name": "EllipseMovement", + "type": "EllipseMovement::EllipseMovement", + "RadiusX": 100, + "RadiusY": 0, + "LoopDuration": 20, + "InitialTurningLeft": false, + "InitialDirectionAngle": 0, + "ShouldRotate": false, + "RotationOffset": 0, + "CenterX": 0, + "CenterY": 0, + "MovementAngle": 0, + "OldX": 2.0247e-320, + "OldY": 2.0247e-320 + } + ], + "animations": [ + { + "name": "", + "useMultipleDirections": false, + "directions": [ + { + "looping": false, + "timeBetweenFrames": 0.08, + "sprites": [ + { + "hasCustomCollisionMask": true, + "image": "assets/phone/wallpaper/1.png", + "points": [], + "originPoint": { + "name": "origine", + "x": 0, + "y": 0 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [ + [ + { + "x": 0, + "y": 1 + }, + { + "x": 1024, + "y": 1 + }, + { + "x": 1024, + "y": 1025 + }, + { + "x": 0, + "y": 1025 + } + ] + ] + }, + { + "hasCustomCollisionMask": true, + "image": "assets/phone/wallpaper/2.png", + "points": [], + "originPoint": { + "name": "origine", + "x": 0, + "y": 0 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [ + [ + { + "x": 0, + "y": 1 + }, + { + "x": 1024, + "y": 1 + }, + { + "x": 1024, + "y": 1025 + }, + { + "x": 0, + "y": 1025 + } + ] + ] + }, + { + "hasCustomCollisionMask": true, + "image": "assets/phone/wallpaper/3.png", + "points": [], + "originPoint": { + "name": "origine", + "x": 0, + "y": 0 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [ + [ + { + "x": 0, + "y": 1 + }, + { + "x": 1024, + "y": 1 + }, + { + "x": 1024, + "y": 1025 + }, + { + "x": 0, + "y": 1025 + } + ] + ] + }, + { + "hasCustomCollisionMask": true, + "image": "assets/phone/wallpaper/4.png", + "points": [], + "originPoint": { + "name": "origine", + "x": 0, + "y": 0 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [ + [ + { + "x": 0, + "y": 1 + }, + { + "x": 1024, + "y": 1 + }, + { + "x": 1024, + "y": 1025 + }, + { + "x": 0, + "y": 1025 + } + ] + ] + } + ] + } + ] + } + ] } ], "objectsFolderStructure": { @@ -61270,7 +61661,16 @@ "objectName": "Thumb" }, { - "objectName": "Phone" + "objectName": "phoneIcons" + }, + { + "objectName": "phoneFrame" + }, + { + "objectName": "phoneMask" + }, + { + "objectName": "phoneWallpaper" }, { "objectName": "phone_battery" @@ -61630,6 +62030,7 @@ "colorG": 176, "colorR": 74, "creationTime": 0, + "folded": true, "name": "ZOrders", "source": "", "type": "BuiltinCommonInstructions::Group", @@ -61768,6 +62169,199 @@ } ], "parameters": [] + }, + { + "colorB": 228, + "colorG": 176, + "colorR": 74, + "creationTime": 0, + "name": "IntroZoom", + "source": "", + "type": "BuiltinCommonInstructions::Group", + "events": [ + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "value": "DepartScene" + }, + "parameters": [ + "" + ] + } + ], + "actions": [ + { + "type": { + "value": "ZoomCamera" + }, + "parameters": [ + "", + "0.35", + "", + "" + ] + }, + { + "type": { + "value": "SetLayerEffectParameter" + }, + "parameters": [ + "", + "", + "\"Vignetting\"", + "\"sepia\"", + "0.3" + ] + }, + { + "type": { + "value": "Tween::TweenCameraZoom2" + }, + "parameters": [ + "", + "\"introZoom\"", + "0.35", + "", + "\"elastic\"", + "1" + ] + }, + { + "type": { + "value": "Wait" + }, + "parameters": [ + "1" + ] + }, + { + "type": { + "value": "SetLayerEffectParameter" + }, + "parameters": [ + "", + "", + "\"Vignetting\"", + "\"sepia\"", + "0.2" + ] + }, + { + "type": { + "value": "Tween::TweenCameraZoom2" + }, + "parameters": [ + "", + "\"introZoom\"", + "0.5", + "", + "\"elastic\"", + "2" + ] + }, + { + "type": { + "value": "Wait" + }, + "parameters": [ + "1" + ] + }, + { + "type": { + "value": "SetLayerEffectParameter" + }, + "parameters": [ + "", + "", + "\"Vignetting\"", + "\"sepia\"", + "0.1" + ] + }, + { + "type": { + "value": "Tween::TweenCameraZoom2" + }, + "parameters": [ + "", + "\"introZoom\"", + "0.75", + "", + "\"elastic\"", + "2" + ] + }, + { + "type": { + "value": "Wait" + }, + "parameters": [ + "1" + ] + }, + { + "type": { + "value": "SetLayerEffectParameter" + }, + "parameters": [ + "", + "", + "\"Vignetting\"", + "\"sepia\"", + "0" + ] + }, + { + "type": { + "value": "Tween::TweenCameraZoom2" + }, + "parameters": [ + "", + "\"introZoom\"", + "1", + "", + "\"elastic\"", + "2" + ] + }, + { + "type": { + "value": "Wait" + }, + "parameters": [ + "1" + ] + }, + { + "type": { + "value": "ToggleGlobalVariableAsBoolean" + }, + "parameters": [ + "Game.intro" + ] + }, + { + "type": { + "value": "ModVarScene" + }, + "parameters": [ + "Game.Camera.Zoom", + "=", + "1" + ] + } + ] + }, + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [] + } + ], + "parameters": [] } ], "layers": [ @@ -61922,6 +62516,10 @@ "name": "Effect", "type": "EffectCapability::EffectBehavior" }, + { + "name": "EllipseMovement", + "type": "EllipseMovement::EllipseMovement" + }, { "name": "FlashTransitionPainter", "type": "FlashTransitionPainter::FlashTransitionPainter" diff --git a/src/layouts/intro.json b/src/layouts/intro.json index 1cc53f3b..b26849da 100644 --- a/src/layouts/intro.json +++ b/src/layouts/intro.json @@ -70,6 +70,16 @@ "\"Loading\"", "yes" ] + }, + { + "type": { + "value": "SetFullScreen" + }, + "parameters": [ + "", + "yes", + "" + ] } ] } diff --git a/src/layouts/loading.json b/src/layouts/loading.json index ec8b09a2..5de68466 100644 --- a/src/layouts/loading.json +++ b/src/layouts/loading.json @@ -18,7 +18,7 @@ "gridColor": 10401023, "gridAlpha": 0.8, "snap": false, - "zoomFactor": 0.4279352201621799, + "zoomFactor": 0.31750495932841655, "windowMask": false }, "objectsGroups": [], @@ -139,7 +139,7 @@ "BarBottomPadding": 6, "BarLeftPadding": 4, "BarRightPadding": 4, - "MaxValue": 1, + "MaxValue": 100, "InitialValue": 0 }, "childrenContent": { @@ -328,7 +328,7 @@ "parameters": [ "RedFlatBarw", "=", - "SceneLoadingProgress(GlobalVariableString(sceneLoad))", + "SceneLoadingProgress(GlobalVariableString(sceneLoad)) * 100", "" ] } @@ -360,6 +360,14 @@ } ], "actions": [ + { + "type": { + "value": "Wait" + }, + "parameters": [ + "1" + ] + }, { "type": { "value": "Scene" diff --git a/svg/phone/phone.svg b/svg/phone/phone.svg new file mode 100644 index 00000000..9aeedc93 --- /dev/null +++ b/svg/phone/phone.svg @@ -0,0 +1,460 @@ + +