diff --git a/data/animations.lua b/data/animations.lua index cf61715..4894f54 100644 --- a/data/animations.lua +++ b/data/animations.lua @@ -50,39 +50,39 @@ animations = { ["mummy_walk"] = { cycle = {1,2,1,3}, frames = { - { frame={x=0,y=24,w=16,h=17}, wait=4 }, - { frame={x=16,y=24,w=16,h=17}, wait=4 }, - { frame={x=32,y=24,w=16,h=17}, wait=4 } + { frame={x=0,y=24,w=16,h=16}, wait=4 }, + { frame={x=16,y=24,w=16,h=16}, wait=4 }, + { frame={x=32,y=24,w=16,h=16}, wait=4 } } }, ["mummy_dying"] = { cycle = {1,2,3,4,5,6,7,6}, 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=4 }, - { frame={x=144,y=24,w=16,h=17}, wait=2 } + { frame={x=48,y=24,w=16,h=16}, wait=2 }, + { frame={x=64,y=24,w=16,h=16}, wait=2 }, + { frame={x=80,y=24,w=16,h=16}, wait=2 }, + { frame={x=96,y=24,w=16,h=16}, wait=2 }, + { frame={x=112,y=24,w=16,h=16}, wait=2 }, + { frame={x=128,y=24,w=16,h=16}, wait=4 }, + { frame={x=144,y=24,w=16,h=16}, wait=2 } } }, ["mummy_dead"] = { cycle = {1}, frames = { - { frame={x=128,y=24,w=16,h=17}, wait=100 }, + { frame={x=128,y=24,w=16,h=16}, 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 } + { frame={x=48,y=24,w=16,h=16}, wait=2 }, + { frame={x=64,y=24,w=16,h=16}, wait=2 }, + { frame={x=80,y=24,w=16,h=16}, wait=2 }, + { frame={x=96,y=24,w=16,h=16}, wait=2 }, + { frame={x=112,y=24,w=16,h=16}, wait=2 }, + { frame={x=128,y=24,w=16,h=16}, wait=1 }, + { frame={x=128,y=40,w=16,h=16}, wait=1 } } }, } \ No newline at end of file diff --git a/data/items.lua b/data/items.lua index 186cf10..1ca215c 100644 --- a/data/items.lua +++ b/data/items.lua @@ -1,5 +1,5 @@ items = { ["mummy"] = { - + visual = {x=0,y=24,w=16,h=16} } } \ No newline at end of file diff --git a/data/menu.lua b/data/menu.lua index ec82811..4049f1e 100644 --- a/data/menu.lua +++ b/data/menu.lua @@ -30,6 +30,7 @@ menu = { popup.create("EDIT", 1, 8) popup.addOption("EDIT", "Background", function() editor.layer=LAYER_BACKGROUND end) popup.addOption("EDIT", "Foreground", function() editor.layer=LAYER_FOREGROUND end) + popup.addOption("EDIT", "Items", function() editor.layer=LAYER_ITEMS end) --popup.addOption("EDIT", "Sprites", function() rooms.toggle_visibility(LAYER_SPRITES) end) menu.option("TOOLS")