Rename Perception datatype/fields

src/Dodge/Creature/Picture.hs

@@ -90,8 +90,8 @@ creatureDisplayText cfig w cr
     . scale theScale theScale 
     . stackText 
     $ clockCycle 25 (V.fromList 
-        [ \cr' -> [crDisplayAwake cr']
-        , \cr' -> [crDisplayAlert cr']
+        [ \cr' -> [crDisplayVigilance cr']
+        , \cr' -> [crDisplayAwareness cr']
         ]
         ) w cr
   where
@@ -101,13 +101,13 @@ creatureDisplayText cfig w cr
     v = cpos -.- campos
     (V2 x y) = campos +.+ v +.+ _crRad cr *.* normalizeV v
 
-crDisplayAlert :: Creature -> String
-crDisplayAlert cr
+crDisplayAwareness :: Creature -> String
+crDisplayAwareness cr
     | isSuspicious = "?"
     | isCognizant  = "!"
     | otherwise    = "."
   where
-    imAwarenesses = _crAwarenessLevel (_crPerception cr)
+    imAwarenesses = _cpAwareness (_crPerception cr)
     isSuspicious = any f imAwarenesses && not (null imAwarenesses)
     isCognizant  = any g imAwarenesses && not (null imAwarenesses)
     f (Suspicious _) = True
@@ -115,14 +115,8 @@ crDisplayAlert cr
     g (Cognizant _) = True
     g _ = False
 
-crDisplayAwake :: Creature -> String
-crDisplayAwake = show . _crAwakeLevel . _crPerception
---crDisplayAwake cr = case _crAwakeLevel (_crPerception cr) of
---    Comatose    -> "-"
---    Asleep      -> "Z"
---    Lethargic   -> "L"
---    Vigilant    -> "V"
---    Overstrung  -> "O"
+crDisplayVigilance :: Creature -> String
+crDisplayVigilance = show . _cpVigilance . _crPerception
 
 --damageMod :: Creature -> Picture -> Picture
 --damageMod cr pic = piercingMod $ bluntScale pic