extreme-tetrom.p8

@@ -107,6 +107,8 @@ function print3(s,y,w)
 end
 
 function cyclenum(n,low,up)
+ low=low or 1
+ up=up or low+1
  return(n-low)%(up-low+1)+low
 end
 
@@ -1261,8 +1263,7 @@ function init_menu()
 
  bg.set("falling")
  gstate=1
- gamev,mode,slc={sprite={}},mode or dget(63),1
- if (mode<1) mode=1
+ gamev,mode,slc={sprite={}},mode or 1,1
 
  options=options or {
   gamev={},
@@ -1364,22 +1365,21 @@ function update_menu()
   sfx"12"
  end
  --start game
- if slc <= 2 then
+ if 1==slc then
   if confirm()then
-   dset(63,mode)
    cpt(modes[modes.list[mode]],gamev)
    init_game(gamev)
   end
-  if slc == 2 then
-   if btnp"0"then
-    sfx"13"
-    mode-=1
-    if(0==mode)mode=#modes.list
-   elseif btnp"1"then
-    sfx"13"
-    mode%=#modes.list
-    mode+=1
-   end
+ --mode selection
+ elseif 2==slc then
+  if btnp"0"then
+   sfx"13"
+   mode-=1
+   if(0==mode)mode=#modes.list
+  elseif btnp"1"then
+   sfx"13"
+   mode%=#modes.list
+   mode+=1
   end
  --option menu
  elseif 3==slc and confirm()then
@@ -2002,7 +2002,6 @@ anim={
  swooshes={},
 
  new=function(t,a)
-  if (debris==3 and t=="crush") return
   local listname = t.."es"
   a.type,a.new,a.next=t,true,anim[listname].next
   anim[listname].next=a
@@ -2012,14 +2011,12 @@ anim={
  draw=function()
   --drawing in correct order
   for t in all({"swoosh","crush"})do
-   local afxn,prev=anim[t],anim[t.."es"]
+   local lnm = t.."es"
+   local prev=anim[lnm]
    local curr=prev.next
    while curr do
-    if not curr.wait and not afxn(curr) then
-     prev.next=curr.next
-    else
-     prev=curr
-    end
+    if (not curr.wait and not anim[t](curr)) prev.next=curr.next
+    prev=curr
     curr=curr.next
    end
    poke2(0x5f06,0x706) 
@@ -2042,7 +2039,8 @@ anim={
  
  swoosh=function(a)
   local baseframes = 10/clrspd  --10 wide
-  if a.age > baseframes+5 then
+  local totalframes = baseframes+5  --5 swooshclrs
+  if a.age > totalframes then
    dirty=true
    return false
   end
@@ -2060,9 +2058,11 @@ anim={
  end,
 
  crush=function(a)
+  if (debris==3) return false
   if (a.lag>0) return true
   poke2(0x5f06,a.c)
-  local spr_base,ret = 8*sprite.normal,false
+  local spr_base = 8*sprite.normal
+  local ret = false
   for p in all(a.list) do
    ret = ret or p.y<128
    sspr(spr_base+p.i%2*3,p.i\2*3,3,3,p.x,p.y)
@@ -2081,14 +2081,12 @@ end
 
 function upd_crush(a)
  if a.list==nil then
-  local c2=clrspd/2
   a.list = {
-   {i=0,x=a.x,y=a.y,dx=-rnd(c2),dy=(rnd(1)-1.5)},
-   {i=1,x=a.x+3,y=a.y,dx=rnd(c2),dy=(rnd(1)-1.5)},
-   {i=3,x=a.x+3,y=a.y+3,dx=rnd(c2),dy=(rnd(1)-0.5)},
-   {i=2,x=a.x,y=a.y+3,dx=-rnd(c2),dy=(rnd(1)-0.5)}
+   {i=0,x=a.x,y=a.y,dx=-rnd(0.5),dy=rnd(1)-1.5},
+   {i=1,x=a.x+3,y=a.y,dx=rnd(0.5),dy=rnd(1)-1.5},
+   {i=3,x=a.x+3,y=a.y+3,dx=rnd(0.5),dy=rnd(1)-0.5},
+   {i=2,x=a.x,y=a.y+3,dx=-rnd(0.5),dy=rnd(1)-0.5}
   }
-  a.g=0.075*clrspd
   if debris==2 then
    deli(a.list,irnd1(4))
    deli(a.list,irnd1(3))
@@ -2101,7 +2099,7 @@ function upd_crush(a)
  for p in all(a.list) do
   p.x+=p.dx
   p.y+=p.dy
-  p.dy+=a.g
+  p.dy+=0.075
  end
 end