Refactor, try to limit dependencies

src/Dodge/Placement/Instance/Terminal.hs

@@ -1,62 +1,67 @@
---{-# LANGUAGE TupleSections #-}
-module Dodge.Placement.Instance.Terminal 
-    ( putMessageTerminal
-    , putTerminal
---    , simpleTermMessage
-    , terminalColor
---    , accessTerminal
-    ) where
-import Dodge.Data
-import Dodge.LevelGen.Data
-import Dodge.Default
-import Dodge.SoundLogic
+module Dodge.Placement.Instance.Terminal (
+    putMessageTerminal,
+    putTerminal,
+    terminalColor,
+) where
+
 import Color
+import Data.Maybe
+import Dodge.Data.GenWorld
+import Dodge.Default
+import Dodge.LevelGen.Data
+import Dodge.SoundLogic
 import Geometry
 import LensHelp
 
-import Data.Maybe
-
 putTerminal :: Machine -> Terminal -> Placement
-putTerminal mc tm 
-    = ps0PushPS (PutTerminal tm) 
-    $ \tmpl -> Just $ ps0PushPS (PutButton termButton)
-    $ \btpl -> Just $ pt0 
-        (PutMachine (reverse $ square 10)
-            (mc & mcMounts . at ObButton ?~ fromJust (_plMID btpl)
-                & mcCloseSound ?~ fridgeHumS)       
-            defaultSensorWall
-        )
-    $ \mcpl -> Just $ sps0 $ PutWorldUpdate $ const (setids tmpl btpl mcpl) 
+putTerminal mc tm =
+    ps0PushPS (PutTerminal tm) $
+        \tmpl -> Just $
+            ps0PushPS (PutButton termButton) $
+                \btpl -> Just $
+                    pt0
+                        ( PutMachine
+                            (reverse $ square 10)
+                            ( mc & mcMounts . at ObButton ?~ fromJust (_plMID btpl)
+                                & mcCloseSound ?~ fridgeHumS
+                            )
+                            defaultSensorWall
+                        )
+                        $ \mcpl -> Just $ sps0 $ PutWorldUpdate $ const (setids tmpl btpl mcpl)
   where
-    setids tmpl btpl mcpl w = w
-        & cWorld . terminals . ix tmid . tmButtonID .~ btid
-        & cWorld . terminals . ix tmid . tmMachineID .~ mcid
-        & cWorld . machines  . ix mcid . mcMounts . at ObTerminal ?~ tmid
-        & cWorld . buttons   . ix btid . btTermMID ?~ tmid
+    setids tmpl btpl mcpl w =
+        w
+            & cWorld . terminals . ix tmid . tmButtonID .~ btid
+            & cWorld . terminals . ix tmid . tmMachineID .~ mcid
+            & cWorld . machines . ix mcid . mcMounts . at ObTerminal ?~ tmid
+            & cWorld . buttons . ix btid . btTermMID ?~ tmid
       where
         tmid = fromJust (_plMID tmpl)
         btid = fromJust (_plMID btpl)
         mcid = fromJust (_plMID mcpl)
 
 putMessageTerminal :: Color -> Terminal -> Placement
-putMessageTerminal col = putTerminal $ defaultMachine
-    & mcColor .~ col
-    & mcDraw .~ MachineDrawTerminal --terminalSPic
-    & mcHP .~ 100
+putMessageTerminal col =
+    putTerminal $
+        defaultMachine
+            & mcColor .~ col
+            & mcDraw .~ MachineDrawTerminal --terminalSPic
+            & mcHP .~ 100
 
 termButton :: Button
-termButton = Button
-    { _btPict   = DrawNoButton
-    , _btPos    = 0
-    , _btRot    = 0
-    , _btEvent  = ButtonAccessTerminal
-    , _btID     = 0
-    , _btText   = "TERMINAL"
-    , _btState  = BtOff
-    , _btTermMID = Nothing
-    , _btName   = ""
-    , _btColor  = dark magenta
-    }
+termButton =
+    Button
+        { _btPict = DrawNoButton
+        , _btPos = 0
+        , _btRot = 0
+        , _btEvent = ButtonAccessTerminal
+        , _btID = 0
+        , _btText = "TERMINAL"
+        , _btState = BtOff
+        , _btTermMID = Nothing
+        , _btName = ""
+        , _btColor = dark magenta
+        }
 
 terminalColor :: Color
 terminalColor = dark magenta