Cleaned up debug logging for better user experience :)

powerof3 · Jan 23, 2025 · 01a064c · 01a064c
1 parent 6a98ede
commit 01a064c
Show file tree

Hide file tree

Showing 6 changed files with 158 additions and 57 deletions.
diff --git a/SPID/include/OutfitManager.h b/SPID/include/OutfitManager.h
@@ -9,7 +9,8 @@ namespace Outfits
 	class Manager :
 		public ISingleton<Manager>,
 		public RE::BSTEventSink<RE::TESFormDeleteEvent>,
-		public RE::BSTEventSink<RE::TESDeathEvent>
+		public RE::BSTEventSink<RE::TESDeathEvent>,
+		public RE::BSTEventSink<RE::TESContainerChangedEvent>
 	{
 	public:
 		void HandleMessage(SKSE::MessagingInterface::Message*);
@@ -75,6 +76,10 @@ namespace Outfits
 		/// TESDeathEvent is used to update outfit after potential Death Distribution of a new outfit.
 		RE::BSEventNotifyControl ProcessEvent(const RE::TESDeathEvent*, RE::BSTEventSource<RE::TESDeathEvent>*) override;
 
+		// TODO: Delete this event once all issues with outfits are solved.
+		/// TESContainerChangedEvent is used to log when items are added/removed. For debugging only!
+		RE::BSEventNotifyControl ProcessEvent(const RE::TESContainerChangedEvent*, RE::BSTEventSource<RE::TESContainerChangedEvent>*) override;
+
 	private:
 		struct OutfitReplacement
 		{

diff --git a/SPID/src/DeathDistribution.cpp b/SPID/src/DeathDistribution.cpp
@@ -203,7 +203,7 @@ namespace DeathDistribution
 		static bool thunk(RE::Character* actor)
 		{
 #ifndef NDEBUG
-			logger::info("Distribute: ShouldBackgroundClone({})", *(actor->As<RE::Actor>()));
+			//logger::info("Distribute: ShouldBackgroundClone({})", *(actor->As<RE::Actor>()));
 #endif
 			if (const auto npc = actor->GetActorBase()) {
 				auto npcData = NPCData(actor, npc);
@@ -216,7 +216,7 @@ namespace DeathDistribution
 
 		static inline void post_hook()
 		{
-			logger::info("Death Distribution: Installed ShouldBackgroundClone hook.");
+			logger::info("\t\t🪝Installed ShouldBackgroundClone hook.");
 		}
 
 		static inline REL::Relocation<decltype(thunk)> func;
@@ -225,18 +225,18 @@ namespace DeathDistribution
 	void Manager::HandleMessage(SKSE::MessagingInterface::Message* message)
 	{
 		switch (message->type) {
-		case SKSE::MessagingInterface::kDataLoaded:
+		case SKSE::MessagingInterface::kPostLoad:
 			if (INI::deathConfigs.empty()) {
 				return;
 			}
 
+			logger::info("💀Death Distribution");
 			if (const auto scripts = RE::ScriptEventSourceHolder::GetSingleton()) {
 				scripts->PrependEventSink<RE::TESDeathEvent>(this);
-				logger::info("Death Distribution: Registered for {}.", typeid(RE::TESDeathEvent).name());
+				logger::info("\t\t📝Registered for {}.", typeid(RE::TESDeathEvent).name());
 			}
-
 			stl::install_hook<ShouldBackgroundClone>();
-
+			
 			break;
 		default:
 			break;

diff --git a/SPID/src/Distribute.cpp b/SPID/src/Distribute.cpp
@@ -207,10 +207,14 @@ namespace Distribute
 		}
 
 		logger::info("Distribution for {}", *npcData.GetActor());
-		for (const auto& pair : results) {
-			logger::info("\t{}", pair.first);
-			for (const auto& form : pair.second) {
-				logger::info("\t\t{} @ {}", *form.first, form.second);
+		if (results.empty()) {
+			logger::info("\tNothing");
+		} else {
+			for (const auto& pair : results) {
+				logger::info("\t{}", pair.first);
+				for (const auto& form : pair.second) {
+					logger::info("\t\t{} @ {}", *form.first, form.second);
+				}
 			}
 		}
 #endif

diff --git a/SPID/src/DistributeManager.cpp b/SPID/src/DistributeManager.cpp
@@ -34,7 +34,7 @@ namespace Distribute
 
 			static bool thunk(RE::Character* actor)
 			{
-				logger::debug("Distribute: ShouldBackgroundClone({})", *(actor->As<RE::Actor>()));
+			//	logger::debug("Distribute: ShouldBackgroundClone({})", *(actor->As<RE::Actor>()));
 				if (const auto npc = actor->GetActorBase()) {
 					detail::distribute_on_load(actor, npc);
 				}