cursor.lua

@@ -172,10 +172,10 @@ function cursor:draw_at(l,i)
   if (not_moving) ix=#self.grabbed_slots-i2
   local card=self.board.slots[slot]:peek(ix)
 
-  local x,y=l:place_card(i+i2+1)
+  local x,y=l:place_card(i+i2)
   local card_fg=self.ruleset.deck:draw_card(x,y,card,{rotate=l.rotated})
   local fg=card_fg
-  if (i2==1) draw_layout_hint(l,i+i2+1,9,false)
+  if (i2==1) draw_layout_hint(l,i+i2,9,false)
  end
 end
 

state_archaeology.lua

@@ -1,6 +1,5 @@
 state_archaeology=klass()
-function state_archaeology:init(tips_mode)
- self.tips_mode=tips_mode
+function state_archaeology:init()
  self.n_holy_books=#liturgy.holy_book
  self:select_book(1)
 end
@@ -12,7 +11,6 @@ function state_archaeology:suspend() end
 
 function state_archaeology:select_book(n)
  self.selection=n
- if (self.tips_mode) self.title="tips" self.full_text=archaeology_tips return
  local lines={}
  local hb=liturgy.holy_book[self.selection] 
  self.title=hb[1]
@@ -70,25 +68,7 @@ function state_archaeology:draw()
  line(tx,y,tx+tw-1,y,15)
  y+=2
 
- if not self.tips_mode then
-  print("⬅️",tx,y)
-  print("➡️",tx+tw-7,y)
- end
+ print("⬅️",tx,y)
+ print("➡️",tx+tw-7,y)
  print("❎ go back",1,122,15)
-end
-
-archaeology_tips=[[
-wise archaeologists know these 
-secrets:
-
-- hold ❎ to get a new board.
-- hold 🅾️ to pick up more than 
-  one card.
-- updates and other games by
-  pyrex and nyeo are 
-  available at nyeogmi.itch.io
-  and lexaloffle.
-
-only diligent research can
-uncover sacred mysteries!
-  - p & n]]
+end

state_menu.lua

@@ -2,14 +2,13 @@ state_menu=klass()
 function state_menu:init()
  self.selection=1
  self.frame=0
- local function plain_opt(n,s,a)
-  return menu_option:new(function() return n end,function() 
-   main.state_manager:push(s:new(a))
-  end)
- end
  self.options={
-  plain_opt("excavate",state_excavate_menu,self),
-  plain_opt("archaeology",state_archaeology),
+  menu_option:new(function() return "excavate" end,function() 
+   main.state_manager:push(state_excavate_menu:new(self))
+  end),
+  menu_option:new(function() return "archaeology" end,function() 
+   main.state_manager:push(state_archaeology:new())
+  end),
   menu_option:new(),
   menu_option:new(function() 
    local pref=completion_tracker:get_music_preference()
@@ -18,8 +17,9 @@ function state_menu:init()
   end,function()
    completion_tracker:set_music_preference(not completion_tracker:get_music_preference())
   end),
-  plain_opt("reset data",state_reset_menu,self),
-  plain_opt("tips",state_archaeology,true)
+  menu_option:new(function() return "reset data" end,function()
+   main.state_manager:push(state_reset_menu:new(self))
+  end)
  }
 end
 function state_menu:enter() end

state_wonironman.lua

@@ -11,7 +11,7 @@ function state_wonironman:reenter() end
 function state_wonironman:suspend() end
 
 function state_wonironman:update()
- if (btnp(4)) sounds:menu() self.done=true self.outcome="menu"
+ if (btnp(4)) sounds:menu() self.done=true
 end
 function state_wonironman:draw()
  cls(13)

state_wonround.lua

@@ -12,7 +12,7 @@ function state_wonround:enter()
  sounds:win()
  completion_tracker:mark_seen(self.verse_id)
  completion_tracker:advance_completion_level(self.board:get_completion_level())
- if (self.board.watcher:allow_tips()) self.tip=deli(_won_round_tips,1) add(_won_round_tips,self.tip)
+ if (self.board.watcher:allow_tips()) self.tip=deli(_won_round_tips,1)
 end
 function state_wonround:exit(new_top) end
 

watcher.lua

@@ -71,7 +71,7 @@ function tutorial_grab:draw(board,layouts)
   text="🅾️"
  else
   layout=layouts:slot(self.dst)
-  i=#board.slots[self.dst].contents+2
+  i=#board.slots[self.dst].contents+1
   draw_layout_hint(layout,i,15,false,true)
   text="🅾️"
  end