Refactor, try to limit dependencies

src/Dodge/Placement/Instance/Analyser.hs

@@ -1,71 +1,45 @@
-module Dodge.Placement.Instance.Analyser 
-    ( analyser
-    ) where
---import Dodge.LevelGen.Data
---import Dodge.PlacementSpot
-import Dodge.Data
---import Dodge.Base.You
-import Dodge.Default
-import Dodge.Terminal
---import Dodge.Tree
---import Dodge.RoomLink
---import Dodge.Room.Door
---import Dodge.Room.Corridor
---import Dodge.Room.Link
---import Dodge.Room.Ngon
---import Dodge.Room.Procedural
---import Dodge.Room.Foreground
---import Dodge.Room.RoadBlock
-import Dodge.Placement.Instance
---import Dodge.Placement.Shift
---import Dodge.SoundLogic
---import Dodge.Default.Room
---import Dodge.Item.Weapon.BulletGuns
---import Dodge.Item.Weapon.Utility
---import Dodge.LevelGen.Data
---import Geometry.Data
---import Geometry
---import Padding
+module Dodge.Placement.Instance.Analyser (
+    analyser,
+) where
+
 import Color
---import Shape
---import ShapePicture
+import Dodge.Data.GenWorld
+import Dodge.Default
+import Dodge.Placement.Instance
+import Dodge.Terminal
 import LensHelp
---import Dodge.RandomHelp
 
---import qualified Data.Set as S
---import Data.Maybe
---import Data.Tree
---import Control.Monad.State
---import System.Random
-
-analyser 
-    :: ProximityRequirement
-    -> PlacementSpot
-    -> PlacementSpot
-    -> Placement
+analyser ::
+    ProximityRequirement ->
+    PlacementSpot ->
+    PlacementSpot ->
+    Placement
 analyser proxreq pslight psmc = extTrigLitPos pslight $ \tp ->
-    Just $ plSpot .~ psmc $ putTerminal
-        (themachine & mcMounts . at ObTrigger .~ _plMID tp)
-        tparams -- (linksensortotrigger tp)
+    Just $
+        plSpot .~ psmc $
+            putTerminal
+                (themachine & mcMounts . at ObTrigger .~ _plMID tp)
+                tparams -- (linksensortotrigger tp)
   where
     tparams = basicTerminal & tmScrollCommands .:~ sensorCommand
---    linksensortotrigger tp _ mc 
---        = triggers . ix (fromJust $ _plMID tp) .~ const (_sensToggle $ _mcSensor mc)
-    themachine = defaultMachine & mcColor .~ aquamarine
---        & mcUpdate .~ mcProximitySensorUpdate
-        & mcDraw .~ MachineDrawTerminal
-        & mcHP .~ 100
-        & mcSensor .~ defaultProximitySensor {_proxRequirement = proxreq}
+    --    linksensortotrigger tp _ mc
+    --        = triggers . ix (fromJust $ _plMID tp) .~ const (_sensToggle $ _mcSensor mc)
+    themachine =
+        defaultMachine & mcColor .~ aquamarine
+            --        & mcUpdate .~ mcProximitySensorUpdate
+            & mcDraw .~ MachineDrawTerminal
+            & mcHP .~ 100
+            & mcSensor .~ defaultProximitySensor{_proxRequirement = proxreq}
 
 --this can probably be deleted
 --mcProximitySensorUpdate :: Machine -> World -> World
---mcProximitySensorUpdate mc w = case 
+--mcProximitySensorUpdate mc w = case
 --        (_proxStatus sens
 --        , _sensToggle sens
---        , mcProxTest mc w 
+--        , mcProxTest mc w
 --        , dist (_crPos ycr) (_mcPos mc) < _proxDist sens) of
 --    (_,True,_,_) -> w
---    (_,False,True,True) -> w 
+--    (_,False,True,True) -> w
 --            & machines . ix (_mcID mc) . mcSensor . sensToggle .~ True
 --            & playsound dedaS
 --            & machines . ix (_mcID mc) . mcSensor . proxStatus .~ IsClose