diff --git a/data/gfx/abad.gif b/data/gfx/abad.gif new file mode 100644 index 0000000..8419687 Binary files /dev/null and b/data/gfx/abad.gif differ diff --git a/data/gfx/paku.gif b/data/gfx/paku.gif new file mode 100644 index 0000000..987e9d8 Binary files /dev/null and b/data/gfx/paku.gif differ diff --git a/data/gfx/sprites.gif b/data/gfx/sprites.gif index ff071d6..3f7d174 100644 Binary files a/data/gfx/sprites.gif and b/data/gfx/sprites.gif differ diff --git a/data/maps/rooms_foreground.gif b/data/maps/rooms_foreground.gif index 08925c3..f546f17 100644 Binary files a/data/maps/rooms_foreground.gif and b/data/maps/rooms_foreground.gif differ diff --git a/data/maps/rooms_items.gif b/data/maps/rooms_items.gif index b9fcd4d..cc12c02 100644 Binary files a/data/maps/rooms_items.gif and b/data/maps/rooms_items.gif differ diff --git a/data/modules/animations.lua b/data/modules/animations.lua index 02b29ca..cfccc67 100644 --- a/data/modules/animations.lua +++ b/data/modules/animations.lua @@ -232,4 +232,12 @@ animations = { { frame={x=56,y=0,w=8,h=8}, wait=100 } } }, + ["abad"] = { + cycle = {1,2}, + loop = true, + frames = { + { frame={x=16,y=0,w=16,h=18}, offset={flipped={x=0,y=-2}}, wait=2 }, + { frame={x=32,y=0,w=16,h=18}, offset={flipped={x=0,y=-2}}, wait=2 } + } + }, } \ No newline at end of file diff --git a/data/modules/items.lua b/data/modules/items.lua index 14622c2..8d21fe9 100644 --- a/data/modules/items.lua +++ b/data/modules/items.lua @@ -18,4 +18,5 @@ items = { { name="rata", label="rata", visual={x=80, y=48, w=9, h=8} }, { name="gota", label="gota", visual={x=80, y=56, w=8, h=8} }, { name="berserk", label="berserk", visual={x=16, y=24, w=16, h=16} }, + { name="abad", label="abad", visual={x=16, y=0, w=16, h=16} }, } diff --git a/data/modules/templates.lua b/data/modules/templates.lua index 0288a64..f593e18 100644 --- a/data/modules/templates.lua +++ b/data/modules/templates.lua @@ -262,6 +262,22 @@ function me.create(type, options) room = options.room, ia = ia.update_berserk } + elseif key == "abad" then + sprite = { + type = key, + pos = options.pos,--{ x=100, y=4*12*8+71 }, + size = { w=16,h=18 }, + bbo = { left=3, top=2, right=3, bottom=0 }, + current_frame = 1, + current_wait = 1, + flipped = options.flipped, + surf = surf.load("gfx/abad.gif"), + animation = "abad", + state = me.ALIVE, + enemy = true, + room = options.room, + ia = ia.update_coin + } else error("Template not recognized") end