Refactor modules

src/Dodge/LevelGen/AutoDoor.hs

@@ -1,7 +1,7 @@
 {- |
 Creation of doors that open when creatures approach them.
  -}
-{-# LANGUAGE BangPatterns #-}
+--{-# LANGUAGE BangPatterns #-}
 module Dodge.LevelGen.AutoDoor
     where
 import Dodge.Data

src/Dodge/LevelGen/Block.hs

@@ -2,6 +2,7 @@
 module Dodge.LevelGen.Block where
 import Dodge.Data
 import Dodge.Base
+import Dodge.Base.Zone
 import Dodge.SoundLogic
 import Dodge.WorldEvent.Sound
 import Dodge.LevelGen.Pathing

src/Dodge/LevelGen/MoveDoor.hs

@@ -3,6 +3,7 @@ module Dodge.LevelGen.MoveDoor
     where
 import Dodge.Data
 import Dodge.Base
+import Dodge.Base.Zone
 import Geometry
 
 import qualified Data.IntMap.Strict as IM
@@ -14,7 +15,7 @@ mvP !ep !p = mvPointTowardAtSpeed 2 ep p
 
 mvPs :: (Point2,Point2) -> (Point2,Point2) -> (Point2,Point2)
 {-# INLINE mvPs #-}
-mvPs !(!ex,!ey) !(!sx,!sy) = (mvP ex sx,mvP ey sy)
+mvPs (!ex,!ey) (!sx,!sy) = (mvP ex sx,mvP ey sy)
 
 moveDoorToward :: (Point2,Point2) -> Wall -> Wall
 {-# INLINE moveDoorToward #-}

src/Dodge/LevelGen/Pathing.hs

@@ -2,6 +2,7 @@ module Dodge.LevelGen.Pathing
     where
 import Dodge.Data
 import Dodge.Base
+import Dodge.Base.Zone
 import Geometry
 
 import Control.Lens

src/Dodge/LevelGen/StaticWalls.hs

@@ -5,8 +5,8 @@ Description : Concerns carving out of static walls to create the general room pl
 module Dodge.LevelGen.StaticWalls 
     where
 import Dodge.Data
-import Dodge.Base.Collide
 import Geometry
+import FoldableHelp
 
 --import Control.Lens
 import Data.List

src/Dodge/LevelGen/TriggerDoor.hs

@@ -1,8 +1,9 @@
-{-# LANGUAGE BangPatterns #-}
+--{-# LANGUAGE BangPatterns #-}
 module Dodge.LevelGen.TriggerDoor
     where
 import Dodge.Data
 import Dodge.Base
+import Dodge.Base.Zone
 import Dodge.SoundLogic
 import Dodge.SoundLogic.Synonyms
 import Dodge.LevelGen.Switch