kistaro/chameleonic
1
0
Fork 0
forked from pyrex/chameleonic
Code Pull Requests Packages Projects Releases Activity

Compare commits

base: kistaro:7c209f11252314ae3fbd426adb19616706141d34
Branches Tags
kistaro:main kistaro:more_levels kistaro:rope_golf kistaro:animate-blocked-moves kistaro:better_debug_mouse kistaro:sprintf kistaro:level_design kistaro:golf pyrex:main pyrex:rope_associated_with_rewrite pyrex:tiles pyrex:simplified_anchors_broken pyrex:level-29 pyrex:intro_sequence pyrex:music_fork pyrex:nyeo_levels pyrex:rewrite_rope
..
compare: kistaro:sprintf
Branches Tags
kistaro:main kistaro:more_levels kistaro:rope_golf kistaro:animate-blocked-moves kistaro:better_debug_mouse kistaro:sprintf kistaro:level_design kistaro:golf pyrex:main pyrex:rope_associated_with_rewrite pyrex:tiles pyrex:simplified_anchors_broken pyrex:level-29 pyrex:intro_sequence pyrex:music_fork pyrex:nyeo_levels pyrex:rewrite_rope

11 Commits
7c209f1125 ... sprintf

Author SHA1 Message Date
Kistaro Windrider
e028209adf assert on unrecognized directive 
saves four tokens and is more diagnostic.
 2023-01-01 14:11:11 -08:00
Kistaro Windrider
ce3fc83221 fmt in debugmouse:draw3. 
This is literally the reason I implemented fmt in the first place
 2023-01-01 13:54:28 -08:00
Kistaro Windrider
3e2229be65 use fmt in a commented-out debug logging block 2023-01-01 13:54:28 -08:00
Kistaro Windrider
46f1339e19 golf recollide_reanchor 
Uses fmt in recollide_reanchor. This has a performance impact in code that is already slow so this might need to be reverted; I think that should be part of a comprehensive optimization pass, however, and making it worse for now as part of a general code cleanup is probably better.
 2023-01-01 13:54:28 -08:00
Kistaro Windrider
f86e52d3bd tostring golf 
this could be golfed further by rewriting the str..= line in terms of fmt, but the performance impact of inserting the extra `fmt` calls and parsing into the tostring recursion seems likely to be a problem.
 2023-01-01 13:54:28 -08:00
Kistaro Windrider
e6c35dbeda Use fmt on title screen. 2023-01-01 13:54:28 -08:00
Kistaro Windrider
3516d2855e fix section before first "%" 
oops, need to special-case the first part of the split list.

amusingly, I don't need to special-case zero-length format strings because that will skip the entire loop and output "", which seems correct. (I am also not special-casing zero-length segments because `s[1] == nil` will go into the error handler and that seems fine.
 2023-01-01 13:54:28 -08:00
Kistaro Windrider
2264349e72 fix double-consume, add %! 
I discovered your tostring function for debugging, might as well make it reachable from fmt.  I also realized I forgot to convert to using "p" when I introduced it so I fixed that
 2023-01-01 13:54:27 -08:00
Kistaro Windrider
93c154f876 fix sprintf and rename to fmt 
the "split on %" strategy makes parsing "%%" complicated, so the "actually literally %" placeholder is now "%~" rather than "%%". since thsi resembles a real sprintf even less now I renamed it to "fmt".

also actually closes the `if m == "~"` block. (which was `if m == "%"` before this patch)
 2023-01-01 13:54:27 -08:00
Kistaro Windrider
3494c48e74 implement fake sprintf 
this spends extra tokens to handle "invalid format character" to catch using a % where %% is intended. this is designed to grow with further format chars if needed; I have ideas for not-exactly-POSIX %d, %x, %h, %!, %#, %c, and possibly others but there is absolutely no reason to spend tokens on these things until we need them. (that said, existing debugging output might benefit from some of these other formats, but that debug code is commented out, so maybe nevert.)
 2023-01-01 13:54:27 -08:00
Kistaro Windrider
e878717c31 Better debug mouse 
Debug mouse is now its own module, so it can be separated from the hint system, since it is useful for more than just positioning hints. It now has the following enhancements:

1. Clock-based table cyclng now has a helper function (cycle)
2. Debug mouse color cycling is distinct from hint color cycling, so debug position readout remains legible
3. Debug position readout now stays on screen even when the cursor is near or past the edges
4. Debug cursor cycles between a mouse sprite specifically marking the exact pixel that is being sampled, an "X" for text character sizing, and a "□" for positioning the centered 3x3 characters often used as hint target markers
5. Map cell coordinates (in square brackets) are displayed in addition to pixel coordnates (in parentheses)

Sprite 50 is now the mouse cursor. Color 15 is color cycling for debug readouts.

Debug mouse features can be disabled by commenting out `add(real_modules, debugmouse)`.

I've done a little bit of golfing but this is stiill a token expense. I'm going to write a crappy sprintf function to save tokens everywhere we're assembling strings from their component parts.
 2023-01-01 13:44:45 -08:00
1 changed files with 253 additions and 267 deletions
Expand all files Collapse all files

520
chameleonic.p8
View File

@ -26,10 +26,10 @@ function music_off()
menuitem(3, "music: off", music_on) menuitem(3, "music: off", music_on)
end end
function gsv(s,sep1,sep2) function gsv(s)
local ret=split(s,sep1 or "\n") local ret=split(s,"\n")
for i,v in ipairs(ret) do for i,v in ipairs(ret) do
ret[i] = type(v) == "string" and split(v,sep2 or "`") or {v} end ret[i] = type(v) == "string" and split(v,"`") or {v} end
return ret return ret
end end
@ -38,6 +38,39 @@ function cycle(tbl,period)
return tbl[t()%period*#tbl\period+1] return tbl[t()%period*#tbl\period+1]
end end
-- fake sprintf function
-- %~ for literal "%"
-- %v for param
-- %! for tostring(param)
-- which dumps tables
function fmt(f, ...)
local out, i = "", 0
for s in all(split(f,"%")) do
if i == 0 then
-- before first format directive
out ..= s
i = 1
else
local m = s[1]
if m == "~" then
out ..= "%"
else
local p = select(i,...)
i+=1
if m == "v" then
out ..= p
elseif m == "!" then
out ..= tostring(p)
else
assert(false, tostr(m).."is not a formatting directive")
end
end
out ..=sub(s,2)
end
end
return out
end
mnames={} mnames={}
function names(root) function names(root)
local n=mnames[root] local n=mnames[root]
@ -246,14 +279,12 @@ function kbd:release(i)
end end
function tostring(any) function tostring(any)
if type(any)=="table" then if (type(any)!="table") return tostr(any)
local str = "{ " local str = "{ "
for k,v in pairs(any) do for k,v in pairs(any) do
str=str..tostring(k).."->"..tostring(v).." " str..=tostring(k).."->"..tostring(v).." "
end
return str.."}"
end end
return tostr(any) return str.."}"
end end
-->8 -->8
@ -269,7 +300,7 @@ function title:draw()
print("pyrex",32,73,7) print("pyrex",32,73,7)
print("[nyeogmi]",62,73,7) print("[nyeogmi]",62,73,7)
print("kistaro",32,79,7) print("kistaro",32,79,7)
local lvlstr = "⬅️ "..start_level.." ➡️" local lvlstr = fmt("⬅️ %v ➡️",start_level)
print(lvlstr,50,91,1) print(lvlstr,50,91,1)
print(lvlstr,51,90,blinkcol) print(lvlstr,51,90,blinkcol)
end end
@ -298,13 +329,12 @@ function level:init()
end end
function level:reinit(n) function level:reinit(n)
self.hintlevel=0 self.hintlevel = 0
self.ix=n self.ix=n
self.todo={} self.todo={}
self.bigx,self.bigy=n%8,n\8 self.bigx,self.bigy=n%8,n\8
self.dirty=false self.dirty=false
player.rope=nil -- reanchor will touch the rope otherwise
self:load_dynobjs() self:load_dynobjs()
self:recollide_reanchor() self:recollide_reanchor()
self:spawn_exit() self:spawn_exit()
@ -319,6 +349,7 @@ 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()
@ -331,11 +362,16 @@ 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.contents then
spr(15,pit.px,pit.py) pal(pitpal)
palt(0,false)
--spr(pit.contents,pit.px,pit.py)
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)
@ -362,11 +398,11 @@ 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.contents then
add(remove,cix) add(remove,cix)
crate.dead=true crate.dead=true
pit.full=true pit.contents=crate.s
end end
end end
end end
@ -388,7 +424,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)
@ -413,7 +449,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]
@ -434,8 +470,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=_mix{"GEOM",mx0,my0,dx,dy} anch_new[fmt("GEOM%v,%v,%v,%v",mx0,my0,dx,dy)]= {
anch_new[key]= {
max(mx0,mx1),max(my0,my1),adx=-dx,ady=-dy max(mx0,mx1),max(my0,my1),adx=-dx,ady=-dy
} }
end end
@ -443,10 +478,9 @@ function level:recollide_reanchor()
end end
for _,cr in pairs(self._crates) do for _,cr in pairs(self._crates) do
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[fmt("CRATE%v,%v,%v",cr.id,dx,dy)]={
max(mx0,mx1),max(my0,my1),adx=-dx,ady=-dy max(mx0,mx1),max(my0,my1),adx=-dx,ady=-dy
} }
end end
@ -462,13 +496,11 @@ function level:recollide_reanchor()
end end
self._anch=anch_new self._anch=anch_new
self._anch_keys={} self._anch_keys={}
self._anch_by={} self._anch_by_position={}
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{ax,ay} local pkey=_mix(_anch_unpack(v))
self._anch_by[pkey]=self._anch_by[pkey] or v self._anch_by_position[pkey]=self._anch_by_position[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)
@ -483,7 +515,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()
@ -496,18 +528,12 @@ function level:anchor_points()
end end
function level:anchor_at(point) function level:anchor_at(point)
return self._anch_by[_mix{_anch_unpack(point)}] return self._anch_by_position[_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.contents) return pit
end end
function level:spawn_exit() function level:spawn_exit()
@ -528,7 +554,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
@ -542,11 +568,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)
@ -556,10 +582,8 @@ function level:_mget(mx,my)
) )
end end
function _mix(arg) function _mix(mx,my)
local out=arg[1] return mx..","..my
for i=2,#arg do out..=","..arg[i] end
return out
end end
-- crate spec: -- crate spec:
@ -578,7 +602,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)
@ -635,7 +659,7 @@ function level:can_move(
end end
function level:tug_crate(mx0,my0,dmx,dmy) function level:tug_crate(mx0,my0,dmx,dmy)
local mxy0=_mix{mx0,my0} local mxy0=_mix(mx0,my0)
local existing=self._crates[mxy0] local existing=self._crates[mxy0]
if (not existing) return if (not existing) return
@ -650,7 +674,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
@ -847,7 +871,7 @@ function player:draw()
if (vanish_level>i/#vanish) pal(ilc,5) if (vanish_level>i/#vanish) pal(ilc,5)
end end
if (self.fall_frame>3) local zc=@0x5f00&0xf0 for i=0x5f00,0x5f0c,4 do poke4(i,0x0505.0505) end poke(0x5f00,zc|0x01) if (self.fall_frame>3) local zc=@0x5f00&0xf0 for i=0x5f00,0x5f0c,4 do poke4(i,0x0101.0101) end poke(0x5f00,zc|0x01)
end end
local rx,ry=self.x*8+self.px+1,self.y*8+self.py+2 local rx,ry=self.x*8+self.px+1,self.y*8+self.py+2
@ -890,7 +914,6 @@ 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
@ -921,12 +944,17 @@ function rope:update()
if (not self.latch) wrongbleep:bleep(5) self:destroy() return if (not self.latch) wrongbleep:bleep(5) self:destroy() return
if self.latch.rec then if self.latch.rec then
self:drag_src{
self.latch.rec.mx+0.5+self.latch.ax_offset,
self.latch.rec.my+0.5+self.latch.ay_offset
}
if self.latch.rec.dead==true then if self.latch.rec.dead==true then
self:destroy() self:destroy()
end end
end end
if (not self:_check_pinch()) self:destroy() if (not self:_check_sane()) self:destroy()
elseif self.state.name=="destroy" then -- destroy elseif self.state.name=="destroy" then -- destroy
self.state.frame+=1 self.state.frame+=1
@ -976,7 +1004,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,hypo_ops=self:_tug(true) local points,highlight=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
@ -1046,16 +1074,6 @@ 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 time%0.5>0.25 and not level:busy() 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
-- debug -- debug
--[[ --[[
local n1=self.src local n1=self.src
@ -1063,24 +1081,27 @@ function rope:draw(artificial_px,artificial_py)
while true do while true do
if (n1==nil) break if (n1==nil) break
local anch=level:anchor_at(n1) local anch=level:anchor_at(n1)
local ax,ay=_anch_unpack(n1) local x=n1.ax*8
local x=ax*8 local y=n1.ay*8
local y=ay*8
if anch then if anch then
if (anch.adx>0) x-=1 if (anch.adx>0) x-=1
if (anch.ady>0) y-=1 if (anch.ady>0) y-=1
end end
rectfill(x-1,y-1,x+1,y+1,12) rectfill(x-1,y-1,x+1,y+1,12)
print("ax="..ax..",ay="..ay,72,sy) print(fmt("ax=%v,ay=%v",n1.ax,n1.ay),72,sy)
sy+=7 sy+=7
local n0=n1.prev local n0=n1.prev
local n2=n1.next local n2=n1.next
if n0!=nil and n2!=nil then if n0!=nil and n2!=nil then
if anch then if anch then
rectfill(x+2,y+2,x+4,y+4,3) local _,_,_=would_stick(anch,n0.ax,n0.ay,n1.ax,n1.ay,n2.ax,n2.ay)
local c=3
if (anch.dropped) c=4
rectfill(x+2,y+2,x+4,y+4,c)
else else
rectfill(x+2,y+2,x+4,y+4,2) rectfill(x+2,y+2,x+4,y+4,2)
end end
else else
rectfill(x+2,y+2,x+4,y+4,4) rectfill(x+2,y+2,x+4,y+4,4)
@ -1090,21 +1111,24 @@ function rope:draw(artificial_px,artificial_py)
end end
for _,p in pairs(level._anch) do for _,p in pairs(level._anch) do
local ax,ay=_anch_unpack(p) local x,y=p.ax*8,p.ay*8
local x,y=ax*8,ay*8
if (p.adx>0) x-=1 if (p.adx>0) x-=1
if (p.ady>0) y-=1 if (p.ady>0) y-=1
pset(x,y,11) pset(x,y,11)
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)
self:drag(self.dst,xy) self:drag(self.dst,xy)
end end
function rope:drag_src(xy)
self:drag(self.src,xy)
end
function rope:drag(n1,axy) function rope:drag(n1,axy)
self:relax() self:relax()
self:_drag(n1,{axy[1],n1[2]}) self:_drag(n1,{axy[1],n1[2]})
@ -1132,16 +1156,16 @@ function rope:relax()
local n2=n1.next local n2=n1.next
if (not n2) return if (not n2) return
local adxy,position_new=calc_tension(n0,n1,n2) local anch=level:anchor_at(n1)
local anch=level:anchor_at_tension(n1,adxy) local wouldstick,position_new=would_stick(anch,n0,n1,n2)
if not anch or _anch_eq(n1,position_new) then if not (wouldstick 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
end end
end end
function rope:_check_pinch() function rope:_check_sane()
if (not self:latched()) return true if (not self:latched()) return true
if (level:busy()) return true if (level:busy()) return true
@ -1210,9 +1234,9 @@ function rope:_check_pinch()
return true return true
end end
function calc_tension(xy0,xy1,xy2) function would_stick(anchor,xy0,xy1,xy2)
local x0,y0=_anch_unpack(xy0) local x0,y0=_anch_unpack(xy0)
local x1,y1=_anch_unpack(xy1) local x1,y1=_anch_unpack(xy1 or anchor)
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
@ -1236,27 +1260,15 @@ function calc_tension(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
function would_stick(anch,tens) return
adx,ady=unpack(tens) anchor and anchor.adx==adx and anchor.ady==ady,
return anch.adx==adx and anch.ady==ady {x1_new,y1_new}
end end
function rope:experience_anchor_moves(moves) function rope:experience_anchor_moves(moves)
local latch=self.latch
self:_be_dragged_by(moves) self:_be_dragged_by(moves)
self:_be_pushed_by(moves) self:_be_pushed_by(moves)
if latch.rec then
self:_drag(self.src,{
latch.rec.mx+0.5+latch.ax_offset,
latch.rec.my+0.5+latch.ay_offset
})
end
self:relax() self:relax()
end end
@ -1305,7 +1317,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,calc_tension(n0,anch_new,n1)) ) and would_stick(anch_new,n0,nil,n1)
then then
local nx05,ny05 local nx05,ny05
if ax_new==ax_old then if ax_new==ax_old then
@ -1343,7 +1355,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,calc_tension(pivot,anchor,point_final))) add(eligible,{anchor,side_final}) if (side_orig!=side_final and would_stick(anchor,pivot,nil,point_final)) add(eligible,{anchor,side_final})
end end
end end
@ -1504,9 +1516,7 @@ end
function rope:tug() function rope:tug()
if (not self:latched()) return if (not self:latched()) return
local success=self:_tug() return self:_tug()
if (success) self.flicker_t=t()
return success
end end
function rope:_tug(hypothetically) function rope:_tug(hypothetically)
@ -1526,16 +1536,19 @@ function rope:_tug(hypothetically)
local ops=ops_to_do local ops=ops_to_do
if #ops>0 then if #ops>0 then
if (hypothetically) return ancs,i-1,ops if (hypothetically) return ancs,i-1
for o in all(ops) do level:tug_crate(unpack(o)) end 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
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
@ -1579,7 +1592,7 @@ function rope:_tug(hypothetically)
if not invalid_move and if not invalid_move and
level:can_move(false,mx0,my0,dmx,dmy,1,0) level:can_move(false,mx0,my0,dmx,dmy,1,0)
then then
if (hypothetically) return ancs,0,{{mx0,my0,dmx,dmy}} if (hypothetically) return ancs,0
level:tug_crate(mx0,my0,dmx,dmy) level:tug_crate(mx0,my0,dmx,dmy)
return true return true
@ -1596,13 +1609,7 @@ function rope:_calc_push(
local ops={} local ops={}
if (not an) return ops if (not an) return ops
local ax0,ay0=_anch_unpack(a0) if a0.x==a1.x then
local ax1,ay1=_anch_unpack(a1)
local anch=level:anchor_at(a0)
if (not anch) return ops
if ax0==ax1 then
-- no far side applying pressure? -- no far side applying pressure?
local y0,y1=_mnmx(a0.y,a1.y) local y0,y1=_mnmx(a0.y,a1.y)
local my0,my1,smy=(y0+1)\8,(y1-1)\8,1 local my0,my1,smy=(y0+1)\8,(y1-1)\8,1
@ -1612,24 +1619,24 @@ function rope:_calc_push(
end end
local mx,dmx local mx,dmx
if anch.adx==-1 and a0.x>an.x+7 then if a0.x%8==0 and a0.x>an.x+7 then
-- push left -- push left
mx=ax0-1 mx=(a0.x-1)\8
dmx=-1 dmx=-1
elseif anch.adx==1 and a0.x<an.x-7 then elseif a0.x%8==7 and a0.x<an.x-7 then
-- push right -- push right
mx=ax0 mx=(a0.x+1)\8
dmx=1 dmx=1
else else
return {} return {}
end end
for my=my0,my1,smy do for my=my0,my1,smy do
add(ops,{mx,my,dmx,0}) add(ops,{mx=mx,my=my,dmx=dmx,dmy=0})
end end
end end
if ay0==ay1 then if a0.y==a1.y then
local x0,x1=_mnmx(a0.x,a1.x) local x0,x1=_mnmx(a0.x,a1.x)
local mx0,mx1,smx=(x0+1)\8,(x1-1)\8,1 local mx0,mx1,smx=(x0+1)\8,(x1-1)\8,1
if a0.x>a1.x then if a0.x>a1.x then
@ -1638,33 +1645,32 @@ function rope:_calc_push(
end end
local my,dmy local my,dmy
if anch.ady==-1 and a0.y>an.y+6 then if a0.y%8==0 and a0.y>an.y+6 then
-- push up -- push up
my=ay0-1 my=(a0.y-1)\8
dmy=-1 dmy=-1
elseif anch.ady==1 and a0.y<an.y-6 then elseif a0.y%8==7 and a0.y<an.y-6 then
-- push down -- push down
my=ay0 my=(a0.y+1)\8
dmy=1 dmy=1
else else
return {} return {}
end end
for mx=mx0,mx1,smx do for mx=mx0,mx1,smx do
add(ops,{mx,my,0,dmy}) add(ops,{mx=mx,my=my,dmx=0,dmy=dmy})
end end
end end
local ops2={} local ops2={}
for o in all(ops) do for o in all(ops) do
local mx,my,dmx,dmy=unpack(o) if not level:mcoll(o.mx,o.my) then
if not level:mcoll(mx,my) then
-- great! -- great!
else else
local crate=level:get_crate(mx,my) local crate=level:get_crate(o.mx,o.my)
if crate then if crate then
if not level:can_move(false,mx,my,dmx,dmy,0,0) then if not level:can_move(false,o.mx,o.my,o.dmx,o.dmy,0,0) then
break break
end end
else else
@ -1742,23 +1748,36 @@ end
-- text -- text
level_text={by_lvl={}} level_text={by_lvl={}}
add(real_modules,level_text) add(real_modules,level_text)
level_text_raw=gsv[[ level_text_raw={
0`9`11`press 🅾️ to mlem & unmlem, "0`9`11`\f7\#0press 🅾️ to mlem & unmlem",
0`33`17`❎ to yoink]] "0`33`17`\f7\#0❎ to yoink"
}
function level_text:init() function level_text:init()
for i=0,31 do self.by_lvl[i]={} end for i=0,32 do level_text.by_lvl[i]={} end
for row in all(level_text_raw) do for row in all(level_text_raw) do
if (row) add(self.by_lvl[row[1]],row) if row then
lvlxys=split(row,"`")
add(level_text.by_lvl[lvlxys[1]],lvlxys)
end
end end
end end
function level_text:draw2() function level_text:draw()
for xys in all(self.by_lvl[level.ix]) do for xys in all(level_text.by_lvl[level.ix]) do
print(xys[4],xys[2],xys[3],7) print(xys[4],xys[2],xys[3],6)
end end
end end
-->8 -->8
--hint system --hint system
function rot13(s)
local sord = pack(ord(s,1,#s))
for i,c in ipairs(sord) do
if (inorder{65, c, 77} or inorder{97, c, 109}) sord[i]=c+13
if (inorder{78, c, 90} or inorder{110, c, 122}) sord[i]=c-13
end
return chr(unpack(sord))
end
--hint file format: --hint file format:
-- each row is one hint. -- each row is one hint.
-- 4 or 5 columns -- 4 or 5 columns
@ -1769,10 +1788,8 @@ end
-- [3] y coord -- [3] y coord
-- [4] message line 1 (rot13) -- [4] message line 1 (rot13)
-- [5] message llne 2 (rot13) -- [5] message llne 2 (rot13)
-- [6] arrow (semicolon separated list: each element is two comma-separated integers)
-- row 5 can be omitted -- row 5 can be omitted
-- for a 1-line hint -- for a 1-line hint
-- row 6 can be omitted if there is no arrow
-- --
-- multiple hints for the same -- multiple hints for the same
-- room are revealed in order -- room are revealed in order
@ -1781,29 +1798,20 @@ hints = {}
add(real_modules,hints) add(real_modules,hints)
function hints:init() function hints:init()
local h = gsv[[0`42`57`🅾️ pULL` ■ local h = gsv[[0`42`57`🅾️ yVPX` ■
0`42`73`❎, ❎ pULL``69,67;55,67 0`42`73`❎, ❎ cHYY
1`35`33`⁘` pULL`62,35;41,35 1`35`34`⁘ sVYY
1`79`82`pULL ■``100,94;100,88 1`99`82`■ cHYY
1`42`98`⁘`IGNORE`66,99;52,99;52,75;28,75;28,120 1`42`98`⁘`VTABER
2`75`65` `⁘`86,67;76,67;76,71 2`75`65`i <`⁘
2`104`73` ■`pULL`81,75;86,75 2`104`73` ■`cHYY
2`27`42`⁘``36,16;36,44;31,44 2`27`42`⁘
3`51`106`■``52,97;52,104 3`51`106`■ cHYY
3`-1`-1```28,78;28,45 3`27`81`⁘ HAOYBPX ZR
3`-1`-1```65,35;83,35 3`91`33`■ FGNAQ` URER]]
3`-1`-1```97,35;105,35
24`-1`-1```41,51;47,51
24`59`49`■
24`-1`-1```75,62;75,51
24`-1`-1```78,49;67,49
24`-1`-1```36,62;36,51
24`-1`-1```56,59;56,51
24`67`17`■
24`-1`-1```62,83;58,83
]]
for rec in all(h) do for rec in all(h) do
if(rec[6]) rec[6]=gsv(rec[6],";",",") rec[4]=rot13(rec[4])
if(rec[5]) rec[5]=rot13(rec[5])
local lh = self[rec[1]] local lh = self[rec[1]]
if lh then if lh then
add(lh,rec) add(lh,rec)
@ -1815,39 +1823,22 @@ function hints:init()
menuitem(2,"hide hints",function() level.hintlevel=0 end) menuitem(2,"hide hints",function() level.hintlevel=0 end)
end end
function shdprint(txt,x,y,c)
print(txt,x-1,y+1,1)
print(txt,x,y,c)
end
hintflicker=split"7,10,9,8,8,9,10,7" hintflicker=split"7,10,9,8,8,9,10,7"
function hints:draw2() function hints:draw2()
pal() pal()
local c=cycle(hintflicker) local c=cycle(hintflicker)
local function body() for i,h in ipairs(self[level.ix]) do
for i,h in ipairs(self[level.ix]) do if (i > level.hintlevel) return
if (i > level.hintlevel) return local _,x,y,txt,txt2=unpack(h)
local _,x,y,txt,txt2,arrow=unpack(h) shdprint(txt,x,y,c)
if (txt2) shdprint(txt2,x,y+8,c)
print(txt,x,y)
if (txt2) print(txt2,x,y+8)
if arrow then
line()
local x0,y0,x1,y1
for i=1,#arrow do
x0,y0,x1,y1=x1,y1,unpack(arrow[i])
line(x1,y1)
end
local dir=atan2(x1-x0,y1-y0)
local function _ahead(d,r)
line(x1+r*sgn0(cos(dir+d)),y1+r*sgn0(sin(dir+d)))
end
_ahead(0.375,2) _ahead(0.625,2) _ahead(0,0)
end
end
end end
color(7)
camera(1,-1) pal(7,1) body()
camera() pal(7,c) body()
pal()
end end
-->8 -->8
@ -1863,33 +1854,28 @@ function debugmouse:init()
end end
debugflicker=split"5,6,7,15,14,8,2,4,9,10,11,3,12,13" debugflicker=split"5,6,7,15,14,8,2,4,9,10,11,3,12,13"
debugchs = split" ,□,x" debugchs = split" ,x, ,□"
function debugmouse:draw3() function debugmouse:draw3()
if (stat(34) == 0) return if (stat(34) == 0) return
pal(15,cycle(debugflicker,1.5)) pal(15,cycle(debugflicker,1.5))
local x, y, c = stat(32), stat(33), debugchs[stat(34) & 0x3] local x, y, c = stat(32), stat(33), cycle(debugchs,2)
if not c or c == " " then if (c == " ") spr(50,x,y)
spr(50,x,y) print(c,x,y,15)
else local px, py = mid(0,x,89), mid(0, y > 111 and y - 12 or y + 6, 117)
print(c,x,y,15) print(fmt("(%v, %v)\n[%v, %v]",x,y,x\8,y\8),px,py,15)
end
print(x..", "..y,
mid(0,x,97),
mid(0, y > 117 and y - 6 or y + 6, 117),
15)
pal() pal()
end end
__gfx__ __gfx__
000030000000002200003000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeff1ff1ff1fffffff1ffffff1fffffff1dddddddd111111110000000033300333 000030000000002200003000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeff1ff1ff1fffffff1ffffff1fffffff1dddddddd111111110005000000000000
003333300000332200333330eeffffffffffffffffffffeee5e555e55e555e5eff1ff1ffffffffffffffffffffffffffdddddddd111111110cc00cc033300333 003333300000332200333330eeffffffffffffffffffffeee5e555e55e555e5eff1ff1ffffffffffffffffffffffffffdddddddd111111110000500000000000
099333990039932009333339effeeeeeeeeeeeeeeeeeeffee5eeeeeeeeeeee5eff1ff1ffff111111ff1111ff111111ffdddddddd111111110cccccc033333333 099333990039932009333339effeeeeeeeeeeeeeeeeeeffee5eeeeeeeeeeee5eff1ff1ffff111111ff1111ff111111ffdddddddd111111110000000000000000
09a333a9033a932009333339efee33e3333e333e3333eefee5e333e333333e5eff1ff1ffff1fffffff1ff1fffffff1ffdddddddd1111111100c00c0000300300 09a333a9033a932009333339efee33e3333e333e3333eefee5e333e333333e5eff1ff1ffff1fffffff1ff1fffffff1ffdddddddd111111115005005000000000
023333323333320000222220efe333e3333e333e33333efee5e333e333333e5eff1ff1ffff1fffffff1ff1fffffff1ffdddddddd1111111100c00c0000300300 023333323333320000222220efe333e3333e333e33333efee5e333e333333e5eff1ff1ffff1fffffff1ff1fffffff1ffdddddddd111111110500500500000000
002222200000220000222220efe33eeeeeeeeeeeeee33efeeee33eeeeee33eeeff1111ffff111111ff1ff1ff111111ffdddddddd111111110cccccc033333333 002222200000220000222220efe33eeeeeeeeeeeeee33efeeee33eeeeee33eeeff1111ffff111111ff1ff1ff111111ffdddddddd111111110000000000000000
000222c002222c0000022200efeeee555e555e55e5eeeefee5eeeeffffeeee5effffffffffffffffff1ff1ffffffffffdddddddd111111110cc00cc033300333 000222c002222c0000022200efeeee555e555e55e5eeeefee5eeeeffffeeee5effffffffffffffffff1ff1ffffffffffdddddddd111111110005000000000000
00000cc00000cc0000000cc0efe33e5eeeeeeeeee5e33efee5e33efeefe33e5e1ffffff11fffffffff1ff1fffffffff1dddddddd111111110000000033300333 00000cc00000cc0000000cc0efe33e5eeeeeeeeee5e33efee5e33efeefe33e5e1ffffff11fffffffff1ff1fffffffff1dddddddd111111110000500000000000
0000ff000000000000000000efe33e5e11111111e5e33efee5e33efeefe33e5eff1ff1ffffffffffffffffffffffffff88888888555555555555555588888888 0000ff000000000000000000efe33e5e11111111e5e33efee5e33efeefe33e5eff1ff1ffffffffffffffffffffffffff88888888555555555555555588888888
000f00f0000000000aa00aa0efe33eee11ffff11eee33efeeee33effffe33e5eff1ff1ffffffffffffffffffffffffff88888888558855885588558888888888 000f00f0000000000aa00aa0efe33eee11ffff11eee33efeeee33effffe33e5eff1ff1ffffffffffffffffffffffffff88888888558855885588558888888888
00d0000f000000000aaaaaa0efe33e5e1ff11ff1e5e33efee5e33eeeeee33eeeff1ff1fffff11111ffffffff11111fff88888888888888888888888888888888 00d0000f000000000aaaaaa0efe33e5e1ff11ff1e5e33efee5e33eeeeee33eeeff1ff1fffff11111ffffffff11111fff88888888888888888888888888888888
@ -1947,69 +1933,69 @@ eeee0000cc04405500444400efeeee5e11111111e5eeeefeeeeeeeeeeeeeeeeeffffffffffffffff
00880888880880888880880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00880888880880888880880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000888888800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030404040404040402140404040404050
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c0c0c0c0c0c000c0c0c0c0c0c051
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c0c0c0c0c0c000c0c0c0c0c0c051
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c0c0c0c0c0c000c0c0c0c0c0c051
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c0c0c0c0c0c000c0c0c0c0c0c051
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c0c0c0c0c0c000c0c0c0c0c0c051
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c0c0c0c0c0c000c0c0c0c0c0c051
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c000000000f300c0c0c0c0c0c051
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c00000e1e10000c0c0c0c0c0c051
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c00000000491b100c0c0c0c0c051
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c000040000000000c0c0c0c0c051
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c0000000c000c0c0c0c0c0c0c051
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c0c0c0c0c000c0c0c0c0c0c0c051
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c0c0c0c0c000c0c0c0c0c0c0c051
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031c0c0c0c0c0c000c0c0c0c0c0c0c051
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000032424242424242104242424242424252 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
d0d0d0d0d0d0d0d0e3d0d0d0d0d0d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
d0d0d0d0d0d04100000041d0d0d0d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
d0d0d0d0d0d04100000041d0d0d0d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
4141304040404040004040404050d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
d300e1e1e1e1d1d100d1d1d1d151d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
d00031000000c1f100c1f1c1f151d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
d00031000400f100e1f124c1005141d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
d000e10000000404f30400c100000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000212000000000000c0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
d00031000400e1e1e1e1e1f1005141d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000c0c0c0c0c021c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c021c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000313000000000000c0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
d000310000000000000000000051d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000c0c100c0c000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c000c0c0c0c0c0c0c0c0c0c00000000000000000000000000000c0
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
4100e1e1e1e1e1e1a4e1e1e1e151d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000c0c1002400c1c100c0c0c0c0c0c0c0c0c0c0c0c0c0c000c0c0c0c0c0c0c0c0c0c00000000000000000000000000000c0
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000c0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
4141324242424242004242424252d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000c00000e300c00000c0c0c0c0c0c0c0c0c0c0c10000c000c0c0c0c0c0c0c0c0c0c00000000000000000000000000000c0
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
d0d0d0d0d0d0d0410041d0d0d0d0d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000c000000000c000c0c0c0c0c0c0c0c0c0c000000000c100c100f3c0c0c0c0c0c0c00000000000000000000000000000c0
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
d0d0d0d0d0d0d0410041d0d0d0d0d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000001000340000c000c0c0c0c0c0c0c0c0c01000c034c1c1c1c100c0c0c0c0c0c0c0c00000000000000000000000000000c0
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
d0d0d0d0d0d0d0410041d0d0d0d0d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000c000000000c100f3c0c0c0c0c0c0c0c0c00000000000000000c0c0c0c0c0c0c0c00000000000000000000000000000c0
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
d0d0d0d0d0d0d0d021d0d0d0d0d0d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c00000000000000212000000000000c0
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c00000000000000313000000000000c0
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c00000000000000000000000000000c0
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0100000000000000000000000000000c0
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c00000000000000000000000000000c0
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c00000000000000000000000000000c0
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c00000000000000000000000000000c0
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c00000000000000000000000000000c0
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
__label__ __label__
77777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 77777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777
77777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777 77777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777
@ -2160,22 +2146,22 @@ __map__
0d0d0d0d0d0d0d0d0d080d0d0d0d0d0d0d0d230024242425141300000000150d0d0d134f1e00151414141400140d0d0d0d0d0d0d0d13000006240024070000150d2324240024242513000040441500140d0d0d0d0d0d0d0d0d080d0d0d0d0d0d0100000000000000062424242514140d0100001d1d483f230024242424242425 0d0d0d0d0d0d0d0d0d080d0d0d0d0d0d0d0d230024242425141300000000150d0d0d134f1e00151414141400140d0d0d0d0d0d0d0d13000006240024070000150d2324240024242513000040441500140d0d0d0d0d0d0d0d0d080d0d0d0d0d0d0100000000000000062424242514140d0100001d1d483f230024242424242425
0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d1400140d0d0d0d2324242424250d0d0d13000000000000000000140d0d0d0d0d0d0d0d23242425140014232424250d0d0d1400140d0d13000000001500120d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d1423242424243c250d0d0d0d0d0d0d0d14131f1f00000000140d0d0d0d0d0d 0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d1400140d0d0d0d2324242424250d0d0d13000000000000000000140d0d0d0d0d0d0d0d23242425140014232424250d0d0d1400140d0d13000000001500120d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d1423242424243c250d0d0d0d0d0d0d0d14131f1f00000000140d0d0d0d0d0d
0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d120d0d0d0d0d0d0d0d0d0d0d0d0d0d23242424251414141414140d0d0d0d0d0d0d0d0d0d0d0d0d010d0d0d0d0d0d0d0d0d010d0d0d232424242425140d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d23242424251414140d0d0d0d0d0d 0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d120d0d0d0d0d0d0d0d0d0d0d0d0d0d23242424251414141414140d0d0d0d0d0d0d0d0d0d0d0d0d010d0d0d0d0d0d0d0d0d010d0d0d232424242425140d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d23242424251414140d0d0d0d0d0d
0d0d0d0d0d0d0d0d030404040404050d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d010d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d0d0d0d0d0d0d0d0d0d0d120d0d0d00000000000000000000000000000000 0d0d0d0d0d0d0d0d030404040404050d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d010d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0d03040404040405133d00001c00150d0d0d0d0d0d0d0d0d0304043e0404050d0d0d0d0d030404000404050d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d0d14030404040404041400140d0d00000000000000000000000000000000 0d03040404040405133d00001c00150d0d0d0d0d0d0d0d0d0304043e0404050d0d0d0d0d030404000404050d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0d13001c1c004f0000421e1d1f00150d0d0d0d0d0d0d0d0d130000000000150d0d0d0d0317420000004816050d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d141413000000000000001e003f0d00000000000000000000000000000000 0d130000000000151300001d1f00150d0d0d0d0d0d0d0d0d150000000000150d0d0d0d0317420000004816050d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0d13001c1c1d00150000001c000000010d03040404040405130000000000150d0d0d141300191b1d191b0015140d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d030417001d1d1d1d1d0015140d0d00000000000000000000000000000000 0d13001d1d1e4f000000001c000000010d03040404040405150000000000150d0d0d141300191b1d191b0015140d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0d13001f1f000015131e1e1f1d1d150d0d13460044004c15130000000000150d0d3d001e0042001f0048001e003f0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d130000001c1c421c1c00150d0d0d00000000000000000000000000000000 0d13001f1f000015131e1e1f1d1d150d0d13460044004c15150000000000150d0d3d001e0042001f0048001e003f0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0d13000000000015130000001c1c150d0d131d1d1e1d1d152324241d2424250d0d140023240700410006242500140d0d0d0d0d0d030404040404050d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d13001d1d1f1f001c1c00150d0d0d00000000000000000000000000000000 0d13000000000015130000001c1c150d0d131d1d1e1d1d152324241d2424250d0d140023240700410006242500140d0d0d0d0d0d030404040404050d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0927271b1e1e0015130014001c1c150d0d131c3d001c1c000000001f040404050d1400000023243c2425000000140d0d0d0d0d0d130000001c000000000d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d13001c1c0000001c1c00150d0d0d00000000000000000000000000000000 0927271b1e1e0015130014001c1c150d0d131c3d001c1c000000001f040404050d1400000023243c2425000000140d0d0d0d0d0d130000001c000000000d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0d131c1c00000000000000001c1c150d0d131f1f1e1f1f1514141300280000150d14000000001f1f1f00000000140d0d0d141414130028001c4516050014140d00000000000000000000000000000000000000000000000000000000000000000d0d13001c1c001e001c1c00150d0d0d00000000000000000000000000000000 0d131c1c00000000000000001c1c150d0d131f1f1e1f1f1514141300280000150d14000000001f1f1f00000000140d0d0d141414130028001c4516050014140d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0d131c1c0014001513001e1e1927270b0d1300004100001514141300000000010d144f47411400000014000000140d0d01000000000000001f0000150000001200000000000000000000000000000000000000000000000000000000000000000d0d13001c1c0000001c1c00150d0d0d00000000000000000000000000000000 0d131c1c0014001513001e1e1927270b0d1300004100001514141300000000010d144f47411400000014000000140d0d01000000000000001f0000150000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0d131c1c00000015130000000000150d0927271b001927270b031741280000150d14434b491400000014000000140d0d0d14141413002800000000151414140d00000000000000000000000000000000000000000000000000000000000000000d0d13001c1c001d1d1f1f00150d0d0d00000000000000000000000000000000 0d131c1c00000015130000000000150d0927271b001927270b031741280000150d14434b491400000014000000140d0d0d14141413002800000000151414140d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0d131f1f1d1e1e151300001d1d00150d0d131f1c001c1c151f130000004900150d03040404040000000304040405140d0d0d0d0d13000000000006250d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d13001c1c481c1c000000150d0d0d00000000000000000000000000000000 0d131f1f1d1e1e151300001d1d00150d0d131f1c001c1c151f130000004900150d03040404040000000304040405140d0d0d0d0d13000000000006250d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
120000001c00000013001f1c1c00150d0d13001f001f1c0000131d1d000000150d1300000000000003170000000000120d0d0d0d232424242424250d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d1413001f1f1f1f1f000624250d0d0d00000000000000000000000000000000 120000001c000000004f1e1f1f00150d0d13001f001f1f0000131d1d000000150d1300000000000003170000000000120d0d0d0d232424242424250d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0d13001d1f1e4800004f001c1c00150d0d13000000001f1500232424242424250d13000000001d1d1d0000000015140d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0000000000000000000000000000000000000000000000000000000000000000010000000000000000001514140d0d0d00000000000000000000000000000000 0d13001d1f000015130000000000150d0d1300000000001500232424242424250d13000000001d1d1d0000000015140d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0d13001c00003f15232424242424250d0d1300000000001500140d0d0d0d0d0d0d130000000625031700000000150d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d14232424242424242425140d0d0d0d00000000000000000000000000000000 0d13001c00003f15232424242424250d0d1300000000001500140d0d0d0d0d0d0d130000000625031700000000150d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0d232424242424250d0d0d0d0d0d0d0d0d2324242424242500140d0d0d0d0d0d0d130000062503170000000000150d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000 0d232424242424250d0d0d0d0d0d0d0d0d2324242424242500140d0d0d0d0d0d0d130000062503170000000000150d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d120d0d0d0d0d0d0d0d232424250d23242424242424250d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000 0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d120d0d0d0d0d0d0d0d232424250d23242424242424250d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
__sfx__ __sfx__
00110000250002500025030250302503000000230350000023030230302303023030230302303023030230302103021030210302103021030210300000000000177401774017740177311e7501e7501e7501e750 00110000250002500025030250302503000000230350000023030230302303023030230302303023030230302103021030210302103021030210300000000000177401774017740177311e7501e7501e7501e750
00110000290202a0212a0202a0202a0202a02025030250052503025030250302503025030250302503025030250302503025030250302503225030230322504526030260302a040000002d0402d0402d0402d040 00110000290202a0212a0202a0202a0202a02025030250052503025030250302503025030250302503025030250302503025030250302503225030230322504526030260302a040000002d0402d0402d0402d040