This commit is contained in:
parent
e11a6cc641
commit
b1ffe3d0d7
6 changed files with 26 additions and 10 deletions
|
@ -5,7 +5,7 @@
|
||||||
{"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"order":0,},
|
{"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"order":0,},
|
||||||
{"id":{"name":"Script1","path":"scripts/Script1/Script1.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":"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": [
|
"Options": [
|
||||||
{"name":"Linux","path":"options/linux/options_linux.yy",},
|
{"name":"Linux","path":"options/linux/options_linux.yy",},
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
"children": [],
|
"children": [],
|
||||||
},
|
},
|
||||||
"RoomOrderNodes": [
|
"RoomOrderNodes": [
|
||||||
{"roomId":{"name":"Room1","path":"rooms/Room1/Room1.yy",},},
|
{"roomId":{"name":"rTest","path":"rooms/rTest/rTest.yy",},},
|
||||||
],
|
],
|
||||||
"Folders": [
|
"Folders": [
|
||||||
{"folderPath":"folders/Sprites.yy","order":1,"resourceVersion":"1.0","name":"Sprites","tags":[],"resourceType":"GMFolder",},
|
{"folderPath":"folders/Sprites.yy","order":1,"resourceVersion":"1.0","name":"Sprites","tags":[],"resourceType":"GMFolder",},
|
||||||
|
|
1
objects/oPlayer/Create_0.gml
Normal file
1
objects/oPlayer/Create_0.gml
Normal file
|
@ -0,0 +1 @@
|
||||||
|
seDeplace = 0;
|
|
@ -1,11 +1,23 @@
|
||||||
keyLeft = keyboard_check(vk_left) or keyboard_check(ord("Q"));
|
keyLeft = keyboard_check(vk_left) or keyboard_check(ord("Q"));
|
||||||
keyRight = keyboard_check(vk_right) or keyboard_check(ord("D"));;
|
keyRight = keyboard_check(vk_right) or keyboard_check(ord("D"));
|
||||||
keyUp = keyboard_check(vk_up) or keyboard_check(ord("Z"));;
|
keyUp = keyboard_check(vk_up) or keyboard_check(ord("Z"));
|
||||||
keyDown = keyboard_check(vk_down) or keyboard_check(ord("S"));;
|
keyDown = keyboard_check(vk_down) or keyboard_check(ord("S"));
|
||||||
keyAttack = keyboard_check_pressed(vk_shift);
|
keyAttack = keyboard_check_pressed(vk_shift);
|
||||||
|
|
||||||
|
|
||||||
|
// Déplacement du joueur
|
||||||
|
|
||||||
deplaceHorizontal = keyRight - keyLeft;
|
deplaceHorizontal = keyRight - keyLeft;
|
||||||
deplaceVertical = keyDown - keyUp;
|
deplaceVertical = keyDown - keyUp;
|
||||||
|
|
||||||
x += deplaceHorizontal;
|
x += deplaceHorizontal;
|
||||||
y += deplaceVertical;
|
y += deplaceVertical;
|
||||||
|
|
||||||
|
seDeplace = (deplaceHorizontal != 0 or deplaceVertical != 0);
|
||||||
|
|
||||||
|
// Animation des sprites
|
||||||
|
|
||||||
|
if (seDeplace) {
|
||||||
|
|
||||||
|
|
||||||
|
}
|
|
@ -22,10 +22,12 @@
|
||||||
"physicsShapePoints": [],
|
"physicsShapePoints": [],
|
||||||
"eventList": [
|
"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":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": [
|
"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":"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":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": [],
|
"overriddenProperties": [],
|
||||||
"parent": {
|
"parent": {
|
||||||
|
|
|
@ -14,15 +14,15 @@
|
||||||
],
|
],
|
||||||
"layers": [
|
"layers": [
|
||||||
{"instances":[
|
{"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",},
|
{"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":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Instances","tags":[],"resourceType":"GMRInstanceLayer",},
|
],"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",},
|
{"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,
|
"inheritLayers": false,
|
||||||
"creationCodeFile": "",
|
"creationCodeFile": "",
|
||||||
"inheritCode": false,
|
"inheritCode": false,
|
||||||
"instanceCreationOrder": [
|
"instanceCreationOrder": [
|
||||||
{"name":"inst_564B33A2","path":"rooms/Room1/Room1.yy",},
|
{"name":"inst_564B33A2","path":"rooms/rTest/rTest.yy",},
|
||||||
],
|
],
|
||||||
"inheritCreationOrder": false,
|
"inheritCreationOrder": false,
|
||||||
"sequenceId": null,
|
"sequenceId": null,
|
||||||
|
@ -50,7 +50,7 @@
|
||||||
"path": "folders/Rooms.yy",
|
"path": "folders/Rooms.yy",
|
||||||
},
|
},
|
||||||
"resourceVersion": "1.0",
|
"resourceVersion": "1.0",
|
||||||
"name": "Room1",
|
"name": "rTest",
|
||||||
"tags": [],
|
"tags": [],
|
||||||
"resourceType": "GMRoom",
|
"resourceType": "GMRoom",
|
||||||
}
|
}
|
|
@ -1,5 +1,6 @@
|
||||||
// Script assets have changed for v2.3.0 see
|
// Script assets have changed for v2.3.0 see
|
||||||
// https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information
|
// https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information
|
||||||
|
|
||||||
function Test(){
|
function Test(){
|
||||||
// C'est un test de git
|
// C'est un test de git
|
||||||
//retest git
|
//retest git
|
||||||
|
|
Reference in a new issue