From 1dee667dfccca66dbc7b683c3b9771e3f3564e77 Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Fri, 27 Jun 2025 13:58:17 +0200 Subject: [PATCH] - Pos m'he passat tant de rato mirant el bug del CCAE i peleant en la IA que ja no se que he fet. --- data/animations.lua | 14 +++++++++++++- data/items.lua | 5 +++++ data/sprites.gif | Bin 1687 -> 1731 bytes data/sprites.lua | 11 +++++------ 4 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 data/items.lua 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 5fd6df69720fdcb89c8d0100e4da9415a8038118..4a956945d5e9a72ba6d5fa30dcabed37f6fbed40 100644 GIT binary patch delta 372 zcmV-)0gL{Z4Z{tvSp|Q5mCBOHL@9i*iBLQm!=l(k-A$2-NwlKCqK8EydXHmV>>?0p zNV@->iSdZ}o1pN{I7T)4FN|#D;S9Hj!#LXUj(E(Y9{0${KKk*GfDB|CKZl>i2{L7A z5QVN1DXv2*K@i8&l_LPrNJq+!6)9qwCBRY1L&AXOERP$>yQ;SP>Bww zjKh@p*+@W+qmzit5*H?frKhw)6kLggDJG$%E^9d!s+=ZH5GkhnhN+>Hc*Q!>q23D= z^O#aHlQ(~v%x3&^h0IW90>Zo|7kbm75cMTF^{GrJO}QNm5mG)Ia_2hPi466$#+r9w zKxo`4PD$p8NG)uF5vWQyBY@gyo}R>#IJ{)2K?xvBWfD|B9ZE-uTIEh?vgkxN%F&K` zK=h*^4XH>+O45>=^rR?FsY+MM(w4gPr7(@DOlL~dn%eZHIL)a}cgoYA`t+wj4XRLw SO4Onn^{7Zqs#5hB0suQ0PO$|5 delta 328 zcmV-O0k{6c4VMkDSp|Pgq7s+L#3nlNiBOE96sJhVDq8W1Sj?gpx5&jVdhv^345Jvw zNXGv%n(>T8#FefVhelncK@@ImgSgt*2tgcgjdpy*4CqJ^mRUj!emq{B_&ADRM9*c< z0LLK-xs7_PLsryqBs!cj4n}feBLO*%P9l;?T$s?3E*VQw)JT65QQl^bX1q#IoHCkA zsB%A`yn|w_BOU6!V3u`>r4%wl8UI{?mz$Y@CUqH<-gGELeMwGzDuc>YUZ_K#fQ zXP(kY&wl#zp8!A&s6Yow(1IHDpa@N+O45>=^rR?FsY+E90suP}sgt(= 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