justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
justin
2022-05-20 21:47:18 +01:00
parent da302aad0c
commit 61fe9b7df4
11 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Room/LasTurret.hs
+9 -6
View File
@@ -77,10 +77,11 @@ keyCardRoomRunPast :: RandomGen g => Int -> Int -> State g (LabSubCompTree Room)
keyCardRoomRunPast keyid rmid = do
cenroom <- shuffleLinks $ keyCardAnalyserByDoor keyid rmid $ roomNgon 6 200
let doorroom = triggerDoorRoom rmid
(return $ treeFromTrunk [PassDown door] $ Node (PassDown cenroom)
return (treeFromTrunk [PassDown door] $ Node (PassDown cenroom)
[ treeFromPost [PassDown doorroom] (UseAll door)
, treeFromPost [PassDown door] (UseLabel 0 corridor)
]) <&> (,TreeSubLabelling "keyCardRoomRunPast" Nothing)
]
,TreeSubLabelling "keyCardRoomRunPast" Nothing)
keyCardAnalyserByDoor :: Int -> Int -> Room -> Room
keyCardAnalyserByDoor keyid = analyserByDoor
@@ -146,10 +147,11 @@ lasCenSensEdge :: RandomGen g => Int -> State g (LabSubCompTree Room)
lasCenSensEdge n = do
cenroom <- shuffleLinks $ lightSensByDoor n cenLasTur
let doorroom = triggerDoorRoom n
(return $ treeFromTrunk [PassDown door] $ Node (PassDown cenroom)
return (treeFromTrunk [PassDown door] $ Node (PassDown cenroom)
[ treeFromPost [PassDown doorroom] (UseAll door)
, treeFromPost [PassDown door] (UseLabel 0 corridor)
]) <&> (,TreeSubLabelling "lasCenSensEdge" Nothing)
]
,TreeSubLabelling "lasCenSensEdge" Nothing)
lasTunnel :: RandomGen g => Float -> State g Room
lasTunnel y = do
@@ -191,7 +193,8 @@ lasTunnelRunPast y = do
r <- lasTunnel y
r1 <- takeOne [door,corridor]
r2 <- takeOne [door,corridor]
(return $ Node (PassDown r)
return (Node (PassDown r)
[ singleUseAll r1
, return (UseLabel 0 $ r2 & rmConnectsTo .~ S.member InLink)
]) <&> (,TreeSubLabelling "lasTunnelRunPast" Nothing)
]
,TreeSubLabelling "lasTunnelRunPast" Nothing)