From 2085ba5a631efb86e321f57012d718301818ec03 Mon Sep 17 00:00:00 2001
From: Nyeogmi <economicsbat@gmail.com>
Date: Sun, 11 Feb 2024 21:53:19 -0800
Subject: [PATCH] Complete the rood

---
 liturgy.lua        | 77 +++++++++++++++++++++++++++++++++++++++++++---
 main.lua           |  8 ++++-
 state_menu.lua     |  2 +-
 state_wonround.lua |  1 -
 4 files changed, 80 insertions(+), 8 deletions(-)

diff --git a/liturgy.lua b/liturgy.lua
index 4e5a1d0..5190e6f 100644
--- a/liturgy.lua
+++ b/liturgy.lua
@@ -1,10 +1,16 @@
 liturgy={
  holy_book=gsv[[rood 1`1,2
 rood 2`3,4,5,6
-rood 3`7,8,9,10]],
+rood 3`7,8,9
+rood 4`10,11,12
+rood 5`13,14,15,16
+rood 6`17,18,19
+rood 7`20,21,22
+rood 8`23,24,25
+rood 9`26]],
  sacred_text_lines=gsv
 [[1`come into this thicket.
-1`i, o man, have a bright wreath.
+1`i have a bright wreath.
 1`my laurel is vibrant.
 2`the hollow of a stone.
 2`this, too, opens to the key.
@@ -35,8 +41,69 @@ rood 3`7,8,9,10]],
 9`catching a leaf, ride it.
 9`suture its veins.
 9`scatter glass in the vineyard.
-10`one day, the seas will boil.
-10`no one will be born again.]]
+10`lanias came in silver.
+10`silver pants. silver armor.
+10`he broke a seed with his beak.
+11`he milled the wheat and barley.
+11`he took oranges from the trees.
+11`apes scattered in the ferns.
+11`he raised his bow and screamed.
+12`the bolt became the wind.
+12`the silver sails lashed.
+12`the silver ospreys swarmed.
+12`the silver shadow wailed.
+13`burning oil from bay to sky.
+13`scampering keas!
+13`no one left. quiet.
+13`lanias came and went in silver.
+14`where were you? a small bird.
+14`divine. you were in the fences.
+14`you were seedling, little one.
+14`the gorgeous lily blooms.
+15`ravens are an old people.
+15`but the mandate is new.
+15`the spry one turns in the egg.
+16`it doesn't hatch.
+16`for a house in heaven, one
+16`buys it on earth.
+16`where does it go?
+17`do not hate beauty.
+17`what ages, molts.
+17`do not envy sores and rashes.
+18`do not despise vanity.
+18`who is this written for?
+18`the vain will not have it
+19`you are a blossom in a blossom.
+19`nobody will rip out your eyes.
+19`you are waiting in the leaves.
+20`you have your room.
+20`i have mine.
+20`let's dig a river,
+20`and build a bridge.
+21`let's burn herbs and
+21`feed your grandparents
+21`there's your soul!
+21`where? inside your body.
+22`let's dig a trap.
+22`let's line it with spikes.
+22`let's cover it with a sheet,
+22`and bury it in soil.
+23`is this what you want?
+23`let me tell you.
+23`you won't like how
+23`this ends.
+24`old men suffer and die
+24`for nothing. listen:
+24`when you grow up: you won't
+24`understand it.
+25`night is here.
+25`you're asleep.
+25`you leave this body.
+25`you won't want to come back.
+26`this rood is not for apes.
+26`those we killed have been 
+26`planted how it says. like this
+26`city, it will not be destroyed.]]
 }
 
 function liturgy:init()
@@ -56,7 +123,7 @@ function liturgy:init()
    local lines=verse_lines[verse]
    annotated_verse_name..=":"..ix.."-"
    ix+=#lines
-   annotated_verse_name..=ix
+   annotated_verse_name..=ix-1
    local annotated_verse=""
    for l in all(lines) do
     if (annotated_verse!="") annotated_verse..="\n"
diff --git a/main.lua b/main.lua
index 801e69e..53965fb 100644
--- a/main.lua
+++ b/main.lua
@@ -5,7 +5,13 @@ function main:init()
  extcmd("rec")
  self.state_manager=state_manager:new()  -- instantiate one global
  self.state_manager:push(state_menu:new())
- -- TODO: Push menu here
+
+ --[[
+ local b=board:new(watcher:new(progression[#progression],1,{}))
+ b.last_card=75
+ self.state_manager:push(state_wonround:new(b))
+ ]]
+
  if (completion_tracker:should_show_tutorial()) self.state_manager:push(state_ironman:new(tutorial))
 end
 
diff --git a/state_menu.lua b/state_menu.lua
index 8d1a155..d362a51 100644
--- a/state_menu.lua
+++ b/state_menu.lua
@@ -35,7 +35,7 @@ end
 function state_menu:update()
  self.frame+=1
  self.frame%=1024
- if (btnp(1) or btnp(4)) sounds:menu() self.options[self.selection]:cb()
+ if (btnp(1) or btnp(4)) sounds:menu() self.options[self.selection]:cb() return
 
  local vel=0
  if (btnp(2)) vel-=1
diff --git a/state_wonround.lua b/state_wonround.lua
index f0cb150..e2aa494 100644
--- a/state_wonround.lua
+++ b/state_wonround.lua
@@ -20,7 +20,6 @@ function state_wonround:exit(new_top) end
 function state_wonround:reenter() end
 function state_wonround:suspend() end
 
-
 function state_wonround:update()
  self.frame=min(self.frame+1,self.frames)
  self.progress=self.frame/self.frames