diff --git a/data/animations.lua b/data/animations.lua index 2440f2a..cf61715 100644 --- a/data/animations.lua +++ b/data/animations.lua @@ -70,7 +70,19 @@ animations = { ["mummy_dead"] = { cycle = {1}, frames = { - { frame={x=128,y=24,w=16,h=17}, wait=50 }, + { frame={x=128,y=24,w=16,h=17}, wait=100 }, + } + }, + ["mummy_undying"] = { + cycle = {7,6,7,6,7,6,7,6,5,4,3,2,1}, + frames = { + { frame={x=48,y=24,w=16,h=17}, wait=2 }, + { frame={x=64,y=24,w=16,h=17}, wait=2 }, + { frame={x=80,y=24,w=16,h=17}, wait=2 }, + { frame={x=96,y=24,w=16,h=17}, wait=2 }, + { frame={x=112,y=24,w=16,h=17}, wait=2 }, + { frame={x=128,y=24,w=16,h=17}, wait=1 }, + { frame={x=128,y=40,w=16,h=17}, wait=1 } } }, } \ No newline at end of file diff --git a/data/items.lua b/data/items.lua new file mode 100644 index 0000000..186cf10 --- /dev/null +++ b/data/items.lua @@ -0,0 +1,5 @@ +items = { + ["mummy"] = { + + } +} \ No newline at end of file diff --git a/data/sprites.gif b/data/sprites.gif index 5fd6df6..4a95694 100644 Binary files a/data/sprites.gif and b/data/sprites.gif differ diff --git a/data/sprites.lua b/data/sprites.lua index 27c7cb0..1cb7593 100644 --- a/data/sprites.lua +++ b/data/sprites.lua @@ -109,20 +109,19 @@ sprites = { elseif spr.state == templates.DYING then if spr.animation ~= "mummy_dying" then sprites.set_animation(spr, "mummy_dying") - --spr.animation = "mummy_dying" - --spr.current_frame = 1 else if spr.current_frame == 8 then sprites.set_animation(spr, "mummy_dead") - --spr.animation = "mummy_dead" - --spr.current_frame = 1 spr.state = templates.DEAD - print("DEAD") -- [TOFIX] end end elseif spr.state == templates.DEAD then - -- [TODO] if spr.current_wait == 1 then + sprites.set_animation(spr, "mummy_undying") + spr.state = templates.RESURRECTING + end + elseif spr.state == templates.RESURRECTING then + if spr.current_frame == 13 then sprites.set_animation(spr, "mummy_walk") spr.state = templates.ALIVE end