Refactor modules

src/Dodge/Creature/Action.hs

@@ -13,6 +13,8 @@ import Dodge.Creature.Stance.Data
 import Dodge.WorldEvent.Shockwave
 import Dodge.Data
 import Dodge.Base
+import Dodge.Base.Zone
+import Dodge.Base.Collide
 import Dodge.SoundLogic
 import Dodge.SoundLogic.Synonyms
 --import Dodge.WorldEvent

src/Dodge/Creature/Action/Flee.hs

@@ -1,8 +1,8 @@
 module Dodge.Creature.Action.Flee
     where
 import Dodge.Data
-import Dodge.Base.Collide
 import Geometry
+import FoldableHelp
 
 retreatPointForFrom
     :: Float -> World -> Creature -> Point2 -> Maybe Point2

src/Dodge/Creature/AlertLevel.hs

@@ -3,8 +3,8 @@ module Dodge.Creature.AlertLevel
     where
 import Dodge.Data
 import Dodge.Creature.AlertLevel.Data
-import Dodge.Base
---import Dodge.Base.Collide
+import Dodge.Base.Collide
+import StrictHelp
 
 import Control.Lens
 import Control.Monad.Reader
@@ -62,4 +62,4 @@ basicAttentionUpdate
     -> Creature
     -> Creature
 basicAttentionUpdate cids w cr = cr & crAttentionDir .~
-    AttentiveTo (forceList $ filter (\cid -> canSee (_crID cr) cid w) cids)
+    AttentiveTo (forceFoldable $ filter (\cid -> canSee (_crID cr) cid w) cids)

src/Dodge/Creature/ArmourChase.hs

@@ -15,6 +15,7 @@ import Dodge.Item.Equipment
 import Dodge.Item.Consumable
 import Picture
 import Geometry
+import FoldableHelp
 
 import Data.Maybe
 import qualified Data.IntMap.Strict as IM

src/Dodge/Creature/ChooseTarget.hs

@@ -2,6 +2,7 @@ module Dodge.Creature.ChooseTarget
     where
 import Dodge.Data
 import Dodge.Base
+import Dodge.Base.Collide
 import Dodge.Creature.AlertLevel.Data
 
 import Control.Lens

src/Dodge/Creature/State.hs

@@ -5,7 +5,7 @@ import Dodge.Creature.State.Data
 import Dodge.Creature.State.WalkCycle
 import Dodge.Creature.Stance.Data
 --import Dodge.Creature.Test
-import Dodge.Base
+--import Dodge.Base
 import Dodge.SoundLogic
 import Dodge.SoundLogic.Synonyms
 import Dodge.RandomHelp
@@ -15,6 +15,7 @@ import Dodge.Creature.Action
 import Geometry
 import Picture
 import qualified IntMapHelp as IM
+import StrictHelp
 
 import Data.List
 --import Data.Char
@@ -81,7 +82,7 @@ crFriction _ _ = (0,0)
 
 doDamage :: Creature -> Creature
 doDamage cr = set (crState . crDamage) [] 
-    $ over (crState . crPastDamage) (forceList . take 20 . (dams :) ) damagedCr
+    $ over (crState . crPastDamage) (forceFoldable . take 20 . (dams :) ) damagedCr
   where 
     dams = _crDamage $ _crState cr
     damagedCr = snd $ _crApplyDamage cr dams cr