Refactor, try to limit dependencies

src/Dodge/Creature/Picture/Awareness.hs

@@ -1,25 +1,30 @@
 module Dodge.Creature.Picture.Awareness where
-import Dodge.Data
-import Dodge.Clock
-import Picture
-import Geometry
 
 import qualified Data.Vector as V
+import Dodge.Clock
+import Dodge.Data.World
+import Geometry
+import Picture
 
 creatureDisplayText :: World -> Creature -> Picture
-creatureDisplayText w cr = setLayer DebugLayer 
-    . setDepth 20 
-    . translate x y 
-    . color white 
-    . rotate (0.5 * pi)
---    . rotate (argV v - 0.5 * pi)
-    . scale theScale theScale 
-    . stackText 
-    $ clockCycle 25 (V.fromList 
-        [ \cr' -> [crDisplayVigilance cr']
-        , \cr' -> [crDisplayAwareness cr']
-        ]
-        ) w cr
+creatureDisplayText w cr =
+    setLayer DebugLayer
+        . setDepth 20
+        . translate x y
+        . color white
+        . rotate (0.5 * pi)
+        --    . rotate (argV v - 0.5 * pi)
+        . scale theScale theScale
+        . stackText
+        $ clockCycle
+            25
+            ( V.fromList
+                [ \cr' -> [crDisplayVigilance cr']
+                , \cr' -> [crDisplayAwareness cr']
+                ]
+            )
+            w
+            cr
   where
     campos = _cameraViewFrom (_cWorld w)
     theScale = 0.15 / _cameraZoom (_cWorld w)
@@ -30,12 +35,12 @@ creatureDisplayText w cr = setLayer DebugLayer
 crDisplayAwareness :: Creature -> String
 crDisplayAwareness cr
     | isSuspicious = "?"
-    | isCognizant  = "!"
-    | otherwise    = "."
+    | isCognizant = "!"
+    | otherwise = "."
   where
     imAwarenesses = _cpAwareness (_crPerception cr)
     isSuspicious = any f imAwarenesses && not (null imAwarenesses)
-    isCognizant  = any g imAwarenesses && not (null imAwarenesses)
+    isCognizant = any g imAwarenesses && not (null imAwarenesses)
     f (Suspicious _) = True
     f _ = False
     g (Cognizant _) = True