12 Commits

Author SHA1 Message Date
a177660344 Slightly more efficient fix to level_tug_crate. 2023-01-02 16:26:30 -08:00
49284d44a8 Fix syntax errors. 2023-01-02 16:25:18 -08:00
b2dbd9ec60 _calc_push golf redux
Removed unnecessary variable declarations and conditional cases by using an "assume, alternate, verify assumption" pattern and reusing ax0/ay0 when they would never be referenced again.
2023-01-02 16:22:10 -08:00
cb36faac23 Fix syntax errors.
This also saves a few tokens and cycles by turning level:tug_crate into a free function. It's not _pretty_ but it's the least bad option.
2023-01-02 16:04:42 -08:00
78f0a96529 calc_push op loop golf
Reorganizing conditionals saves tokens here.
2023-01-02 15:58:23 -08:00
d792831370 can_move also takes a rope operation table
this is approximately token-neutral but performance-saving. each function parameter makes its call cost worse. When can_move is called inside a loop, we already have a table and we unpack to call can_move; moving the unpack into can_move saves us marshalling cost. It requires us to construct a table in a different spot (where we were not previously doing so) but that spot is not in a loop.
2023-01-02 15:57:27 -08:00
b1cc74fe3b Remove unused vars, convert tug_crate arg to table
The tug_crate conversion is for performance. `foreach(tbl, predefined_func)` is substantially faster than a standard `for` loop using the `all` iterator. However, if the function inside the foreach is defined inline, it's much slower due to closure-construction overhead (even though nothing is being closed over). Converting `tug_crate` to take a table as an argument allows foreach to feed right into it, and it also naturally suggests a rewrite a few lines down to get rid of duplicative listing of `mx0,my0,dmx,dmy`, saving several tokens.

I'm going to take a look at can_move to see if it's worth making iits mx0,my0,dmx,dmy arguments into a table as well.
2023-01-02 15:35:10 -08:00
0aeeb1975b Show blocked crate moves (#24)
Save/load system. Not golfed.

Saves the music flag, the last level the player played, and the furthest level reached. Loads music flag on launch. Title screen starts on most recent level played; when in "release configuration" the title screen will only let the player pick levels up to the maximum reached through gameplay, but right now this is replaced with the 31.

Save file can be wiped by holding the down arrow at the title screen.

block writes while reading

Disabling writes during "wipe" and "first load" is not quite semantically what we want, it's writes during read we want to block. This happens because turning the music on or off tries to save the state, and it's easier to just ignore that persistence request than to rework the music code so it doesn't. "wipe" and "first load" are when we're actually reading (and enacting) state, but it's the act of reading rather than those two acts that should block writes.

It is also unwilling to write until it's done its first read, which I think is a feature; it makes it harder to accidentally blank out the player's data.

Show blocked moves as an animated X.

I am not convinced the sprite is very good. This could help the player learn what pulls were considered before proposing the ones that would occur if the player pulled the tongue. Or it's just visual noise that sucks. Anyway, this correctly captures what the blocked considered moves were, and we can decide whether to use it or not.

Reviewed-on: pyrex/chameleonic#24
Co-authored-by: Kistaro Windrider <kistaro@gmail.com>
Co-committed-by: Kistaro Windrider <kistaro@gmail.com>
2023-01-02 23:08:10 +00:00
b6d1a21b7e Basic save/load system (#23)
Save/load system. Not golfed.

Saves the music flag, the last level the player played, and the furthest level reached. Loads music flag on launch. Title screen starts on most recent level played; when in "release configuration" the title screen will only let the player pick levels up to the maximum reached through gameplay, but right now this is replaced with the 31.

Save file can be wiped by holding the down arrow at the title screen.

block writes while reading

Disabling writes during "wipe" and "first load" is not quite semantically what we want, it's writes during read we want to block. This happens because turning the music on or off tries to save the state, and it's easier to just ignore that persistence request than to rework the music code so it doesn't. "wipe" and "first load" are when we're actually reading (and enacting) state, but it's the act of reading rather than those two acts that should block writes.

It is also unwilling to write until it's done its first read, which I think is a feature; it makes it harder to accidentally blank out the player's data.

Reviewed-on: pyrex/chameleonic#23
Co-authored-by: Kistaro Windrider <kistaro@gmail.com>
Co-committed-by: Kistaro Windrider <kistaro@gmail.com>
2023-01-02 23:08:03 +00:00
7c209f1125 Level 23. Minimal "requires pivot to avoid occlusion". (#22)
Fix spurious pit.

Reviewed-on: pyrex/chameleonic#22
Co-authored-by: Kistaro Windrider <kistaro@gmail.com>
Co-committed-by: Kistaro Windrider <kistaro@gmail.com>
2023-01-02 21:31:20 +00:00
5df3f00809 Fix another rope bug 2023-01-02 13:05:58 -08:00
c81b3a03d3 Crate push previews 2023-01-02 12:18:30 -08:00

View File

@ -337,7 +337,6 @@ function level:advance()
end end
normpal = {[1]=0,[8]=0,[14]=0} normpal = {[1]=0,[8]=0,[14]=0}
pitpal = {[8]=0,[13]=3,[4]=3,[7]=3}
function level:draw() function level:draw()
cls(5) cls(5)
fillp() fillp()
@ -350,15 +349,11 @@ function level:draw()
for _,pit in pairs(self._pits) do for _,pit in pairs(self._pits) do
local px,py=pit.px,pit.py local px,py=pit.px,pit.py
local pr=self._pits[_mix(px+1,py)] local pr=self._pits[_mix{px+1,py}]
spr(pit.s,px,py) spr(pit.s,px,py)
if pit.full then if pit.full then
pal(pitpal) spr(15,pit.px,pit.py)
palt(0,false)
spr(79,pit.px,pit.py)
pal()
pal(normpal)
end end
palt(8,true) palt(8,true)
spr(pit.s,px,py) spr(pit.s,px,py)
@ -385,7 +380,7 @@ function level:update()
_apply(crate, crate.todo) _apply(crate, crate.todo)
if #crate.todo==0 then if #crate.todo==0 then
local pit=self._pits[_mix(crate.mx,crate.my)] local pit=self._pits[_mix{crate.mx,crate.my}]
if pit and not pit.full then if pit and not pit.full then
add(remove,cix) add(remove,cix)
crate.dead=true crate.dead=true
@ -411,7 +406,7 @@ function level:load_dynobjs()
local crate_id=1 local crate_id=1
for mx=0,15,1 do for mx=0,15,1 do
for my=0,15,1 do for my=0,15,1 do
local mxy=_mix(mx,my) local mxy=_mix{mx,my}
local px,py=mx*8,my*8 local px,py=mx*8,my*8
local s=self:_mget(mx,my) local s=self:_mget(mx,my)
local def=self:_get_cratedef(s) local def=self:_get_cratedef(s)
@ -436,7 +431,7 @@ function level:recollide_reanchor()
self._coll={} self._coll={}
for mx=0,15 do for mx=0,15 do
for my=0,15 do for my=0,15 do
local mxy=_mix(mx,my) local mxy=_mix{mx,my}
self._coll[mxy]= self._coll[mxy]=
fget(self:_mget(mx,my),7) or fget(self:_mget(mx,my),7) or
self._crates[mxy] self._crates[mxy]
@ -457,7 +452,7 @@ function level:recollide_reanchor()
not self:mcoll(mx1,my0) and not self:mcoll(mx1,my0) and
not self:mcoll(mx1,my1) not self:mcoll(mx1,my1)
) then ) then
local key="GEOM"..mx0..","..my0..","..dx..","..dy local key=_mix{"GEOM",mx0,my0,dx,dy}
anch_new[key]= { anch_new[key]= {
max(mx0,mx1),max(my0,my1),adx=-dx,ady=-dy max(mx0,mx1),max(my0,my1),adx=-dx,ady=-dy
} }
@ -466,7 +461,7 @@ function level:recollide_reanchor()
end end
for _,cr in pairs(self._crates) do for _,cr in pairs(self._crates) do
local key="CRATE"..cr.id..","..dx..","..dy local key=_mix{"CRATE",cr.id,dx,dy}
local mx0,my0=cr.mx,cr.my local mx0,my0=cr.mx,cr.my
local mx1,my1=mx0+dx,my0+dy local mx1,my1=mx0+dx,my0+dy
anch_new[key]={ anch_new[key]={
@ -485,11 +480,13 @@ function level:recollide_reanchor()
end end
self._anch=anch_new self._anch=anch_new
self._anch_keys={} self._anch_keys={}
self._anch_by_position={} self._anch_by={}
for k,v in pairs(self._anch) do for k,v in pairs(self._anch) do
local ax,ay=_anch_unpack(v)
add(self._anch_keys,{key=k}) add(self._anch_keys,{key=k})
local pkey=_mix(_anch_unpack(v)) local pkey=_mix{ax,ay}
self._anch_by_position[pkey]=self._anch_by_position[pkey] or v self._anch_by[pkey]=self._anch_by[pkey] or v
self._anch_by[_mix{ax,ay,v.adx,v.ady}]=v
end end
shellsort(self._anch_keys) shellsort(self._anch_keys)
shellsort(moves) shellsort(moves)
@ -504,7 +501,7 @@ function level:recollide_reanchor()
end end
function level:win_at(mx,my) function level:win_at(mx,my)
return self._wins[_mix(mx,my)] return self._wins[_mix{mx,my}]
end end
function level:anchor_points() function level:anchor_points()
@ -517,11 +514,17 @@ function level:anchor_points()
end end
function level:anchor_at(point) function level:anchor_at(point)
return self._anch_by_position[_mix(_anch_unpack(point))] return self._anch_by[_mix{_anch_unpack(point)}]
end
function level:anchor_at_tension(point,tension)
local ax,ay=_anch_unpack(point)
local adx,ady=_anch_unpack(tension)
return self._anch_by[_mix{ax,ay,adx,ady}]
end end
function level:get_open_pit(mx,my) function level:get_open_pit(mx,my)
local pit=self._pits[_mix(mx,my)] local pit=self._pits[_mix{mx,my}]
if (pit and not pit.full) return pit if (pit and not pit.full) return pit
end end
@ -543,7 +546,7 @@ function level:spawn_exit()
-- next check: is at least one of -- next check: is at least one of
-- nx or ny out of range [0, 15]? -- nx or ny out of range [0, 15]?
if (nx | ny) & 0xFFF0 ~= 0 then if (nx | ny) & 0xFFF0 ~= 0 then
self._wins[_mix(nx,ny)]=true self._wins[_mix{nx,ny}]=true
end end
end end
end end
@ -557,11 +560,11 @@ end
function level:mcoll(mx,my) function level:mcoll(mx,my)
if ((mx | my) & 0xFFF0!=0) return true if ((mx | my) & 0xFFF0!=0) return true
return self._coll[_mix(mx,my)] return self._coll[_mix{mx,my}]
end end
function level:get_crate(mx,my) function level:get_crate(mx,my)
return self._crates[_mix(mx,my)] return self._crates[_mix{mx,my}]
end end
function level:_mget(mx,my) function level:_mget(mx,my)
@ -571,8 +574,10 @@ function level:_mget(mx,my)
) )
end end
function _mix(mx,my) function _mix(arg)
return mx..","..my local out=arg[1]
for i=2,#arg do out..=","..arg[i] end
return out
end end
-- crate spec: -- crate spec:
@ -591,7 +596,7 @@ end
function level:get_latch(dx,dy,px,py) function level:get_latch(dx,dy,px,py)
local mx,my=px\8,py\8 local mx,my=px\8,py\8
local mxy=_mix(mx,my) local mxy=_mix{mx,my}
local crate=self._crates[mxy] local crate=self._crates[mxy]
local dx1,dy1=-sgn0(dx),-sgn0(dy) local dx1,dy1=-sgn0(dx),-sgn0(dy)
@ -628,10 +633,12 @@ end
ropecheck=split"-0.6,0.4,0.4" ropecheck=split"-0.6,0.4,0.4"
-- argument "o" is a rope operation:
-- array of [mx0,my0,dmx,dmy]
function level:can_move( function level:can_move(
is_player, is_player,o,exclude_src,exclude_dst
mx0,my0,dmx,dmy,exclude_src,exclude_dst
) )
local mx0,my0,dmx,dmy=unpack(o)
local mx1,my1=mx0+dmx,my0+dmy local mx1,my1=mx0+dmx,my0+dmy
if (is_player and self:win_at(mx1,my1)) return true if (is_player and self:win_at(mx1,my1)) return true
if (is_player and self:get_open_pit(mx1,my1)) return wrongbleep:adequately_warned() if (is_player and self:get_open_pit(mx1,my1)) return wrongbleep:adequately_warned()
@ -647,8 +654,13 @@ function level:can_move(
return true return true
end end
function level:tug_crate(mx0,my0,dmx,dmy) -- argument is a rope operation:
local mxy0=_mix(mx0,my0) -- array of [mx0,my0,dmx,dmy]
-- must be a free function
-- to use as a foreach target
function level_tug_crate(t)
local self,mx0,my0,dmx,dmy=level,unpack(t)
local mxy0=_mix{mx0,my0}
local existing=self._crates[mxy0] local existing=self._crates[mxy0]
if (not existing) return if (not existing) return
@ -663,7 +675,7 @@ function level:tug_crate(mx0,my0,dmx,dmy)
{px=px1,py=py1} {px=px1,py=py1}
} }
self._crates[_mix(mx1,my1)]=existing self._crates[_mix{mx1,my1}]=existing
end end
-->8 -->8
@ -729,7 +741,7 @@ function player:update()
else else
local x,y=self.x,self.y local x,y=self.x,self.y
local function try_move(dx,dy,f) local function try_move(dx,dy,f)
if level:can_move(true,x,y,dx,dy,0,2) then if level:can_move(true,{x,y,dx,dy},0,2) then
self.todo=f self.todo=f
self.cooldown=3 self.cooldown=3
local t=f[#f] local t=f[#f]
@ -903,6 +915,7 @@ function rope:new(
id=0, id=0,
state={name="cast",frame=0}, state={name="cast",frame=0},
latch=latch, latch=latch,
flicker_t=t(),
} }
r.src=src r.src=src
r.dst=dst r.dst=dst
@ -988,7 +1001,7 @@ function rope:affected_src_xy(artificial_px,artificial_py)
end end
function rope:draw(artificial_px,artificial_py) function rope:draw(artificial_px,artificial_py)
local points,highlight=self:_tug(true) local points,highlight,hypo_ops,hypo_blocks=self:_tug(true)
local n,perc_to_show,from_end = self.state.name,1.0 local n,perc_to_show,from_end = self.state.name,1.0
if (n=="done") return if (n=="done") return
if (n=="cast") perc_to_show=self.state.frame/2 if (n=="cast") perc_to_show=self.state.frame/2
@ -1058,6 +1071,22 @@ function rope:draw(artificial_px,artificial_py)
color() color()
end end
-- hypothetical
local time=t()-self.flicker_t
if n=="latched" and time>0 and not level:busy() then
if time%0.5>0.25 then
for o in all(hypo_ops) do
local mx0,my0,dmx,dmy=unpack(o)
local px1,py1=(mx0+dmx)*8,(my0+dmy)*8
spr(14,px1,py1)
end
end
for o in all(hypo_blocks) do
local x,y,dx,dy=unpack(o)
spr(53,8*x+4*dx,8*y+4*dy,1,1,time%0.5>0.25)
end
end
-- debug -- debug
--[[ --[[
local n1=self.src local n1=self.src
@ -1100,7 +1129,7 @@ function rope:draw(artificial_px,artificial_py)
pset(x+p.adx,y,11) pset(x+p.adx,y,11)
pset(x,y+p.ady,11) pset(x,y+p.ady,11)
end end
]] ]]--
end end
function rope:drag_dst(xy) function rope:drag_dst(xy)
@ -1134,9 +1163,9 @@ function rope:relax()
local n2=n1.next local n2=n1.next
if (not n2) return if (not n2) return
local anch=level:anchor_at(n1) local adxy,position_new=calc_tension(n0,n1,n2)
local wouldstick,position_new=would_stick(anch,n0,n1,n2) local anch=level:anchor_at_tension(n1,adxy)
if not (wouldstick or _anch_eq(n1,position_new)) then if not anch or _anch_eq(n1,position_new) then
self:_drag(n1,position_new,{_anch_unpack(n1)}) self:_drag(n1,position_new,{_anch_unpack(n1)})
_anch_del(n1) _anch_del(n1)
else n0=n0.next end else n0=n0.next end
@ -1212,9 +1241,9 @@ function rope:_check_pinch()
return true return true
end end
function would_stick(anchor,xy0,xy1,xy2) function calc_tension(xy0,xy1,xy2)
local x0,y0=_anch_unpack(xy0) local x0,y0=_anch_unpack(xy0)
local x1,y1=_anch_unpack(xy1 or anchor) local x1,y1=_anch_unpack(xy1)
local x2,y2=_anch_unpack(xy2) local x2,y2=_anch_unpack(xy2)
local dx,dy=x2-x0,y2-y0 local dx,dy=x2-x0,y2-y0
@ -1238,10 +1267,12 @@ function would_stick(anchor,xy0,xy1,xy2)
x1_new,y1_new=x0+(y1-y0)/dy*dx,y1 x1_new,y1_new=x0+(y1-y0)/dy*dx,y1
ady,adx=signs(dx,x1_new-x1) ady,adx=signs(dx,x1_new-x1)
end end
return {adx,ady},{x1_new,y1_new}
end
return function would_stick(anch,tens)
anchor and anchor.adx==adx and anchor.ady==ady, adx,ady=unpack(tens)
{x1_new,y1_new} return anch.adx==adx and anch.ady==ady
end end
function rope:experience_anchor_moves(moves) function rope:experience_anchor_moves(moves)
@ -1305,7 +1336,7 @@ function rope:_be_pushed_by1(anch_old,anch_new)
(_which_side(anch_old,n0,n1)!= (_which_side(anch_old,n0,n1)!=
_which_side(anch_new,n0,n1) _which_side(anch_new,n0,n1)
) and would_stick(anch_new,n0,nil,n1) ) and would_stick(anch_new,calc_tension(n0,anch_new,n1))
then then
local nx05,ny05 local nx05,ny05
if ax_new==ax_old then if ax_new==ax_old then
@ -1343,7 +1374,7 @@ function rope:_drag(n1,new,removing)
local side_orig=_which_side(anchor,pivot,point_orig) local side_orig=_which_side(anchor,pivot,point_orig)
local side_final=_which_side(anchor,pivot,point_final) local side_final=_which_side(anchor,pivot,point_final)
if (side_orig!=side_final and would_stick(anchor,pivot,nil,point_final)) add(eligible,{anchor,side_final}) if (side_orig!=side_final and would_stick(anchor,calc_tension(pivot,anchor,point_final))) add(eligible,{anchor,side_final})
end end
end end
@ -1504,39 +1535,38 @@ end
function rope:tug() function rope:tug()
if (not self:latched()) return if (not self:latched()) return
return self:_tug() local success=self:_tug()
if (success) self.flicker_t=t()
return success
end end
function rope:_tug(hypothetically) function rope:_tug(hypothetically)
local ancs=self:_anchors_simplified() local ancs=self:_anchors_simplified()
local touched={} local touched={}
local blocks = {}
for i=#ancs-1,2,-1 do for i=#ancs-1,2,-1 do
local ops_before_trash=self:_calc_push(ancs[i+1],ancs[i],ancs[i-1],ancs[i-2]) local ops_before_trash,blocks_before_trash=self:_calc_push(ancs[i+1],ancs[i],ancs[i-1],ancs[i-2])
local ops_to_do,corners={} local ops = {}
for b in all(blocks_before_trash) do add(blocks, b) end
if #ops_before_trash>0 then if #ops_before_trash>0 then
ops_to_do=ops_before_trash ops=ops_before_trash
else else
local ops_after_trash=self:_calc_push(ancs[i-2],ancs[i-1],ancs[i],ancs[i+1]) local ops_after_trash,blocks_after_trash=self:_calc_push(ancs[i-2],ancs[i-1],ancs[i],ancs[i+1])
ops_to_do=ops_after_trash ops=ops_after_trash
for b in all(blocks_after_trash) do add(blocks,b) end
end end
local ops=ops_to_do
if #ops>0 then if #ops>0 then
if (hypothetically) return ancs,i-1 if (hypothetically) return ancs,i-1,ops,blocks
foreach(ops, level_tug_crate)
local dmx,dmy=ops[1].dmx,ops[1].dmy
for o in all(ops) do
level:tug_crate(o.mx,o.my,o.dmx,o.dmy)
end
return true return true
end end
end end
local latch=self.latch local latch=self.latch
if latch and latch.el=="eyehook" then if latch and latch.el=="eyehook" then
if (hypothetically) return ancs,0 if (hypothetically) return ancs,0,{},blocks
player.todo={{ player.todo={{
update=function(s) update=function(s)
if not s.rope or s.rope:done() then if not s.rope or s.rope:done() then
@ -1577,17 +1607,20 @@ function rope:_tug(hypothetically)
invalid_move=true invalid_move=true
end end
if not invalid_move and if not invalid_move then
level:can_move(false,mx0,my0,dmx,dmy,1,0) local mv = {mx0,my0,dmx,dmy}
then if level:can_move(false,mv,1,0) then
if (hypothetically) return ancs,0 if (hypothetically) return ancs,0,{mv},blocks
level:tug_crate(mx0,my0,dmx,dmy) level_tug_crate(mv)
return true return true
else
add(blocks, mv)
end
end end
end end
if (hypothetically) return ancs if (hypothetically) return ancs,0,{},blocks
return return
end end
@ -1612,21 +1645,16 @@ function rope:_calc_push(
smy=-smy smy=-smy
end end
local mx,dmx local dmx=1 -- maybe push right?
if anch.adx==-1 and a0.x>an.x+7 then if anch.adx==-1 and a0.x>an.x+7 then
-- push left -- push left
mx=ax0-1 ax0, dmx=ax0-1,-1
dmx=-1 elseif anch.adx!=1 or a0.x>=an.x-7 then
elseif anch.adx==1 and a0.x<an.x-7 then
-- push right
mx=ax0
dmx=1
else
return {} return {}
end end
for my=my0,my1,smy do for my=my0,my1,smy do
add(ops,{mx=mx,my=my,dmx=dmx,dmy=0}) add(ops,{ax0,my,dmx,0})
end end
end end
@ -1638,42 +1666,32 @@ function rope:_calc_push(
smx=-smx smx=-smx
end end
local my,dmy local dmy=1 -- maybe push down?
if anch.ady==-1 and a0.y>an.y+6 then if anch.ady==-1 and a0.y>an.y+6 then
-- push up -- push up
my=ay0-1 ay0,dmy=ay0-1,-1
dmy=-1 elseif anch.ady!=1 or a0.y>=an.y-6 then
elseif anch.ady==1 and a0.y<an.y-6 then
-- push down
my=ay0
dmy=1
else
return {} return {}
end end
for mx=mx0,mx1,smx do for mx=mx0,mx1,smx do
add(ops,{mx=mx,my=my,dmx=0,dmy=dmy}) add(ops,{mx,ay0,0,dmy})
end end
end end
local ops2={} local ops2,blocked={},{}
for o in all(ops) do for o in all(ops) do
if not level:mcoll(o.mx,o.my) then local mx,my=unpack(o)
-- great! if level:mcoll(mx,my) then
else if (not level:get_crate(mx, my)) break
local crate=level:get_crate(o.mx,o.my) if not level:can_move(false,o,0,0) then
if crate then add(blocked,o)
if not level:can_move(false,o.mx,o.my,o.dmx,o.dmy,0,0) then
break
end
else
break break
end end
add(ops2,o) add(ops2,o)
end end
end end
return ops2 return ops2,blocked
end end
function rope:_anchors_simplified() function rope:_anchors_simplified()
@ -1897,24 +1915,23 @@ function persist:init0()
cartdata("ulimate_lizard_total_destruction_0_1") cartdata("ulimate_lizard_total_destruction_0_1")
self.init0 = self.read self.init0 = self.read
self:read() self:read()
self.ready=true
end end
function persist:read() function persist:read()
self.ready=false
local m = dget(0) == 0 local m = dget(0) == 0
self.music = m self.music = m
if m then music_on() else music_off() end if m then music_on() else music_off() end
self.max_level = dget(1) self.max_level = dget(1)
self.recent_level = dget(2) self.recent_level = dget(2)
self.ready=true
end end
function persist:wipe() function persist:wipe()
self.ready=false
for i=0,64 do for i=0,64 do
dset(i,0) dset(i,0)
end end
self:read() self:read()
self.ready=true
end end
function persist:lvlstart() function persist:lvlstart()
@ -1930,14 +1947,14 @@ function persist:write()
dset(2, self.recent_level) dset(2, self.recent_level)
end end
__gfx__ __gfx__
000030000000002200003000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeff1ff1ff1fffffff1ffffff1fffffff1dddddddd111111110005000000000000 000030000000002200003000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeff1ff1ff1fffffff1ffffff1fffffff1dddddddd111111110000000033300333
003333300000332200333330eeffffffffffffffffffffeee5e555e55e555e5eff1ff1ffffffffffffffffffffffffffdddddddd111111110000500000000000 003333300000332200333330eeffffffffffffffffffffeee5e555e55e555e5eff1ff1ffffffffffffffffffffffffffdddddddd111111110cc00cc033300333
099333990039932009333339effeeeeeeeeeeeeeeeeeeffee5eeeeeeeeeeee5eff1ff1ffff111111ff1111ff111111ffdddddddd111111110000000000000000 099333990039932009333339effeeeeeeeeeeeeeeeeeeffee5eeeeeeeeeeee5eff1ff1ffff111111ff1111ff111111ffdddddddd111111110cccccc033333333
09a333a9033a932009333339efee33e3333e333e3333eefee5e333e333333e5eff1ff1ffff1fffffff1ff1fffffff1ffdddddddd111111115005005000000000 09a333a9033a932009333339efee33e3333e333e3333eefee5e333e333333e5eff1ff1ffff1fffffff1ff1fffffff1ffdddddddd1111111100c00c0000300300
023333323333320000222220efe333e3333e333e33333efee5e333e333333e5eff1ff1ffff1fffffff1ff1fffffff1ffdddddddd111111110500500500000000 023333323333320000222220efe333e3333e333e33333efee5e333e333333e5eff1ff1ffff1fffffff1ff1fffffff1ffdddddddd1111111100c00c0000300300
002222200000220000222220efe33eeeeeeeeeeeeee33efeeee33eeeeee33eeeff1111ffff111111ff1ff1ff111111ffdddddddd111111110000000000000000 002222200000220000222220efe33eeeeeeeeeeeeee33efeeee33eeeeee33eeeff1111ffff111111ff1ff1ff111111ffdddddddd111111110cccccc033333333
000222c002222c0000022200efeeee555e555e55e5eeeefee5eeeeffffeeee5effffffffffffffffff1ff1ffffffffffdddddddd111111110005000000000000 000222c002222c0000022200efeeee555e555e55e5eeeefee5eeeeffffeeee5effffffffffffffffff1ff1ffffffffffdddddddd111111110cc00cc033300333
00000cc00000cc0000000cc0efe33e5eeeeeeeeee5e33efee5e33efeefe33e5e1ffffff11fffffffff1ff1fffffffff1dddddddd111111110000500000000000 00000cc00000cc0000000cc0efe33e5eeeeeeeeee5e33efee5e33efeefe33e5e1ffffff11fffffffff1ff1fffffffff1dddddddd111111110000000033300333
0000ff000000000000000000efe33e5e11111111e5e33efee5e33efeefe33e5eff1ff1ffffffffffffffffffffffffff88888888555555555555555588888888 0000ff000000000000000000efe33e5e11111111e5e33efee5e33efeefe33e5eff1ff1ffffffffffffffffffffffffff88888888555555555555555588888888
000f00f0000000000aa00aa0efe33eee11ffff11eee33efeeee33effffe33e5eff1ff1ffffffffffffffffffffffffff88888888558855885588558888888888 000f00f0000000000aa00aa0efe33eee11ffff11eee33efeeee33effffe33e5eff1ff1ffffffffffffffffffffffffff88888888558855885588558888888888
00d0000f000000000aaaaaa0efe33e5e1ff11ff1e5e33efee5e33eeeeee33eeeff1ff1fffff11111ffffffff11111fff88888888888888888888888888888888 00d0000f000000000aaaaaa0efe33e5e1ff11ff1e5e33efee5e33eeeeee33eeeff1ff1fffff11111ffffffff11111fff88888888888888888888888888888888
@ -1956,10 +1973,10 @@ eeee0000cc04405500444400efeeee5e11111111e5eeeefeeeeeeeeeeeeeeeeeffffffffffffffff
000aa111991111103bbbbbb3eeeeeeeeeeeeeeeeeeeeeeeeff1ff1ffffffffffffffffff00000000000000000000000000000000000000000000000000000000 000aa111991111103bbbbbb3eeeeeeeeeeeeeeeeeeeeeeeeff1ff1ffffffffffffffffff00000000000000000000000000000000000000000000000000000000
0000000099100000f765000000000000000000000000000000000000000000000000000000000000000000000000000011111111111111111999999111111111 0000000099100000f765000000000000000000000000000000000000000000000000000000000000000000000000000011111111111111111999999111111111
00000000990000007700000000000000000000000000000000000000000000000000000000000000000000000000000019911991999999911999999119999999 00000000990000007700000000000000000000000000000000000000000000000000000000000000000000000000000019911991999999911999999119999999
00000000990000006060000000000000000000000000000000000000000000000000000000000000000000000000000019977991999999911999999119999999 00000000990000006060000000000000000bc0000090020000000000000000000000000000000000000000000000000019977991999999911999999119999999
00000000090000005005000000000000000000000000000000000000000000000000000000000000000000000000000019911991999117111991199111711999 00000000090000005005000000bbcc00000bc0000009200000000000000000000000000000000000000000000000000019911991999117111991199111711999
00000000aa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000019911991999117111991199111711999 00000000aa0000000000000000ccbb00000cb0000002900000000000000000000000000000000000000000000000000019911991999117111991199111711999
0000000077a000000000000000000000000000000000000000000000000000000000000000000000000000000000000019999991999999911997799119999999 0000000077a000000000000000000000000cb0000020090000000000000000000000000000000000000000000000000019999991999999911997799119999999
00000007777a00000000000000000000000000000000000000000000000000000000000000000000000000000000000019999991999999911991199119999999 00000007777a00000000000000000000000000000000000000000000000000000000000000000000000000000000000019999991999999911991199119999999
00044444444444000000000000000000000000000000000000000000000000000000000000000000000000000000000019999991111111111111111111111111 00044444444444000000000000000000000000000000000000000000000000000000000000000000000000000000000019999991111111111111111111111111
44444444444004444444444444400444444444444440044444444444444004444444444444400444444444444440044444444444444004444444444444400444 44444444444004444444444444400444444444444440044444444444444004444444444444400444444444444440044444444444444004444444444444400444
@ -2017,7 +2034,7 @@ eeee0000cc04405500444400efeeee5e11111111e5eeeefeeeeeeeeeeeeeeeeeffffffffffffffff
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c000040000000000c0c0c0c0c051 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c000040000000000c0c0c0c0c051
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c0000000c0d0c0c0c0c0c0c0c051 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c0000000c000c0c0c0c0c0c0c051
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c0c0c0c0c000c0c0c0c0c0c0c051 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c0c0c0c0c000c0c0c0c0c0c0c051
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
@ -2189,7 +2206,7 @@ __label__
77777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 77777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777
__gff__ __gff__
000000c0c0c0c0c0c0c0c0c0c0c00000000000c0c0c0c0c0c0c0c0c0202020200040c0c0c0c0c0c0c008080800000000404000000808080808080808c0c0c0c000000000080808080808080800000008000000000808080808080808000000000008080808080808080808080000000000080808080808080808080800000000 000000c0c0c0c0c0c0c0c0c0c0c00000000000c0c0c0c0c0c0c0c0c0202020200040c0c0c0c0c0c0c008080800000000404000000000080808080808c0c0c0c000000000080808080808080800000008000000000808080808080808000000000008080808080808080808080000000000080808080808080808080800000000
0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
__map__ __map__
0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d1203040404050d0d0d0d010d0d0d0d0d0d0d0d0d0d0d0d0d0d120d0d0d0d0d0d0d0d0d0d0d0d0d03043e0a040404050d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d 0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d1203040404050d0d0d0d010d0d0d0d0d0d0d0d0d0d0d0d0d0d120d0d0d0d0d0d0d0d0d0d0d0d0d03043e0a040404050d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d