Defunction-ify item modules, requires more cleanup

2022-06-08 12:28:11 +01:00
parent d91a53f76c
commit bcbfd7d2fa
48 changed files with 762 additions and 740 deletions
@@ -20,8 +20,8 @@ data Annotation
    | AnoApplyInt Int (Int -> State StdGen (LabSubCompTree Room))
    | AnoNewInt (Int -> State StdGen (SubCompTree Room))
    | PassthroughLockKeyLists Int 
-        [(Int -> State StdGen (LabSubCompTree Room), State StdGen CombineType)]
-        [(CombineType, State StdGen (LabSubCompTree Room))]
+        [(Int -> State StdGen (LabSubCompTree Room), State StdGen ItemBaseType)]
+        [(ItemBaseType, State StdGen (LabSubCompTree Room))]
 --    | SetLabel Int (State g Room)
 --    | UseLabel Int (State g Room)
    | ChainAnos [[Annotation]]