Golf tostring()

chameleonic.p8

@@ -53,21 +53,18 @@ function linefill(ax,ay,bx,by,r,c)
  local dx,dy=bx-ax,by-ay
  -- avoid overflow
  -- credits: https://www.lexaloffle.com/bbs/?tid=28999
- local d=max(abs(dx),abs(dy))
- local n=min(abs(dx),abs(dy))/d
+ local n,d=_mnmx(abs(dx),abs(dy)) 
+ n/=d
  d*=sqrt(n*n+1)
  if(d<0.001) return
  local ca,sa=dx/d,-dy/d
    
  -- polygon points
- local s={
-  {0,-r},{d,-r},{d,r},{0,r}
- }
- local u,v,spans=s[4][1],s[4][2],{}
- local x0,y0=ax+u*ca+v*sa,ay-u*sa+v*ca
- for i=1,4 do
-  local u,v=s[i][1],s[i][2]
-  local x1,y1=ax+u*ca+v*sa,ay-u*sa+v*ca
+ local spans={}
+ local function calcxy(u,v) return ax+u*ca+v*sa,ay-u*sa+v*ca end
+ local x0,y0=calcxy(0,r)
+ for s in all{{0,-r},{d,-r},{d,r},{0,r}} do
+  local x1,y1=calcxy(unpack(s))
   local _x1,_y1=x1,y1
   if(y0>y1) x0,y0,x1,y1=x1,y1,x0,y0
   local dx=(x1-x0)/(y1-y0)
@@ -78,11 +75,8 @@ function linefill(ax,ay,bx,by,r,c)
   for y=y0\1+1,min(y1\1,127) do
    -- open span?
    local span=spans[y]
-   if span then
-    rectfill(x0,y,span,y)
-   else
+   if (span) rectfill(x0,y,span,y)
    spans[y]=x0
-   end
    x0+=dx
   end
   x0,y0=_x1,_y1
@@ -92,19 +86,14 @@ end
 function _apply(x,ts,a)
  local t=deli(ts,1)
  for k,v in pairs(t) do
-  if k=="update" then
-   --
-  else
-   x[k]=v
-  end
+  if (k!="update") x[k]=v 
  end
 
  if (t and t.update and not t.update(x,a)) add(ts,t,1)
 end
 
 function sgn0(x)
- if (x==0) return x
- return sgn(x)
+ return x!=0 and sgn(x) or 0
 end
 
 function _mnmx(x,y)
@@ -114,13 +103,14 @@ end
 
 
 function _rast(
- x0,y0,x1,y1
+ xs,ys,x0,y0,x1,y1
 )
- local dx=abs(x1-x0)
- local dy=abs(y1-y0)
- local x=x0
- local y=y0
+ local function _add()
+  local n=#xs
+  if (n==0 or xs[n]!=x0 or ys[n]!=y0) add(xs,x0) add(ys,y0)
+ end
 
+ local dx,dy=abs(x1-x0),abs(y1-y0)
  local sx=-1
  local sy=-1
  if (x0<x1) sx=1
@@ -129,27 +119,22 @@ function _rast(
  local done=false,err
  if dx>dy then
   err=dx/2.0
-  return function()
-   if (done) return 
-   if (x==x1) done=true return x1,y1
-   local oldx,oldy=x,y
+  while x0!=x1 do
+   _add()
    err-=dy
-   if (err<0) y+=sy err+=dx
-   x+=sx
-   return oldx,oldy
+   if (err<0) y0+=sy err+=dx
+   x0+=sx
   end
  else
   err=dy/2.0
-  return function()
-   if (done) return
-   if (y==y1) done=true return x1,y1
-   local oldx,oldy=x,y
+  while y0!=y1 do
+   _add()
    err-=dx
-   if (err<0) x+=sx err+=dy 
-   y+=sy
-   return oldx,oldy
+   if (err<0) x0+=sx err+=dy 
+   y0+=sy
   end
  end
+ _add()
 end
 
 -->8
@@ -158,63 +143,40 @@ kbd={}
 add(real_modules,kbd)
 function kbd:init()
  self.real=btn()
- self.down=0
+ self.state={btn=0}
 end
 
 function kbd:update()
  -- figure out what keys are _really_ pressed
- local now_real=btn()
- local was_real=self.real
+ local now_real,was_real=btn(),self.real
  self.real=now_real
 
  -- add keys that are really pressed 
  -- if they weren't really pressed before
  -- (they may have been force-
  --  released by :release())
- local real_pressed=(~was_real)&now_real
+ local real_pressed=~was_real&now_real
 
- local now_down=(self.down&now_real)|real_pressed
- local was_down=self.down
- self.down=now_down
+ local state=self.state
+ local now_down=state.btn&now_real|real_pressed
+ local was_down=state.btn
 
  -- deduce pressed/released by changes in down
- local pressed=(~was_down)&now_down
- local released=(~now_down)&was_down
-
- self.pressed=pressed
- self.released=released
+ state.btn,state.btnp,state.btnr=
+  now_down,
+  ~was_down&now_down,
+  ~now_down&was_down
 end
 
-function kbd:btn(i)
- return self.down&(1<<i)!=0
-end
-
-function kbd:btnp(i)
- return self.pressed&(1<<i)!=0
-end
-
-function kbd:btnr(i)
- return self.released&(1<<i)!=0
+for _kbdi in all(split"btn,btnp,btnr") do
+ kbd[_kbdi]=function(self,i,t) return 1<<i&self.state[_kbdi]!=0 end
 end
 
 function kbd:release(i)
- self.down&=~(1<<i)
+ self.state.btn&=~(1<<i)
 end
 
 function tostring(any)
- if type(any)=="function" then 
-     return "function" 
- end
- if any==nil then 
-     return "nil" 
- end
- if type(any)=="string" then
-     return any
- end
- if type(any)=="boolean" then
-     if any then return "true" end
-     return "false"
- end
  if type(any)=="table" then
   local str = "{ "
   for k,v in pairs(any) do
@@ -222,10 +184,7 @@ function tostring(any)
   end
   return str.."}"
  end
- if type(any)=="number" then
-     return ""..any
- end
-  return "unknown" -- should never show
+ return tostr(any)
 end
 
 -->8
@@ -1087,7 +1046,6 @@ function rope:draw(artificial_px,artificial_py)
  end
 
  -- debug
- --[[
  local n1=self.src
  local sy=0
  while true do
@@ -1134,7 +1092,6 @@ function rope:draw(artificial_px,artificial_py)
 	 pset(x+p.adx,y,11)
 	 pset(x,y+p.ady,11)
 	end
- ]]
 end
 
 function rope:drag_dst(x,y)
@@ -1153,18 +1110,6 @@ function rope:drag(n1,ax_new,ay_new)
 end
 
 function rope:relax()
- local n=self.src
-
- while true do
-  if (n==nil) break
-
-  if (n.associated_with) then 
-   self:_drag(n,n.associated_with.ax,n.associated_with.ay)
-  end
-
-  n=n.next
- end
-
  local n0=self.src
  while true do
   local n1=n0.next
@@ -1173,7 +1118,7 @@ function rope:relax()
 
   if n0.ax==n1.ax and n0.ay==n1.ay then 
    n0.next=n2 
-   n2.prev=n0
+   if (n2!=nil) n2.prev=n0
   else
    n0=n0.next
   end
@@ -1193,9 +1138,14 @@ function rope:relax()
    local x1,y1=n1.ax,n1.ay
    local x2,y2=n2.ax,n2.ay
 
+   if x1!=n1.associated_with.ax or y1!=n1.associated_with.ay then
+    -- printh("dragging home: "..tostring{n1.ax,n1.ay}.."->"..tostring(n1.associated_with))
+    self:_drag(n1,n1.associated_with.ax,n1.associated_with.ay)
+   end
+
    local would,x1_new,y1_new=would_stick(x0,y0,n1.associated_with,x2,y2)
    if not would and not (n1.ax==x1_new and n1.ay==y1_new) then
-    --printh("relaxing: "..tostring(n0.associated_with).."->"..tostring(n1.associated_with).."->"..tostring(n2.associated_with))
+    -- printh("relaxing: "..tostring(n0.associated_with).."->"..tostring(n1.associated_with).."->"..tostring(n2.associated_with))
     self:_drag(n1,x1_new,y1_new)
     n0=n1.prev
     n2=n1.next
@@ -1219,12 +1169,7 @@ function rope:_check_sane()
   local n1=n0.next
   if (n1==nil) break 
 
-  for qx,qy in _rast(flr(n0.ax*2),flr(n0.ay*2),flr(n1.ax*2),flr(n1.ay*2)) do
-   if not (qx==qxs[#qxs] and qy==qys[#qys]) then
-    add(qxs,qx)
-    add(qys,qy)
-   end
-  end
+  _rast(qxs,qys,flr(n0.ax*2),flr(n0.ay*2),flr(n1.ax*2),flr(n1.ay*2)) 
   n0=n1
  end
 
@@ -1287,6 +1232,14 @@ function would_stick(x0,y0,anchor,x2,y2)
  local dx=x2-x0
  local dy=y2-y0
 
+ -- there is no reason for an acute angle to stick around in this world
+ --[[
+ local ang0=atan2(x2-x1,y2-y1)
+ local ang2=atan2(x0-x1,y0-y1)
+ local diff=abs((ang0-ang2 + 0.5)%1-0.5)
+ if (diff<0.25) return false,x0,y0,0,0
+ ]]--
+
  local adx,ady
  local x1_new,y1_new
  if abs(dx)>abs(dy) then
@@ -1323,8 +1276,11 @@ function rope:be_pushed_by(anchor,ax_old,ay_old)
   local nx1,ny1=n1.ax,n1.ay
 
   if
+   (ax_new==ax_old and nx0<=anchor.ax and anchor.ax<=nx1) and 
+   (ay_new==ay_old and ny0<=anchor.ay and anchor.ay<=ny1) and 
    not (anchor.ax==nx0 and anchor.ay==ny0) and
    not (anchor.ax==nx1 and anchor.ay==ny1) and
+
    (_which_side(ax_old,ay_old,nx0,ny0,nx1,ny1)!= 
     _which_side(ax_new,ay_new,nx0,ny0,nx1,ny1) 
    ) and would_stick(nx0,ny0,anchor,nx1,ny1)
@@ -1368,7 +1324,7 @@ function rope:_drag(n1,ax1_new,ay1_new)
     for anchor in level:anchor_points() do
      if 
       not (anchor.ax==ax_pivot and anchor.ay==ay_pivot) and
-      not (anchor.ax==ax_far0 and anchor.ay==ay_far0) and
+      -- not (anchor.ax==ax_far0 and anchor.ay==ay_far0) and
       not (anchor.ax==ax_far1 and anchor.ay==ay_far1) and
       (ax0<=anchor.ax and anchor.ax<=ax1) and 
       would_stick(ax_pivot,ay_pivot,anchor,ax_far,ay_far_new) and
@@ -1391,7 +1347,7 @@ function rope:_drag(n1,ax1_new,ay1_new)
     for anchor in level:anchor_points() do
      if 
       not (anchor.ax==ax_pivot and anchor.ay==ay_pivot) and
-      not (anchor.ax==ax_far0 and anchor.ay==ay_far0) and
+      -- not (anchor.ax==ax_far0 and anchor.ay==ay_far0) and
       not (anchor.ax==ax_far1 and anchor.ay==ay_far1) and
       would_stick(ax_pivot,ay_pivot,anchor,ax_far_new,ay_far) and
       (ay0<=anchor.ay and anchor.ay<=ay1) and 
@@ -1418,7 +1374,7 @@ function rope:_drag(n1,ax1_new,ay1_new)
   local anch=_sweep_radar(n0.ax,n0.ay,ax1_old,ay1_old,ax1_new,ay1_new)
   if (anch==nil) break
   local n05={ax=anch.ax,ay=anch.ay,associated_with=anch,prev=n0,next=n1}
-  --printh("creating post: "..tostring(n0.associated_with).."->"..tostring(n05.associated_with).."->"..tostring(n1.associated_with))
+  -- printh("creating pre: "..tostring(n0.associated_with).."->"..tostring(n05.associated_with).."->"..tostring(n1.associated_with))
   n0.next=n05
   n1.prev=n05
   n0=n05
@@ -1430,7 +1386,7 @@ function rope:_drag(n1,ax1_new,ay1_new)
   local anch=_sweep_radar(n2.ax,n2.ay,ax1_old,ay1_old,ax1_new,ay1_new)
   if (anch==nil) break
   local n15={ax=anch.ax,ay=anch.ay,associated_with=anch,prev=n1,next=n2}
-  --printh("creating post: "..tostring(n1.associated_with).."->"..tostring(n15.associated_with).."->"..tostring(n2.associated_with))
+  -- printh("creating post: "..tostring(n1.associated_with).."->"..tostring(n15.associated_with).."->"..tostring(n2.associated_with))
   n1.next=n15
   n2.prev=n15
   n2=n15
@@ -1492,18 +1448,8 @@ function rope:collide_mrect(mx0,my0,mw,mh,exclude_src,exclude_dst)
    if (nd==nil) return false
   end
 
-  if exclude_src<=0 then
-   if (_line_line(n0.ax,n0.ay,n1.ax,n1.ay,mx0,my0,mx1,my0)) return true
-   if (_line_line(n0.ax,n0.ay,n1.ax,n1.ay,mx0,my0,mx0,my1)) return true
-   if (_line_line(n0.ax,n0.ay,n1.ax,n1.ay,mx0,my1,mx1,my1)) return true
-   if (_line_line(n0.ax,n0.ay,n1.ax,n1.ay,mx1,my0,mx1,my1)) return true
-  end
-  exclude_src-=1
-  n0=n1
- end
-end
-
-function _line_line(x1,y1,x2,y2,x3,y3,x4,y4)
+  local x1,y1,x2,y2=n0.ax,n0.ay,n1.ax,n1.ay
+  local function _line_line(x3,y3,x4,y4)
    local denom=((y4-y3)*(x2-x1)-(x4-x3)*(y2-y1))
 
    local ua=
@@ -1515,6 +1461,15 @@ function _line_line(x1,y1,x2,y2,x3,y3,x4,y4)
    if (ub<0 or ub>1) return false
 
    return true
+  end
+
+
+  if exclude_src<=0 then
+   if (_line_line(mx0,my0,mx1,my0) or _line_line(mx0,my0,mx0,my1) or _line_line(mx0,my1,mx1,my1) or _line_line(mx1,my0,mx1,my1)) return true
+  end
+  exclude_src-=1
+  n0=n1
+ end
 end
 
 -->8
@@ -1717,20 +1672,20 @@ function rope:_anchors_simplified()
    x=flr(a.ax*8+0.5),y=flr(a.ay*8+0.5),
    ax=a.ax,ay=a.ay
   }
-  if a.associated_with then
-   if (a.associated_with.adx==1) point.x-=1
-   if (a.associated_with.ady==1) point.y-=1
-  elseif a.prev==nil and self.latch then
-   if (self.latch.ax_offset<0) point.x-=1
-   if (self.latch.ay_offset<0) point.y-=1
+  local aw=a.associated_with
+  local l=self.latch
+  if aw then
+   if (aw.adx==1) point.x-=1
+   if (aw.ady==1) point.y-=1
+  elseif a.prev==nil and l then
+   if (l.ax_offset<0) point.x-=1
+   if (l.ay_offset<0) point.y-=1
   end
 
-  if #points<=1 then 
+  local p0,p1=points[#points-1],points[#points]
+  if p0==nil then
    add(points,point)
-  elseif abs(
-   _slope(points[#points-1],points[#points])-
-   _slope(points[#points],point)
-  )==0 then  -- epsilon?
+  elseif _slope(p0,p1)==_slope(p1,point) then  -- epsilon?
    points[#points]=point
   else
    add(points,point)
@@ -1778,14 +1733,14 @@ function level_text:init()
  for i=0,32 do level_text.by_lvl[i]={} end
 	for row in all(level_text_raw) do
   if row then
-   lvl,x,y,s=unpack(split(row,"`"))
-   add(level_text.by_lvl[lvl],{x,y,s})
+   lvlxys=split(row,"`")
+   add(level_text.by_lvl[lvlxys[1]],lvlxys)
   end
 	end
 end
 function level_text:draw()
  for xys in all(level_text.by_lvl[level.ix]) do
-  print(xys[3],xys[1],xys[2],6)
+  print(xys[4],xys[2],xys[3],6)
  end
 end
 __gfx__
@@ -1963,22 +1918,22 @@ __gff__
 000000000808080808080808c00000000000000008080808080808080000000040400000080808080808080800000000404000000808080808080808c0c0c0c000000000080808080808080800000000000000000808080808080808000000000000000008080808080808080000000000000000080808080808080800000000
 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 __map__
-0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e
-0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c00000000000000000000000000000c000000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e000000000000000000000000000000
-0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c00000000000000000000000000000c000000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e000000000000000000000000000000
-0c000000000044000c0c0c0c0c0c0c0c0c00000000000000000000000000000c000000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e000000000000000000000000000000
-0c0000000000000000000000000000000c00000000000000000000000000000c000000000000000000000000000000000e00000000000e0e0e0e0000000000000e000000000e000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e000000000000000000000000000000
-3d1c000000001c0000000000000000000000000000000000000000000000000c000000000000000000000000000000000e00000000000000000e0000000000000e000000000e000e00000000000000000e0000000000000000000000000000000e0000000000000e0e000000000000000e00000000000e0e0e0e000000000000
-0c0000000000000000000000000000410000000000000000000000000000000c0000000000000e0e0e000000000000000e00000000000000000e0000000000000e000000000e000e00000000000000000e00000000000e0e0e000000000000000e00000000000e0000000000000000000e00000000000000000e000000000000
-0c000000000000000c0c0c0c0c0c0c0c0c00000000000020210000000000000c00000000000e00000e0e0000000000000e0000000000000e0e0e0000000000000e000000000e0e0e0e0e0000000000000e00000000000e0000000000000000000e00000000000e0e0e000000000000000e000000000000000e00000000000000
-0c0c0c0c0c0c00000000000c0c0c0c0c0c00000000000030310000000000000c000000000000000e0e000000000000000e00000000000000000e0000000000000e0000000000000e00000000000000000e00000000000e0e0e000000000000000e00000000000e00000e0000000000000e0000000000000e0000000000000000
-0c00000000000c0c004f000c0c0c0c0c0c00000000000000000000000000000c0000000000000e0e00000000000000000e00000000000e0e0e0e0000000000000e0000000000000e00000000000000000e000000000000000e000000000000000e0000000000000e0e000000000000000e0000000000000e0000000000000000
-0c00000c4f00000000000000000000120100000000000000000000000000000c00000000000e0e0e0e0e0000000000000e0000000000000000000000000000000e0000000000000e00000000000000000e00000000000e0e0e000000000000000e0000000000000000000000000000000e000000000000000000000000000000
-3d0000000000003f0c000c0c0c0c0c0c0c00000000000000000000000000000c000000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e000000000000000000000000000000
-0c0000000000000000000c0c0c0c0c0c0c00000000000000000000000000000c000000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e000000000000000000000000000000
-010000000000000c0c0c0c0c0c0c0c0c0c00000000000000000000000000000c000000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e000000000000000000000000000000
-0c0c0c0c00000c0c0c0c0c0c0c0c0c0c0c00000000000000000000000000000c000000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e000000000000000000000000000000
-0c0c0c0c00410c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c000000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e000000000000000000000000000000
+0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e
+0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c00000000000000000000000000000c0c00000000000000000000000000000c0e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e000000000000000000000000000000
+0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c00000000000000000000000000000c0c0000000000000c001c1c000c0c000c0e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e000000000000000000000000000000
+0c000000000044000c0c0c0c0c0c0c0c0c00000000000000000000000000000c0c0000000000000000000000000c000c0e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e000000000000000000000000000000
+0c0000000000000000000000000000000c00000000000000000000000000000c0c00004f0c0c0000000c000000001c120e00000000000e0e0e0e0000000000000e000000000e000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e000000000000000000000000000000
+3d1c000000001c0000000000000000000000000000000000000000000000000c3d000c000c0c0000003f0c0c0000000c0e00000000000000000e0000000000000e000000000e000e00000000000000000e0000000000000000000000000000000e0000000000000e0e000000000000000e00000000000e0e0e0e000000000000
+0c0000000000000000000000000000410000000000000000000000000000000c0c000c0000000000000000000000000c0e00000000000000000e0000000000000e000000000e000e00000000000000000e00000000000e0e0e000000000000000e00000000000e0000000000000000000e00000000000000000e000000000000
+0c000000000000000c0c0c0c0c0c0c0c0c00000000000020210000000000000c01000c0c00000000000c0c004f00000c0e0000000000000e0e0e0000000000000e000000000e0e0e0e0e0000000000000e00000000000e0000000000000000000e00000000000e0e0e000000000000000e000000000000000e00000000000000
+0c0c0c0c0c0c00000000000c0c0c0c0c0c00000000000030310000000000000c0c0000000000000c00000c000000000c0e00000000000000000e0000000000000e0000000000000e00000000000000000e00000000000e0e0e000000000000000e00000000000e00000e0000000000000e0000000000000e0000000000000000
+0c00000000000c0c004f000c0c0c0c0c0c00000000000000000000000000000c0c00004f0000000c0c000c0000000c0c0e00000000000e0e0e0e0000000000000e0000000000000e00000000000000000e000000000000000e000000000000000e0000000000000e0e000000000000000e0000000000000e0000000000000000
+0c00000c4f00000000000000000000120100000000000000000000000000000c0c00000000000000000000000000000c0e0000000000000000000000000000000e0000000000000e00000000000000000e00000000000e0e0e000000000000000e0000000000000000000000000000000e000000000000000000000000000000
+3d0000000000003f0c000c0c0c0c0c0c0c00000000000000000000000000000c0c00000c00000000000000000000000c0e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e000000000000000000000000000000
+0c0000000000000000000c0c0c0c0c0c0c00000000000000000000000000000c0c000c0c0c0000000c0c0c004f00000c0e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e000000000000000000000000000000
+010000000000000c0c0c0c0c0c0c0c0c0c00000000000000000000000000000c0c00000c00000000000000000000000c0e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e000000000000000000000000000000
+0c0c0c0c00000c0c0c0c0c0c0c0c0c0c0c00000000000000000000000000000c0c00000000001c00000000000000000c0e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e000000000000000000000000000000
+0c0c0c0c00410c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e0000000000000000000000000000000e000000000000000000000000000000
 0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e
 0c00000000000000000000000000000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0000000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0e0000000000000000000000000000000e000000000000000000000000000000
 0c004f000000000c001c1c000c0c000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0000000000000c0c0c0c0c0c0c0c0c0c0c0c00000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c3e0c0c0c0c0c0e0000000000000000000000000000000e000000000000000000000000000000
@@ -1996,18 +1951,18 @@ __map__
 0c00000000001c00000000000000000c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0e0000000000000000000000000000000e000000000000000000000000000000
 0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e
 __sfx__
-01320000050350c03511045185451d55511515115000050001035080350d04514545195551b5551a5301b5401a5551a51516555145001554015545000000000013005130350d035100450c045100201d0530c053
-0132000000000000001f0001f035200452001520000180001b0001b00500000190351b0451d0451c0551d0451c0551c015180551b000170401704519000140001800000000130051305517055170251701500000
-01280000050350c03511045185451d5550c515115150051501515011150c0000f000130000f0000c0001403314550145530c023080141950000000000000000000000070000f0001300018000130000f0000c000
-012800000000000000130001f055220552005500000270551f0551d05500000000000000000000000000000024050240501d0261a0030c0040000000000000000000000000000000000000000000000000000000
-013200001102511025110250c000140001d0451c0411904018040160401404013040110500d00508005264002740027400080000f000180001400026400244002240022400030000a0001f4001f4001b4001b400
-013200002c555295552955508000115002c5552b55528555285552b5552955528545295451853518535265002750027500075000e5001f5001f4002640026400244002440000000070000f0000f0000e0000c000
-013200000000000000000000000013000190001805116050140501305011050100510d0350d0350d0350000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+01280000050550c05511055180551d05500000000000000000055070550c0550f055130550f0550c0550705501055080550d055140551905500000000000000000055070550f0551305518055130550f0550c055
+0128000000000000001f0001f055200551f0551d055180551b055000000000000000000000000000000000000000000000000001b0551d0551b05519055140551805500000000000000000000000000000000000
+01280000050550c05511055180551d05518055110550d0550c055130551b055240552b0551b05518055130550a055110551a05522055290550e0550a05505055000550705510055180551f055100550c05507055
+012800000000000000130001f055220552005500000270551f0550000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+012800001d4521d452050550c05514055110551f452204522445224452050550c055140551105526452264522745227452080550f055180551405526452244522245222452030550a0551f4521f4521b4521b452
+012800001d4521d4520105508055110550d0551f452204522445224452050550c055140551105526452264522745227452070550e0551f4521f4522645226452244522445200055070550f0520f0550e0550c055
+00280000000000000000000000000505500000050550c055000000000000000050050505500000050550c055000000000000000000000805500000080550f05500000000000000000000030550a0550205509055
 012800000122401222000000000001055000000105508055052220522200000000000505500000050550c05507222072220000000000022220222202222022220022200222000000000000055070550005507055
-012800001d3141f3142032420300203040000027324273201f320000001d3001d3241b324000001f324000001d3141f3142031422314243142631427324293242b3240000024324273002932129320293102b310
-012800000000000000010550805501055080050105508055000550800000000070550005507055000550705501055000000100508005010050800501055080550005500000070550000000050000000705500000
-01280010183241a3241b3240000000000000002232400000213240000026324000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-01281000080050f005080250f02501055000000f025000000e3250000013325000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+012800001d3541f3542035420300203040000027354273501f350000001d3001d3541b354000001f354000001d3541f3542035422354243542635027354293502b3540000024354000002935429350293502b350
+012800000000000000010550805501055080050105508055000550800000000070550005507055000550705500000000000105508055010550805501055080550005500000070550000000055000000705500000
+01280010183541a3541b3540000000000000002235400000213540000026354000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+01281000080050f005080550f05501055000000f055000000e3550000013355000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
@@ -2063,9 +2018,8 @@ __sfx__
 __music__
 01 00014344
 00 02034344
-00 04050644
+00 04064344
 00 05074344
 00 08094344
 02 0a0b4344
-00 0c424344