Cleanup

2022-07-27 12:49:23 +01:00
parent 6554d219dc
commit 8d17ce66e9
106 changed files with 2911 additions and 2678 deletions
@@ -35,10 +35,10 @@ lockRoomKeyItems =
    ,(const longRoomRunPast, takeOne [HELD SNIPERRIFLE,HELD FLATSHIELD])
    ,(const glassLessonRunPast, takeOne [HELD LASGUN])
    ,(const $ lasTunnelRunPast 400, takeOne [HELD FLATSHIELD,HELD FORCEFIELDGUN])
-    ,(keyCardRoomRunPast 0, return (KEYCARD 0))
+    ,(keyCardRoomRunPast 0, return (HELD $ KEYCARD 0))
    ]
 keyCardRunPastRand :: RandomGen g => [ (Int -> State g (MetaTree Room String) , State g ItemBaseType ) ]
-keyCardRunPastRand = [(keyCardRoomRunPast 0, return (KEYCARD 0)) ]
+keyCardRunPastRand = [(keyCardRoomRunPast 0, return (HELD $ KEYCARD 0)) ]

 itemRooms :: RandomGen g => [(ItemBaseType, State g (MetaTree Room String))]
 itemRooms = 
@@ -76,7 +76,7 @@ itemRooms =
        [rc [forceFieldGun]
        ]
      )
-    , (KEYCARD 0   , join $ takeOne 
+    , (HELD $ KEYCARD 0   , join $ takeOne 
        [rc [keyCard 0]
        ]
      )