diff --git a/Surprise Dungeon.yyp b/Surprise Dungeon.yyp index 3a63377..e62dc24 100644 --- a/Surprise Dungeon.yyp +++ b/Surprise Dungeon.yyp @@ -5,7 +5,7 @@ {"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"order":0,}, {"id":{"name":"Script1","path":"scripts/Script1/Script1.yy",},"order":0,}, {"id":{"name":"sTest","path":"sprites/sTest/sTest.yy",},"order":0,}, - {"id":{"name":"Room1","path":"rooms/Room1/Room1.yy",},"order":0,}, + {"id":{"name":"rTest","path":"rooms/rTest/rTest.yy",},"order":0,}, ], "Options": [ {"name":"Linux","path":"options/linux/options_linux.yy",}, @@ -22,7 +22,7 @@ "children": [], }, "RoomOrderNodes": [ - {"roomId":{"name":"Room1","path":"rooms/Room1/Room1.yy",},}, + {"roomId":{"name":"rTest","path":"rooms/rTest/rTest.yy",},}, ], "Folders": [ {"folderPath":"folders/Sprites.yy","order":1,"resourceVersion":"1.0","name":"Sprites","tags":[],"resourceType":"GMFolder",}, diff --git a/objects/oPlayer/Create_0.gml b/objects/oPlayer/Create_0.gml new file mode 100644 index 0000000..748d11a --- /dev/null +++ b/objects/oPlayer/Create_0.gml @@ -0,0 +1 @@ +seDeplace = 0; \ No newline at end of file diff --git a/objects/oPlayer/Step_0.gml b/objects/oPlayer/Step_0.gml index 15513bd..1e5ddf2 100644 --- a/objects/oPlayer/Step_0.gml +++ b/objects/oPlayer/Step_0.gml @@ -1,11 +1,23 @@ keyLeft = keyboard_check(vk_left) or keyboard_check(ord("Q")); -keyRight = keyboard_check(vk_right) or keyboard_check(ord("D"));; -keyUp = keyboard_check(vk_up) or keyboard_check(ord("Z"));; -keyDown = keyboard_check(vk_down) or keyboard_check(ord("S"));; +keyRight = keyboard_check(vk_right) or keyboard_check(ord("D")); +keyUp = keyboard_check(vk_up) or keyboard_check(ord("Z")); +keyDown = keyboard_check(vk_down) or keyboard_check(ord("S")); keyAttack = keyboard_check_pressed(vk_shift); + +// Déplacement du joueur + deplaceHorizontal = keyRight - keyLeft; deplaceVertical = keyDown - keyUp; x += deplaceHorizontal; -y += deplaceVertical; \ No newline at end of file +y += deplaceVertical; + +seDeplace = (deplaceHorizontal != 0 or deplaceVertical != 0); + +// Animation des sprites + +if (seDeplace) { + + +} \ No newline at end of file diff --git a/objects/oPlayer/oPlayer.yy b/objects/oPlayer/oPlayer.yy index 6396b12..750fda4 100644 --- a/objects/oPlayer/oPlayer.yy +++ b/objects/oPlayer/oPlayer.yy @@ -22,10 +22,12 @@ "physicsShapePoints": [], "eventList": [ {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [ {"varType":1,"value":"0","rangeEnabled":false,"rangeMin":0.0,"rangeMax":10.0,"listItems":[],"multiselect":false,"filters":[],"resourceVersion":"1.0","name":"deplaceHorizontal","tags":[],"resourceType":"GMObjectProperty",}, {"varType":1,"value":"0","rangeEnabled":false,"rangeMin":0.0,"rangeMax":10.0,"listItems":[],"multiselect":false,"filters":[],"resourceVersion":"1.0","name":"deplaceVertical","tags":[],"resourceType":"GMObjectProperty",}, + {"varType":0,"value":"0","rangeEnabled":false,"rangeMin":0.0,"rangeMax":10.0,"listItems":[],"multiselect":false,"filters":[],"resourceVersion":"1.0","name":"spriteDir","tags":[],"resourceType":"GMObjectProperty",}, ], "overriddenProperties": [], "parent": { diff --git a/rooms/Room1/Room1.yy b/rooms/rTest/rTest.yy similarity index 92% rename from rooms/Room1/Room1.yy rename to rooms/rTest/rTest.yy index a863d72..31115c2 100644 --- a/rooms/Room1/Room1.yy +++ b/rooms/rTest/rTest.yy @@ -14,15 +14,15 @@ ], "layers": [ {"instances":[ - {"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":160.0,"y":64.0,"resourceVersion":"1.0","name":"inst_564B33A2","tags":[],"resourceType":"GMRInstance",}, - ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Instances","tags":[],"resourceType":"GMRInstanceLayer",}, + {"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":0.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":160.0,"y":64.0,"resourceVersion":"1.0","name":"inst_564B33A2","tags":[],"resourceType":"GMRInstance",}, + ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":16,"gridY":16,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Instances","tags":[],"resourceType":"GMRInstanceLayer",}, {"spriteId":null,"colour":4289967027,"x":0,"y":0,"htiled":false,"vtiled":false,"hspeed":0.0,"vspeed":0.0,"stretch":false,"animationFPS":15.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Background","tags":[],"resourceType":"GMRBackgroundLayer",}, ], "inheritLayers": false, "creationCodeFile": "", "inheritCode": false, "instanceCreationOrder": [ - {"name":"inst_564B33A2","path":"rooms/Room1/Room1.yy",}, + {"name":"inst_564B33A2","path":"rooms/rTest/rTest.yy",}, ], "inheritCreationOrder": false, "sequenceId": null, @@ -50,7 +50,7 @@ "path": "folders/Rooms.yy", }, "resourceVersion": "1.0", - "name": "Room1", + "name": "rTest", "tags": [], "resourceType": "GMRoom", } \ No newline at end of file diff --git a/scripts/Script1/Script1.gml b/scripts/Script1/Script1.gml index e9a7819..907c494 100644 --- a/scripts/Script1/Script1.gml +++ b/scripts/Script1/Script1.gml @@ -1,5 +1,6 @@ // Script assets have changed for v2.3.0 see // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information + function Test(){ // C'est un test de git //retest git