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

Conflicts:
	Surprise Dungeon.yyp
	sprites/sTrou/sTrou.yy

Surprise Dungeon.yyp

@@ -1,41 +1,41 @@
 {
   "resources": [
     {"id":{"name":"r1","path":"rooms/r1/r1.yy",},"order":2,},
-    {"id":{"name":"sFire","path":"sprites/sFire/sFire.yy",},"order":6,},
+    {"id":{"name":"sFire","path":"sprites/sFire/sFire.yy",},"order":2,},
-    {"id":{"name":"r11","path":"rooms/r11/r11.yy",},"order":14,},
     {"id":{"name":"r9","path":"rooms/r9/r9.yy",},"order":10,},
-    {"id":{"name":"sBox","path":"sprites/sBox/sBox.yy",},"order":10,},
+    {"id":{"name":"sBox","path":"sprites/sBox/sBox.yy",},"order":0,},
     {"id":{"name":"sBlobR","path":"sprites/sBlobR/sBlobR.yy",},"order":3,},
     {"id":{"name":"r7","path":"rooms/r7/r7.yy",},"order":8,},
     {"id":{"name":"sMaudit","path":"sprites/sMaudit/sMaudit.yy",},"order":14,},
+    {"id":{"name":"sTrouDetect","path":"sprites/sTrouDetect/sTrouDetect.yy",},"order":2,},
     {"id":{"name":"r0","path":"rooms/r0/r0.yy",},"order":1,},
     {"id":{"name":"oGame","path":"objects/oGame/oGame.yy",},"order":2,},
     {"id":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},"order":0,},
-    {"id":{"name":"sWalls","path":"sprites/sWalls/sWalls.yy",},"order":7,},
+    {"id":{"name":"sWalls","path":"sprites/sWalls/sWalls.yy",},"order":5,},
     {"id":{"name":"rOver","path":"rooms/rOver/rOver.yy",},"order":13,},
     {"id":{"name":"r8","path":"rooms/r8/r8.yy",},"order":9,},
     {"id":{"name":"oTransition","path":"objects/oTransition/oTransition.yy",},"order":3,},
     {"id":{"name":"rType","path":"rooms/rType/rType.yy",},"order":0,},
     {"id":{"name":"sPlayerRun","path":"sprites/sPlayerRun/sPlayerRun.yy",},"order":1,},
     {"id":{"name":"oMonsterMelee","path":"objects/oMonsterMelee/oMonsterMelee.yy",},"order":2,},
-    {"id":{"name":"sStone","path":"sprites/sStone/sStone.yy",},"order":5,},
+    {"id":{"name":"sStone","path":"sprites/sStone/sStone.yy",},"order":3,},
-    {"id":{"name":"rWin","path":"rooms/rWin/rWin.yy",},"order":15,},
     {"id":{"name":"oMaudit","path":"objects/oMaudit/oMaudit.yy",},"order":1,},
     {"id":{"name":"oOver","path":"objects/oOver/oOver.yy",},"order":4,},
     {"id":{"name":"r4","path":"rooms/r4/r4.yy",},"order":5,},
     {"id":{"name":"r6","path":"rooms/r6/r6.yy",},"order":7,},
-    {"id":{"name":"sTransition","path":"sprites/sTransition/sTransition.yy",},"order":16,},
+    {"id":{"name":"sTransition","path":"sprites/sTransition/sTransition.yy",},"order":0,},
     {"id":{"name":"oMonster","path":"objects/oMonster/oMonster.yy",},"order":1,},
+    {"id":{"name":"oTrou","path":"objects/oTrou/oTrou.yy",},"order":6,},
     {"id":{"name":"oWall","path":"objects/oWall/oWall.yy",},"order":5,},
-    {"id":{"name":"sWall","path":"sprites/sWall/sWall.yy",},"order":3,},
+    {"id":{"name":"sWall","path":"sprites/sWall/sWall.yy",},"order":1,},
     {"id":{"name":"r2","path":"rooms/r2/r2.yy",},"order":3,},
     {"id":{"name":"sSwordh","path":"sprites/sSwordh/sSwordh.yy",},"order":2,},
     {"id":{"name":"sPlayerAttackSlash","path":"sprites/sPlayerAttackSlash/sPlayerAttackSlash.yy",},"order":2,},
     {"id":{"name":"sPlayer","path":"sprites/sPlayer/sPlayer.yy",},"order":0,},
     {"id":{"name":"r10","path":"rooms/r10/r10.yy",},"order":11,},
-    {"id":{"name":"sCoffre","path":"sprites/sCoffre/sCoffre.yy",},"order":9,},
+    {"id":{"name":"sCoffre","path":"sprites/sCoffre/sCoffre.yy",},"order":1,},
     {"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"order":0,},
-    {"id":{"name":"sTrou","path":"sprites/sTrou/sTrou.yy",},"order":8,},
+    {"id":{"name":"sTrou","path":"sprites/sTrou/sTrou.yy",},"order":4,},
     {"id":{"name":"sSkeletonR","path":"sprites/sSkeletonR/sSkeletonR.yy",},"order":1,},
     {"id":{"name":"r3","path":"rooms/r3/r3.yy",},"order":4,},
     {"id":{"name":"rInit","path":"rooms/rInit/rInit.yy",},"order":12,},
@@ -72,8 +72,6 @@
     {"roomId":{"name":"r9","path":"rooms/r9/r9.yy",},},
     {"roomId":{"name":"r10","path":"rooms/r10/r10.yy",},},
     {"roomId":{"name":"rOver","path":"rooms/rOver/rOver.yy",},},
-    {"roomId":{"name":"r11","path":"rooms/r11/r11.yy",},},
-    {"roomId":{"name":"rWin","path":"rooms/rWin/rWin.yy",},},
   ],
   "Folders": [
     {"folderPath":"folders/Sprites.yy","order":0,"resourceVersion":"1.0","name":"Sprites","tags":[],"resourceType":"GMFolder",},
@@ -94,6 +92,8 @@
     {"folderPath":"folders/Objects/Entity.yy","order":0,"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":15,"resourceVersion":"1.0","name":"Player","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Sprites/SpecialsSprite.yy","order":18,"resourceVersion":"1.0","name":"SpecialsSprite","tags":[],"resourceType":"GMFolder",},
+    {"folderPath":"folders/Sprites/Decors.yy","order":19,"resourceVersion":"1.0","name":"Decors","tags":[],"resourceType":"GMFolder",},
   ],
   "AudioGroups": [
     {"targets":461609314234257646,"resourceVersion":"1.0","name":"audiogroup_default","resourceType":"GMAudioGroup",},

objects/oPlayer/KeyPress_74.gml

@@ -1,6 +1,5 @@
- // Attaque au corp à corp
+// Attaque au corp à corp
  
- //jouer l'animation
 isAttack = true;
 compteurFrames = 0;
 tailleEpee = 20; // à définir
@@ -27,24 +26,6 @@ switch (indexImageInfo) {
 }
  
  if (inst != noone) {
-	show_debug_message("objet trouvé !");
-	// attaque
 	hit(self, inst, attack);
 	inst.touche = 30;
- } else {
-	 //a supp
-	 show_debug_message("pas d'objet...");
  }
- 
-
- /*
- if (inst != noone && !ds_list_empty(inst)) {
-	show_debug_message("objet trouvé !");
-	show_debug_message(inst);
-	with (inst) instance_destroy();
-	// attaque
- } else {
-	 //a supp
-	 show_debug_message("pas d'objet...");
- }
- */

objects/oTrou/oTrou.yy

@@ -0,0 +1,31 @@
+{
+  "spriteId": null,
+  "solid": false,
+  "visible": true,
+  "spriteMaskId": null,
+  "persistent": false,
+  "parentObjectId": null,
+  "physicsObject": false,
+  "physicsSensor": false,
+  "physicsShape": 1,
+  "physicsGroup": 1,
+  "physicsDensity": 0.5,
+  "physicsRestitution": 0.1,
+  "physicsLinearDamping": 0.1,
+  "physicsAngularDamping": 0.1,
+  "physicsFriction": 0.2,
+  "physicsStartAwake": true,
+  "physicsKinematic": false,
+  "physicsShapePoints": [],
+  "eventList": [],
+  "properties": [],
+  "overriddenProperties": [],
+  "parent": {
+    "name": "Objects",
+    "path": "folders/Objects.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "oTrou",
+  "tags": [],
+  "resourceType": "GMObject",
+}

sprites/sBox/sBox.yy

@@ -147,8 +147,8 @@
     {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"f56083f1-9982-4b6a-b1e3-577f5c18f4ec","tags":[],"resourceType":"GMImageLayer",},
   ],
   "parent": {
-    "name": "Sprites",
+    "name": "Decors",
-    "path": "folders/Sprites.yy",
+    "path": "folders/Sprites/Decors.yy",
   },
   "resourceVersion": "1.0",
   "name": "sBox",

sprites/sCoffre/sCoffre.yy

@@ -68,8 +68,8 @@
     {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"3aa71186-de7d-4c1e-b8c2-c0095d63b58a","tags":[],"resourceType":"GMImageLayer",},
   ],
   "parent": {
-    "name": "Sprites",
+    "name": "Decors",
-    "path": "folders/Sprites.yy",
+    "path": "folders/Sprites/Decors.yy",
   },
   "resourceVersion": "1.0",
   "name": "sCoffre",

sprites/sFire/sFire.yy

@@ -132,8 +132,8 @@
     {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"531ffd50-3098-4c05-bace-87d9b1451308","tags":[],"resourceType":"GMImageLayer",},
   ],
   "parent": {
-    "name": "Sprites",
+    "name": "Decors",
-    "path": "folders/Sprites.yy",
+    "path": "folders/Sprites/Decors.yy",
   },
   "resourceVersion": "1.0",
   "name": "sFire",

sprites/sStone/sStone.yy

@@ -68,8 +68,8 @@
     {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"01a7bb04-d450-44df-b278-e0447c493e58","tags":[],"resourceType":"GMImageLayer",},
   ],
   "parent": {
-    "name": "Sprites",
+    "name": "Decors",
-    "path": "folders/Sprites.yy",
+    "path": "folders/Sprites/Decors.yy",
   },
   "resourceVersion": "1.0",
   "name": "sStone",

sprites/sTransition/sTransition.yy

@@ -68,8 +68,8 @@
     {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"490f3754-fe04-4547-bba9-b42dd0ece39a","tags":[],"resourceType":"GMImageLayer",},
   ],
   "parent": {
-    "name": "Sprites",
+    "name": "SpecialsSprite",
-    "path": "folders/Sprites.yy",
+    "path": "folders/Sprites/SpecialsSprite.yy",
   },
   "resourceVersion": "1.0",
   "name": "sTransition",

sprites/sTrou/sTrou.yy

@@ -38,7 +38,7 @@
     "spriteId": {"name":"sTrou","path":"sprites/sTrou/sTrou.yy",},
     "timeUnits": 1,
     "playback": 1,
-    "playbackSpeed": 0.0,
+    "playbackSpeed": 30.0,
     "playbackSpeedType": 0,
     "autoRecord": true,
     "volume": 1.0,
@@ -76,8 +76,8 @@
     {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"6c64befe-1318-4fb5-b35d-b834bad06c7c","tags":[],"resourceType":"GMImageLayer",},
   ],
   "parent": {
-    "name": "Sprites",
+    "name": "Decors",
-    "path": "folders/Sprites.yy",
+    "path": "folders/Sprites/Decors.yy",
   },
   "resourceVersion": "1.0",
   "name": "sTrou",

sprites/sTrouDetect/sTrouDetect.yy

@@ -0,0 +1,78 @@
+{
+  "bboxMode": 0,
+  "collisionKind": 0,
+  "type": 0,
+  "origin": 4,
+  "preMultiplyAlpha": false,
+  "edgeFiltering": false,
+  "collisionTolerance": 0,
+  "swfPrecision": 2.525,
+  "bbox_left": 0,
+  "bbox_right": 15,
+  "bbox_top": 0,
+  "bbox_bottom": 14,
+  "HTile": false,
+  "VTile": false,
+  "For3D": false,
+  "width": 16,
+  "height": 16,
+  "textureGroupId": {
+    "name": "Default",
+    "path": "texturegroups/Default",
+  },
+  "swatchColours": null,
+  "gridX": 0,
+  "gridY": 0,
+  "frames": [
+    {"compositeImage":{"FrameId":{"name":"e870ced5-8af8-4e05-8fa9-f23681eb4ddb","path":"sprites/sTrouDetect/sTrouDetect.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"e870ced5-8af8-4e05-8fa9-f23681eb4ddb","path":"sprites/sTrouDetect/sTrouDetect.yy",},"LayerId":{"name":"c359226f-9a05-4afc-aac4-d47d7d3cd2ac","path":"sprites/sTrouDetect/sTrouDetect.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sTrouDetect","path":"sprites/sTrouDetect/sTrouDetect.yy",},"resourceVersion":"1.0","name":"e870ced5-8af8-4e05-8fa9-f23681eb4ddb","tags":[],"resourceType":"GMSpriteFrame",},
+  ],
+  "sequence": {
+    "spriteId": {"name":"sTrouDetect","path":"sprites/sTrouDetect/sTrouDetect.yy",},
+    "timeUnits": 1,
+    "playback": 1,
+    "playbackSpeed": 30.0,
+    "playbackSpeedType": 0,
+    "autoRecord": true,
+    "volume": 1.0,
+    "length": 1.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":"2df73cd0-7124-4bbd-80ac-1b6f33236aaa","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e870ced5-8af8-4e05-8fa9-f23681eb4ddb","path":"sprites/sTrouDetect/sTrouDetect.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": 1366,
+    "backdropHeight": 768,
+    "backdropXOffset": 0.0,
+    "backdropYOffset": 0.0,
+    "xorigin": 8,
+    "yorigin": 8,
+    "eventToFunction": {},
+    "eventStubScript": null,
+    "parent": {"name":"sTrouDetect","path":"sprites/sTrouDetect/sTrouDetect.yy",},
+    "resourceVersion": "1.3",
+    "name": "sTrouDetect",
+    "tags": [],
+    "resourceType": "GMSequence",
+  },
+  "layers": [
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":60.0,"displayName":"default","resourceVersion":"1.0","name":"c359226f-9a05-4afc-aac4-d47d7d3cd2ac","tags":[],"resourceType":"GMImageLayer",},
+  ],
+  "parent": {
+    "name": "SpecialsSprite",
+    "path": "folders/Sprites/SpecialsSprite.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "sTrouDetect",
+  "tags": [],
+  "resourceType": "GMSprite",
+}

sprites/sWall/sWall.yy

@@ -68,8 +68,8 @@
     {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"1956fe38-ffa4-4581-93ca-a202f6e7e129","tags":[],"resourceType":"GMImageLayer",},
   ],
   "parent": {
-    "name": "Sprites",
+    "name": "SpecialsSprite",
-    "path": "folders/Sprites.yy",
+    "path": "folders/Sprites/SpecialsSprite.yy",
   },
   "resourceVersion": "1.0",
   "name": "sWall",

sprites/sWalls/sWalls.yy

@@ -68,8 +68,8 @@
     {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"8602f62c-4ddd-41df-979b-d90f76df5c8d","tags":[],"resourceType":"GMImageLayer",},
   ],
   "parent": {
-    "name": "Sprites",
+    "name": "Decors",
-    "path": "folders/Sprites.yy",
+    "path": "folders/Sprites/Decors.yy",
   },
   "resourceVersion": "1.0",
   "name": "sWalls",