Cleanup

2021-10-19 13:14:52 +01:00
parent d46de1ca80
commit 9e9d2b5def
15 changed files with 71 additions and 122 deletions
@@ -1,15 +1,11 @@
-{- 
-Specification of rooms that teleport (between levels).
-}
+{- Specification of rooms that teleport (between levels).  -}
 module Dodge.Room.Teleport
    where
 import Dodge.Data
-import Dodge.World.Trigger.Data
 import Dodge.Base
 import Dodge.Room.Data
 import Dodge.Room.Procedural
 import Dodge.Room.Placement
--import Dodge.Layout
 import Dodge.LevelGen.Data
 import Geometry
 import Picture
@@ -42,6 +38,6 @@ telRoomLev i = do
        }
    ppFootprint = rectNSEW 20 (-20) 20 (-20)
    levelReset pp w
-        | dist (_crPos $ you w) (_ppPos pp) < 20 = makeExplosionAt (_ppPos pp) $ startNewGame w
+        | dist (_crPos $ you w) (_ppPos pp) < 20 = makeExplosionAt (_ppPos pp) $ 
+            w & worldTriggers %~ S.insert (ResetLevel i)
        | otherwise = w
-    startNewGame w = w & worldTriggers %~ S.insert (ResetLevel i)