Improve logging

src/Dodge/Annotation.hs

@@ -8,7 +8,7 @@ import Dodge.RandomHelp
 import Dodge.Tree
 import Dodge.Room
 import Dodge.Annotation.Data
-import LensHelp
+--import LensHelp
 
 import Data.Tree
 import Control.Monad.State

src/Dodge/Creature/ArmourChase.hs

@@ -32,6 +32,7 @@ armourChaseCrit = defaultCreature
         , const overrideMeleeCloseTarget
         , const (crMeleeCooldown %~ max 0 . subtract 1)
         ]
+    , _crName = "armourChaseCrit"
     , _crHP = 300
     , _crPict = basicCrPict green
     , _crInv = IM.fromList 

src/Dodge/Creature/ChaseCrit.hs

@@ -41,6 +41,7 @@ chaseCrit = defaultCreature
         , targetYouWhenCognizant
         , const (crMeleeCooldown %~ max 0 . subtract 1)
         ]
+    , _crName = "chaseCrit"
     , _crHP = 150
     , _crPict = basicCrPict green
     , _crInv = IM.fromList [(0,medkit 200)]

src/Dodge/Data.hs

@@ -294,6 +294,7 @@ data Creature = Creature
     , _crIntention      :: Intention
     , _crMvType         :: CrMvType
     , _crHammerPosition :: HammerPosition
+    , _crName           :: String
     }
 data Vocalization 
     = Mute

src/Dodge/Default.hs

@@ -61,6 +61,7 @@ defaultCreature = Creature
     , _crGroup   = LoneWolf
     , _crMvType  = defaultAimMvType
     , _crHammerPosition = HammerUp
+    , _crName = "DEFAULTCRNAME"
     }
 defaultInanimate :: Creature
 defaultInanimate = defaultCreature & crActionPlan .~ Inanimate

src/Dodge/LockAndKey.hs

@@ -9,7 +9,7 @@ import Dodge.Creature
 import Dodge.Item.Craftable
 import Dodge.Item.Weapon.BulletGun.Rod
 import Dodge.Item
-import LensHelp
+--import LensHelp
 --import Dodge.Item.Equipment
 
 import System.Random
@@ -102,5 +102,5 @@ corridorBoss cr = do
     endroom <- bossRoom cr
     return (treeFromPost (replicate 5 $ PassDown corridor) 
                             (PassDown endroom)
-        ,TreeSubLabelling "corridorBoss" Nothing)
+        ,TreeSubLabelling ("corridorBoss-"++_crName cr) Nothing)
 

src/Dodge/Room/Containing.hs

@@ -14,6 +14,7 @@ import Geometry
 
 import System.Random
 import Control.Monad.State
+import Data.List
 
 roomsContaining :: RandomGen g => [Creature] -> [Item] -> State g (LabSubCompTree Room)
 roomsContaining crs its = do
@@ -22,7 +23,8 @@ roomsContaining crs its = do
         , tanksRoom crs its
         ]
     return (treeFromPost [] $ UseAll endroom
-        ,TreeSubLabelling "roomsContaining" Nothing)
+        ,TreeSubLabelling ("roomsContaining-creatures:" ++ intercalate "," (map _crName crs) 
+            ++ "-items:" ++ intercalate "," (map _itName its)) Nothing)
 
 pedestalRoom :: RandomGen g => Item -> State g Room
 pedestalRoom it = do