king: fix noun derivation

This commit is contained in:
ryjm 2021-06-09 01:50:34 -04:00
parent 148fb1b45c
commit 8ad9d022a1
2 changed files with 4 additions and 4 deletions

View File

@ -127,7 +127,7 @@ data Germ = Germ
{ gLife :: Life { gLife :: Life
, gRing :: Ring , gRing :: Ring
} }
deriving (Eq, Show) deriving (Eq, Ord, Show)
data Feed data Feed
= Feed0 Seed = Feed0 Seed
@ -273,8 +273,8 @@ deriveNoun ''BoatEv
-- Boat Events ----------------------------------------------------------------- -- Boat Events -----------------------------------------------------------------
data JaelEv data JaelEv
= JaelEvRekey Life Ring = JaelEvRekey () (Life, Ring)
deriving (Eq, Ord, Show) deriving (Eq, Show)
deriveNoun ''JaelEv deriveNoun ''JaelEv

View File

@ -104,7 +104,7 @@ genBootSeq ship PillPill {..} lite boot feed = do
extraKeys = case feed of extraKeys = case feed of
Feed0 _ -> [] Feed0 _ -> []
Feed1 Seeds{..} -> fmap rekey gFeed Feed1 Seeds{..} -> fmap rekey gFeed
rekey Germ{..} = EvBlip $ BlipEvJael $ JaelEvRekey gLife gRing rekey Germ{..} = EvBlip $ BlipEvJael $ JaelEvRekey () (gLife, gRing)
-- Write to the log. ----------------------------------------------------------- -- Write to the log. -----------------------------------------------------------