Cleanup

src/Dodge/Base/Collide.hs

@@ -39,7 +39,6 @@ module Dodge.Base.Collide
     , anythingHitCirc
     ) where
 import Dodge.Data
-import Dodge.Zone
 import Dodge.Zoning
 import Dodge.Base.Wall
 import Geometry
@@ -49,7 +48,6 @@ import Data.List (sortOn)
 import Data.Maybe
 import qualified IntMapHelp as IM
 import Control.Lens
-import Control.Monad
 import StreamingHelp
 import qualified Streaming.Prelude as S
 import qualified Data.IntSet as IS

src/Dodge/Block.hs

@@ -4,7 +4,6 @@ import Dodge.Data
 import Dodge.Base.Collide
 import Dodge.Material.Sound
 import Dodge.Block.Debris
-import Dodge.Zone
 import Dodge.LightSource
 import Dodge.Wall.Zone
 import Dodge.WorldEvent.Sound
@@ -20,7 +19,6 @@ import Data.Maybe
 import qualified Data.IntSet as IS
 import qualified IntMapHelp as IM
 import Control.Lens
-import qualified Streaming.Prelude as S
 import qualified Data.Graph.Inductive as FGL
 
 splinterBlock :: Block -> World -> World

src/Dodge/Bullet.hs

@@ -14,7 +14,6 @@ import LensHelp
 import StreamingHelp
 
 import qualified IntMapHelp as IM
-import qualified Streaming.Prelude as S
 import Data.Maybe
 import Dodge.Movement.Turn
 import Dodge.WorldEvent.ThingsHit

src/Dodge/DamageCircle.hs

@@ -7,7 +7,6 @@ import Geometry
 import LensHelp
 
 import Data.Foldable
-import qualified Streaming.Prelude as S
 import qualified IntMapHelp as IM
 damageCircle :: Float -> Point2 -> DamageType -> Int -> World -> World
 damageCircle r sp dt da w = w

src/Dodge/Flame.hs

@@ -7,7 +7,6 @@ import Dodge.Zoning.Wall
 import qualified ListHelp as List
 import Dodge.Data
 import Dodge.LightSource
-import Dodge.Zone
 import Dodge.WorldEvent.ThingsHit
 import Dodge.WorldEvent.Cloud
 import Dodge.SoundLogic
@@ -16,11 +15,9 @@ import Picture
 import Geometry
 import qualified IntMapHelp as IM
 import LensHelp
-import StreamingHelp
 
 import Data.Foldable
 import Data.Tuple
-import qualified Streaming.Prelude as S
 
 aFlameParticle 
     :: Int      -- ^ Timer

src/Dodge/Item/Weapon/Grenade.hs

@@ -2,7 +2,6 @@ module Dodge.Item.Weapon.Grenade where
 import Dodge.Zoning.Wall
 import Dodge.Data
 import Dodge.Base
-import Dodge.Zone
 import Dodge.SoundLogic
 import Picture
 import Geometry

src/Dodge/Placement/PlaceSpot/TriggerDoor.hs

@@ -5,7 +5,6 @@ module Dodge.Placement.PlaceSpot.TriggerDoor
     ) where
 import Dodge.Zoning.Wall
 import Dodge.Data
-import Dodge.Zone
 import Dodge.Base
 import Dodge.Path
 import Dodge.Default.Door
@@ -22,7 +21,6 @@ import LensHelp
 import Data.List
 import qualified Data.IntSet as IS
 import qualified Data.Graph.Inductive as FGL
-import qualified Streaming.Prelude as S
 plDoor :: Color
     -> EdgeObstacle
     -> (World -> Bool)      -- ^ Opening condition

src/Dodge/RadarSweep.hs

@@ -1,14 +1,12 @@
 module Dodge.RadarSweep where
 import Dodge.Zoning.Wall
 import Dodge.Data
-import Dodge.Zone
 import Color
 import Geometry
 import LensHelp
 
 import Data.Maybe
 import qualified IntMapHelp as IM
-import qualified Streaming.Prelude as S
 
 aRadarPulse :: Object -> Creature -> World -> World
 aRadarPulse ob cr = radarSweeps .:~ RadarSweep

src/Dodge/Render/Walls.hs

@@ -6,7 +6,6 @@ import Dodge.Zoning.Base
 import Dodge.Zoning.Wall
 import Dodge.Data
 import Dodge.Wall.Draw
-import Dodge.Zone
 import Dodge.Base.Wall
 import Geometry
 import ShapePicture
@@ -14,12 +13,7 @@ import ShapePicture
 import Control.Lens
 --import Data.Maybe
 import qualified Control.Foldl as L
-import qualified Streaming.Prelude as S
+wallsToDraw :: World -> ( [((Point2,Point2),Point4)]  ,[((Point2,Point2),Point4)], SPic )
---import Data.List
---import qualified IntMapHelp as IM
-wallsToDraw
-    :: World
-    -> ( [((Point2,Point2),Point4)]  ,[((Point2,Point2),Point4)], SPic )
 wallsToDraw w
     = ( wls, wins,spic)
   where

src/Dodge/Update/Camera.hs

@@ -10,7 +10,6 @@ module Dodge.Update.Camera
 import Dodge.Zoning.Wall
 import Dodge.Data
 import Dodge.Base
-import Dodge.Zone
 import Dodge.Equipment
 import Dodge.Creature.Test
 import Geometry

src/Dodge/Wall/Zone.hs

@@ -2,15 +2,9 @@ module Dodge.Wall.Zone
     where
 import Dodge.Zoning.Wall
 import Dodge.Data
-import Dodge.Zone
-import qualified IntMapHelp as IM
 
-import Data.Foldable
+--import qualified Data.IntSet as IS
-import qualified Data.IntSet as IS
 import Control.Lens
---import Data.Foldable
---import Streaming
---import qualified Streaming.Prelude as S
 
 -- need to verify that this not only inserts but also overwrites (updates) any
 -- already existing walls

src/Dodge/WallCreatureCollisions.hs

@@ -7,7 +7,6 @@ module Dodge.WallCreatureCollisions
     ) where
 import Dodge.Zoning.Wall
 import Dodge.Data
-import Dodge.Zone
 import Dodge.Base
 import Geometry
 
@@ -15,9 +14,6 @@ import Data.Monoid
 import Data.Maybe
 import Data.Function
 import Control.Lens
---import qualified IntMapHelp as IM
-
-import qualified Streaming.Prelude as S
 
 colCrsWalls :: Universe -> Universe
 colCrsWalls uv = uv & uvWorld . creatures %~ fmap (noclipCheck (_uvConfig uv) (_uvWorld uv))

src/Dodge/WorldEvent/Shockwave.hs

@@ -8,14 +8,12 @@ import Dodge.Zoning.Wall
 import Dodge.Data
 import Dodge.Wall.Damage
 import Dodge.Base
-import Dodge.Zone
 import Geometry
 import Picture
 import LensHelp
 
 import Data.Foldable
 import qualified IntMapHelp as IM
-import qualified Streaming.Prelude as S
 -- currently very effective against walls
 makeShockwaveAt 
     :: [Int]    -- ^ IDs of invulnerable creatures.

src/Dodge/WorldEvent/ThingsHit.hs

@@ -15,18 +15,14 @@ import Dodge.Zoning.Wall
 import Dodge.Zoning.Creature
 import Dodge.Data
 import Dodge.Base
-import Dodge.Zone
 import Geometry
 import qualified ListHelp as List
 
 import Control.Lens
 import Data.Maybe
 import Data.List (sortOn)
-import Data.Functor
 import Data.Bifunctor
-import StreamingHelp
 import qualified Data.IntSet as IS
-import qualified Streaming.Prelude as S
 
 {- List those objects that appear on a line.  -}
 thingsHit

src/Dodge/Zone.hs

@@ -100,11 +100,11 @@ nearSeg f p r w = streamFromZone zn $ zoneOfSeg (_znSize zn) p r
 --{-# INLINE crsNearSeg #-}
 --crsNearSeg = nearSeg _crZoning
 
-insideCirc :: Foldable t => (World -> Zoning t a) -> Point2 -> Float -> World -> StreamOf a
+--insideCirc :: Foldable t => (World -> Zoning t a) -> Point2 -> Float -> World -> StreamOf a
-{-# INLINE insideCirc #-}
+--{-# INLINE insideCirc #-}
-insideCirc f p r w = streamFromZone zn $ zoneInsideCirc (_znSize zn) p r
+--insideCirc f p r w = streamFromZone zn $ zoneInsideCirc (_znSize zn) p r
-  where
+--  where
-    zn = f w
+--    zn = f w
 
 --wlsInsideCirc :: Point2 -> Float -> World -> Stream (Of Wall) Identity ()
 --{-# INLINE wlsInsideCirc #-}