diff --git a/game.json b/game.json index 09a6060..095105a 100644 --- a/game.json +++ b/game.json @@ -564,6 +564,24 @@ "name": "кот_сидит_недоволен.png", "smoothed": true, "userAdded": true + }, + { + "alwaysLoaded": false, + "file": "кот_лижет_лужу_язык.png", + "kind": "image", + "metadata": "", + "name": "кот_лижет_лужу_язык.png", + "smoothed": true, + "userAdded": true + }, + { + "alwaysLoaded": false, + "file": "кот_лижет_лужу_без_языка.png", + "kind": "image", + "metadata": "", + "name": "кот_лижет_лужу_без_языка.png", + "smoothed": true, + "userAdded": false } ], "resourceFolders": [] @@ -607,6 +625,34 @@ { "name": "MO_Y", "value": "" + }, + { + "name": "KOT_X", + "value": "" + }, + { + "name": "KOT_Y", + "value": "" + }, + { + "name": "CK_AH", + "value": "0.2" + }, + { + "name": "MO_BHu3Y", + "value": "0" + }, + { + "name": "KOT_X_K", + "value": "" + }, + { + "name": "KOT_Y_K", + "value": "" + }, + { + "name": "CK_AH_K", + "value": "0.05" } ], "instances": [ @@ -651,8 +697,8 @@ "name": "KO", "persistentUuid": "c5eaa6c9-a5cd-4683-b811-a516b3d2a9a5", "width": 0, - "x": -83, - "y": 397, + "x": -64, + "y": 355, "zOrder": 4, "numberProperties": [], "stringProperties": [], @@ -1764,6 +1810,52 @@ ] } ] + }, + { + "name": "JIu}|{ET", + "useMultipleDirections": false, + "directions": [ + { + "looping": true, + "timeBetweenFrames": 0.3, + "sprites": [ + { + "hasCustomCollisionMask": false, + "image": "кот_лижет_лужу_язык.png", + "points": [], + "originPoint": { + "name": "origine", + "x": 0, + "y": 140 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [] + }, + { + "hasCustomCollisionMask": false, + "image": "кот_лижет_лужу_без_языка.png", + "points": [], + "originPoint": { + "name": "origine", + "x": 0, + "y": 140 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [] + } + ] + } + ] } ] } @@ -1806,6 +1898,16 @@ ], "subInstructions": [] }, + { + "type": { + "inverted": false, + "value": "Cache" + }, + "parameters": [ + "JIY" + ], + "subInstructions": [] + }, { "type": { "inverted": false, @@ -1846,10 +1948,48 @@ { "type": { "inverted": false, - "value": "Cache" + "value": "ModVarScene" }, "parameters": [ - "JIY" + "KOT_X_K", + "=", + "KOT.X() - 230" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "KOT_Y_K", + "=", + "KOT.Y() + 210" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "KOT_X", + "=", + "KOT.X()" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "KOT_Y", + "=", + "KOT.Y()" ], "subInstructions": [] } @@ -2232,7 +2372,7 @@ "parameters": [ "MO", "=", - "lerp(MO.Angle(), Variable(MO_BP), 0.2)" + "lerp(MO.Angle(), Variable(MO_BP), Variable(CK_AH))" ], "subInstructions": [] }, @@ -2244,7 +2384,7 @@ "parameters": [ "MO", "=", - "lerp(MO.Y(), Variable(MO_Y), 0.2)" + "lerp(MO.Y(), Variable(MO_Y), Variable(CK_AH))" ], "subInstructions": [] }, @@ -2263,6 +2403,42 @@ ], "events": [] }, + { + "disabled": false, + "folded": false, + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "inverted": false, + "value": "CollisionNP" + }, + "parameters": [ + "MO", + "nOJI", + "85", + "", + "" + ], + "subInstructions": [] + } + ], + "actions": [ + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "MO_BHu3Y", + "=", + "1" + ], + "subInstructions": [] + } + ], + "events": [] + }, { "disabled": false, "folded": false, @@ -2274,9 +2450,9 @@ "value": "VarScene" }, "parameters": [ - "MO_BP", + "MO_BHu3Y", "=", - "90" + "1" ], "subInstructions": [] } @@ -2292,6 +2468,30 @@ "" ], "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "KOT_X", + "=", + "Variable(KOT_X_K)" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "KOT_Y", + "=", + "Variable(KOT_Y_K)" + ], + "subInstructions": [] } ], "events": [] @@ -2363,6 +2563,64 @@ } ], "events": [] + }, + { + "disabled": false, + "folded": false, + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "inverted": false, + "value": "MettreXY" + }, + "parameters": [ + "KOT", + "=", + "lerp(KOT.X(), Variable(KOT_X), Variable(CK_AH_K))", + "=", + "lerp(KOT.Y(), Variable(KOT_Y), Variable(CK_AH_K))" + ], + "subInstructions": [] + } + ], + "events": [] + }, + { + "disabled": false, + "folded": false, + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "inverted": false, + "value": "CollisionNP" + }, + "parameters": [ + "KOT", + "nOJI", + "", + "", + "" + ], + "subInstructions": [] + } + ], + "actions": [ + { + "type": { + "inverted": false, + "value": "SetAnimationName" + }, + "parameters": [ + "KOT", + "\"JIu}|{ET\"" + ], + "subInstructions": [] + } + ], + "events": [] } ], "layers": [ diff --git a/game.json.autosave b/game.json.autosave index 09a6060..095105a 100644 --- a/game.json.autosave +++ b/game.json.autosave @@ -564,6 +564,24 @@ "name": "кот_сидит_недоволен.png", "smoothed": true, "userAdded": true + }, + { + "alwaysLoaded": false, + "file": "кот_лижет_лужу_язык.png", + "kind": "image", + "metadata": "", + "name": "кот_лижет_лужу_язык.png", + "smoothed": true, + "userAdded": true + }, + { + "alwaysLoaded": false, + "file": "кот_лижет_лужу_без_языка.png", + "kind": "image", + "metadata": "", + "name": "кот_лижет_лужу_без_языка.png", + "smoothed": true, + "userAdded": false } ], "resourceFolders": [] @@ -607,6 +625,34 @@ { "name": "MO_Y", "value": "" + }, + { + "name": "KOT_X", + "value": "" + }, + { + "name": "KOT_Y", + "value": "" + }, + { + "name": "CK_AH", + "value": "0.2" + }, + { + "name": "MO_BHu3Y", + "value": "0" + }, + { + "name": "KOT_X_K", + "value": "" + }, + { + "name": "KOT_Y_K", + "value": "" + }, + { + "name": "CK_AH_K", + "value": "0.05" } ], "instances": [ @@ -651,8 +697,8 @@ "name": "KO", "persistentUuid": "c5eaa6c9-a5cd-4683-b811-a516b3d2a9a5", "width": 0, - "x": -83, - "y": 397, + "x": -64, + "y": 355, "zOrder": 4, "numberProperties": [], "stringProperties": [], @@ -1764,6 +1810,52 @@ ] } ] + }, + { + "name": "JIu}|{ET", + "useMultipleDirections": false, + "directions": [ + { + "looping": true, + "timeBetweenFrames": 0.3, + "sprites": [ + { + "hasCustomCollisionMask": false, + "image": "кот_лижет_лужу_язык.png", + "points": [], + "originPoint": { + "name": "origine", + "x": 0, + "y": 140 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [] + }, + { + "hasCustomCollisionMask": false, + "image": "кот_лижет_лужу_без_языка.png", + "points": [], + "originPoint": { + "name": "origine", + "x": 0, + "y": 140 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [] + } + ] + } + ] } ] } @@ -1806,6 +1898,16 @@ ], "subInstructions": [] }, + { + "type": { + "inverted": false, + "value": "Cache" + }, + "parameters": [ + "JIY" + ], + "subInstructions": [] + }, { "type": { "inverted": false, @@ -1846,10 +1948,48 @@ { "type": { "inverted": false, - "value": "Cache" + "value": "ModVarScene" }, "parameters": [ - "JIY" + "KOT_X_K", + "=", + "KOT.X() - 230" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "KOT_Y_K", + "=", + "KOT.Y() + 210" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "KOT_X", + "=", + "KOT.X()" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "KOT_Y", + "=", + "KOT.Y()" ], "subInstructions": [] } @@ -2232,7 +2372,7 @@ "parameters": [ "MO", "=", - "lerp(MO.Angle(), Variable(MO_BP), 0.2)" + "lerp(MO.Angle(), Variable(MO_BP), Variable(CK_AH))" ], "subInstructions": [] }, @@ -2244,7 +2384,7 @@ "parameters": [ "MO", "=", - "lerp(MO.Y(), Variable(MO_Y), 0.2)" + "lerp(MO.Y(), Variable(MO_Y), Variable(CK_AH))" ], "subInstructions": [] }, @@ -2263,6 +2403,42 @@ ], "events": [] }, + { + "disabled": false, + "folded": false, + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "inverted": false, + "value": "CollisionNP" + }, + "parameters": [ + "MO", + "nOJI", + "85", + "", + "" + ], + "subInstructions": [] + } + ], + "actions": [ + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "MO_BHu3Y", + "=", + "1" + ], + "subInstructions": [] + } + ], + "events": [] + }, { "disabled": false, "folded": false, @@ -2274,9 +2450,9 @@ "value": "VarScene" }, "parameters": [ - "MO_BP", + "MO_BHu3Y", "=", - "90" + "1" ], "subInstructions": [] } @@ -2292,6 +2468,30 @@ "" ], "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "KOT_X", + "=", + "Variable(KOT_X_K)" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "ModVarScene" + }, + "parameters": [ + "KOT_Y", + "=", + "Variable(KOT_Y_K)" + ], + "subInstructions": [] } ], "events": [] @@ -2363,6 +2563,64 @@ } ], "events": [] + }, + { + "disabled": false, + "folded": false, + "type": "BuiltinCommonInstructions::Standard", + "conditions": [], + "actions": [ + { + "type": { + "inverted": false, + "value": "MettreXY" + }, + "parameters": [ + "KOT", + "=", + "lerp(KOT.X(), Variable(KOT_X), Variable(CK_AH_K))", + "=", + "lerp(KOT.Y(), Variable(KOT_Y), Variable(CK_AH_K))" + ], + "subInstructions": [] + } + ], + "events": [] + }, + { + "disabled": false, + "folded": false, + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "inverted": false, + "value": "CollisionNP" + }, + "parameters": [ + "KOT", + "nOJI", + "", + "", + "" + ], + "subInstructions": [] + } + ], + "actions": [ + { + "type": { + "inverted": false, + "value": "SetAnimationName" + }, + "parameters": [ + "KOT", + "\"JIu}|{ET\"" + ], + "subInstructions": [] + } + ], + "events": [] } ], "layers": [ diff --git a/кот_лижет_лужу.xcf b/кот_лижет_лужу.xcf index 282f339..2e11ee4 100644 Binary files a/кот_лижет_лужу.xcf and b/кот_лижет_лужу.xcf differ diff --git a/кот_лижет_лужу_без_языка.png b/кот_лижет_лужу_без_языка.png index d57bda0..b99e3c9 100644 Binary files a/кот_лижет_лужу_без_языка.png and b/кот_лижет_лужу_без_языка.png differ diff --git a/кот_лижет_лужу_язык.png b/кот_лижет_лужу_язык.png index 8788e29..befa005 100644 Binary files a/кот_лижет_лужу_язык.png and b/кот_лижет_лужу_язык.png differ