diff --git a/Surprise Dungeon.yyp b/Surprise Dungeon.yyp
index 3a63377..13b72c9 100644
--- a/Surprise Dungeon.yyp
+++ b/Surprise Dungeon.yyp
@@ -1,7 +1,7 @@
{
"resources": [
{"id":{"name":"sPlayer","path":"sprites/sPlayer/sPlayer.yy",},"order":2,},
- {"id":{"name":"Purple","path":"sprites/Purple/Purple.yy",},"order":1,},
+ {"id":{"name":"sSword","path":"sprites/sSword/sSword.yy",},"order":1,},
{"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,},
diff --git a/objects/oPlayer/Step_0.gml b/objects/oPlayer/Step_0.gml
index 15513bd..e9fa4a7 100644
--- a/objects/oPlayer/Step_0.gml
+++ b/objects/oPlayer/Step_0.gml
@@ -1,11 +1,11 @@
-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"));;
-keyAttack = keyboard_check_pressed(vk_shift);
-
-deplaceHorizontal = keyRight - keyLeft;
-deplaceVertical = keyDown - keyUp;
-
-x += deplaceHorizontal;
-y += deplaceVertical;
\ No newline at end of file
+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"));;
+keyAttack = keyboard_check_pressed(vk_shift);
+
+deplaceHorizontal = keyRight - keyLeft;
+deplaceVertical = keyDown - keyUp;
+
+x += deplaceHorizontal;
+y += deplaceVerticald;
\ No newline at end of file
diff --git a/objects/oPlayer/oPlayer.yy b/objects/oPlayer/oPlayer.yy
index 6396b12..9d2d709 100644
--- a/objects/oPlayer/oPlayer.yy
+++ b/objects/oPlayer/oPlayer.yy
@@ -1,39 +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",
+{
+ "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 a863e14..0000000
Binary files a/sprites/Purple/1f54f59f-74d3-450c-a41c-1986c1537345.png and /dev/null differ
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 a863e14..0000000
Binary files a/sprites/Purple/layers/1f54f59f-74d3-450c-a41c-1986c1537345/19b32337-1cc4-49aa-a953-00db83b561b0.png and /dev/null differ
diff --git a/sprites/sSword/1f54f59f-74d3-450c-a41c-1986c1537345.png b/sprites/sSword/1f54f59f-74d3-450c-a41c-1986c1537345.png
new file mode 100644
index 0000000..47ecb4d
Binary files /dev/null and b/sprites/sSword/1f54f59f-74d3-450c-a41c-1986c1537345.png differ
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 0000000..47ecb4d
Binary files /dev/null and b/sprites/sSword/layers/1f54f59f-74d3-450c-a41c-1986c1537345/19b32337-1cc4-49aa-a953-00db83b561b0.png differ
diff --git a/sprites/Purple/Purple.yy b/sprites/sSword/sSword.yy
similarity index 81%
rename from sprites/Purple/Purple.yy
rename to sprites/sSword/sSword.yy
index 4a2bee6..f8d7887 100644
--- a/sprites/Purple/Purple.yy
+++ b/sprites/sSword/sSword.yy
@@ -7,10 +7,10 @@
"edgeFiltering": false,
"collisionTolerance": 0,
"swfPrecision": 2.525,
- "bbox_left": 0,
- "bbox_right": 63,
- "bbox_top": 0,
- "bbox_bottom": 63,
+ "bbox_left": 22,
+ "bbox_right": 32,
+ "bbox_top": 6,
+ "bbox_bottom": 43,
"HTile": false,
"VTile": false,
"For3D": false,
@@ -24,12 +24,12 @@
"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",},
+ {"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":"Purple","path":"sprites/Purple/Purple.yy",},
+ "spriteId": {"name":"sSword","path":"sprites/sSword/sSword.yy",},
"timeUnits": 1,
"playback": 1,
"playbackSpeed": 30.0,
@@ -41,7 +41,7 @@
"moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
"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<SpriteFrameKeyframe>",},
+ {"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<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,
@@ -58,9 +58,9 @@
"yorigin": 0,
"eventToFunction": {},
"eventStubScript": null,
- "parent": {"name":"Purple","path":"sprites/Purple/Purple.yy",},
+ "parent": {"name":"sSword","path":"sprites/sSword/sSword.yy",},
"resourceVersion": "1.3",
- "name": "Purple",
+ "name": "sSword",
"tags": [],
"resourceType": "GMSequence",
},
@@ -72,7 +72,7 @@
"path": "folders/Sprites.yy",
},
"resourceVersion": "1.0",
- "name": "Purple",
+ "name": "sSword",
"tags": [],
"resourceType": "GMSprite",
}
\ No newline at end of file