From a823ed7f53fb3d085de7a5432956f09a54c4f2cb Mon Sep 17 00:00:00 2001
From: justin <justin.g.kruger@gmail.com>
Date: Fri, 20 May 2022 23:11:01 +0100
Subject: [PATCH] Improve logging

---
 src/Dodge/Annotation.hs           | 2 +-
 src/Dodge/Creature/ArmourChase.hs | 1 +
 src/Dodge/Creature/ChaseCrit.hs   | 1 +
 src/Dodge/Data.hs                 | 1 +
 src/Dodge/Default.hs              | 1 +
 src/Dodge/LockAndKey.hs           | 4 ++--
 src/Dodge/Room/Containing.hs      | 4 +++-
 7 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Dodge/Annotation.hs b/src/Dodge/Annotation.hs
index e500f0a51..f42646ac6 100644
--- a/src/Dodge/Annotation.hs
+++ b/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
diff --git a/src/Dodge/Creature/ArmourChase.hs b/src/Dodge/Creature/ArmourChase.hs
index 39f053c0d..65690e637 100644
--- a/src/Dodge/Creature/ArmourChase.hs
+++ b/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 
diff --git a/src/Dodge/Creature/ChaseCrit.hs b/src/Dodge/Creature/ChaseCrit.hs
index aa3bb7c5e..1b23949ec 100644
--- a/src/Dodge/Creature/ChaseCrit.hs
+++ b/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)]
diff --git a/src/Dodge/Data.hs b/src/Dodge/Data.hs
index 84f4feec3..dbea03377 100644
--- a/src/Dodge/Data.hs
+++ b/src/Dodge/Data.hs
@@ -294,6 +294,7 @@ data Creature = Creature
     , _crIntention      :: Intention
     , _crMvType         :: CrMvType
     , _crHammerPosition :: HammerPosition
+    , _crName           :: String
     }
 data Vocalization 
     = Mute
diff --git a/src/Dodge/Default.hs b/src/Dodge/Default.hs
index 809cc3163..2cbf71d50 100644
--- a/src/Dodge/Default.hs
+++ b/src/Dodge/Default.hs
@@ -61,6 +61,7 @@ defaultCreature = Creature
     , _crGroup   = LoneWolf
     , _crMvType  = defaultAimMvType
     , _crHammerPosition = HammerUp
+    , _crName = "DEFAULTCRNAME"
     }
 defaultInanimate :: Creature
 defaultInanimate = defaultCreature & crActionPlan .~ Inanimate
diff --git a/src/Dodge/LockAndKey.hs b/src/Dodge/LockAndKey.hs
index 613bba213..8d6e65fa7 100644
--- a/src/Dodge/LockAndKey.hs
+++ b/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)
 
diff --git a/src/Dodge/Room/Containing.hs b/src/Dodge/Room/Containing.hs
index 7d8d0e16d..3b619652b 100644
--- a/src/Dodge/Room/Containing.hs
+++ b/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