From df905ce2ccbe525c45f6f91146717c412635ad51 Mon Sep 17 00:00:00 2001
From: justin <justin.g.kruger@gmail.com>
Date: Sun, 21 Aug 2022 23:11:28 +0100
Subject: [PATCH] Remove unnecessary packages

---
 package.yaml                                  | 10 +-
 src/Dodge/LevelGen/Data.hs                    | 95 -------------------
 src/Dodge/LevelGen/LevelStructure.hs          |  4 +-
 src/Dodge/LevelGen/SwarmPlacement.hs          |  2 +-
 src/Dodge/Placement/Instance/Button.hs        |  2 +-
 src/Dodge/Placement/Instance/Door.hs          |  2 +-
 src/Dodge/Placement/Instance/LightSource.hs   |  2 +-
 .../Placement/Instance/LightSource/Flicker.hs |  2 +-
 src/Dodge/Placement/Instance/Sensor.hs        |  2 +-
 src/Dodge/Placement/Instance/Tank.hs          |  2 +-
 src/Dodge/Placement/Instance/Terminal.hs      |  2 +-
 src/Dodge/Placement/Instance/Turret.hs        |  2 +-
 src/Dodge/Placement/Instance/Wall.hs          |  2 +-
 src/Dodge/Room.hs                             |  4 +-
 src/Dodge/Room/Airlock.hs                     |  2 +-
 src/Dodge/Room/Boss.hs                        |  2 +-
 src/Dodge/Room/Containing.hs                  |  2 +-
 src/Dodge/Room/GlassLesson.hs                 |  2 +-
 src/Dodge/Room/LasTurret.hs                   |  2 +-
 src/Dodge/Room/LongDoor.hs                    |  2 +-
 src/Dodge/Room/LongRoom.hs                    |  2 +-
 src/Dodge/Room/Modify/Girder.hs               |  2 +-
 src/Dodge/Room/NoNeedWeapon.hs                |  2 +-
 src/Dodge/Room/Pillar.hs                      |  2 +-
 src/Dodge/Room/Procedural.hs                  |  2 +-
 src/Dodge/Room/RezBox.hs                      |  2 +-
 src/Dodge/Room/RoadBlock.hs                   |  2 +-
 src/Dodge/Room/Room.hs                        |  2 +-
 src/Dodge/Room/RunPast.hs                     |  2 +-
 src/Dodge/Room/SensorDoor.hs                  |  2 +-
 src/Dodge/Room/Start.hs                       |  4 +-
 src/Dodge/Room/Tanks.hs                       |  2 +-
 src/Dodge/Room/Teleport.hs                    |  2 +-
 src/Dodge/Room/Treasure.hs                    |  2 +-
 src/Dodge/Save.hs                             |  7 +-
 src/MapHelp.hs                                |  4 -
 36 files changed, 44 insertions(+), 142 deletions(-)
 delete mode 100644 src/Dodge/LevelGen/Data.hs
 delete mode 100644 src/MapHelp.hs

diff --git a/package.yaml b/package.yaml
index d30eb3b8b..c737b1fbd 100644
--- a/package.yaml
+++ b/package.yaml
@@ -22,10 +22,10 @@ description:         Description text, TODO link to README.md
 dependencies:
 - base >= 4.7 && < 5
 - containers
-- strict-containers
-- strict-containers-lens
+  #- strict-containers
+  #- strict-containers-lens
 - unordered-containers
-- bitwise-enum
+  #- bitwise-enum
 - graphviz
 - template-haskell
   #- heap
@@ -54,12 +54,12 @@ dependencies:
   #- store
   #- binary
   #- flat
-- th-utilities
+  #- th-utilities
 - directory
 - extra
 - primitive
 - streaming
-- repa
+  #- repa
 - monad-parallel
 - parallel
 - Clipboard
diff --git a/src/Dodge/LevelGen/Data.hs b/src/Dodge/LevelGen/Data.hs
deleted file mode 100644
index 2a34fb861..000000000
--- a/src/Dodge/LevelGen/Data.hs
+++ /dev/null
@@ -1,95 +0,0 @@
-module Dodge.LevelGen.Data where
-
-import Control.Lens
-import Data.Maybe
-import Dodge.Data.GenWorld
-import Geometry
-
---spNoID
-psPtPl :: PlacementSpot -> PSType -> Placement
-psPtPl ps pst = Placement 10 ps pst Nothing (const . const Nothing)
-
-psPtJpl :: PlacementSpot -> PSType -> Maybe Placement
-psPtJpl ps = Just . psPtPl ps
-
-pContID :: PlacementSpot -> PSType -> (Int -> Maybe Placement) -> Placement
-pContID ps pt = Placement 10 ps pt Nothing . contToIDCont
-
-psPtCont :: PlacementSpot -> PSType -> (Placement -> Maybe Placement) -> Placement
-psPtCont ps pt = Placement 10 ps pt Nothing . const
-
-ptCont :: PSType -> (Placement -> Maybe Placement) -> Placement
-ptCont = psPtCont (PS 0 0)
-
-psPt :: PlacementSpot -> PSType -> Placement
-psPt ps pt = Placement 10 ps pt Nothing (const . const Nothing)
-
-sPS :: Point2 -> Float -> PSType -> Placement
-sPS p a pt = Placement 10 (PS p a) pt Nothing (const . const Nothing)
-
-sps :: PlacementSpot -> PSType -> Placement
-sps ps pt = Placement 10 ps pt Nothing (const . const Nothing)
-
-plRRpt :: Int -> PSType -> Placement
-plRRpt i pt = Placement 10 (PSRoomRand i (uncurry PS)) pt Nothing (const . const Nothing)
-
-jsps :: Point2 -> Float -> PSType -> Maybe Placement
-jsps p a pst = Just $ Placement 10 (PS p a) pst Nothing $ const . const Nothing
-
-jsps0 :: PSType -> Maybe Placement
-jsps0 = Just . sPS (V2 0 0) 0
-
-sps0 :: PSType -> Placement
-sps0 = sPS (V2 0 0) 0
-
-jspsJ :: Point2 -> Float -> PSType -> Placement -> Maybe Placement
-jspsJ p a pst plm = Just $ Placement 10 (PS p a) pst Nothing $ \_ _ -> Just plm
-
-jsps0J :: PSType -> Placement -> Maybe Placement
-jsps0J pst plm = Just $ Placement 10 (PS (V2 0 0) 0) pst Nothing $ \_ _ -> Just plm
-
-ps0 :: PSType -> (Int -> Maybe Placement) -> Placement
-ps0 pst = Placement 10 (PS (V2 0 0) 0) pst Nothing . contToIDCont
-
-pt0 :: PSType -> (Placement -> Maybe Placement) -> Placement
-pt0 pst = Placement 10 (PS (V2 0 0) 0) pst Nothing . const
-
-contToIDCont :: (Int -> Maybe Placement) -> World -> Placement -> Maybe Placement
-contToIDCont f _ = f . fromJust . _plMID
-
-jps0' :: PSType -> (Placement -> Maybe Placement) -> Maybe Placement
-jps0' pst = Just . Placement 10 (PS (V2 0 0) 0) pst Nothing . const
-
-jps0PushPS :: PSType -> (Int -> Maybe Placement) -> Maybe Placement
-jps0PushPS pst f = Just . Placement 10 (PSNoShiftCont (V2 0 0) 0) pst Nothing $
-    \_ plmnt -> f (fromJust $ _plMID plmnt) <&> plSpot .~ _plSpot plmnt
-
-ps0j :: PSType -> Placement -> Placement
-ps0j pst plmnt = Placement 10 (PS (V2 0 0) 0) pst Nothing (\_ -> const $ Just plmnt)
-
-psj :: PlacementSpot -> PSType -> Placement -> Placement
-psj ps pst plmnt = Placement 10 ps pst Nothing (\_ -> const $ Just plmnt)
-
--- the NoShiftCont is necessary when shifting then combining rooms
-ps0jPushPS :: PSType -> Placement -> Placement
-ps0jPushPS pst plmnt = Placement 10 (PSNoShiftCont (V2 0 0) 0) pst Nothing $
-    \_ p -> Just $ plmnt & plSpot .~ _plSpot p
-
--- the NoShiftCont is necessary when shifting then combining rooms
-ps0PushPS :: PSType -> (Placement -> Maybe Placement) -> Placement
-ps0PushPS pst f = Placement 10 (PSNoShiftCont (V2 0 0) 0) pst Nothing $
-    \_ pl -> f pl & _Just . plSpot %~ const (_plSpot pl)
-
-ps0PushPSw :: PSType -> (World -> Placement -> Maybe Placement) -> Placement
-ps0PushPSw pst f = Placement 10 (PSNoShiftCont (V2 0 0) 0) pst Nothing $
-    \w pl -> f w pl & _Just . plSpot %~ const (_plSpot pl)
-
-addPlmnt :: Placement -> Placement -> Placement
-addPlmnt pl pl2 = case pl2 of
-    (PlacementUsingPos p f) -> PlacementUsingPos p (fmap (addPlmnt pl) f)
-    (RandomPlacement rp) -> RandomPlacement $ fmap (addPlmnt pl) rp
-    (Placement i ps pt mi f) -> Placement i ps pt mi (fmap (fmap g) f)
-    PickOnePlacement{} -> error "not written how to combine PickOnePlacement with others yet"
-  where
-    g Nothing = Just pl
-    g (Just pl') = Just $ addPlmnt pl pl'
diff --git a/src/Dodge/LevelGen/LevelStructure.hs b/src/Dodge/LevelGen/LevelStructure.hs
index 18c3340ff..5c92f1603 100644
--- a/src/Dodge/LevelGen/LevelStructure.hs
+++ b/src/Dodge/LevelGen/LevelStructure.hs
@@ -1,12 +1,12 @@
 module Dodge.LevelGen.LevelStructure (
-    module Dodge.LevelGen.Data,
+    module Dodge.LevelGen.PlacementHelper,
     worldToGenWorld,
 ) where
 
 import Color
 import qualified Data.Map.Strict as M
 import Dodge.Data.GenWorld
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import qualified IntMapHelp as IM
 import LensHelp
 import RandomHelp
diff --git a/src/Dodge/LevelGen/SwarmPlacement.hs b/src/Dodge/LevelGen/SwarmPlacement.hs
index 32991bd80..dcf75cf0f 100644
--- a/src/Dodge/LevelGen/SwarmPlacement.hs
+++ b/src/Dodge/LevelGen/SwarmPlacement.hs
@@ -3,7 +3,7 @@ module Dodge.LevelGen.SwarmPlacement
     )
     where
 --import Dodge.Data
---import Dodge.LevelGen.Data
+--import Dodge.LevelGen.PlacementHelper
 --import Dodge.Creature.State.Data
 ----import Geometry
 --import Geometry.ConvexPoly
diff --git a/src/Dodge/Placement/Instance/Button.hs b/src/Dodge/Placement/Instance/Button.hs
index 09fb2beef..760c126fd 100644
--- a/src/Dodge/Placement/Instance/Button.hs
+++ b/src/Dodge/Placement/Instance/Button.hs
@@ -4,7 +4,7 @@ import Color
 import Control.Lens
 import Data.Maybe
 import Dodge.Data.GenWorld
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.LevelGen.Switch
 import Dodge.LightSource
 import Dodge.Placement.Instance.LightSource
diff --git a/src/Dodge/Placement/Instance/Door.hs b/src/Dodge/Placement/Instance/Door.hs
index c441ba454..a89acf966 100644
--- a/src/Dodge/Placement/Instance/Door.hs
+++ b/src/Dodge/Placement/Instance/Door.hs
@@ -10,7 +10,7 @@ import Control.Lens
 import Dodge.Data.CreatureEffect
 import Dodge.Data.GenWorld
 import Dodge.Default.Door
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.LevelGen.Switch
 import Geometry
 
diff --git a/src/Dodge/Placement/Instance/LightSource.hs b/src/Dodge/Placement/Instance/LightSource.hs
index 9db54cb69..f3a1a913f 100644
--- a/src/Dodge/Placement/Instance/LightSource.hs
+++ b/src/Dodge/Placement/Instance/LightSource.hs
@@ -6,7 +6,7 @@ import Data.Maybe
 import Dodge.Creature.Inanimate
 import Dodge.Data.GenWorld
 import Dodge.Default
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.LightSource
 import Dodge.Room.Foreground
 import Geometry
diff --git a/src/Dodge/Placement/Instance/LightSource/Flicker.hs b/src/Dodge/Placement/Instance/LightSource/Flicker.hs
index bb5bd9b1b..0c6eefeb1 100644
--- a/src/Dodge/Placement/Instance/LightSource/Flicker.hs
+++ b/src/Dodge/Placement/Instance/LightSource/Flicker.hs
@@ -3,7 +3,7 @@ module Dodge.Placement.Instance.LightSource.Flicker where
 import Control.Lens
 import Data.Maybe
 import Dodge.Data.GenWorld
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import System.Random
 
 -- Supposes the orginal placement is a light source, adds a flicker
diff --git a/src/Dodge/Placement/Instance/Sensor.hs b/src/Dodge/Placement/Instance/Sensor.hs
index 1e4d72f54..ea16cf410 100644
--- a/src/Dodge/Placement/Instance/Sensor.hs
+++ b/src/Dodge/Placement/Instance/Sensor.hs
@@ -8,7 +8,7 @@ import Control.Lens
 import qualified Data.Map.Strict as M
 import Dodge.Data.GenWorld
 import Dodge.Default
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.LightSource
 import Geometry
 
diff --git a/src/Dodge/Placement/Instance/Tank.hs b/src/Dodge/Placement/Instance/Tank.hs
index dd7fcc15a..d26749567 100644
--- a/src/Dodge/Placement/Instance/Tank.hs
+++ b/src/Dodge/Placement/Instance/Tank.hs
@@ -6,7 +6,7 @@ module Dodge.Placement.Instance.Tank (
 
 import Color
 import Dodge.Data.GenWorld
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.Placement.Instance.Block
 import Dodge.Room.Foreground
 import Geometry
diff --git a/src/Dodge/Placement/Instance/Terminal.hs b/src/Dodge/Placement/Instance/Terminal.hs
index cb885f82b..d2e6d8a3a 100644
--- a/src/Dodge/Placement/Instance/Terminal.hs
+++ b/src/Dodge/Placement/Instance/Terminal.hs
@@ -8,7 +8,7 @@ import Color
 import Data.Maybe
 import Dodge.Data.GenWorld
 import Dodge.Default
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.SoundLogic
 import Geometry
 import LensHelp
diff --git a/src/Dodge/Placement/Instance/Turret.hs b/src/Dodge/Placement/Instance/Turret.hs
index 987718608..a4b78a666 100644
--- a/src/Dodge/Placement/Instance/Turret.hs
+++ b/src/Dodge/Placement/Instance/Turret.hs
@@ -4,7 +4,7 @@ import Dodge.Item.Held.BatteryGuns
 import Color
 import Dodge.Data.GenWorld
 import Dodge.Default
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Geometry
 import LensHelp
 
diff --git a/src/Dodge/Placement/Instance/Wall.hs b/src/Dodge/Placement/Instance/Wall.hs
index dff588ddd..e48cdb02a 100644
--- a/src/Dodge/Placement/Instance/Wall.hs
+++ b/src/Dodge/Placement/Instance/Wall.hs
@@ -6,7 +6,7 @@ import Data.List
 import Dodge.Data.GenWorld
 import Dodge.Default.Block
 import Dodge.Default.Wall
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.Placement.Instance.Block
 import Geometry
 
diff --git a/src/Dodge/Room.hs b/src/Dodge/Room.hs
index ed4a4ac3c..6982f7bda 100644
--- a/src/Dodge/Room.hs
+++ b/src/Dodge/Room.hs
@@ -6,7 +6,7 @@ module Dodge.Room (
     module Dodge.Room.RoadBlock,
     module Dodge.Room.LasTurret,
     module Dodge.Room.Foreground,
-    module Dodge.LevelGen.Data,
+    module Dodge.LevelGen.PlacementHelper,
     module Dodge.Room.Procedural,
     module Dodge.Room.Corridor,
     module Dodge.Room.Link,
@@ -28,7 +28,7 @@ module Dodge.Room (
     module Dodge.Room.Pillar,
 ) where
 
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.Room.Airlock
 import Dodge.Room.BlinkAcross
 import Dodge.Room.Boss
diff --git a/src/Dodge/Room/Airlock.hs b/src/Dodge/Room/Airlock.hs
index da00d3d36..176fce15e 100644
--- a/src/Dodge/Room/Airlock.hs
+++ b/src/Dodge/Room/Airlock.hs
@@ -6,7 +6,7 @@ module Dodge.Room.Airlock where
 import Dodge.Data.GenWorld
 import Dodge.Default.Door
 import Dodge.Default.Room
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.LevelGen.Switch
 import Dodge.Placement.Instance
 import Dodge.Room.Foreground
diff --git a/src/Dodge/Room/Boss.hs b/src/Dodge/Room/Boss.hs
index 54363ac96..a7ed0a82b 100644
--- a/src/Dodge/Room/Boss.hs
+++ b/src/Dodge/Room/Boss.hs
@@ -4,7 +4,7 @@ module Dodge.Room.Boss where
 import Dodge.Creature
 import Dodge.Data.GenWorld
 import Dodge.Default.Room
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.LevelGen.StaticWalls
 import Dodge.Placement.Instance
 import Dodge.Room.Corridor
diff --git a/src/Dodge/Room/Containing.hs b/src/Dodge/Room/Containing.hs
index 7454c6775..8479cff57 100644
--- a/src/Dodge/Room/Containing.hs
+++ b/src/Dodge/Room/Containing.hs
@@ -4,7 +4,7 @@ module Dodge.Room.Containing where
 import Dodge.Cleat
 import Dodge.Data.GenWorld
 import Dodge.Item.Display
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.PlacementSpot
 import Dodge.Room.Link
 import Dodge.Room.Ngon
diff --git a/src/Dodge/Room/GlassLesson.hs b/src/Dodge/Room/GlassLesson.hs
index e9b61a611..9f2a9ca94 100644
--- a/src/Dodge/Room/GlassLesson.hs
+++ b/src/Dodge/Room/GlassLesson.hs
@@ -7,7 +7,7 @@ import Dodge.Cleat
 import Dodge.Creature
 import Dodge.Data.GenWorld
 import Dodge.Default.Wall
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.Placement.Instance
 import Dodge.Room.Corridor
 import Dodge.Room.Door
diff --git a/src/Dodge/Room/LasTurret.hs b/src/Dodge/Room/LasTurret.hs
index 43b373c8a..dbac66999 100644
--- a/src/Dodge/Room/LasTurret.hs
+++ b/src/Dodge/Room/LasTurret.hs
@@ -5,7 +5,7 @@ import Dodge.Cleat
 import Dodge.Data.GenWorld
 import Dodge.Default.Room
 import Dodge.Item.Consumable
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.Placement.Instance
 import Dodge.Placement.Instance.Analyser
 import Dodge.PlacementSpot
diff --git a/src/Dodge/Room/LongDoor.hs b/src/Dodge/Room/LongDoor.hs
index bbbfb4a03..8c4ec8be8 100644
--- a/src/Dodge/Room/LongDoor.hs
+++ b/src/Dodge/Room/LongDoor.hs
@@ -9,7 +9,7 @@ import Dodge.Creature
 import Dodge.Data.GenWorld
 import Dodge.Default.Door
 import Dodge.Default.Room
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.LightSource
 import Dodge.Placement.Instance
 import Dodge.PlacementSpot
diff --git a/src/Dodge/Room/LongRoom.hs b/src/Dodge/Room/LongRoom.hs
index aa9fb5467..5e1d99fdc 100644
--- a/src/Dodge/Room/LongRoom.hs
+++ b/src/Dodge/Room/LongRoom.hs
@@ -6,7 +6,7 @@ import Dodge.Cleat
 import Dodge.Creature
 import Dodge.Data.GenWorld
 import Dodge.Default.Wall
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.Placement.Instance
 import Dodge.Room.Corridor
 import Dodge.Room.Door
diff --git a/src/Dodge/Room/Modify/Girder.hs b/src/Dodge/Room/Modify/Girder.hs
index 4aa031694..69c16f926 100644
--- a/src/Dodge/Room/Modify/Girder.hs
+++ b/src/Dodge/Room/Modify/Girder.hs
@@ -13,7 +13,7 @@ import Data.List (nub)
 import Data.Maybe
 import qualified Data.Set as S
 import Dodge.Data.GenWorld
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.LightSource
 import Dodge.PlacementSpot
 import Dodge.Room.Foreground
diff --git a/src/Dodge/Room/NoNeedWeapon.hs b/src/Dodge/Room/NoNeedWeapon.hs
index 3c0643084..3c247a0a2 100644
--- a/src/Dodge/Room/NoNeedWeapon.hs
+++ b/src/Dodge/Room/NoNeedWeapon.hs
@@ -6,7 +6,7 @@ module Dodge.Room.NoNeedWeapon (
 import Control.Lens
 import Dodge.Creature
 import Dodge.Data.GenWorld
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.Room.Procedural
 import Geometry.Data
 import RandomHelp
diff --git a/src/Dodge/Room/Pillar.hs b/src/Dodge/Room/Pillar.hs
index 56fc6f83a..86d1ddc44 100644
--- a/src/Dodge/Room/Pillar.hs
+++ b/src/Dodge/Room/Pillar.hs
@@ -4,7 +4,7 @@ import qualified Data.Set as S
 import Dodge.Cleat
 import Dodge.Data.GenWorld
 import Dodge.Default.Block
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.Placement.Instance
 import Dodge.PlacementSpot
 import Dodge.Room.Link
diff --git a/src/Dodge/Room/Procedural.hs b/src/Dodge/Room/Procedural.hs
index 9d2c84297..c0785b0db 100644
--- a/src/Dodge/Room/Procedural.hs
+++ b/src/Dodge/Room/Procedural.hs
@@ -16,7 +16,7 @@ import Dodge.Creature
 import Dodge.Data.GenWorld
 import Dodge.Default.Door
 import Dodge.Default.Room
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.LevelGen.Switch
 import Dodge.Placement.Instance
 import Dodge.Placement.Shift
diff --git a/src/Dodge/Room/RezBox.hs b/src/Dodge/Room/RezBox.hs
index e2fcefe8e..e536e693a 100644
--- a/src/Dodge/Room/RezBox.hs
+++ b/src/Dodge/Room/RezBox.hs
@@ -4,7 +4,7 @@ import qualified Data.Set as S
 import Dodge.Cleat
 import Dodge.Data.GenWorld
 import Dodge.Item.Random
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.LightSource
 import Dodge.Placement.Instance
 import Dodge.Room.Corridor
diff --git a/src/Dodge/Room/RoadBlock.hs b/src/Dodge/Room/RoadBlock.hs
index b0cbcbad5..a6cb5d01e 100644
--- a/src/Dodge/Room/RoadBlock.hs
+++ b/src/Dodge/Room/RoadBlock.hs
@@ -8,7 +8,7 @@ import Dodge.Data.GenWorld
 import Dodge.Default.Block
 import Dodge.Default.Room
 import Dodge.Default.Wall
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.Placement.Instance
 import Dodge.Room.Corridor
 import Dodge.Room.Link
diff --git a/src/Dodge/Room/Room.hs b/src/Dodge/Room/Room.hs
index affdb1616..ab5b482e5 100644
--- a/src/Dodge/Room/Room.hs
+++ b/src/Dodge/Room/Room.hs
@@ -16,7 +16,7 @@ import Dodge.Creature
 import Dodge.Data.GenWorld
 import Dodge.Default.Room
 import Dodge.Item.Display
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.Placement.Instance
 import Dodge.Placement.Random
 import Dodge.PlacementSpot
diff --git a/src/Dodge/Room/RunPast.hs b/src/Dodge/Room/RunPast.hs
index 94f749313..5727adcd8 100644
--- a/src/Dodge/Room/RunPast.hs
+++ b/src/Dodge/Room/RunPast.hs
@@ -7,7 +7,7 @@ import qualified Data.Set as S
 import Dodge.Cleat
 import Dodge.Data.GenWorld
 import Dodge.Item.Random
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.LightSource
 import Dodge.Placement.Instance
 import Dodge.PlacementSpot
diff --git a/src/Dodge/Room/SensorDoor.hs b/src/Dodge/Room/SensorDoor.hs
index a916e8fbd..d2716cb3a 100644
--- a/src/Dodge/Room/SensorDoor.hs
+++ b/src/Dodge/Room/SensorDoor.hs
@@ -7,7 +7,7 @@ import qualified Data.Set as S
 import Dodge.Annotation.Data
 import Dodge.Cleat
 import Dodge.Data.GenWorld
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.Placement.Instance
 import Dodge.PlacementSpot
 import Dodge.Room.Corridor
diff --git a/src/Dodge/Room/Start.hs b/src/Dodge/Room/Start.hs
index c2153634c..d144984cb 100644
--- a/src/Dodge/Room/Start.hs
+++ b/src/Dodge/Room/Start.hs
@@ -11,7 +11,7 @@ import Dodge.Cleat
 import Dodge.Data.GenWorld
 import Dodge.Item.Craftable
 import Dodge.Item.Weapon
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.Room.Containing
 import Dodge.Room.Corridor
 import Dodge.Room.Door
@@ -20,7 +20,7 @@ import Dodge.Room.RezBox
 import Dodge.Room.Room
 import Dodge.Room.RunPast
 import Dodge.Tree
---import Dodge.LevelGen.Data
+--import Dodge.LevelGen.PlacementHelper
 --import Geometry.Data
 --import Padding
 --import Shape
diff --git a/src/Dodge/Room/Tanks.hs b/src/Dodge/Room/Tanks.hs
index 45946b8a1..615e24f91 100644
--- a/src/Dodge/Room/Tanks.hs
+++ b/src/Dodge/Room/Tanks.hs
@@ -2,7 +2,7 @@ module Dodge.Room.Tanks where
 import Color
 import Dodge.Base.CardinalPoint
 import Dodge.Data.GenWorld
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.Placement.Instance
 import Dodge.Placement.Instance.Pipe
 import Dodge.Placement.TopDecoration
diff --git a/src/Dodge/Room/Teleport.hs b/src/Dodge/Room/Teleport.hs
index 64929b539..b9a5e6d81 100644
--- a/src/Dodge/Room/Teleport.hs
+++ b/src/Dodge/Room/Teleport.hs
@@ -4,7 +4,7 @@ module Dodge.Room.Teleport where
 import Control.Lens
 import Control.Monad.State
 import Dodge.Data.GenWorld
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.Placement.Instance
 import Dodge.Room.Procedural
 import Geometry
diff --git a/src/Dodge/Room/Treasure.hs b/src/Dodge/Room/Treasure.hs
index f1e32c142..fc7a7f561 100644
--- a/src/Dodge/Room/Treasure.hs
+++ b/src/Dodge/Room/Treasure.hs
@@ -7,7 +7,7 @@ module Dodge.Room.Treasure where
 import Control.Monad.State
 import Dodge.Data.GenWorld
 import Dodge.Default.Room
-import Dodge.LevelGen.Data
+import Dodge.LevelGen.PlacementHelper
 import Dodge.Placement.Instance
 import Dodge.RoomLink
 import Geometry
diff --git a/src/Dodge/Save.hs b/src/Dodge/Save.hs
index e3e6d40f9..b831bea71 100644
--- a/src/Dodge/Save.hs
+++ b/src/Dodge/Save.hs
@@ -12,7 +12,7 @@ import Dodge.Concurrent
 import Control.Lens
 import Dodge.Data.SaveSlot
 import Data.Aeson
-import qualified Data.Aeson.Encode.Pretty as AEP
+--import qualified Data.Aeson.Encode.Pretty as AEP
 import qualified Data.ByteString.Lazy as BS
 --import qualified Data.ByteString as BSS
 import Dodge.Data.Universe
@@ -25,8 +25,9 @@ writeSaveSlot ss u = do
     putStrLn $ "Saving " ++ saveSlotPath ss
     createDirectoryIfMissing True "saveSlot"
     BS.writeFile (saveSlotPath ss) $
-        AEP.encodePretty'
-            (AEP.Config (AEP.Spaces 2) compare AEP.Generic False)
+        --AEP.encodePretty'
+        --    (AEP.Config (AEP.Spaces 2) compare AEP.Generic False)
+        encode
             (u ^. uvWorld . cWorld)
     return Just
 
diff --git a/src/MapHelp.hs b/src/MapHelp.hs
deleted file mode 100644
index 30a225fa6..000000000
--- a/src/MapHelp.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module MapHelp 
-    ( module Data.Strict.Map
-    ) where
-import Data.Strict.Map