diff --git a/game.json b/game.json index addb84f..09a6060 100644 --- a/game.json +++ b/game.json @@ -537,6 +537,33 @@ "name": "банка_молока.png", "smoothed": true, "userAdded": true + }, + { + "alwaysLoaded": false, + "file": "лужа.png", + "kind": "image", + "metadata": "", + "name": "лужа.png", + "smoothed": true, + "userAdded": false + }, + { + "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": true } ], "resourceFolders": [] @@ -626,7 +653,7 @@ "width": 0, "x": -83, "y": 397, - "zOrder": 3, + "zOrder": 4, "numberProperties": [], "stringProperties": [], "initialVariables": [] @@ -829,7 +856,7 @@ "height": 78, "layer": "", "locked": false, - "name": "Milk", + "name": "MO", "persistentUuid": "7fe6d256-d6fe-4e91-a2e3-65047705896d", "width": 49, "x": 939, @@ -934,6 +961,38 @@ "numberProperties": [], "stringProperties": [], "initialVariables": [] + }, + { + "angle": 0, + "customSize": true, + "height": 44, + "layer": "", + "locked": false, + "name": "JIY", + "persistentUuid": "623f094f-80c4-49d0-8ad6-783d64ce9a53", + "width": 103, + "x": 977, + "y": 552, + "zOrder": 3, + "numberProperties": [], + "stringProperties": [], + "initialVariables": [] + }, + { + "angle": 0, + "customSize": true, + "height": 92, + "layer": "", + "locked": false, + "name": "KOT", + "persistentUuid": "0ffa0669-dc67-4d4c-8d80-20eb3edb4670", + "width": 182, + "x": 1266, + "y": 290, + "zOrder": 12, + "numberProperties": [], + "stringProperties": [], + "initialVariables": [] } ], "objects": [ @@ -1554,7 +1613,7 @@ ] }, { - "name": "Milk", + "name": "MO", "tags": "", "type": "Sprite", "updateIfNotVisible": false, @@ -1600,6 +1659,113 @@ ] } ] + }, + { + "name": "JIY", + "tags": "", + "type": "Sprite", + "updateIfNotVisible": false, + "variables": [], + "behaviors": [], + "animations": [ + { + "name": "", + "useMultipleDirections": false, + "directions": [ + { + "looping": false, + "timeBetweenFrames": 0.08, + "sprites": [ + { + "hasCustomCollisionMask": false, + "image": "лужа.png", + "points": [], + "originPoint": { + "name": "origine", + "x": 0, + "y": 0 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [] + } + ] + } + ] + } + ] + }, + { + "name": "KOT", + "tags": "", + "type": "Sprite", + "updateIfNotVisible": false, + "variables": [], + "behaviors": [], + "animations": [ + { + "name": "Cu", + "useMultipleDirections": false, + "directions": [ + { + "looping": false, + "timeBetweenFrames": 0.08, + "sprites": [ + { + "hasCustomCollisionMask": false, + "image": "кот_сидит_нейтраль.png", + "points": [], + "originPoint": { + "name": "origine", + "x": 0, + "y": 0 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [] + } + ] + } + ] + }, + { + "name": "Cu_HE", + "useMultipleDirections": false, + "directions": [ + { + "looping": false, + "timeBetweenFrames": 0.08, + "sprites": [ + { + "hasCustomCollisionMask": false, + "image": "кот_сидит_недоволен.png", + "points": [], + "originPoint": { + "name": "origine", + "x": 0, + "y": 0 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [] + } + ] + } + ] + } + ] } ], "events": [ @@ -1646,7 +1812,7 @@ "value": "ModVarObjetTxt" }, "parameters": [ - "Milk", + "MO", "CT", "=", "\"1\"" @@ -1661,7 +1827,7 @@ "parameters": [ "MO_BP", "=", - "Milk.Angle()" + "MO.Angle()" ], "subInstructions": [] }, @@ -1673,7 +1839,17 @@ "parameters": [ "MO_Y", "=", - "Milk.Y()" + "MO.Y()" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "Cache" + }, + "parameters": [ + "JIY" ], "subInstructions": [] } @@ -1958,7 +2134,7 @@ }, "parameters": [ "KO", - "Milk", + "MO", "", "", "" @@ -1971,7 +2147,7 @@ "value": "VarObjetTxt" }, "parameters": [ - "Milk", + "MO", "CT", "=", "\"1\"" @@ -2008,7 +2184,7 @@ "value": "ModVarObjetTxt" }, "parameters": [ - "Milk", + "MO", "CT", "=", "\"0\"" @@ -2035,7 +2211,7 @@ "parameters": [ "MO_Y", "=", - "Milk.Y() + Table.Height() + 15" + "MO.Y() + Table.Height() + 15" ], "subInstructions": [] } @@ -2054,9 +2230,9 @@ "value": "SetAngle" }, "parameters": [ - "Milk", + "MO", "=", - "lerp(Milk.Angle(), Variable(MO_BP), 0.2)" + "lerp(MO.Angle(), Variable(MO_BP), 0.2)" ], "subInstructions": [] }, @@ -2066,9 +2242,9 @@ "value": "MettreY" }, "parameters": [ - "Milk", + "MO", "=", - "lerp(Milk.Y(), Variable(MO_Y), 0.2)" + "lerp(MO.Y(), Variable(MO_Y), 0.2)" ], "subInstructions": [] }, @@ -2080,7 +2256,108 @@ "parameters": [ "OT", "=", - "ToString(Milk.Y())" + "ToString(MO.Y())" + ], + "subInstructions": [] + } + ], + "events": [] + }, + { + "disabled": false, + "folded": false, + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "inverted": false, + "value": "VarScene" + }, + "parameters": [ + "MO_BP", + "=", + "90" + ], + "subInstructions": [] + } + ], + "actions": [ + { + "type": { + "inverted": false, + "value": "Montre" + }, + "parameters": [ + "JIY", + "" + ], + "subInstructions": [] + } + ], + "events": [] + }, + { + "disabled": false, + "folded": false, + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "inverted": false, + "value": "PlatformBehavior::IsFalling" + }, + "parameters": [ + "KO", + "PlatformerObject" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "CollisionNP" + }, + "parameters": [ + "KO", + "KOT", + "", + "", + "" + ], + "subInstructions": [] + } + ], + "actions": [ + { + "type": { + "inverted": false, + "value": "PlatformBehavior::SetCanJump" + }, + "parameters": [ + "KO", + "PlatformerObject" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "PlatformBehavior::SimulateJumpKey" + }, + "parameters": [ + "KO", + "PlatformerObject" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "SetAnimationName" + }, + "parameters": [ + "KOT", + "\"Cu_HE\"" ], "subInstructions": [] } diff --git a/game.json.autosave b/game.json.autosave index addb84f..09a6060 100644 --- a/game.json.autosave +++ b/game.json.autosave @@ -537,6 +537,33 @@ "name": "банка_молока.png", "smoothed": true, "userAdded": true + }, + { + "alwaysLoaded": false, + "file": "лужа.png", + "kind": "image", + "metadata": "", + "name": "лужа.png", + "smoothed": true, + "userAdded": false + }, + { + "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": true } ], "resourceFolders": [] @@ -626,7 +653,7 @@ "width": 0, "x": -83, "y": 397, - "zOrder": 3, + "zOrder": 4, "numberProperties": [], "stringProperties": [], "initialVariables": [] @@ -829,7 +856,7 @@ "height": 78, "layer": "", "locked": false, - "name": "Milk", + "name": "MO", "persistentUuid": "7fe6d256-d6fe-4e91-a2e3-65047705896d", "width": 49, "x": 939, @@ -934,6 +961,38 @@ "numberProperties": [], "stringProperties": [], "initialVariables": [] + }, + { + "angle": 0, + "customSize": true, + "height": 44, + "layer": "", + "locked": false, + "name": "JIY", + "persistentUuid": "623f094f-80c4-49d0-8ad6-783d64ce9a53", + "width": 103, + "x": 977, + "y": 552, + "zOrder": 3, + "numberProperties": [], + "stringProperties": [], + "initialVariables": [] + }, + { + "angle": 0, + "customSize": true, + "height": 92, + "layer": "", + "locked": false, + "name": "KOT", + "persistentUuid": "0ffa0669-dc67-4d4c-8d80-20eb3edb4670", + "width": 182, + "x": 1266, + "y": 290, + "zOrder": 12, + "numberProperties": [], + "stringProperties": [], + "initialVariables": [] } ], "objects": [ @@ -1554,7 +1613,7 @@ ] }, { - "name": "Milk", + "name": "MO", "tags": "", "type": "Sprite", "updateIfNotVisible": false, @@ -1600,6 +1659,113 @@ ] } ] + }, + { + "name": "JIY", + "tags": "", + "type": "Sprite", + "updateIfNotVisible": false, + "variables": [], + "behaviors": [], + "animations": [ + { + "name": "", + "useMultipleDirections": false, + "directions": [ + { + "looping": false, + "timeBetweenFrames": 0.08, + "sprites": [ + { + "hasCustomCollisionMask": false, + "image": "лужа.png", + "points": [], + "originPoint": { + "name": "origine", + "x": 0, + "y": 0 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [] + } + ] + } + ] + } + ] + }, + { + "name": "KOT", + "tags": "", + "type": "Sprite", + "updateIfNotVisible": false, + "variables": [], + "behaviors": [], + "animations": [ + { + "name": "Cu", + "useMultipleDirections": false, + "directions": [ + { + "looping": false, + "timeBetweenFrames": 0.08, + "sprites": [ + { + "hasCustomCollisionMask": false, + "image": "кот_сидит_нейтраль.png", + "points": [], + "originPoint": { + "name": "origine", + "x": 0, + "y": 0 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [] + } + ] + } + ] + }, + { + "name": "Cu_HE", + "useMultipleDirections": false, + "directions": [ + { + "looping": false, + "timeBetweenFrames": 0.08, + "sprites": [ + { + "hasCustomCollisionMask": false, + "image": "кот_сидит_недоволен.png", + "points": [], + "originPoint": { + "name": "origine", + "x": 0, + "y": 0 + }, + "centerPoint": { + "automatic": true, + "name": "centre", + "x": 0, + "y": 0 + }, + "customCollisionMask": [] + } + ] + } + ] + } + ] } ], "events": [ @@ -1646,7 +1812,7 @@ "value": "ModVarObjetTxt" }, "parameters": [ - "Milk", + "MO", "CT", "=", "\"1\"" @@ -1661,7 +1827,7 @@ "parameters": [ "MO_BP", "=", - "Milk.Angle()" + "MO.Angle()" ], "subInstructions": [] }, @@ -1673,7 +1839,17 @@ "parameters": [ "MO_Y", "=", - "Milk.Y()" + "MO.Y()" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "Cache" + }, + "parameters": [ + "JIY" ], "subInstructions": [] } @@ -1958,7 +2134,7 @@ }, "parameters": [ "KO", - "Milk", + "MO", "", "", "" @@ -1971,7 +2147,7 @@ "value": "VarObjetTxt" }, "parameters": [ - "Milk", + "MO", "CT", "=", "\"1\"" @@ -2008,7 +2184,7 @@ "value": "ModVarObjetTxt" }, "parameters": [ - "Milk", + "MO", "CT", "=", "\"0\"" @@ -2035,7 +2211,7 @@ "parameters": [ "MO_Y", "=", - "Milk.Y() + Table.Height() + 15" + "MO.Y() + Table.Height() + 15" ], "subInstructions": [] } @@ -2054,9 +2230,9 @@ "value": "SetAngle" }, "parameters": [ - "Milk", + "MO", "=", - "lerp(Milk.Angle(), Variable(MO_BP), 0.2)" + "lerp(MO.Angle(), Variable(MO_BP), 0.2)" ], "subInstructions": [] }, @@ -2066,9 +2242,9 @@ "value": "MettreY" }, "parameters": [ - "Milk", + "MO", "=", - "lerp(Milk.Y(), Variable(MO_Y), 0.2)" + "lerp(MO.Y(), Variable(MO_Y), 0.2)" ], "subInstructions": [] }, @@ -2080,7 +2256,108 @@ "parameters": [ "OT", "=", - "ToString(Milk.Y())" + "ToString(MO.Y())" + ], + "subInstructions": [] + } + ], + "events": [] + }, + { + "disabled": false, + "folded": false, + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "inverted": false, + "value": "VarScene" + }, + "parameters": [ + "MO_BP", + "=", + "90" + ], + "subInstructions": [] + } + ], + "actions": [ + { + "type": { + "inverted": false, + "value": "Montre" + }, + "parameters": [ + "JIY", + "" + ], + "subInstructions": [] + } + ], + "events": [] + }, + { + "disabled": false, + "folded": false, + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "inverted": false, + "value": "PlatformBehavior::IsFalling" + }, + "parameters": [ + "KO", + "PlatformerObject" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "CollisionNP" + }, + "parameters": [ + "KO", + "KOT", + "", + "", + "" + ], + "subInstructions": [] + } + ], + "actions": [ + { + "type": { + "inverted": false, + "value": "PlatformBehavior::SetCanJump" + }, + "parameters": [ + "KO", + "PlatformerObject" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "PlatformBehavior::SimulateJumpKey" + }, + "parameters": [ + "KO", + "PlatformerObject" + ], + "subInstructions": [] + }, + { + "type": { + "inverted": false, + "value": "SetAnimationName" + }, + "parameters": [ + "KOT", + "\"Cu_HE\"" ], "subInstructions": [] } diff --git a/кот_лижет_лужу.xcf b/кот_лижет_лужу.xcf new file mode 100644 index 0000000..282f339 Binary files /dev/null and b/кот_лижет_лужу.xcf differ diff --git a/кот_лижет_лужу_без_языка.png b/кот_лижет_лужу_без_языка.png new file mode 100644 index 0000000..d57bda0 Binary files /dev/null and b/кот_лижет_лужу_без_языка.png differ diff --git a/кот_лижет_лужу_язык.png b/кот_лижет_лужу_язык.png new file mode 100644 index 0000000..8788e29 Binary files /dev/null and b/кот_лижет_лужу_язык.png differ diff --git a/кот_сидит.xcf b/кот_сидит.xcf new file mode 100644 index 0000000..20e3e4b Binary files /dev/null and b/кот_сидит.xcf differ diff --git a/кот_сидит_недоволен.png b/кот_сидит_недоволен.png new file mode 100644 index 0000000..a9620e6 Binary files /dev/null and b/кот_сидит_недоволен.png differ diff --git a/кот_сидит_нейтраль.png b/кот_сидит_нейтраль.png new file mode 100644 index 0000000..6e71977 Binary files /dev/null and b/кот_сидит_нейтраль.png differ diff --git a/лужа.png b/лужа.png new file mode 100644 index 0000000..45da705 Binary files /dev/null and b/лужа.png differ diff --git a/лужа.xcf b/лужа.xcf new file mode 100644 index 0000000..56547a9 Binary files /dev/null and b/лужа.xcf differ