Cleanup, move towards unifying zones

src/Dodge/Creature/Action.hs

@@ -14,8 +14,9 @@ import Dodge.Path
 import Dodge.Creature.Stance.Data
 import Dodge.WorldEvent.Shockwave
 import Dodge.Data
+import Dodge.Data.SoundOrigin
 import Dodge.Base
-import Dodge.Base.Zone
+import Dodge.Zone
 import Dodge.Base.Collide
 import Dodge.SoundLogic
 import Dodge.SoundLogic.Synonyms

src/Dodge/Creature/Impulse.hs

@@ -3,8 +3,10 @@ module Dodge.Creature.Impulse
     )
     where
 import Dodge.Data
+import Dodge.Data.SoundOrigin
 import Dodge.Creature.Impulse.Movement
 import Dodge.Creature.Impulse.UseItem
+import Dodge.Data.DamageType
 --import Dodge.Creature.Action.UseItem
 import Dodge.Creature.State.Data
 import Dodge.Creature.Stance.Data

src/Dodge/Creature/Perception.hs

@@ -10,6 +10,7 @@ import Dodge.Creature.Memory.Data
 import Dodge.Base.Collide
 import Geometry.Vector
 --import Geometry.Data
+import Geometry.Data
 import Sound.Data
 --import StrictHelp
 

src/Dodge/Creature/Picture.hs

@@ -8,6 +8,7 @@ module Dodge.Creature.Picture
     , picAtCrPosNoRot
     ) where
 import Dodge.Data
+import Dodge.Data.DamageType
 --import Dodge.Base
 --import Dodge.Creature.Stance.Data
 import Dodge.Creature.Perception.Data

src/Dodge/Creature/State.hs

@@ -1,5 +1,7 @@
 module Dodge.Creature.State where
 import Dodge.Data
+import Dodge.Data.DamageType
+import Dodge.Data.SoundOrigin
 import Dodge.Item.Data
 import Dodge.Creature.State.Data
 import Dodge.Creature.State.WalkCycle

src/Dodge/Creature/State/WalkCycle.hs

@@ -1,8 +1,10 @@
 module Dodge.Creature.State.WalkCycle
     where
 import Dodge.Data
+import Dodge.Data.SoundOrigin
 import Dodge.Creature.Stance.Data
 import Dodge.SoundLogic
+import Geometry.Data
 
 import Control.Lens