From 939e86ac8895dc55d7b62474df5ca3af4f8b7240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=D0=9A=D0=B0=D0=BF?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BA=D0=BE?= Date: Thu, 18 Feb 2021 19:24:23 +0300 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=BE=D0=BD=D1=8F=D1=82=D1=8C=20=D0=B1?= =?UTF-8?q?=D0=B0=D0=BD=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game.json | 337 ++++++++++++++++++++++++++++++++++++++++----- game.json.autosave | 337 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 608 insertions(+), 66 deletions(-) diff --git a/game.json b/game.json index 3562199..addb84f 100644 --- a/game.json +++ b/game.json @@ -572,7 +572,16 @@ "zoomFactor": 1 }, "objectsGroups": [], - "variables": [], + "variables": [ + { + "name": "MO_BP", + "value": "" + }, + { + "name": "MO_Y", + "value": "" + } + ], "instances": [ { "angle": 0, @@ -598,7 +607,7 @@ "locked": false, "name": "nOJI", "persistentUuid": "3cec120a-dfae-46ec-8a05-845983c7004a", - "width": 1981, + "width": 2000, "x": -440, "y": 578, "zOrder": 2, @@ -615,8 +624,8 @@ "name": "KO", "persistentUuid": "c5eaa6c9-a5cd-4683-b811-a516b3d2a9a5", "width": 0, - "x": 11, - "y": 234, + "x": -83, + "y": 397, "zOrder": 3, "numberProperties": [], "stringProperties": [], @@ -791,8 +800,8 @@ "name": "Window", "persistentUuid": "0cbbe175-be2d-451b-a8d0-4dd76fecb4b5", "width": 205, - "x": 1004, - "y": 162, + "x": 1218, + "y": 168, "zOrder": 1, "numberProperties": [], "stringProperties": [], @@ -807,7 +816,7 @@ "name": "Table", "persistentUuid": "34738d65-c9c8-4fe2-8edb-7842f4ecab4d", "width": 617, - "x": 799, + "x": 800, "y": 416, "zOrder": 1, "numberProperties": [], @@ -823,15 +832,15 @@ "name": "Milk", "persistentUuid": "7fe6d256-d6fe-4e91-a2e3-65047705896d", "width": 49, - "x": 1339, - "y": 345, + "x": 939, + "y": 342, "zOrder": 8, "numberProperties": [], "stringProperties": [], "initialVariables": [] }, { - "angle": 0, + "angle": -5, "customSize": true, "height": 8, "layer": "", @@ -839,8 +848,8 @@ "name": "Surface", "persistentUuid": "8ae69b94-a850-4a35-9ad8-0e7bbb503c4f", "width": 195, - "x": 1008, - "y": 369, + "x": 1224, + "y": 372, "zOrder": 9, "numberProperties": [], "stringProperties": [], @@ -855,12 +864,76 @@ "name": "Surface", "persistentUuid": "d6376da4-64bf-4bd4-a3a4-3b7e1a61d42b", "width": 602, - "x": 803, + "x": 805, "y": 420, "zOrder": 9, "numberProperties": [], "stringProperties": [], "initialVariables": [] + }, + { + "angle": 180, + "customSize": true, + "height": 22, + "layer": "", + "locked": false, + "name": "nOJI", + "persistentUuid": "6441ff8e-225e-4ce3-ba5a-8a2956460ee0", + "width": 2000, + "x": -440, + "y": 38, + "zOrder": 10, + "numberProperties": [], + "stringProperties": [], + "initialVariables": [] + }, + { + "angle": 90, + "customSize": true, + "height": 22, + "layer": "", + "locked": false, + "name": "nOJI", + "persistentUuid": "d0c7899a-a552-4e9e-a340-3e12c352f569", + "width": 529, + "x": -715, + "y": 307, + "zOrder": 11, + "numberProperties": [], + "stringProperties": [], + "initialVariables": [] + }, + { + "angle": -90, + "customSize": true, + "height": 22, + "layer": "", + "locked": false, + "name": "nOJI", + "persistentUuid": "6f30b43d-b095-428d-a460-97e2cbad412f", + "width": 529, + "x": 1307, + "y": 309, + "zOrder": 11, + "numberProperties": [], + "stringProperties": [], + "initialVariables": [] + }, + { + "angle": 0, + "customSize": true, + "height": 8, + "layer": "", + "locked": false, + "name": "Surface", + "persistentUuid": "5c87602c-fae7-4abf-8754-e35c056329f2", + "width": 169, + "x": 1233, + "y": 173, + "zOrder": 9, + "numberProperties": [], + "stringProperties": [], + "initialVariables": [] } ], "objects": [ @@ -1485,7 +1558,16 @@ "tags": "", "type": "Sprite", "updateIfNotVisible": false, - "variables": [], + "variables": [ + { + "name": "CT", + "value": "1" + }, + { + "name": "BP", + "value": "0" + } + ], "behaviors": [], "animations": [ { @@ -1521,6 +1603,83 @@ } ], "events": [ + { + "disabled": false, + "folded": false, + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "inverted": false, + "value": "DepartScene" + }, + "parameters": [ + "" + ], + "subInstructions": [] + } + ], + "actions": [ + { + "type": { + "inverted": false, + "value": "Cache" + }, + "parameters": [ + "Surface" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "Cache" + }, + "parameters": [ + "OT" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarObjetTxt" + }, + "parameters": [ + "Milk", + "CT", + "=", + "\"1\"" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "MO_BP", + "=", + "Milk.Angle()" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "MO_Y", + "=", + "Milk.Y()" + ], + "subInstructions": [] + } + ], + "events": [] + }, { "disabled": false, "folded": false, @@ -1715,10 +1874,11 @@ { "type": { "inverted": false, - "value": "DepartScene" + "value": "PlatformBehavior::IsJumping" }, "parameters": [ - "" + "KO", + "PlatformerObject" ], "subInstructions": [] } @@ -1727,20 +1887,48 @@ { "type": { "inverted": false, - "value": "Cache" + "value": "SetAnimationName" }, "parameters": [ - "Surface" + "KO", + "\"Jump\"" + ], + "subInstructions": [] + } + ], + "events": [] + }, + { + "disabled": false, + "folded": false, + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "inverted": false, + "value": "CameraX" + }, + "parameters": [ + "", + "=", + "lerp(CameraX(), KO.X(), 0.1)", + "", + "" ], "subInstructions": [] }, { "type": { "inverted": false, - "value": "Cache" + "value": "CameraY" }, "parameters": [ - "OT" + "", + "=", + "lerp(CameraY(), KO.Y(), 0.1)", + "", + "" ], "subInstructions": [] } @@ -1755,24 +1943,99 @@ { "type": { "inverted": false, - "value": "PlatformBehavior::IsJumping" + "value": "PlatformBehavior::IsFalling" }, "parameters": [ "KO", "PlatformerObject" ], "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "CollisionNP" + }, + "parameters": [ + "KO", + "Milk", + "", + "", + "" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "VarObjetTxt" + }, + "parameters": [ + "Milk", + "CT", + "=", + "\"1\"" + ], + "subInstructions": [] } ], "actions": [ { "type": { "inverted": false, - "value": "SetAnimationName" + "value": "PlatformBehavior::SetCanJump" }, "parameters": [ "KO", - "\"Jump\"" + "PlatformerObject" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "PlatformBehavior::SimulateJumpKey" + }, + "parameters": [ + "KO", + "PlatformerObject" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarObjetTxt" + }, + "parameters": [ + "Milk", + "CT", + "=", + "\"0\"" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "MO_BP", + "=", + "90" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "MO_Y", + "=", + "Milk.Y() + Table.Height() + 15" ], "subInstructions": [] } @@ -1788,28 +2051,36 @@ { "type": { "inverted": false, - "value": "CameraX" + "value": "SetAngle" }, "parameters": [ - "", + "Milk", "=", - "lerp(CameraX(), KO.X(), 0.1)", - "", - "" + "lerp(Milk.Angle(), Variable(MO_BP), 0.2)" ], "subInstructions": [] }, { "type": { "inverted": false, - "value": "CameraY" + "value": "MettreY" }, "parameters": [ - "", + "Milk", "=", - "lerp(CameraY(), KO.Y(), 0.1)", - "", - "" + "lerp(Milk.Y(), Variable(MO_Y), 0.2)" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "TextObject::String" + }, + "parameters": [ + "OT", + "=", + "ToString(Milk.Y())" ], "subInstructions": [] } diff --git a/game.json.autosave b/game.json.autosave index 3562199..addb84f 100644 --- a/game.json.autosave +++ b/game.json.autosave @@ -572,7 +572,16 @@ "zoomFactor": 1 }, "objectsGroups": [], - "variables": [], + "variables": [ + { + "name": "MO_BP", + "value": "" + }, + { + "name": "MO_Y", + "value": "" + } + ], "instances": [ { "angle": 0, @@ -598,7 +607,7 @@ "locked": false, "name": "nOJI", "persistentUuid": "3cec120a-dfae-46ec-8a05-845983c7004a", - "width": 1981, + "width": 2000, "x": -440, "y": 578, "zOrder": 2, @@ -615,8 +624,8 @@ "name": "KO", "persistentUuid": "c5eaa6c9-a5cd-4683-b811-a516b3d2a9a5", "width": 0, - "x": 11, - "y": 234, + "x": -83, + "y": 397, "zOrder": 3, "numberProperties": [], "stringProperties": [], @@ -791,8 +800,8 @@ "name": "Window", "persistentUuid": "0cbbe175-be2d-451b-a8d0-4dd76fecb4b5", "width": 205, - "x": 1004, - "y": 162, + "x": 1218, + "y": 168, "zOrder": 1, "numberProperties": [], "stringProperties": [], @@ -807,7 +816,7 @@ "name": "Table", "persistentUuid": "34738d65-c9c8-4fe2-8edb-7842f4ecab4d", "width": 617, - "x": 799, + "x": 800, "y": 416, "zOrder": 1, "numberProperties": [], @@ -823,15 +832,15 @@ "name": "Milk", "persistentUuid": "7fe6d256-d6fe-4e91-a2e3-65047705896d", "width": 49, - "x": 1339, - "y": 345, + "x": 939, + "y": 342, "zOrder": 8, "numberProperties": [], "stringProperties": [], "initialVariables": [] }, { - "angle": 0, + "angle": -5, "customSize": true, "height": 8, "layer": "", @@ -839,8 +848,8 @@ "name": "Surface", "persistentUuid": "8ae69b94-a850-4a35-9ad8-0e7bbb503c4f", "width": 195, - "x": 1008, - "y": 369, + "x": 1224, + "y": 372, "zOrder": 9, "numberProperties": [], "stringProperties": [], @@ -855,12 +864,76 @@ "name": "Surface", "persistentUuid": "d6376da4-64bf-4bd4-a3a4-3b7e1a61d42b", "width": 602, - "x": 803, + "x": 805, "y": 420, "zOrder": 9, "numberProperties": [], "stringProperties": [], "initialVariables": [] + }, + { + "angle": 180, + "customSize": true, + "height": 22, + "layer": "", + "locked": false, + "name": "nOJI", + "persistentUuid": "6441ff8e-225e-4ce3-ba5a-8a2956460ee0", + "width": 2000, + "x": -440, + "y": 38, + "zOrder": 10, + "numberProperties": [], + "stringProperties": [], + "initialVariables": [] + }, + { + "angle": 90, + "customSize": true, + "height": 22, + "layer": "", + "locked": false, + "name": "nOJI", + "persistentUuid": "d0c7899a-a552-4e9e-a340-3e12c352f569", + "width": 529, + "x": -715, + "y": 307, + "zOrder": 11, + "numberProperties": [], + "stringProperties": [], + "initialVariables": [] + }, + { + "angle": -90, + "customSize": true, + "height": 22, + "layer": "", + "locked": false, + "name": "nOJI", + "persistentUuid": "6f30b43d-b095-428d-a460-97e2cbad412f", + "width": 529, + "x": 1307, + "y": 309, + "zOrder": 11, + "numberProperties": [], + "stringProperties": [], + "initialVariables": [] + }, + { + "angle": 0, + "customSize": true, + "height": 8, + "layer": "", + "locked": false, + "name": "Surface", + "persistentUuid": "5c87602c-fae7-4abf-8754-e35c056329f2", + "width": 169, + "x": 1233, + "y": 173, + "zOrder": 9, + "numberProperties": [], + "stringProperties": [], + "initialVariables": [] } ], "objects": [ @@ -1485,7 +1558,16 @@ "tags": "", "type": "Sprite", "updateIfNotVisible": false, - "variables": [], + "variables": [ + { + "name": "CT", + "value": "1" + }, + { + "name": "BP", + "value": "0" + } + ], "behaviors": [], "animations": [ { @@ -1521,6 +1603,83 @@ } ], "events": [ + { + "disabled": false, + "folded": false, + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "inverted": false, + "value": "DepartScene" + }, + "parameters": [ + "" + ], + "subInstructions": [] + } + ], + "actions": [ + { + "type": { + "inverted": false, + "value": "Cache" + }, + "parameters": [ + "Surface" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "Cache" + }, + "parameters": [ + "OT" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarObjetTxt" + }, + "parameters": [ + "Milk", + "CT", + "=", + "\"1\"" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "MO_BP", + "=", + "Milk.Angle()" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "MO_Y", + "=", + "Milk.Y()" + ], + "subInstructions": [] + } + ], + "events": [] + }, { "disabled": false, "folded": false, @@ -1715,10 +1874,11 @@ { "type": { "inverted": false, - "value": "DepartScene" + "value": "PlatformBehavior::IsJumping" }, "parameters": [ - "" + "KO", + "PlatformerObject" ], "subInstructions": [] } @@ -1727,20 +1887,48 @@ { "type": { "inverted": false, - "value": "Cache" + "value": "SetAnimationName" }, "parameters": [ - "Surface" + "KO", + "\"Jump\"" + ], + "subInstructions": [] + } + ], + "events": [] + }, + { + "disabled": false, + "folded": false, + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "inverted": false, + "value": "CameraX" + }, + "parameters": [ + "", + "=", + "lerp(CameraX(), KO.X(), 0.1)", + "", + "" ], "subInstructions": [] }, { "type": { "inverted": false, - "value": "Cache" + "value": "CameraY" }, "parameters": [ - "OT" + "", + "=", + "lerp(CameraY(), KO.Y(), 0.1)", + "", + "" ], "subInstructions": [] } @@ -1755,24 +1943,99 @@ { "type": { "inverted": false, - "value": "PlatformBehavior::IsJumping" + "value": "PlatformBehavior::IsFalling" }, "parameters": [ "KO", "PlatformerObject" ], "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "CollisionNP" + }, + "parameters": [ + "KO", + "Milk", + "", + "", + "" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "VarObjetTxt" + }, + "parameters": [ + "Milk", + "CT", + "=", + "\"1\"" + ], + "subInstructions": [] } ], "actions": [ { "type": { "inverted": false, - "value": "SetAnimationName" + "value": "PlatformBehavior::SetCanJump" }, "parameters": [ "KO", - "\"Jump\"" + "PlatformerObject" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "PlatformBehavior::SimulateJumpKey" + }, + "parameters": [ + "KO", + "PlatformerObject" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarObjetTxt" + }, + "parameters": [ + "Milk", + "CT", + "=", + "\"0\"" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "MO_BP", + "=", + "90" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "MO_Y", + "=", + "Milk.Y() + Table.Height() + 15" ], "subInstructions": [] } @@ -1788,28 +2051,36 @@ { "type": { "inverted": false, - "value": "CameraX" + "value": "SetAngle" }, "parameters": [ - "", + "Milk", "=", - "lerp(CameraX(), KO.X(), 0.1)", - "", - "" + "lerp(Milk.Angle(), Variable(MO_BP), 0.2)" ], "subInstructions": [] }, { "type": { "inverted": false, - "value": "CameraY" + "value": "MettreY" }, "parameters": [ - "", + "Milk", "=", - "lerp(CameraY(), KO.Y(), 0.1)", - "", - "" + "lerp(Milk.Y(), Variable(MO_Y), 0.2)" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "TextObject::String" + }, + "parameters": [ + "OT", + "=", + "ToString(Milk.Y())" ], "subInstructions": [] }