all states exist! they're okay
This commit is contained in:
parent
470b909d0a
commit
76afbcbfe1
38
vacation.p8
38
vacation.p8
@ -422,14 +422,14 @@ phinstate_crest = {
|
|||||||
yo=-8,
|
yo=-8,
|
||||||
}
|
}
|
||||||
phinstate_fall_wax = {
|
phinstate_fall_wax = {
|
||||||
s={1},
|
s={128},
|
||||||
ws=3,
|
ws=3,
|
||||||
hs=3,
|
hs=3,
|
||||||
xo=-12,
|
xo=-12,
|
||||||
yo=-16,
|
yo=-16,
|
||||||
}
|
}
|
||||||
phinstate_fall_full = {
|
phinstate_fall_full = {
|
||||||
s={7},
|
s={77},
|
||||||
ws=2,
|
ws=2,
|
||||||
hs=3,
|
hs=3,
|
||||||
xo=-4,
|
xo=-4,
|
||||||
@ -437,7 +437,7 @@ phinstate_fall_full = {
|
|||||||
}
|
}
|
||||||
phinstate_dive_full = phinstate_fall_full
|
phinstate_dive_full = phinstate_fall_full
|
||||||
phinstate_dive_wane = {
|
phinstate_dive_wane = {
|
||||||
s={1},
|
s={128},
|
||||||
ws=3,
|
ws=3,
|
||||||
hs=3,
|
hs=3,
|
||||||
xo=-12,
|
xo=-12,
|
||||||
@ -551,13 +551,17 @@ function toyphin:update()
|
|||||||
local wet, st = y > 64, phinstate_error
|
local wet, st = y > 64, phinstate_error
|
||||||
if dy < -2.15 then
|
if dy < -2.15 then
|
||||||
st = wet and phinstate_rise_full or phinstate_jump_full
|
st = wet and phinstate_rise_full or phinstate_jump_full
|
||||||
elseif dy <= -1 then
|
elseif dy <= -1 and (y < 60 or y > 68) then
|
||||||
st = wet and phinstate_rise_wax or phinstate_jump_wane
|
st = wet and phinstate_rise_wax or phinstate_jump_wane
|
||||||
|
elseif dy <= -1 then
|
||||||
|
st = phinstate_nrm
|
||||||
elseif dy < 1 then
|
elseif dy < 1 then
|
||||||
-- handle idle special case later
|
-- handle idle special case later
|
||||||
st = wet and phinstate_return or phinstate_crest
|
st = wet and phinstate_return or phinstate_crest
|
||||||
elseif dy <= 2.15 then
|
elseif dy <= 2.15 and (y < 60 or y < 68) then
|
||||||
st = wet and phinstate_dive_wane or phinstate_fall_wax
|
st = wet and phinstate_dive_wane or phinstate_fall_wax
|
||||||
|
elseif dy <= 2.15 then
|
||||||
|
st = phinstate_nrm
|
||||||
else
|
else
|
||||||
st = wet and phinstate_dive_full or phinstate_fall_full
|
st = wet and phinstate_dive_full or phinstate_fall_full
|
||||||
end
|
end
|
||||||
@ -911,6 +915,30 @@ __gfx__
|
|||||||
000000000000000000000000000000000000000000000000000000000000000000000000eeee2262eeeee0000000000000000000000000000000000000000000
|
000000000000000000000000000000000000000000000000000000000000000000000000eeee2262eeeee0000000000000000000000000000000000000000000
|
||||||
00000000000000000000000000000000000000000000000000000000000000000000000000022226000000000000000000000000000000000000000000000000
|
00000000000000000000000000000000000000000000000000000000000000000000000000022226000000000000000000000000000000000000000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000000000000000222ee00000000000000000000000000000000000000000000000000
|
0000000000000000000000000000000000000000000000000000000000000000000000000222ee00000000000000000000000000000000000000000000000000
|
||||||
|
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
00000000026000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
00000000022600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
00000002e22600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
00000022222200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
00000ee6622220000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
00000eeee22226000026000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
000000000ee622620026000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
0000000000ee22222222600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
00000000000ee2222222200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
000000000000ee222266200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
000000000000ee222622200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
0000000000000ee22222660000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
00000000000222662222220000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
00000000000e22222227722000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
000000000000eee22222c72000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
00000000000000002eee122000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
00000000000000000eeee26200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
000000000000000000eee22600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
|
00000000000000000000ee2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
__label__
|
__label__
|
||||||
cssscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
|
cssscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
|
||||||
s777sccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
|
s777sccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
|
||||||
|
Loading…
Reference in New Issue
Block a user