Cleanup creatures somewhat, fix LOS to LOSIndirect

src/Dodge/Render/ShapePicture.hs

@@ -25,6 +25,7 @@ import ShapePicture
 import Picture
 import Sound.Data
 import Geometry.ConvexPoly
+import ShortShow
 --import Dodge.Base.Collide
 
 --import Data.Foldable
@@ -36,6 +37,7 @@ import Data.Maybe
 import qualified Streaming.Prelude as S
 import qualified Data.Graph.Inductive as FGL
 import qualified Data.Set as Set
+import Padding
 
 -- TODO only filter out shapes outside the range of the furthest shown light source
 worldSPic :: Configuration -> World -> SPic
@@ -79,7 +81,7 @@ extraPics cfig w = pictures (_decorations w)
     <> concatMapPic clDraw (_clouds w      )
     <> concatMapPic ppDraw (_pressPlates w )
     <> viewClipBounds cfig w
---    <> debugDraw cfig w
+    <> debugDraw cfig w
 
 debugDraw :: Configuration -> World -> Picture
 {-# INLINE debugDraw #-}
@@ -126,6 +128,7 @@ drawPathBetween w = setLayer DebugLayer
     $  color rose (foldMap (arrowPath . mapMaybe nodepos) nodelist)
     <> foldMap (color green . arrow sp) (nodepos =<< walkableNodeNear w sp)
     <> foldMap (color cyan . flip arrow ep) (nodepos =<< walkableNodeNear w ep)
+    <> foldMap (color orange . arrow sp) (pointTowardsImpulse sp ep w)
   where
     nodepos = (`getNodePos` w)
     nodelist = makePathBetween sp ep w
@@ -309,16 +312,16 @@ drawPathing cfig w = setLayer DebugLayer
 
 crDisplayInfo :: Configuration -> World -> Creature -> Maybe (Point2,[String])
 crDisplayInfo cfig w cr 
---    | _crID cr == 0 = Nothing
+    | _crID cr == 0 = Nothing
     | crOnScreen = Just (_crPos cr, catMaybes
 --        [fmap show $ ap ^? crGoal
-        [ fmap show $ cr ^? crHP
-        , fmap show $ ap ^? crStrategy
-        , fmap show $ cr ^? crPos
-        , fmap show $ cr ^? crPerception . cpVigilance
+        [ fpreShow "crHP" $ cr ^? crHP
+        , fpreShow "crStrategy" $ ap ^? apStrategy
+        , fmap (("crPos....." ++) . shortShow) $ cr ^? crPos
+        , fpreShow "cpVigilance" $ cr ^? crPerception . cpVigilance
 --        , fmap show $ cr ^? crOldPos
-        , fmap show $ ap ^? crAction
-        , fmap show $ ap ^? crImpulse
+        , fpreShow "crAction" $ ap ^? apAction
+        , fpreShow "crImpulse" $ ap ^? apImpulse
         ]
         )
     | otherwise = Nothing
@@ -326,6 +329,9 @@ crDisplayInfo cfig w cr
     ap = _crActionPlan cr
     crOnScreen = pointOnScreen cfig w $ _crPos cr
 
+fpreShow :: (Show a,Functor f) => String -> f a -> f String
+fpreShow str = fmap (((rightPad 7 '.'str ++ "...") ++) . show)
+
 drawCrInfo :: Configuration -> World -> Picture
 drawCrInfo cfig w = setLayer FixedCoordLayer 
         $ renderInfoListsAt (2*hw - 400) 0 cfig w