From b1ffe3d0d7065fdacac035beec37a7603c3d731a Mon Sep 17 00:00:00 2001 From: sOlaris38 Date: Sat, 5 Dec 2020 12:48:37 +0100 Subject: [PATCH 1/2] --- Surprise Dungeon.yyp | 4 ++-- objects/oPlayer/Create_0.gml | 1 + objects/oPlayer/Step_0.gml | 20 ++++++++++++++++---- objects/oPlayer/oPlayer.yy | 2 ++ rooms/{Room1/Room1.yy => rTest/rTest.yy} | 8 ++++---- scripts/Script1/Script1.gml | 1 + 6 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 objects/oPlayer/Create_0.gml rename rooms/{Room1/Room1.yy => rTest/rTest.yy} (92%) 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 From 652d9e66ffca44e1ddf8993225909d0ae9770540 Mon Sep 17 00:00:00 2001 From: sOlaris38 Date: Sat, 5 Dec 2020 12:50:56 +0100 Subject: [PATCH 2/2] --- objects/oPlayer/oPlayer.yy.base | 39 +++++ objects/oPlayer/oPlayer.yy.ours | 41 +++++ objects/oPlayer/oPlayer.yy.theirs | 39 +++++ .../1f54f59f-74d3-450c-a41c-1986c1537345.png | Bin 243 -> 0 bytes sprites/Purple/Purple.yy | 154 +++++++++--------- .../19b32337-1cc4-49aa-a953-00db83b561b0.png | Bin 243 -> 0 bytes .../1f54f59f-74d3-450c-a41c-1986c1537345.png | Bin 0 -> 295 bytes .../19b32337-1cc4-49aa-a953-00db83b561b0.png | Bin 0 -> 295 bytes sprites/sSword/sSword.yy | 78 +++++++++ 9 files changed, 274 insertions(+), 77 deletions(-) create mode 100644 objects/oPlayer/oPlayer.yy.base create mode 100644 objects/oPlayer/oPlayer.yy.ours create mode 100644 objects/oPlayer/oPlayer.yy.theirs delete mode 100644 sprites/Purple/1f54f59f-74d3-450c-a41c-1986c1537345.png delete mode 100644 sprites/Purple/layers/1f54f59f-74d3-450c-a41c-1986c1537345/19b32337-1cc4-49aa-a953-00db83b561b0.png create mode 100644 sprites/sSword/1f54f59f-74d3-450c-a41c-1986c1537345.png create mode 100644 sprites/sSword/layers/1f54f59f-74d3-450c-a41c-1986c1537345/19b32337-1cc4-49aa-a953-00db83b561b0.png create mode 100644 sprites/sSword/sSword.yy diff --git a/objects/oPlayer/oPlayer.yy.base b/objects/oPlayer/oPlayer.yy.base new file mode 100644 index 0000000..6396b12 --- /dev/null +++ b/objects/oPlayer/oPlayer.yy.base @@ -0,0 +1,39 @@ +{ + "spriteId": { + "name": "sPlayer", + "path": "sprites/sPlayer/sPlayer.yy", + }, + "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": [ + {"isDnD":false,"eventNum":0,"eventType":3,"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",}, + ], + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "resourceVersion": "1.0", + "name": "oPlayer", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/objects/oPlayer/oPlayer.yy.ours b/objects/oPlayer/oPlayer.yy.ours new file mode 100644 index 0000000..750fda4 --- /dev/null +++ b/objects/oPlayer/oPlayer.yy.ours @@ -0,0 +1,41 @@ +{ + "spriteId": { + "name": "sPlayer", + "path": "sprites/sPlayer/sPlayer.yy", + }, + "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": [ + {"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": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "resourceVersion": "1.0", + "name": "oPlayer", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/objects/oPlayer/oPlayer.yy.theirs b/objects/oPlayer/oPlayer.yy.theirs new file mode 100644 index 0000000..6396b12 --- /dev/null +++ b/objects/oPlayer/oPlayer.yy.theirs @@ -0,0 +1,39 @@ +{ + "spriteId": { + "name": "sPlayer", + "path": "sprites/sPlayer/sPlayer.yy", + }, + "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": [ + {"isDnD":false,"eventNum":0,"eventType":3,"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",}, + ], + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "resourceVersion": "1.0", + "name": "oPlayer", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/sprites/Purple/1f54f59f-74d3-450c-a41c-1986c1537345.png b/sprites/Purple/1f54f59f-74d3-450c-a41c-1986c1537345.png deleted file mode 100644 index a863e14ef899b617e10403c7c8a80b57c2a51fd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=yF6VSLn`LHy}6OMIY8uS09RS# zQ>E0&3K4y|hd53yx9m!~zJ9}++j}eHZ@qUu|N",}, - "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, - "tracks": [ - {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ - {"id":"4e12be63-a77f-4039-aa72-09a02319ca8d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1f54f59f-74d3-450c-a41c-1986c1537345","path":"sprites/Purple/Purple.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"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": 0, - "yorigin": 0, - "eventToFunction": {}, - "eventStubScript": null, - "parent": {"name":"Purple","path":"sprites/Purple/Purple.yy",}, - "resourceVersion": "1.3", - "name": "Purple", - "tags": [], - "resourceType": "GMSequence", - }, - "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"19b32337-1cc4-49aa-a953-00db83b561b0","tags":[],"resourceType":"GMImageLayer",}, - ], - "parent": { - "name": "Sprites", - "path": "folders/Sprites.yy", - }, - "resourceVersion": "1.0", - "name": "Purple", - "tags": [], - "resourceType": "GMSprite", +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 0, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 0, + "bbox_right": 63, + "bbox_top": 0, + "bbox_bottom": 63, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 64, + "height": 64, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"1f54f59f-74d3-450c-a41c-1986c1537345","path":"sprites/Purple/Purple.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"1f54f59f-74d3-450c-a41c-1986c1537345","path":"sprites/Purple/Purple.yy",},"LayerId":{"name":"19b32337-1cc4-49aa-a953-00db83b561b0","path":"sprites/Purple/Purple.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"Purple","path":"sprites/Purple/Purple.yy",},"resourceVersion":"1.0","name":"1f54f59f-74d3-450c-a41c-1986c1537345","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"Purple","path":"sprites/Purple/Purple.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",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"4e12be63-a77f-4039-aa72-09a02319ca8d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1f54f59f-74d3-450c-a41c-1986c1537345","path":"sprites/Purple/Purple.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"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": 0, + "yorigin": 0, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"Purple","path":"sprites/Purple/Purple.yy",}, + "resourceVersion": "1.3", + "name": "Purple", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"19b32337-1cc4-49aa-a953-00db83b561b0","tags":[],"resourceType":"GMImageLayer",}, + ], + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "resourceVersion": "1.0", + "name": "Purple", + "tags": [], + "resourceType": "GMSprite", } \ No newline at end of file diff --git a/sprites/Purple/layers/1f54f59f-74d3-450c-a41c-1986c1537345/19b32337-1cc4-49aa-a953-00db83b561b0.png b/sprites/Purple/layers/1f54f59f-74d3-450c-a41c-1986c1537345/19b32337-1cc4-49aa-a953-00db83b561b0.png deleted file mode 100644 index a863e14ef899b617e10403c7c8a80b57c2a51fd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=yF6VSLn`LHy}6OMIY8uS09RS# zQ>E0&3K4y|hd53yx9m!~zJ9}++j}eHZ@qUu|Nt=`Ln`LHy>Xkf#ejh|P<+iv zzcog4Z-jhf)a#btWq*>hf}O?D@bQce3xD(UYfQ6PEI#m%Of`A`&SnT!vHZCA=bVS&C!s3{^)P+d=xL0v_62+Gv}*q=lWWC1Ep?|&`t5Dg zxTdFYZrQV=ZrA?{Mh6OGuTM_y(P7kG;K_i58~T!YKY#u1oz@_BL4^RmV|PG!>TB7U U85%zx0e#Nk>FVdQ&MBb@02*U+=>Px# literal 0 HcmV?d00001 diff --git a/sprites/sSword/layers/1f54f59f-74d3-450c-a41c-1986c1537345/19b32337-1cc4-49aa-a953-00db83b561b0.png b/sprites/sSword/layers/1f54f59f-74d3-450c-a41c-1986c1537345/19b32337-1cc4-49aa-a953-00db83b561b0.png new file mode 100644 index 0000000000000000000000000000000000000000..47ecb4d147fa19d998017c1684ee1411042589f6 GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=?>t=`Ln`LHy>Xkf#ejh|P<+iv zzcog4Z-jhf)a#btWq*>hf}O?D@bQce3xD(UYfQ6PEI#m%Of`A`&SnT!vHZCA=bVS&C!s3{^)P+d=xL0v_62+Gv}*q=lWWC1Ep?|&`t5Dg zxTdFYZrQV=ZrA?{Mh6OGuTM_y(P7kG;K_i58~T!YKY#u1oz@_BL4^RmV|PG!>TB7U U85%zx0e#Nk>FVdQ&MBb@02*U+=>Px# literal 0 HcmV?d00001 diff --git a/sprites/sSword/sSword.yy b/sprites/sSword/sSword.yy new file mode 100644 index 0000000..f8d7887 --- /dev/null +++ b/sprites/sSword/sSword.yy @@ -0,0 +1,78 @@ +{ + "bboxMode": 0, + "collisionKind": 1, + "type": 0, + "origin": 0, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 22, + "bbox_right": 32, + "bbox_top": 6, + "bbox_bottom": 43, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 64, + "height": 64, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"1f54f59f-74d3-450c-a41c-1986c1537345","path":"sprites/sSword/sSword.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"1f54f59f-74d3-450c-a41c-1986c1537345","path":"sprites/sSword/sSword.yy",},"LayerId":{"name":"19b32337-1cc4-49aa-a953-00db83b561b0","path":"sprites/sSword/sSword.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"sSword","path":"sprites/sSword/sSword.yy",},"resourceVersion":"1.0","name":"1f54f59f-74d3-450c-a41c-1986c1537345","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"sSword","path":"sprites/sSword/sSword.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",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"4e12be63-a77f-4039-aa72-09a02319ca8d","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1f54f59f-74d3-450c-a41c-1986c1537345","path":"sprites/sSword/sSword.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"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": 0, + "yorigin": 0, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"sSword","path":"sprites/sSword/sSword.yy",}, + "resourceVersion": "1.3", + "name": "sSword", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"19b32337-1cc4-49aa-a953-00db83b561b0","tags":[],"resourceType":"GMImageLayer",}, + ], + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "resourceVersion": "1.0", + "name": "sSword", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file