From f334e060786fa15ff2b5e24076cbaf411022337b Mon Sep 17 00:00:00 2001 From: James Turk Date: Wed, 12 Apr 2023 00:40:03 -0500 Subject: [PATCH] fix explode --- toomgis.p8 | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/toomgis.p8 b/toomgis.p8 index 353c6e1..3839de8 100644 --- a/toomgis.p8 +++ b/toomgis.p8 @@ -143,7 +143,7 @@ function hitbody() ejected += 1 end end - printh("ejected "..ejected) + printh("#tbody=".. #tbody .." ejected "..ejected) end function toomgis_draw(x, y) @@ -184,11 +184,12 @@ function toomgis_upd() piece.r += 5 if piece.r > 90 then add(to_remove, idx) + --piece.ejecting = false end end end - for idx in all(to_remove) do - deli(tbody, idx) + for i = #to_remove, 1, -1 do + deli(tbody, to_remove[i]) end end -->8 @@ -269,11 +270,11 @@ function level_draw() circ(20, 104-py, 16+(gdp*50), 11) circ(20, 104-py, 16+(gdp*25), 11) end - - -- draw guitar - spr(35, 20, 104-py, 2, 2) - -- draw flames if within cooldown - + if (time() - last_guitar) < GUITAR_COOLDOWN then + spr(35 + time()*2%4, 19, 104-py) + spr(35 + time()*4%4, 25, 104-py) + end + spr(33, 20, 104-py, 2, 2) -- draw item shadows shadow_pal() @@ -565,7 +566,7 @@ function explainer_draw() end toomgis_draw(50, 50) - spr(35, 50, 60, 2, 2) + spr(33, 50, 60, 2, 2) for n=0,14 do end @@ -606,21 +607,21 @@ __gfx__ 0000000000000000006333600003300099900000088888802220222009999990033333300333000003333330033333300022200000222200033ee33000aa9999 00000000000000000006660000033000990000000088880002000200009999000030030000000000000000000033330000020000000220000033330000aaaaaa 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000aaaaaa -00000000000000000000000000000000000006440000000000000000099999099099099000000000000000000000000000000011000000000000000000a0aaaa -0700077700000000000000000000000000006444000000000000000099909909999999900000000000000000000000000000011100000000000000000000aaaa -00707700000000000000000000000000000044540000000000000000999099099099099000000000000000000000000000001111000000000000000000009aaa -0007077700000000000000000000000000044546000000000000000088808808808808800000000000000000000000000000066600000000000000000009999a -000777000000000000000000000000000044540000000000000000000880880880880880000000000000000000000000000006b6000000000000000000999999 -0007777700000000000000000000000bb44540000000000000000000008888088088088800000000000000000000000000000166000000000000000009999999 -00007000000000000000000000000bbbb55400000000000000000000000000000000000000000000000000000000000000000016000000000000000009999999 -000077770000000000000000000bbbbb5b5400000000000000000000000000000000000000000000000000000000000000111001000000000000000099999999 -0000000700000000000000000bbbb77575bb00000000000000000000022220022022022000000000000000000000000006611111000000000000000099999999 -000000770000000000000000bbbb775757bb00000000000000000000020222022222222000000000000000000000000000001111000000000000000099999999 -000007700000000000000000bbbbbbb577bb00000000000000000000020222022022022000000000000000000000000000011111000000000000000099999999 -000000700000000000000000000000b77bb000000000000000000000011110011011011000000000000000000000000000111111000000000000000099999999 -000007000000000000000000000000b7bb0000000000000000000000011000011011011000000000000000000000000000111111000000000000000099999999 -000077000000000000000000000000bbb00000000000000000000000011000011011011100000000000000000000000000111111000000000000000099999999 -000770000000000000000000000000bb000000000000000000000000011000000000000000000000000000000000000000000440000000000000000009999999 +00000000000000000000064400000000000000000000000000008800099999099099099000000000000000000000000000000011000000000000000000a0aaaa +07000777000000000000644400000000000008800000000000008a8899909909999999900000000000000000000000000000011100000000000000000000aaaa +00707700000000000000445400000008000008a800000008000088a8999099099099099000000000000000000000000000001111000000000000000000009aaa +00070777000000000004454600000088000008aa08888808000008a888808808808808800000000000000000000000000000066600000000000000000009999a +0007770000000000004454000000008a0000008a008aa88a008888a80880880880880880000000000000000000000000000006b6000000000000000000999999 +000777770000000bb4454000000888aa000888aa0088aaaa08aaaaaa008888088088088800000000000000000000000000000166000000000000000009999999 +0000700000000bbbb554000000008aaa00008aaa00088aaa0088aaaa000000000000000000000000000000000000000000000016000000000000000009999999 +00007777000bbbbb5b54000000000000000000000000000000000000000000000000000000000000000000000000000000111001000000000000000099999999 +000000070bbbb77575bb000000000000000000000000000000000000022220022022022000000000000000000000000006611111000000000000000099999999 +00000077bbbb775757bb000000000000000000000000000000000000020222022222222000000000000000000000000000001111000000000000000099999999 +00000770bbbbbbb577bb000000000000000000000000000000000000020222022022022000000000000000000000000000011111000000000000000099999999 +00000070000000b77bb0000000000000000000000000000000000000011110011011011000000000000000000000000000111111000000000000000099999999 +00000700000000b7bb00000000000000000000000000000000000000011000011011011000000000000000000000000000111111000000000000000099999999 +00007700000000bbb000000000000000000000000000000000000000011000011011011100000000000000000000000000111111000000000000000099999999 +00077000000000bb0000000000000000000000000000000000000000011000000000000000000000000000000000000000000440000000000000000009999999 22000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 22200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 22220000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000