Compare commits

..

No commits in common. "4ee343621cf024ea0e9fc4d18b85e7c830d8f067" and "7b01fe5d2054b628945ff629bc2d5fdfbfa579d1" have entirely different histories.

View File

@ -386,7 +386,7 @@ phinstate_nrm = {
yo=-8, yo=-8,
} }
phinstate_jump_full = { phinstate_jump_full = {
s={64}, s={7},
ws=2, ws=2,
hs=3, hs=3,
xo=-4, xo=-4,
@ -407,14 +407,14 @@ phinstate_crest = {
yo=-8, yo=-8,
} }
phinstate_fall_wax = phinstate_jump_wane phinstate_fall_wax = phinstate_jump_wane
phinstate_fall_full = { phinstate_fall_full = phinstate_jump_full
phinstate_dive_full = {
s={7}, s={7},
ws=2, ws=2,
hs=3, hs=3,
xo=-4, xo=-4,
yo=-16, yo=-16,
} }
phinstate_dive_full = phinstate_fall_full
phinstate_dive_wane = { phinstate_dive_wane = {
s={1}, s={1},
ws=3, ws=3,
@ -580,7 +580,7 @@ function collides(b1, b2)
end end
function wordtarget:update() function wordtarget:update()
if collides({self.x, self.y, self.w, 6}, self.phin:box()) then if collides({self.x, self.y, self.w, 7}, self.phin:box()) then
self:on_hit() self:on_hit()
return true return true
end end
@ -858,30 +858,6 @@ __gfx__
00000000000000000000000000000000000000002222ee7e22222000000000000000000027770000777722e2777770002eee0000eeee2272eeeee00000000000 00000000000000000000000000000000000000002222ee7e22222000000000000000000027770000777722e2777770002eee0000eeee2272eeeee00000000000
0000000000000000000000000000000000000000000eeee7000000000000000000000000770000000002222e00000000ee000000000222270000000000000000 0000000000000000000000000000000000000000000eeee7000000000000000000000000770000000002222e00000000ee000000000222270000000000000000
00000000000000000000000000000000000000000eee2200000000000000000000000000000000000222770000000000000000000222ee000000000000000000 00000000000000000000000000000000000000000eee2200000000000000000000000000000000000222770000000000000000000222ee000000000000000000
00000000000066000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000222600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000002222e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0000000002712ee00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000627ceee00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000022277eee00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000222222ee000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000066226622ee000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0006222622226e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00022222222226000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00220022222222000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0000002226ee26000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0000002226ee22600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000222ee002200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000022eee002200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0000022eee0000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0000022ee00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0000022e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0006622e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0022226e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
02222226000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
022e022e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0200022e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
__label__ __label__
cssscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc cssscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
s777sccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc s777sccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc