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

Surprise Dungeon.yyp

@@ -3,14 +3,15 @@
     {"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":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"order":2,},
+    {"id":{"name":"sMaudit","path":"sprites/sMaudit/sMaudit.yy",},"order":10,},
     {"id":{"name":"oGame","path":"objects/oGame/oGame.yy",},"order":4,},
     {"id":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},"order":0,},
     {"id":{"name":"sWalls","path":"sprites/sWalls/sWalls.yy",},"order":7,},
     {"id":{"name":"r1","path":"rooms/r1/r1.yy",},"order":11,},
     {"id":{"name":"r6","path":"rooms/r6/r6.yy",},"order":16,},
     {"id":{"name":"rType","path":"rooms/rType/rType.yy",},"order":0,},
-    {"id":{"name":"sPlayerRun","path":"sprites/sPlayerRun/sPlayerRun.yy",},"order":4,},
+    {"id":{"name":"sPlayerRun","path":"sprites/sPlayerRun/sPlayerRun.yy",},"order":0,},
     {"id":{"name":"oMonsterMelee","path":"objects/oMonsterMelee/oMonsterMelee.yy",},"order":2,},
     {"id":{"name":"rTestVal","path":"rooms/rTestVal/rTestVal.yy",},"order":2,},
     {"id":{"name":"r8","path":"rooms/r8/r8.yy",},"order":18,},
@@ -23,7 +24,7 @@
     {"id":{"name":"r3","path":"rooms/r3/r3.yy",},"order":13,},
     {"id":{"name":"rTestRick","path":"rooms/rTestRick/rTestRick.yy",},"order":1,},
     {"id":{"name":"sSwordh","path":"sprites/sSwordh/sSwordh.yy",},"order":2,},
-    {"id":{"name":"sPlayer","path":"sprites/sPlayer/sPlayer.yy",},"order":0,},
+    {"id":{"name":"sPlayer","path":"sprites/sPlayer/sPlayer.yy",},"order":1,},
     {"id":{"name":"r7","path":"rooms/r7/r7.yy",},"order":17,},
     {"id":{"name":"sCoffre","path":"sprites/sCoffre/sCoffre.yy",},"order":9,},
     {"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"order":0,},
@@ -84,6 +85,7 @@
     {"folderPath":"folders/Sprites/Monsters.yy","order":1,"resourceVersion":"1.0","name":"Monsters","tags":[],"resourceType":"GMFolder",},
     {"folderPath":"folders/Objects/Entity.yy","order":1,"resourceVersion":"1.0","name":"Entity","tags":[],"resourceType":"GMFolder",},
     {"folderPath":"folders/Rooms/rooms.yy","order":4,"resourceVersion":"1.0","name":"rooms","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Sprites/Player.yy","order":9,"resourceVersion":"1.0","name":"Player","tags":[],"resourceType":"GMFolder",},
   ],
   "AudioGroups": [
     {"targets":461609314234257646,"resourceVersion":"1.0","name":"audiogroup_default","resourceType":"GMAudioGroup",},

objects/oMonster/Create_0.gml

@@ -8,3 +8,8 @@ dir = 3;
 pv = 5;
 
 attack = 1;
+
+enum typeMelee {
+	squelette,
+	blob
+}

objects/oMonsterMelee/Create_0.gml

@@ -0,0 +1,17 @@
+event_inherited();
+randomize();
+
+monType = choose(typeMelee.squelette, typeMelee.blob);
+image_speed = 1;
+
+switch (monType) {
+	case typeMelee.squelette:
+		attack = 10;
+		sprite_index = sSkeletonR;
+		break;
+	case typeMelee.blob:
+		sprite_index = sBlobR;
+		break;
+	default:
+		break;
+}

objects/oMonsterMelee/oMonsterMelee.yy

@@ -23,7 +23,9 @@
   "physicsStartAwake": true,
   "physicsKinematic": false,
   "physicsShapePoints": [],
-  "eventList": [],
+  "eventList": [
+    {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oMonsterMelee","path":"objects/oMonsterMelee/oMonsterMelee.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
+  ],
   "properties": [],
   "overriddenProperties": [],
   "parent": {

sprites/sPlayer/sPlayer.yy

@@ -80,8 +80,8 @@
     {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"ca7e216e-5f3b-47d3-a70c-1fc69d3f3535","tags":[],"resourceType":"GMImageLayer",},
   ],
   "parent": {
-    "name": "Sprites",
+    "name": "Player",
-    "path": "folders/Sprites.yy",
+    "path": "folders/Sprites/Player.yy",
   },
   "resourceVersion": "1.0",
   "name": "sPlayer",

sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy

@@ -0,0 +1,165 @@
+{
+  "bboxMode": 0,
+  "collisionKind": 1,
+  "type": 0,
+  "origin": 9,
+  "preMultiplyAlpha": false,
+  "edgeFiltering": false,
+  "collisionTolerance": 0,
+  "swfPrecision": 2.525,
+  "bbox_left": 19,
+  "bbox_right": 58,
+  "bbox_top": 0,
+  "bbox_bottom": 29,
+  "HTile": false,
+  "VTile": false,
+  "For3D": false,
+  "width": 60,
+  "height": 30,
+  "textureGroupId": {
+    "name": "",
+    "path": "",
+  },
+  "swatchColours": null,
+  "gridX": 0,
+  "gridY": 0,
+  "frames": [
+    {"compositeImage":{"FrameId":{"name":"8a31babf-9a3d-45da-86e4-820607b8a3f9","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":null,"resourceVersion":"1.0","name":"composite","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"8a31babf-9a3d-45da-86e4-820607b8a3f9","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"2e505114-44ce-42e6-a96b-b49244d2db3a","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"8a31babf-9a3d-45da-86e4-820607b8a3f9","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"6c6ed207-d2f7-494d-9028-a1d9e8228480","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"8a31babf-9a3d-45da-86e4-820607b8a3f9","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"fc3a8827-3fae-4259-a161-5d4b6a9bbf50","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"8a31babf-9a3d-45da-86e4-820607b8a3f9","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"1565bfd5-3985-442f-a41e-ba17918505c6","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"1565bfd5-3985-442f-a41e-ba17918505c6","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"fc3a8827-3fae-4259-a161-5d4b6a9bbf50","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"1565bfd5-3985-442f-a41e-ba17918505c6","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"2e505114-44ce-42e6-a96b-b49244d2db3a","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"1565bfd5-3985-442f-a41e-ba17918505c6","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"737960c9-4126-466b-b25b-25a27ac9cd8f","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"737960c9-4126-466b-b25b-25a27ac9cd8f","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"fc3a8827-3fae-4259-a161-5d4b6a9bbf50","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"737960c9-4126-466b-b25b-25a27ac9cd8f","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"2e505114-44ce-42e6-a96b-b49244d2db3a","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"737960c9-4126-466b-b25b-25a27ac9cd8f","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"c42da796-ee66-4ff9-a0a6-3315950a9668","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"c42da796-ee66-4ff9-a0a6-3315950a9668","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"fc3a8827-3fae-4259-a161-5d4b6a9bbf50","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"c42da796-ee66-4ff9-a0a6-3315950a9668","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"2e505114-44ce-42e6-a96b-b49244d2db3a","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"c42da796-ee66-4ff9-a0a6-3315950a9668","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"ef5f6a72-b0a8-4d7e-9b49-488cf286860b","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":null,"resourceVersion":"1.0","name":"composite","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"ef5f6a72-b0a8-4d7e-9b49-488cf286860b","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"2e505114-44ce-42e6-a96b-b49244d2db3a","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"ef5f6a72-b0a8-4d7e-9b49-488cf286860b","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"6c6ed207-d2f7-494d-9028-a1d9e8228480","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"ef5f6a72-b0a8-4d7e-9b49-488cf286860b","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"fc3a8827-3fae-4259-a161-5d4b6a9bbf50","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"ef5f6a72-b0a8-4d7e-9b49-488cf286860b","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"ccaea034-d086-4581-acee-7bebeb4538f7","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":null,"resourceVersion":"1.0","name":"composite","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"ccaea034-d086-4581-acee-7bebeb4538f7","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"2e505114-44ce-42e6-a96b-b49244d2db3a","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"ccaea034-d086-4581-acee-7bebeb4538f7","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"6c6ed207-d2f7-494d-9028-a1d9e8228480","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"ccaea034-d086-4581-acee-7bebeb4538f7","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"fc3a8827-3fae-4259-a161-5d4b6a9bbf50","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"ccaea034-d086-4581-acee-7bebeb4538f7","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"83b8ec01-d0c9-4ab8-860e-3664c2931a3f","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":null,"resourceVersion":"1.0","name":"composite","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"83b8ec01-d0c9-4ab8-860e-3664c2931a3f","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"2e505114-44ce-42e6-a96b-b49244d2db3a","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"83b8ec01-d0c9-4ab8-860e-3664c2931a3f","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"6c6ed207-d2f7-494d-9028-a1d9e8228480","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"83b8ec01-d0c9-4ab8-860e-3664c2931a3f","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"fc3a8827-3fae-4259-a161-5d4b6a9bbf50","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"83b8ec01-d0c9-4ab8-860e-3664c2931a3f","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"4311ba53-850b-4bd7-b48e-365b349b173f","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":null,"resourceVersion":"1.0","name":"composite","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"4311ba53-850b-4bd7-b48e-365b349b173f","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"2e505114-44ce-42e6-a96b-b49244d2db3a","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"4311ba53-850b-4bd7-b48e-365b349b173f","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"6c6ed207-d2f7-494d-9028-a1d9e8228480","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"4311ba53-850b-4bd7-b48e-365b349b173f","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"fc3a8827-3fae-4259-a161-5d4b6a9bbf50","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"4311ba53-850b-4bd7-b48e-365b349b173f","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"b0e1a95a-cd2c-4762-a518-49bbebadf5dc","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"b0e1a95a-cd2c-4762-a518-49bbebadf5dc","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"fc3a8827-3fae-4259-a161-5d4b6a9bbf50","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"b0e1a95a-cd2c-4762-a518-49bbebadf5dc","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"2e505114-44ce-42e6-a96b-b49244d2db3a","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"b0e1a95a-cd2c-4762-a518-49bbebadf5dc","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"51d26ee6-97d9-437e-92a6-7ec4e0fb04ea","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":null,"resourceVersion":"1.0","name":"composite","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"51d26ee6-97d9-437e-92a6-7ec4e0fb04ea","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"2e505114-44ce-42e6-a96b-b49244d2db3a","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"51d26ee6-97d9-437e-92a6-7ec4e0fb04ea","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"6c6ed207-d2f7-494d-9028-a1d9e8228480","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"51d26ee6-97d9-437e-92a6-7ec4e0fb04ea","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"fc3a8827-3fae-4259-a161-5d4b6a9bbf50","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"51d26ee6-97d9-437e-92a6-7ec4e0fb04ea","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"740c3942-3044-47e2-a9a7-1f399f777754","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":null,"resourceVersion":"1.0","name":"composite","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"740c3942-3044-47e2-a9a7-1f399f777754","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"2e505114-44ce-42e6-a96b-b49244d2db3a","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"740c3942-3044-47e2-a9a7-1f399f777754","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"6c6ed207-d2f7-494d-9028-a1d9e8228480","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"740c3942-3044-47e2-a9a7-1f399f777754","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"fc3a8827-3fae-4259-a161-5d4b6a9bbf50","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"740c3942-3044-47e2-a9a7-1f399f777754","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"24dbadf4-78e1-42f9-9104-8d21fdcdd0cc","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"24dbadf4-78e1-42f9-9104-8d21fdcdd0cc","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"fc3a8827-3fae-4259-a161-5d4b6a9bbf50","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"24dbadf4-78e1-42f9-9104-8d21fdcdd0cc","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"2e505114-44ce-42e6-a96b-b49244d2db3a","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"24dbadf4-78e1-42f9-9104-8d21fdcdd0cc","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"550d85d2-f361-4d4c-b21c-0eeef418e425","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":null,"resourceVersion":"1.0","name":"composite","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"550d85d2-f361-4d4c-b21c-0eeef418e425","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"2e505114-44ce-42e6-a96b-b49244d2db3a","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"550d85d2-f361-4d4c-b21c-0eeef418e425","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"6c6ed207-d2f7-494d-9028-a1d9e8228480","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"550d85d2-f361-4d4c-b21c-0eeef418e425","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"fc3a8827-3fae-4259-a161-5d4b6a9bbf50","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"550d85d2-f361-4d4c-b21c-0eeef418e425","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"50fdb082-b8d1-40f9-98cc-26e1c8644f24","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":null,"resourceVersion":"1.0","name":"composite","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"50fdb082-b8d1-40f9-98cc-26e1c8644f24","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"2e505114-44ce-42e6-a96b-b49244d2db3a","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"50fdb082-b8d1-40f9-98cc-26e1c8644f24","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"6c6ed207-d2f7-494d-9028-a1d9e8228480","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"50fdb082-b8d1-40f9-98cc-26e1c8644f24","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"fc3a8827-3fae-4259-a161-5d4b6a9bbf50","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"50fdb082-b8d1-40f9-98cc-26e1c8644f24","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"91665d92-9dd7-418f-a8ae-b24d3f59ae31","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"91665d92-9dd7-418f-a8ae-b24d3f59ae31","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"fc3a8827-3fae-4259-a161-5d4b6a9bbf50","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"91665d92-9dd7-418f-a8ae-b24d3f59ae31","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"2e505114-44ce-42e6-a96b-b49244d2db3a","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"91665d92-9dd7-418f-a8ae-b24d3f59ae31","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"891f0793-f3fa-40ce-8b8b-630dfa4f4233","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":null,"resourceVersion":"1.0","name":"composite","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"891f0793-f3fa-40ce-8b8b-630dfa4f4233","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"2e505114-44ce-42e6-a96b-b49244d2db3a","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"891f0793-f3fa-40ce-8b8b-630dfa4f4233","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"6c6ed207-d2f7-494d-9028-a1d9e8228480","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+        {"FrameId":{"name":"891f0793-f3fa-40ce-8b8b-630dfa4f4233","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"LayerId":{"name":"fc3a8827-3fae-4259-a161-5d4b6a9bbf50","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","name":"891f0793-f3fa-40ce-8b8b-630dfa4f4233","tags":[],"resourceType":"GMSpriteFrame",},
+  ],
+  "sequence": {
+    "spriteId": {"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},
+    "timeUnits": 1,
+    "playback": 1,
+    "playbackSpeed": 10.0,
+    "playbackSpeedType": 0,
+    "autoRecord": true,
+    "volume": 1.0,
+    "length": 16.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":"2d712411-945b-4544-8e20-d6cb84ec1c35","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8a31babf-9a3d-45da-86e4-820607b8a3f9","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"e25a60ef-15c4-481a-8eaa-0b54653865c9","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1565bfd5-3985-442f-a41e-ba17918505c6","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"f044256f-bfc9-482f-81ab-c14349501e0a","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"737960c9-4126-466b-b25b-25a27ac9cd8f","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"b0774ba9-0901-48f2-936a-fc6b6052735f","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"c42da796-ee66-4ff9-a0a6-3315950a9668","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"6e346ad0-c695-4c3f-bd6e-c97b6d4551e3","Key":4.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ef5f6a72-b0a8-4d7e-9b49-488cf286860b","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"903c846b-7bb4-4791-85a6-15abeea25692","Key":5.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"ccaea034-d086-4581-acee-7bebeb4538f7","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"78d43c39-afee-4923-97ee-c5c2df8e0d8b","Key":6.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"83b8ec01-d0c9-4ab8-860e-3664c2931a3f","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"220ab69f-6c3f-4cec-a701-3545b6825c77","Key":7.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"4311ba53-850b-4bd7-b48e-365b349b173f","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"7bf93209-7a9b-440c-8f38-eff775c96a6c","Key":8.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b0e1a95a-cd2c-4762-a518-49bbebadf5dc","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"493d692f-637b-46f8-a76b-ea8621b1d6a0","Key":9.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"51d26ee6-97d9-437e-92a6-7ec4e0fb04ea","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"39e7845d-3502-4f91-b56b-b00da5b68b31","Key":10.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"740c3942-3044-47e2-a9a7-1f399f777754","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"031c2989-62d3-4403-b36d-fa54ad9d70c0","Key":11.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"24dbadf4-78e1-42f9-9104-8d21fdcdd0cc","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"0ef782a9-e19a-474d-a525-1a21cd635da2","Key":12.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"550d85d2-f361-4d4c-b21c-0eeef418e425","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"4b6599e5-eb0b-4934-8748-544dcb8ed3f5","Key":13.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"50fdb082-b8d1-40f9-98cc-26e1c8644f24","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"708f7e1f-b94f-434c-a20f-666684fd25e4","Key":14.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"91665d92-9dd7-418f-a8ae-b24d3f59ae31","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"c32d0172-e49b-46b8-add4-20b07222e8d7","Key":15.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"891f0793-f3fa-40ce-8b8b-630dfa4f4233","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.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,
+    "lockOrigin": false,
+    "showBackdrop": true,
+    "showBackdropImage": false,
+    "backdropImagePath": "",
+    "backdropImageOpacity": 0.5,
+    "backdropWidth": 1920,
+    "backdropHeight": 1080,
+    "backdropXOffset": 0.0,
+    "backdropYOffset": 0.0,
+    "xorigin": 38,
+    "yorigin": 23,
+    "eventToFunction": {},
+    "eventStubScript": null,
+    "parent": {"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},
+    "resourceVersion": "1.3",
+    "name": "",
+    "tags": [],
+    "resourceType": "GMSequence",
+  },
+  "layers": [
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"Layer 1","resourceVersion":"1.0","name":"fc3a8827-3fae-4259-a161-5d4b6a9bbf50","tags":[],"resourceType":"GMImageLayer",},
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"2e505114-44ce-42e6-a96b-b49244d2db3a","tags":[],"resourceType":"GMImageLayer",},
+  ],
+  "parent": {
+    "name": "Player",
+    "path": "folders/Sprites/Player.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "sPlayerAttackSlash",
+  "tags": [],
+  "resourceType": "GMSprite",
+}

sprites/sPlayerRun/sPlayerRun.yy

@@ -192,8 +192,8 @@
     {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"387193d8-b1ff-4efd-9bcf-494281aae83a","tags":[],"resourceType":"GMImageLayer",},
   ],
   "parent": {
-    "name": "Sprites",
+    "name": "Player",
-    "path": "folders/Sprites.yy",
+    "path": "folders/Sprites/Player.yy",
   },
   "resourceVersion": "1.0",
   "name": "sPlayerRun",