Cleanup, move towards unifying zones

src/Dodge/Item/Weapon/Booster.hs

@@ -2,7 +2,7 @@ module Dodge.Item.Weapon.Booster
     where
 import Dodge.Data
 import Dodge.Base
-import Dodge.Base.Zone
+import Dodge.Zone
 import Dodge.Base.Collide
 import Geometry
 import qualified IntMapHelp as IM

src/Dodge/Item/Weapon/Decoration.hs

@@ -6,7 +6,7 @@ module Dodge.Item.Weapon.Decoration
 import Dodge.Data
 import Dodge.Picture.Layer
 import Dodge.Picture
---import Geometry.Data
+import Geometry.Data
 import Picture
 
 import Control.Lens

src/Dodge/Item/Weapon/Grenade.hs

@@ -1,9 +1,10 @@
 module Dodge.Item.Weapon.Grenade
     where
 import Dodge.Data
+import Dodge.Data.SoundOrigin
 import Dodge.Item.Data
 import Dodge.Base
-import Dodge.Base.Zone
+import Dodge.Zone
 import Dodge.Picture.Layer
 import Dodge.SoundLogic
 import Dodge.SoundLogic.Synonyms

src/Dodge/Item/Weapon/Laser.hs

@@ -2,6 +2,7 @@
 module Dodge.Item.Weapon.Laser
     where
 import Dodge.Data
+import Dodge.Data.DamageType
 import Dodge.Picture
 --import Dodge.Picture.Layer
 import Dodge.Item.Attachment.Data

src/Dodge/Item/Weapon/Launcher.hs

@@ -1,6 +1,7 @@
 module Dodge.Item.Weapon.Launcher
     where
 import Dodge.Data
+import Dodge.Data.SoundOrigin
 import Dodge.Default.Weapon
 import Dodge.Default.Shell
 import Dodge.SoundLogic.Synonyms
@@ -11,7 +12,7 @@ import Dodge.Item.Draw
 import Dodge.Item.Weapon.Shell
 import Dodge.Item.Weapon.TriggerType
 import Dodge.Base
-import Dodge.Base.Zone
+import Dodge.Zone
 import Dodge.SoundLogic
 import Dodge.WorldEvent.SpawnParticle
 import Dodge.WorldEvent.Cloud

src/Dodge/Item/Weapon/Targeting.hs

@@ -1,6 +1,7 @@
 module Dodge.Item.Weapon.Targeting
     where
 import Dodge.Data
+import Geometry.Data
 
 import Control.Lens
 --import qualified Data.IntMap.Strict as IM

src/Dodge/Item/Weapon/TriggerType.hs

@@ -35,6 +35,7 @@ module Dodge.Item.Weapon.TriggerType
     )
     where
 import Dodge.Data
+import Dodge.Data.SoundOrigin
 import Dodge.SoundLogic
 import Dodge.Creature.Action (startReloadingWeapon)
 import Dodge.WorldEvent (tempLightForAt)

src/Dodge/Item/Weapon/UseEffect.hs

@@ -5,7 +5,7 @@ module Dodge.Item.Weapon.UseEffect
     where
 import Dodge.Data
 import Dodge.Base
-import Dodge.Base.Zone
+import Dodge.Zone
 import Dodge.Base.Collide
 import Dodge.Picture.Layer
 --import Dodge.Item.Weapon.Decoration