Tidy the level

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.

Simplify debug info display.

Save tokens by omitting parentheses and map coordinates. Adjust location to match.

Instead of cycling between symbols, the cursor shape can be chosen by using left, right, or both mouse buttons.

Reviewed-on: pyrex/chameleonic#20
Co-authored-by: Kistaro Windrider <kistaro@gmail.com>
Co-committed-by: Kistaro Windrider <kistaro@gmail.com>

chameleonic.p8

@@ -33,6 +33,11 @@ function gsv(s,sep1,sep2)
  return ret
 end
 
+function cycle(tbl,period)
+ period = period or 1
+ return tbl[t()%period*#tbl\period+1]
+end
+
 mnames={}
 function names(root)
  local n=mnames[root]
@@ -293,12 +298,13 @@ function level:init()
 end
 
 function level:reinit(n)
- self.hintlevel=255
+ self.hintlevel=0
  self.ix=n
  self.todo={}
  self.bigx,self.bigy=n%8,n\8
  self.dirty=false
 
+ player.rope=nil  -- reanchor will touch the rope otherwise
  self:load_dynobjs()
  self:recollide_reanchor()
  self:spawn_exit()
@@ -329,10 +335,9 @@ function level:draw()
   local pr=self._pits[_mix(px+1,py)]
 
   spr(pit.s,px,py)
-  if pit.contents then
+  if pit.full then
    pal(pitpal)
    palt(0,false)
-   --spr(pit.contents,pit.px,pit.py)
    spr(79,pit.px,pit.py)
    pal()
    pal(normpal)
@@ -363,10 +368,10 @@ function level:update()
 
   if #crate.todo==0 then 
    local pit=self._pits[_mix(crate.mx,crate.my)]
-   if pit and not pit.contents then
+   if pit and not pit.full then
     add(remove,cix)
     crate.dead=true
-    pit.contents=crate.s
+    pit.full=true
    end
   end
  end
@@ -499,7 +504,7 @@ end
 
 function level:get_open_pit(mx,my)
  local pit=self._pits[_mix(mx,my)]
- if (pit and not pit.contents) return pit
+ if (pit and not pit.full) return pit
 end
 
 function level:spawn_exit()
@@ -837,7 +842,7 @@ function player:draw()
    if (vanish_level>i/#vanish) pal(ilc,5)
   end
 
-  if (self.fall_frame>3) local zc=@0x5f00&0xf0 for i=0x5f00,0x5f0c,4 do poke4(i,0x0101.0101) end poke(0x5f00,zc|0x01)
+  if (self.fall_frame>3) local zc=@0x5f00&0xf0 for i=0x5f00,0x5f0c,4 do poke4(i,0x0505.0505) end poke(0x5f00,zc|0x01)
  end
 
  local rx,ry=self.x*8+self.px+1,self.y*8+self.py+2
@@ -910,17 +915,12 @@ function rope:update()
   if (not self.latch) wrongbleep:bleep(5) self:destroy() return
 
   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 
     self:destroy()
    end
   end
 
-  if (not self:_check_sane()) self:destroy()
+  if (not self:_check_pinch()) self:destroy()
 
  elseif self.state.name=="destroy" then -- destroy
   self.state.frame+=1
@@ -1047,27 +1047,24 @@ function rope:draw(artificial_px,artificial_py)
  while true do
   if (n1==nil) break
   local anch=level:anchor_at(n1)
-  local x=n1.ax*8
+  local ax,ay=_anch_unpack(n1)
-  local y=n1.ay*8
+  local x=ax*8
+  local y=ay*8
   if anch then
    if (anch.adx>0) x-=1
    if (anch.ady>0) y-=1
   end
   rectfill(x-1,y-1,x+1,y+1,12)
-  print("ax="..n1.ax..",ay="..n1.ay,72,sy)
+  print("ax="..ax..",ay="..ay,72,sy)
   sy+=7
 
   local n0=n1.prev
   local n2=n1.next
   if n0!=nil and n2!=nil then
    if anch then
-    local _,_,_=would_stick(anch,n0.ax,n0.ay,n1.ax,n1.ay,n2.ax,n2.ay)
+    rectfill(x+2,y+2,x+4,y+4,3)
-
-    local c=3
-    if (anch.dropped) c=4
-    rectfill(x+2,y+2,x+4,y+4,c)
    else
-   rectfill(x+2,y+2,x+4,y+4,2)
+    rectfill(x+2,y+2,x+4,y+4,2)
    end
   else
    rectfill(x+2,y+2,x+4,y+4,4)
@@ -1077,24 +1074,21 @@ function rope:draw(artificial_px,artificial_py)
  end
 
  for _,p in pairs(level._anch) do
-  local x,y=p.ax*8,p.ay*8
+  local ax,ay=_anch_unpack(p)
+  local x,y=ax*8,ay*8
   if (p.adx>0) x-=1
   if (p.ady>0) y-=1
 	 pset(x,y,11)
 	 pset(x+p.adx,y,11)
 	 pset(x,y+p.ady,11)
 	end
-  ]]
+ ]]
 end
 
 function rope:drag_dst(xy)
  self:drag(self.dst,xy)
 end
 
-function rope:drag_src(xy)
- self:drag(self.src,xy)
-end
-
 function rope:drag(n1,axy)
  self:relax()
  self:_drag(n1,{axy[1],n1[2]})
@@ -1131,7 +1125,7 @@ function rope:relax()
  end
 end
 
-function rope:_check_sane()
+function rope:_check_pinch()
  if (not self:latched()) return true
  if (level:busy()) return true
 
@@ -1233,8 +1227,18 @@ function would_stick(anchor,xy0,xy1,xy2)
 end
 
 function rope:experience_anchor_moves(moves)
+ local latch=self.latch
+
  self:_be_dragged_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()
 end
 
@@ -1575,7 +1579,13 @@ function rope:_calc_push(
  local ops={}
  if (not an) return ops
 
- if a0.x==a1.x then
+ local ax0,ay0=_anch_unpack(a0)
+ 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?
   local y0,y1=_mnmx(a0.y,a1.y)
   local my0,my1,smy=(y0+1)\8,(y1-1)\8,1
@@ -1585,13 +1595,13 @@ function rope:_calc_push(
   end
   
   local mx,dmx
-  if a0.x%8==0 and a0.x>an.x+7 then
+  if anch.adx==-1 and a0.x>an.x+7 then
    -- push left
-   mx=(a0.x-1)\8
+   mx=ax0-1
    dmx=-1
-  elseif a0.x%8==7 and a0.x<an.x-7 then
+  elseif anch.adx==1 and a0.x<an.x-7 then
    -- push right
-   mx=(a0.x+1)\8
+   mx=ax0
    dmx=1
   else
    return {}
@@ -1602,7 +1612,7 @@ function rope:_calc_push(
   end
  end
  
- if a0.y==a1.y then
+ if ay0==ay1 then
   local x0,x1=_mnmx(a0.x,a1.x)
   local mx0,mx1,smx=(x0+1)\8,(x1-1)\8,1
   if a0.x>a1.x then
@@ -1611,14 +1621,14 @@ function rope:_calc_push(
   end
   
   local my,dmy
-  if a0.y%8==0 and a0.y>an.y+6 then
+  if anch.ady==-1 and a0.y>an.y+6 then
    -- push up
-   my=(a0.y-1)\8
+   my=ay0-1
    dmy=-1
    
-  elseif a0.y%8==7 and a0.y<an.y-6 then
+  elseif anch.ady==1 and a0.y<an.y-6 then
    -- push down
-   my=(a0.y+1)\8
+   my=ay0
    dmy=1
   else
    return {}
@@ -1714,36 +1724,23 @@ end
 -- text
 level_text={by_lvl={}}
 add(real_modules,level_text)
-level_text_raw={
+level_text_raw=gsv[[
- "0`9`11`\f7\#0press 🅾️ to mlem & unmlem",
+0`9`11`press 🅾️ to mlem & unmlem,
- "0`33`17`\f7\#0❎ to yoink"
+0`33`17`❎ to yoink]]
-}
 function level_text:init()
- for i=0,32 do level_text.by_lvl[i]={} end
+ for i=0,31 do self.by_lvl[i]={} end
 	for row in all(level_text_raw) do
-  if row then
+  if (row) add(self.by_lvl[row[1]],row)
-   lvlxys=split(row,"`")
-   add(level_text.by_lvl[lvlxys[1]],lvlxys)
-  end
 	end
 end
-function level_text:draw()
+function level_text:draw2()
- for xys in all(level_text.by_lvl[level.ix]) do
+ for xys in all(self.by_lvl[level.ix]) do
-  print(xys[4],xys[2],xys[3],6)
+  print(xys[4],xys[2],xys[3],7)
  end
 end
 
 -->8
 --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:
 -- each row is one hint.
 -- 4 or 5 columns
@@ -1766,21 +1763,28 @@ hints = {}
 add(real_modules,hints)
 
 function hints:init()
- local h = gsv[[0`42`57`🅾️ yVPX`  ■
+ local h = gsv[[0`42`57`🅾️ pULL`  ■
-0`42`73`❎, ❎ cHYY``69,67;55,67
+0`42`73`❎, ❎ pULL``69,67;55,67
-1`35`33`⁘`   cHYY`62,35;41,35
+1`35`33`⁘`   pULL`62,35;41,35
-1`79`82`cHYY ■``100,94;100,88
+1`79`82`pULL ■``100,94;100,88
-1`42`98`⁘`VTABER`66,99;52,99;52,75;28,75;28,120
+1`42`98`⁘`IGNORE`66,99;52,99;52,75;28,75;28,120
 2`75`65`   `⁘`86,67;76,67;76,71
-2`104`73` ■`cHYY`81,75;86,75
+2`104`73` ■`pULL`81,75;86,75
 2`27`42`⁘``36,16;36,44;31,44
 3`51`106`■``52,97;52,104
 3`-1`-1```28,78;28,45
 3`-1`-1```65,35;83,35
-3`-1`-1```97,35;105,35]]
+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
-  rec[4]=rot13(rec[4])
-  if(rec[5]) rec[5]=rot13(rec[5])
   if(rec[6]) rec[6]=gsv(rec[6],";",",")
   local lh = self[rec[1]]
   if lh then
@@ -1791,20 +1795,12 @@ function hints:init()
  end
  menuitem(1,"get hint",function() level.hintlevel+=1 end)
  menuitem(2,"hide hints",function() level.hintlevel=0 end)
- -- debug mode: enable mouse
- poke(0x5f2d,1)
 end
 
-hintflicker={7,10,9,8,8,9,10,7}
+hintflicker=split"7,10,9,8,8,9,10,7"
 function hints:draw2()
  pal()
- local c=hintflicker[t()%1*#hintflicker\1+1]
+ local c=cycle(hintflicker)
-  -- debug mode: mouse coord display
- if stat(34) != 0 then
-  local mousex, mousey = stat(32), stat(33)
-  print("x ("..mousex..", "..mousey..")",mousex,mousey,c)
- end
-
 
  local function body()
   for i,h in ipairs(self[level.ix]) do
@@ -1836,6 +1832,37 @@ function hints:draw2()
  pal()
 end
 
+-->8
+-- debug mouse support
+
+debugmouse = {}
+
+-- comment this out to disable debug mode
+add(real_modules, debugmouse)
+
+function debugmouse:init()
+ poke(0x5f2d,1)
+end
+
+debugflicker=split"5,6,7,15,14,8,2,4,9,10,11,3,12,13"
+debugchs = split" ,□,x"
+
+function debugmouse:draw3()
+ if (stat(34) == 0) return
+ pal(15,cycle(debugflicker,1.5))
+ local x, y, c = stat(32), stat(33), debugchs[stat(34) & 0x3]
+ if not c or c == " " then
+  spr(50,x,y)
+ else
+  print(c,x,y,15)
+ end
+ print(x..", "..y,
+       mid(0,x,97),
+       mid(0, y > 117 and y - 6 or y + 6, 117),
+       15)
+ pal()
+end
+
 __gfx__
 000030000000002200003000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeff1ff1ff1fffffff1ffffff1fffffff1dddddddd111111110005000000000000
 003333300000332200333330eeffffffffffffffffffffeee5e555e55e555e5eff1ff1ffffffffffffffffffffffffffdddddddd111111110000500000000000
@@ -1861,10 +1888,10 @@ eeee0000cc04405500444400efeeee5e11111111e5eeeefeeeeeeeeeeeeeeeeeffffffffffffffff
 0a000aa4441a91a1bbabbbbbeffeeeeeeeeeeeeeeeeeeffeff1ff1ff11111111ff1111ff00000000000000000000000000000000000000000000000000000000
 00a0044449a110a1bbbbbbbbeeffffffffffffffffffffeeff1ff1ffffffffffffffffff00000000000000000000000000000000000000000000000000000000
 000aa111991111103bbbbbb3eeeeeeeeeeeeeeeeeeeeeeeeff1ff1ffffffffffffffffff00000000000000000000000000000000000000000000000000000000
-00000000991000000000000000000000000000000000000000000000000000000000000000000000000000000000000011111111111111111999999111111111
+0000000099100000f765000000000000000000000000000000000000000000000000000000000000000000000000000011111111111111111999999111111111
-00000000990000000000000000000000000000000000000000000000000000000000000000000000000000000000000019911991999999911999999119999999
+00000000990000007700000000000000000000000000000000000000000000000000000000000000000000000000000019911991999999911999999119999999
-00000000990000000000000000000000000000000000000000000000000000000000000000000000000000000000000019977991999999911999999119999999
+00000000990000006060000000000000000000000000000000000000000000000000000000000000000000000000000019977991999999911999999119999999
-00000000090000000000000000000000000000000000000000000000000000000000000000000000000000000000000019911991999117111991199111711999
+00000000090000005005000000000000000000000000000000000000000000000000000000000000000000000000000019911991999117111991199111711999
 00000000aa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000019911991999117111991199111711999
 0000000077a000000000000000000000000000000000000000000000000000000000000000000000000000000000000019999991999999911997799119999999
 00000007777a00000000000000000000000000000000000000000000000000000000000000000000000000000000000019999991999999911991199119999999
@@ -1933,37 +1960,37 @@ eeee0000cc04405500444400efeeee5e11111111e5eeeefeeeeeeeeeeeeeeeeeffffffffffffffff
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+d0d0d0d0d0d0d0d0e3d0d0d0d0d0d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+d0d0d0d0d0d04100000041d0d0d0d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+d0d0d0d0d0d04100000041d0d0d0d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+4141304040404040004040404050d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+d300e1e1e1e1d1d100d1d1d1d151d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+d00031000000c1f100c1f1c1f151d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+d00031000400f100e1f124c1005141d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+d000e10000000404f30400c100000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000212000000000000c0
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+d00031000400e1e1e1e1e1f1005141d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000313000000000000c0
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+d000310000000000000000000051d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+4100e1e1e1e1e1e1a4e1e1e1e151d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000c0
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+4141324242424242004242424252d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+d0d0d0d0d0d0d0410041d0d0d0d0d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+d0d0d0d0d0d0d0410041d0d0d0d0d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+d0d0d0d0d0d0d0410041d0d0d0d0d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000c0
-00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+d0d0d0d0d0d0d0d021d0d0d0d0d0d0d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
 __label__
 77777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777777
@@ -2099,9 +2126,9 @@ __gff__
 000000c0c0c0c0c0c0c0c0c0c0c00000000000c0c0c0c0c0c0c0c0c0202020200040c0c0c0c0c0c0c008080800000000404000000808080808080808c0c0c0c000000000080808080808080800000008000000000808080808080808000000000008080808080808080808080000000000080808080808080808080800000000
 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 __map__
-0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d1203040404050d0d0d0d010d0d0d0d0d0d0d0d0d0d0d0d0d0d120d0d0d0d0d0d0d0d0d0d0d0d0d03043e0a00000000000000000000000000000000000000000000000000000000000000000d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d
+0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d1203040404050d0d0d0d010d0d0d0d0d0d0d0d0d0d0d0d0d0d120d0d0d0d0d0d0d0d0d0d0d0d0d03043e0a040404050d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d
-0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0a0d0d0d0d0a0d0304040405140013004f00150d0d0d1400140d0d0d0d0d0d0d0d0d0d0d0d1400140d0d0d0d0d030404040404041700002600000000000000000000000000000000000000000000000000000000000000000d0d0d0d0d033e0404040404050d0d0d0d0d0d0d
+0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0a0d0d0d0d0a0d0304040405140013004f00150d0d0d1400140d0d0d0d0d0d0d0d0d0d0d0d1400140d0d0d0d0d0304040404040417000026000000150d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d030404043e050d0d0d0d0d0d033e0404040404050d0d0d0d0d0d0d
-0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d03042604040404260417000000151400001e0000150304040400040404050d0d0d0d0d03040404050003040404050d130000000000000000001800000000000000000000000000000000000000000000000000000000000000000d0d0d0d0d134400000000001514140d0d0d0d0d
+0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d03042604040404260417000000151400001e0000150304040400040404050d0d0d0d0d03040404050003040404050d1300000000000000000018000000150d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0304041700000000150d0d0d0d0d0d134400000000001514140d0d0d0d0d
 0d0d0d0d0d0d0d0d0d0a0d0d0d0d0d0d0d14130018000000001800000000001514141300000015130000000000000015030404040513000000160017000000150d1300000000000000421e00000000150d0d0d0d0d0d0d0d0d0a0d0d0d0d0d0d0d0d1300000000000000150d0d0d0d0d12001d0000000000000003040404050d
 0d0d0d0d0d0d0d0d0d260d0d0d0d0d0d010000001e0000004f000000000000150d031700000015130000000000000015130000001513004200001e43000000150d130000000000000000001a000041150d0d0d0d0d0d0d0d0d260d0d0d0d0d0d0d0d13000000001d1d00150d0d0d0d0d0d131c0000000000150013000000150d
 0d0d0d0d0d0d0d0d0d260d0d0d0d0d0d0d1413001a000000001a0000000000150d13000000001513000000000000001513001d1d0000000000000000000000150d232424002424240700002600001e150d0d0d0d0d0d0d0d0d260d0d0d0d0d0d0d0d1346062407471c00150d0d0d0d0d0d231c24241d2424250000000000150d
@@ -2115,22 +2142,22 @@ __map__
 0d0d0d0d0d0d0d0d0d080d0d0d0d0d0d0d0d230024242425141300000000150d0d0d134f1e00151414141400140d0d0d0d0d0d0d0d13000006240024070000150d2324240024242513000040441500140d0d0d0d0d0d0d0d0d080d0d0d0d0d0d0100000000000000062424242514140d0100001d1d483f230024242424242425
 0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d1400140d0d0d0d2324242424250d0d0d13000000000000000000140d0d0d0d0d0d0d0d23242425140014232424250d0d0d1400140d0d13000000001500120d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d1423242424243c250d0d0d0d0d0d0d0d14131f1f00000000140d0d0d0d0d0d
 0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d120d0d0d0d0d0d0d0d0d0d0d0d0d0d23242424251414141414140d0d0d0d0d0d0d0d0d0d0d0d0d010d0d0d0d0d0d0d0d0d010d0d0d232424242425140d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d23242424251414140d0d0d0d0d0d
-0d0d0d0d0d0d0d0d030404040404050d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d010d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0d0d0d0d0d0d0d0d030404040404050d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d010d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d0d0d0d0d0d0d0d0d0d0d120d0d0d00000000000000000000000000000000
-0d03040404040405133d00001c00150d0d0d0d0d0d0d0d0d0304043e0404050d0d0d0d0d030404000404050d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0d03040404040405133d00001c00150d0d0d0d0d0d0d0d0d0304043e0404050d0d0d0d0d030404000404050d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d0d14030404040404041400140d0d00000000000000000000000000000000
-0d130000000000151300001d1f00150d0d0d0d0d0d0d0d0d150000000000150d0d0d0d0317420000004816050d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0d13001c1c004f0000421e1d1f00150d0d0d0d0d0d0d0d0d130000000000150d0d0d0d0317420000004816050d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d141413000000000000001e003f0d00000000000000000000000000000000
-0d13001d1d1e4f000000001c000000010d03040404040405150000000000150d0d0d141300191b1d191b0015140d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0d13001c1c1d00150000001c000000010d03040404040405130000000000150d0d0d141300191b1d191b0015140d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d030417001d1d1d1d1d0015140d0d00000000000000000000000000000000
-0d13001f1f000015131e1e1f1d1d150d0d13460044004c15150000000000150d0d3d001e0042001f0048001e003f0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0d13001f1f000015131e1e1f1d1d150d0d13460044004c15130000000000150d0d3d001e0042001f0048001e003f0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d130000001c1c421c1c00150d0d0d00000000000000000000000000000000
-0d13000000000015130000001c1c150d0d131d1d1e1d1d152324241d2424250d0d140023240700410006242500140d0d0d0d0d0d030404040404050d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0d13000000000015130000001c1c150d0d131d1d1e1d1d152324241d2424250d0d140023240700410006242500140d0d0d0d0d0d030404040404050d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d13001d1d1f1f001c1c00150d0d0d00000000000000000000000000000000
-0927271b1e1e0015130014001c1c150d0d131c3d001c1c000000001f040404050d1400000023243c2425000000140d0d0d0d0d0d130000001c000000000d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0927271b1e1e0015130014001c1c150d0d131c3d001c1c000000001f040404050d1400000023243c2425000000140d0d0d0d0d0d130000001c000000000d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d13001c1c0000001c1c00150d0d0d00000000000000000000000000000000
-0d131c1c00000000000000001c1c150d0d131f1f1e1f1f1514141300280000150d14000000001f1f1f00000000140d0d0d141414130028001c4516050014140d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0d131c1c00000000000000001c1c150d0d131f1f1e1f1f1514141300280000150d14000000001f1f1f00000000140d0d0d141414130028001c4516050014140d00000000000000000000000000000000000000000000000000000000000000000d0d13001c1c001e001c1c00150d0d0d00000000000000000000000000000000
-0d131c1c0014001513001e1e1927270b0d1300004100001514141300000000010d144f47411400000014000000140d0d01000000000000001f0000150000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0d131c1c0014001513001e1e1927270b0d1300004100001514141300000000010d144f47411400000014000000140d0d01000000000000001f0000150000001200000000000000000000000000000000000000000000000000000000000000000d0d13001c1c0000001c1c00150d0d0d00000000000000000000000000000000
-0d131c1c00000015130000000000150d0927271b001927270b031741280000150d14434b491400000014000000140d0d0d14141413002800000000151414140d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0d131c1c00000015130000000000150d0927271b001927270b031741280000150d14434b491400000014000000140d0d0d14141413002800000000151414140d00000000000000000000000000000000000000000000000000000000000000000d0d13001c1c001d1d1f1f00150d0d0d00000000000000000000000000000000
-0d131f1f1d1e1e151300001d1d00150d0d131f1c001c1c151f130000004900150d03040404040000000304040405140d0d0d0d0d13000000000006250d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0d131f1f1d1e1e151300001d1d00150d0d131f1c001c1c151f130000004900150d03040404040000000304040405140d0d0d0d0d13000000000006250d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d13001c1c481c1c000000150d0d0d00000000000000000000000000000000
-120000001c000000004f1e1f1f00150d0d13001f001f1f0000131d1d000000150d1300000000000003170000000000120d0d0d0d232424242424250d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+120000001c00000013001f1c1c00150d0d13001f001f1c0000131d1d000000150d1300000000000003170000000000120d0d0d0d232424242424250d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d1413001f1f1f1f1f000624250d0d0d00000000000000000000000000000000
-0d13001d1f000015130000000000150d0d1300000000001500232424242424250d13000000001d1d1d0000000015140d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0d13001d1f1e4800004f001c1c00150d0d13000000001f1500232424242424250d13000000001d1d1d0000000015140d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0000000000000000000000000000000000000000000000000000000000000000010000000000000000001514140d0d0d00000000000000000000000000000000
-0d13001c00003f15232424242424250d0d1300000000001500140d0d0d0d0d0d0d130000000625031700000000150d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0d13001c00003f15232424242424250d0d1300000000001500140d0d0d0d0d0d0d130000000625031700000000150d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d14232424242424242425140d0d0d0d00000000000000000000000000000000
-0d232424242424250d0d0d0d0d0d0d0d0d2324242424242500140d0d0d0d0d0d0d130000062503170000000000150d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0d232424242424250d0d0d0d0d0d0d0d0d2324242424242500140d0d0d0d0d0d0d130000062503170000000000150d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000
-0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d120d0d0d0d0d0d0d0d232424250d23242424242424250d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d120d0d0d0d0d0d0d0d232424250d23242424242424250d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000000000000000000000000000000000000d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d00000000000000000000000000000000
 __sfx__
 00110000250002500025030250302503000000230350000023030230302303023030230302303023030230302103021030210302103021030210300000000000177401774017740177311e7501e7501e7501e750
 00110000290202a0212a0202a0202a0202a02025030250052503025030250302503025030250302503025030250302503025030250302503225030230322504526030260302a040000002d0402d0402d0402d040