From f71db7a45646bbaa8f2f82e23f39f4d18ed2481d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20Ryb=C3=A1rsky?= <bruno@brn.systems>
Date: Wed, 2 Mar 2022 19:15:45 +0100
Subject: [PATCH] some stuff

---
 assets/images/icons/window.png         | Bin 0 -> 504 bytes
 assets/images/spritesheets/player.json | 264 ++++++++++++-------------
 modules/globals.lua                    |   1 -
 modules/player.lua                     |   9 +-
 modules/update_callback.lua            |  17 +-
 5 files changed, 148 insertions(+), 143 deletions(-)
 create mode 100644 assets/images/icons/window.png

diff --git a/assets/images/icons/window.png b/assets/images/icons/window.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a7b263385bffbb1e8bc84e4fabd6ab4c601703f
GIT binary patch
literal 504
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$7>k44ofy`glX=O&z_`iN
z#WAE}&fA%WMNEb~uHtRl1%fY%7KF@P_()`Bh9&cKkI8xdhZN1GrXA=}ikuW4_w9d{
z<F@O~^Y*81-YLs>`NM+0KMW&E?El%-Uh7l-x_jQaWj`m_>EHi<Z2P*4_Z@yPZc?AH
zHufj$TF=)~*ZK~BovgC<WmF@>sR^daft%jh#WgbM32bf4wsoDfT~A@+^ah5i4^@sc
zALjU9<YMvQU37iJbe=1W2dfkvJ~3sp?W~LZZO_S)A$=`v!*s4-A&v)3-X{|@R|e^n
z3koE>T~V6fr?UFD`&?EJ1&6E+A^I1>dK4PuT)xZHnpTt?6)#nbuw|S*|7Erm+wR?N
z^UpoI_KGv1obl9}^832KqdPOd$}4hAkaAgHn5*{ulbFB+TgKG^>@1zC3$B%Jm3+B2
zkAX2#f8E}lnW_Q@Sff%EUb(5Sn#aHx)O>Af^tW{kOgkLDyw%p!dc1<AdC5BFdtXC1
zm|i66ndd##4Qphm$|(JnZQFO<+ri<r_?Nn642&@g%!+UR-c=eSaDa7<x!K;-2qBIR
zxee2I+pTqA5RZ7p>%TV4pP{bd4QI;fTJ?x^Ki_n12wScGfdBuAb-uMm<!THJ3=E#G
KelF{r5}E+eNYw2B

literal 0
HcmV?d00001

diff --git a/assets/images/spritesheets/player.json b/assets/images/spritesheets/player.json
index aed33eb..a335d2b 100644
--- a/assets/images/spritesheets/player.json
+++ b/assets/images/spritesheets/player.json
@@ -3,90 +3,90 @@
     "filename": "Sprite-0002 0.aseprite",
     "frame": { "x": 140, "y": 0, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
     "filename": "Sprite-0002 1.aseprite",
     "frame": { "x": 0, "y": 0, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
     "filename": "Sprite-0002 2.aseprite",
     "frame": { "x": 140, "y": 320, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
     "filename": "Sprite-0002 3.aseprite",
     "frame": { "x": 0, "y": 320, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
     "filename": "Sprite-0002 4.aseprite",
     "frame": { "x": 840, "y": 160, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
     "filename": "Sprite-0002 5.aseprite",
     "frame": { "x": 700, "y": 160, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
     "filename": "Sprite-0002 6.aseprite",
     "frame": { "x": 560, "y": 160, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
     "filename": "Sprite-0002 7.aseprite",
     "frame": { "x": 420, "y": 160, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
     "filename": "Sprite-0002 8.aseprite",
     "frame": { "x": 280, "y": 160, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
     "filename": "Sprite-0002 9.aseprite",
     "frame": { "x": 140, "y": 160, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -94,8 +94,8 @@
     "frame": { "x": 280, "y": 320, "w": 140, "h": 150 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 150 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 150 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -103,8 +103,8 @@
     "frame": { "x": 420, "y": 320, "w": 140, "h": 150 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 150 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 150 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -112,8 +112,8 @@
     "frame": { "x": 0, "y": 620, "w": 140, "h": 140 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 140 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 140 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -121,8 +121,8 @@
     "frame": { "x": 840, "y": 610, "w": 140, "h": 140 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 140 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 140 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -130,8 +130,8 @@
     "frame": { "x": 700, "y": 610, "w": 140, "h": 140 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 140 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 140 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -139,8 +139,8 @@
     "frame": { "x": 560, "y": 610, "w": 140, "h": 140 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 140 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 140 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -148,8 +148,8 @@
     "frame": { "x": 420, "y": 610, "w": 140, "h": 140 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 140 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 140 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -157,8 +157,8 @@
     "frame": { "x": 420, "y": 610, "w": 140, "h": 140 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 140 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 140 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -166,8 +166,8 @@
     "frame": { "x": 280, "y": 610, "w": 140, "h": 140 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 140 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 140 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -175,8 +175,8 @@
     "frame": { "x": 140, "y": 480, "w": 140, "h": 140 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 140 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 140 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -184,8 +184,8 @@
     "frame": { "x": 0, "y": 480, "w": 140, "h": 140 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 140 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 140 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -193,8 +193,8 @@
     "frame": { "x": 840, "y": 470, "w": 140, "h": 140 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 140 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 140 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -202,8 +202,8 @@
     "frame": { "x": 700, "y": 470, "w": 140, "h": 140 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 140 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 140 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -211,8 +211,8 @@
     "frame": { "x": 560, "y": 470, "w": 140, "h": 140 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 140 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 140 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -220,8 +220,8 @@
     "frame": { "x": 140, "y": 620, "w": 140, "h": 140 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 140 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 140 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -229,8 +229,8 @@
     "frame": { "x": 420, "y": 470, "w": 140, "h": 140 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 140 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 140 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -238,8 +238,8 @@
     "frame": { "x": 840, "y": 320, "w": 140, "h": 150 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 150 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 150 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -247,116 +247,116 @@
     "frame": { "x": 700, "y": 320, "w": 140, "h": 150 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 150 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 150 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
     "filename": "Sprite-0002 28.aseprite",
     "frame": { "x": 280, "y": 160, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 500
    },
    {
     "filename": "Sprite-0002 29.aseprite",
     "frame": { "x": 280, "y": 0, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 500
    },
    {
     "filename": "Sprite-0002 30.aseprite",
     "frame": { "x": 420, "y": 0, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 200
    },
    {
     "filename": "Sprite-0002 31.aseprite",
     "frame": { "x": 560, "y": 0, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 200
    },
    {
     "filename": "Sprite-0002 32.aseprite",
     "frame": { "x": 700, "y": 0, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 200
    },
    {
     "filename": "Sprite-0002 33.aseprite",
     "frame": { "x": 420, "y": 0, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 200
    },
    {
     "filename": "Sprite-0002 34.aseprite",
     "frame": { "x": 420, "y": 0, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 200
    },
    {
     "filename": "Sprite-0002 35.aseprite",
     "frame": { "x": 840, "y": 0, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 200
    },
    {
     "filename": "Sprite-0002 36.aseprite",
     "frame": { "x": 0, "y": 160, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 200
    },
    {
     "filename": "Sprite-0002 37.aseprite",
     "frame": { "x": 420, "y": 0, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 200
    },
    {
     "filename": "Sprite-0002 38.aseprite",
     "frame": { "x": 280, "y": 0, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 65535
    },
    {
     "filename": "Sprite-0002 39.aseprite",
     "frame": { "x": 280, "y": 0, "w": 140, "h": 160 },
     "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 0, "w": 140, "h": 160 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 140, "h": 160 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -364,8 +364,8 @@
     "frame": { "x": 560, "y": 320, "w": 140, "h": 150 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 10, "w": 140, "h": 150 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 10, "w": 140, "h": 150 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -373,8 +373,8 @@
     "frame": { "x": 280, "y": 470, "w": 140, "h": 140 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 20, "w": 140, "h": 140 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 20, "w": 140, "h": 140 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -382,8 +382,8 @@
     "frame": { "x": 280, "y": 750, "w": 140, "h": 130 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 30, "w": 140, "h": 130 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 30, "w": 140, "h": 130 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -391,8 +391,8 @@
     "frame": { "x": 420, "y": 750, "w": 140, "h": 120 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 40, "w": 140, "h": 120 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 40, "w": 140, "h": 120 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -400,8 +400,8 @@
     "frame": { "x": 560, "y": 750, "w": 140, "h": 110 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 50, "w": 140, "h": 110 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 50, "w": 140, "h": 110 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -409,8 +409,8 @@
     "frame": { "x": 700, "y": 750, "w": 140, "h": 100 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 60, "w": 140, "h": 100 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 60, "w": 140, "h": 100 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -418,8 +418,8 @@
     "frame": { "x": 840, "y": 750, "w": 140, "h": 90 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 70, "w": 140, "h": 90 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 70, "w": 140, "h": 90 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -427,8 +427,8 @@
     "frame": { "x": 0, "y": 760, "w": 140, "h": 80 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 80, "w": 140, "h": 80 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 80, "w": 140, "h": 80 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -436,8 +436,8 @@
     "frame": { "x": 140, "y": 760, "w": 140, "h": 70 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 10, "y": 90, "w": 140, "h": 70 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 0, "y": 90, "w": 140, "h": 70 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -445,8 +445,8 @@
     "frame": { "x": 140, "y": 830, "w": 120, "h": 60 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 20, "y": 100, "w": 120, "h": 60 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 10, "y": 100, "w": 120, "h": 60 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -454,8 +454,8 @@
     "frame": { "x": 0, "y": 840, "w": 100, "h": 50 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 30, "y": 110, "w": 100, "h": 50 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 20, "y": 110, "w": 100, "h": 50 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -463,8 +463,8 @@
     "frame": { "x": 840, "y": 840, "w": 100, "h": 40 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 30, "y": 120, "w": 100, "h": 40 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 20, "y": 120, "w": 100, "h": 40 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -472,8 +472,8 @@
     "frame": { "x": 700, "y": 850, "w": 60, "h": 30 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 50, "y": 130, "w": 60, "h": 30 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 40, "y": 130, "w": 60, "h": 30 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -481,8 +481,8 @@
     "frame": { "x": 760, "y": 850, "w": 60, "h": 20 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 50, "y": 140, "w": 60, "h": 20 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 40, "y": 140, "w": 60, "h": 20 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    },
    {
@@ -490,8 +490,8 @@
     "frame": { "x": 560, "y": 860, "w": 60, "h": 10 },
     "rotated": false,
     "trimmed": true,
-    "spriteSourceSize": { "x": 50, "y": 150, "w": 60, "h": 10 },
-    "sourceSize": { "w": 160, "h": 160 },
+    "spriteSourceSize": { "x": 40, "y": 150, "w": 60, "h": 10 },
+    "sourceSize": { "w": 140, "h": 160 },
     "duration": 1
    }
  ],
diff --git a/modules/globals.lua b/modules/globals.lua
index 3a9c5b6..97e8c6f 100644
--- a/modules/globals.lua
+++ b/modules/globals.lua
@@ -6,7 +6,6 @@ game.title = "Weeeeeeeee"
 game.version = "0.0.1"
 game.fullscreen = false
 game.level = 1
-game.die_animation_elapsed = false
 
 return {
     game = game
diff --git a/modules/player.lua b/modules/player.lua
index d1b704e..39465e7 100644
--- a/modules/player.lua
+++ b/modules/player.lua
@@ -1,9 +1,11 @@
 local player = {}
 player.x = 0
 player.y = 500
-player.width = 160
+player.width = 140
 player.height = 160
 player.speed = 200
+player.speed_jumping = 400
+player.speed_walking = 200
 player.jump_height = 500
 player.state = "idle"
 player.direction = "right"
@@ -53,7 +55,7 @@ player.die = function(self, dt)
         self.state = "die"
         self.animation = self.spritesheets["player_die"]
         self.sound_effects["die"]:play()
-        die_animation_elapsed = false
+        self.spritesheets["player_die"]:setFrame(1)
     end
 end
 player.revive = function(self, dt)
@@ -62,7 +64,8 @@ player.revive = function(self, dt)
         self.state = "idle"
         self.animation = self.spritesheets["player_default"]
         self.sound_effects["revive"]:play()
-        die_animation_elapsed = false
+        self.spritesheets["player_die"]:setFrame(1)
+
     end
 end
 player.idle = function(self, dt)
diff --git a/modules/update_callback.lua b/modules/update_callback.lua
index cb3a95f..4e63316 100644
--- a/modules/update_callback.lua
+++ b/modules/update_callback.lua
@@ -6,10 +6,8 @@ end
 
 local function update(dt)
     --update player_animation
-    if spritesheets["player_die"]:getFrame() ~= 16 and not game.die_animation_elapsed then
+    if spritesheets["player_die"]:getFrame() ~= 16 then
         spritesheets["player_die"]:update(dt)
-    else
-        game.die_animation_elapsed = true
     end
     if player.alive then
         spritesheets["player_jump"]:update(dt)
@@ -21,30 +19,35 @@ local function update(dt)
 
     --get keyboard
     local key = love.keyboard.isDown
+    player:idle(dt)
     --move player
     if key("d") then
         player:walk_right(dt)
     elseif key("a") then
         player:walk_left(dt)
-    else
-        player:idle(dt)
     end
     --jump player
     if key("w") then
         player:jump(dt)
+        player.speed = player.speed_jumping
+    else
+        player.speed = player.speed_walking
     end
     if game.debug then
         if key("s") then
             player:down(dt)
+            player.speed = player.speed_jumping
+        else
+            player.speed = player.speed_walking
         end
         if key("f") then
             --die
+            player.spritesheets["player_die"]:setFrame(1)
             player:die(dt)
-            game.die_animation_elapsed = false
         elseif key("g") then
             --revive player
+            player.spritesheets["player_die"]:setFrame(1)
             player:revive(dt)
-            game.die_animation_elapsed = false
         end     
     end
 end