Merge branch 'dev' of https://git.gnous.eu/RSV_Studio/Yogscast_Game_Jam_2020 into dev

Surprise Dungeon.yyp

@@ -2,6 +2,7 @@
   "resources": [
     {"id":{"name":"sFire","path":"sprites/sFire/sFire.yy",},"order":6,},
     {"id":{"name":"r5","path":"rooms/r5/r5.yy",},"order":15,},
+    {"id":{"name":"sBlobR","path":"sprites/sBlobR/sBlobR.yy",},"order":3,},
     {"id":{"name":"sMaudit","path":"sprites/sMaudit/sMaudit.yy",},"order":14,},
     {"id":{"name":"oGame","path":"objects/oGame/oGame.yy",},"order":4,},
     {"id":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},"order":0,},
@@ -15,7 +16,6 @@
     {"id":{"name":"r8","path":"rooms/r8/r8.yy",},"order":18,},
     {"id":{"name":"sStone","path":"sprites/sStone/sStone.yy",},"order":5,},
     {"id":{"name":"oMaudit","path":"objects/oMaudit/oMaudit.yy",},"order":2,},
-    {"id":{"name":"sBlobR","path":"sprites/sBlobR/sBlobR.yy",},"order":2,},
     {"id":{"name":"r9","path":"rooms/r9/r9.yy",},"order":19,},
     {"id":{"name":"oMonster","path":"objects/oMonster/oMonster.yy",},"order":1,},
     {"id":{"name":"oWall","path":"objects/oWall/oWall.yy",},"order":3,},

sprites/sBlobR/sBlobR.yy

@@ -2,46 +2,87 @@
   "bboxMode": 0,
   "collisionKind": 1,
   "type": 0,
-  "origin": 4,
+  "origin": 3,
   "preMultiplyAlpha": false,
   "edgeFiltering": false,
   "collisionTolerance": 0,
   "swfPrecision": 2.525,
   "bbox_left": 0,
-  "bbox_right": 0,
-  "bbox_top": 0,
-  "bbox_bottom": 0,
+  "bbox_right": 15,
+  "bbox_top": 6,
+  "bbox_bottom": 31,
   "HTile": false,
   "VTile": false,
   "For3D": false,
-  "width": 32,
+  "width": 16,
   "height": 32,
   "textureGroupId": {
-    "name": "Default",
-    "path": "texturegroups/Default",
+    "name": "",
+    "path": "",
   },
   "swatchColours": null,
-  "gridX": 0,
-  "gridY": 0,
+  "gridX": 1,
+  "gridY": 1,
   "frames": [
-    {"compositeImage":{"FrameId":{"name":"3aaa25a4-3f20-4f8a-9efd-b1302a4f8d5a","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"3aaa25a4-3f20-4f8a-9efd-b1302a4f8d5a","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"3a433ec1-0b0f-4f4c-91e0-8f6fbc465fb8","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"sBlobR","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"3aaa25a4-3f20-4f8a-9efd-b1302a4f8d5a","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"a22bb958-b4a4-4ea5-869e-eb64c7ce9feb","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"a22bb958-b4a4-4ea5-869e-eb64c7ce9feb","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"df6c36c3-e0d3-43ed-b189-94b164b5284b","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"a22bb958-b4a4-4ea5-869e-eb64c7ce9feb","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"0d3b996b-f144-432f-bf67-9531ec507c1d","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sBlobR","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"a22bb958-b4a4-4ea5-869e-eb64c7ce9feb","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"d17378f9-2d77-4415-931b-dc727c9d884f","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"d17378f9-2d77-4415-931b-dc727c9d884f","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"df6c36c3-e0d3-43ed-b189-94b164b5284b","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"d17378f9-2d77-4415-931b-dc727c9d884f","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"0d3b996b-f144-432f-bf67-9531ec507c1d","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sBlobR","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"d17378f9-2d77-4415-931b-dc727c9d884f","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"4f9a6841-2a2a-487d-a814-f2e42fe68b28","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"4f9a6841-2a2a-487d-a814-f2e42fe68b28","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"df6c36c3-e0d3-43ed-b189-94b164b5284b","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"4f9a6841-2a2a-487d-a814-f2e42fe68b28","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"0d3b996b-f144-432f-bf67-9531ec507c1d","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sBlobR","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"4f9a6841-2a2a-487d-a814-f2e42fe68b28","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"fd4c29e3-beb6-401a-9cf6-bec185a46257","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"fd4c29e3-beb6-401a-9cf6-bec185a46257","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"df6c36c3-e0d3-43ed-b189-94b164b5284b","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"fd4c29e3-beb6-401a-9cf6-bec185a46257","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"0d3b996b-f144-432f-bf67-9531ec507c1d","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sBlobR","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"fd4c29e3-beb6-401a-9cf6-bec185a46257","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"ae4b90a1-8217-4df0-b610-4518cf35115a","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"ae4b90a1-8217-4df0-b610-4518cf35115a","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"df6c36c3-e0d3-43ed-b189-94b164b5284b","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"ae4b90a1-8217-4df0-b610-4518cf35115a","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"0d3b996b-f144-432f-bf67-9531ec507c1d","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sBlobR","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"ae4b90a1-8217-4df0-b610-4518cf35115a","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"36d125c1-e2e4-48c7-a1ff-1f9490824ef4","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"36d125c1-e2e4-48c7-a1ff-1f9490824ef4","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"df6c36c3-e0d3-43ed-b189-94b164b5284b","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"36d125c1-e2e4-48c7-a1ff-1f9490824ef4","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"0d3b996b-f144-432f-bf67-9531ec507c1d","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sBlobR","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"36d125c1-e2e4-48c7-a1ff-1f9490824ef4","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"962e61f8-5ab0-4763-98f9-60f937bac15d","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"962e61f8-5ab0-4763-98f9-60f937bac15d","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"df6c36c3-e0d3-43ed-b189-94b164b5284b","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"962e61f8-5ab0-4763-98f9-60f937bac15d","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"0d3b996b-f144-432f-bf67-9531ec507c1d","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sBlobR","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"962e61f8-5ab0-4763-98f9-60f937bac15d","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"cf81ff09-1905-408d-a438-fed5c6784e0b","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"cf81ff09-1905-408d-a438-fed5c6784e0b","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"df6c36c3-e0d3-43ed-b189-94b164b5284b","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"cf81ff09-1905-408d-a438-fed5c6784e0b","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"0d3b996b-f144-432f-bf67-9531ec507c1d","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sBlobR","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"cf81ff09-1905-408d-a438-fed5c6784e0b","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"a98c904d-6247-4763-8c68-93189f381757","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"a98c904d-6247-4763-8c68-93189f381757","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"df6c36c3-e0d3-43ed-b189-94b164b5284b","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"a98c904d-6247-4763-8c68-93189f381757","path":"sprites/sBlobR/sBlobR.yy",},"LayerId":{"name":"0d3b996b-f144-432f-bf67-9531ec507c1d","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sBlobR","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","name":"a98c904d-6247-4763-8c68-93189f381757","tags":[],"resourceType":"GMSpriteFrame",},
   ],
   "sequence": {
     "spriteId": {"name":"sBlobR","path":"sprites/sBlobR/sBlobR.yy",},
     "timeUnits": 1,
     "playback": 1,
-    "playbackSpeed": 30.0,
+    "playbackSpeed": 10.0,
     "playbackSpeedType": 0,
     "autoRecord": true,
     "volume": 1.0,
-    "length": 1.0,
+    "length": 9.0,
     "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
     "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
     "tracks": [
       {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
-            {"id":"a81ea1d1-7515-4b1f-91f7-c851f36a52e8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3aaa25a4-3f20-4f8a-9efd-b1302a4f8d5a","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"a03a000d-4096-44bc-9062-cf81ef26ee9b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a22bb958-b4a4-4ea5-869e-eb64c7ce9feb","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"15d6a042-75ca-4a86-a5ad-5a79b5064da1","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"d17378f9-2d77-4415-931b-dc727c9d884f","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"dd6c7625-1154-47fa-9588-185876f20e49","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4f9a6841-2a2a-487d-a814-f2e42fe68b28","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"a14fdb51-bf65-4a62-94d4-1921ad74fafc","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"fd4c29e3-beb6-401a-9cf6-bec185a46257","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"333f6c08-200c-4a58-b069-6a6e01e31fcb","Key":4.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ae4b90a1-8217-4df0-b610-4518cf35115a","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"d56e4f0b-44bb-4d8b-8a3c-10cdcf8de8d9","Key":5.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"36d125c1-e2e4-48c7-a1ff-1f9490824ef4","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"8fa8e77e-6a77-477e-bfe2-63a5e3166f88","Key":6.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"962e61f8-5ab0-4763-98f9-60f937bac15d","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"7af31b6d-66a4-46c2-a764-3322b9148d38","Key":7.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"cf81ff09-1905-408d-a438-fed5c6784e0b","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"d6596f2f-91f6-4592-a81a-2ccdb4e0f39e","Key":8.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a98c904d-6247-4763-8c68-93189f381757","path":"sprites/sBlobR/sBlobR.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
           ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
     ],
     "visibleRange": null,
@@ -54,7 +95,7 @@
     "backdropHeight": 768,
     "backdropXOffset": 0.0,
     "backdropYOffset": 0.0,
-    "xorigin": 16,
+    "xorigin": 0,
     "yorigin": 16,
     "eventToFunction": {},
     "eventStubScript": null,
@@ -65,7 +106,8 @@
     "resourceType": "GMSequence",
   },
   "layers": [
-    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"3a433ec1-0b0f-4f4c-91e0-8f6fbc465fb8","tags":[],"resourceType":"GMImageLayer",},
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"df6c36c3-e0d3-43ed-b189-94b164b5284b","tags":[],"resourceType":"GMImageLayer",},
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"Layer 1","resourceVersion":"1.0","name":"0d3b996b-f144-432f-bf67-9531ec507c1d","tags":[],"resourceType":"GMImageLayer",},
   ],
   "parent": {
     "name": "Monsters",