diff --git a/objects/oGame/oGame.yy b/objects/oGame/oGame.yy index a8072d8..312c6c0 100644 --- a/objects/oGame/oGame.yy +++ b/objects/oGame/oGame.yy @@ -19,8 +19,11 @@ "physicsShapePoints": [], "eventList": [ {"isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,"parent":{"name":"oGame","path":"objects/oGame/oGame.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oGame","path":"objects/oGame/oGame.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [ + {"varType":1,"value":"1","rangeEnabled":false,"rangeMin":0.0,"rangeMax":10.0,"listItems":[],"multiselect":false,"filters":[],"resourceVersion":"1.0","name":"difficulté","tags":[],"resourceType":"GMObjectProperty",}, ], - "properties": [], "overriddenProperties": [], "parent": { "name": "Objects", diff --git a/objects/oPlayer/Step_0.gml b/objects/oPlayer/Step_0.gml index 8059a0b..c014af4 100644 --- a/objects/oPlayer/Step_0.gml +++ b/objects/oPlayer/Step_0.gml @@ -41,7 +41,7 @@ if (seDeplace) { indexImageInfo = 3; image_index = compteurFrames % nbFrames + 3*nbFrames; } - compteurFrames++; + compteurFrames += 0.25; } else { sprite_index = sPlayer; image_index = indexImageInfo; diff --git a/rooms/r1/r1.yy b/rooms/r1/r1.yy index 87ef110..b698d44 100644 --- a/rooms/r1/r1.yy +++ b/rooms/r1/r1.yy @@ -85,6 +85,8 @@ {"properties":[],"isDnd":false,"objectId":{"name":"oWall","path":"objects/oWall/oWall.yy",},"inheritCode":true,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_56CAC8A8","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":16.0,"y":208.0,"resourceVersion":"1.0","name":"inst_56CAC8A8","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oWall","path":"objects/oWall/oWall.yy",},"inheritCode":true,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_54D90856","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":32.0,"resourceVersion":"1.0","name":"inst_54D90856","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"oWall","path":"objects/oWall/oWall.yy",},"inheritCode":true,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":{"name":"inst_35D0D","path":"rooms/rType/rType.yy",},"frozen":false,"ignore":false,"inheritItemSettings":true,"x":400.0,"y":16.0,"resourceVersion":"1.0","name":"inst_35D0D","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":224.0,"y":112.0,"resourceVersion":"1.0","name":"inst_1F99BFFE","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"oMonsterMelee","path":"objects/oMonsterMelee/oMonsterMelee.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":0.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":320.0,"y":80.0,"resourceVersion":"1.0","name":"inst_45379430","tags":[],"resourceType":"GMRInstance",}, ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":true,"inheritLayerSettings":true,"gridX":16,"gridY":16,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Instances","tags":[],"resourceType":"GMRInstanceLayer",}, {"assets":[],"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":true,"inheritLayerSettings":true,"gridX":16,"gridY":16,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Assets_1","tags":[],"resourceType":"GMRAssetLayer",}, {"tilesetId":{"name":"TileSet1","path":"tilesets/TileSet1/TileSet1.yy",},"x":0,"y":0,"tiles":{"SerialiseWidth":27,"SerialiseHeight":15,"TileSerialiseData":[ @@ -178,6 +180,8 @@ {"name":"inst_56CAC8A8","path":"rooms/r1/r1.yy",}, {"name":"inst_54D90856","path":"rooms/r1/r1.yy",}, {"name":"inst_35D0D","path":"rooms/r1/r1.yy",}, + {"name":"inst_1F99BFFE","path":"rooms/r1/r1.yy",}, + {"name":"inst_45379430","path":"rooms/r1/r1.yy",}, ], "inheritCreationOrder": true, "sequenceId": null, diff --git a/sprites/sMonsterMelee/sMonsterMelee.yy b/sprites/sMonsterMelee/sMonsterMelee.yy index c6517f2..92dbdcf 100644 --- a/sprites/sMonsterMelee/sMonsterMelee.yy +++ b/sprites/sMonsterMelee/sMonsterMelee.yy @@ -7,8 +7,8 @@ "edgeFiltering": false, "collisionTolerance": 0, "swfPrecision": 2.525, - "bbox_left": 2, - "bbox_right": 16, + "bbox_left": 9, + "bbox_right": 23, "bbox_top": 9, "bbox_bottom": 30, "HTile": false,