Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp

@@ -22,6 +22,8 @@ namespace ArtifactTracker
 	RE::BGSListForm* g_listStored;
 	RE::BGSListForm* g_listFound;
 	RE::BGSListForm* g_persistentStorage;
+	RE::BGSListForm* g_persistentCells;
+	RE::BGSListForm* g_persistentCellStorageList;
 	RE::BGSKeyword* g_homeKeyword;
 	std::unordered_map<RE::FormID, RE::TESForm*> g_artifactMap;
 	std::unordered_set<RE::FormType> g_artifactFormTypes;
@@ -52,6 +54,8 @@ namespace ArtifactTracker
 		g_listStored = dataHandler->LookupForm<RE::BGSListForm>(0x801, "Artifact Tracker.esp");        // ETR_ItemsStored
 		g_listFound = dataHandler->LookupForm<RE::BGSListForm>(0x802, "Artifact Tracker.esp");         // ETR_ItemsFound
 		g_persistentStorage = dataHandler->LookupForm<RE::BGSListForm>(0x803, "Artifact Tracker.esp"); // ETR_PersistentStorageList
+		g_persistentCells = dataHandler->LookupForm<RE::BGSListForm>(0x805, "Artifact Tracker.esp");   // ETR_PersistentCellList
+		g_persistentCellStorageList = dataHandler->LookupForm<RE::BGSListForm>(0x806, "Artifact Tracker.esp"); // ETR_PersistentCellStorageList
 
 		g_homeKeyword = dataHandler->LookupForm<RE::BGSKeyword>(0xFC1A3, "Skyrim.esm"); // LocTypePlayerHouse
 
@@ -59,7 +63,7 @@ namespace ArtifactTracker
 		const auto notArtifactKeyword = dataHandler->LookupForm<RE::BGSKeyword>(0xAFC111, "Update.esm");   // ETR_NotArtifact
 		const auto npcRaceKeyword = dataHandler->LookupForm<RE::BGSKeyword>(0x13794, "Skyrim.esm");        // ActorTypeNPC
 
-		if (!g_cellContainer || !g_listNew || !g_listStored || !g_listFound || !g_persistentStorage || !g_homeKeyword || !extraArtifactKeyword || !notArtifactKeyword || !npcRaceKeyword) {
+		if (!g_cellContainer || !g_listNew || !g_listStored || !g_listFound || !g_persistentStorage || !g_persistentCells || !g_persistentCellStorageList || !g_homeKeyword || !extraArtifactKeyword || !notArtifactKeyword || !npcRaceKeyword) {
 			log::warn("Unable to load data from Artifact Tracker.esp");
 			RE::DebugMessageBox("Unable to load data from Artifact Tracker.esp, the mod is disabled.");
 			return false;
@@ -206,6 +210,26 @@ namespace ArtifactTracker
 			return RE::BSContainer::ForEachResult::kContinue;
 		});
 
+		const auto parentCell = RE::PlayerCharacter::GetSingleton()->GetParentCell();
+
+		ListRevert(g_persistentCellStorageList);
+		g_persistentCells->ForEachForm([&](RE::TESForm& a_exform) {
+			if (&a_exform) {
+				const auto cell = a_exform.As<RE::TESObjectCELL>();
+				if (cell && cell != parentCell) {
+					cell->ForEachReference([&parentCell](RE::TESObjectREFR& a_ref) {
+						if (&a_ref && (a_ref.formFlags & RE::TESObjectREFR::RecordFlags::kPersistent) != 0 && a_ref.GetBaseObject()->Is(RE::FormType::Container)) {
+							//RE::DebugNotification(a_ref.GetBaseObject()->GetName());
+							g_persistentMap[a_ref.formID] = &a_ref;
+							g_persistentCellStorageList->AddForm(&a_ref);
+						}
+						return RE::BSContainer::ForEachResult::kContinue;
+					});
+				}
+			}
+			return RE::BSContainer::ForEachResult::kContinue;
+		});
+
 		std::uint32_t savedCount = g_listStored->forms.size() + g_listFound->forms.size() + g_listNew->forms.size();
 		if (savedCount != g_artifactMap.size()) {
 			ListRevert(g_listNew);
@@ -363,7 +387,7 @@ namespace ArtifactTracker
 		RE::TESObjectCELL* cell = RE::TESForm::LookupByID<RE::TESObjectCELL>(a_formID);
 		RE::BGSLocation* location = cell ? cell->GetLocation() : nullptr;
 
-		if (!cell || !location || !cell->IsInteriorCell() || !location->HasKeyword(g_homeKeyword)) {
+		if (!cell || !location || !cell->IsInteriorCell() || !location->HasKeyword(g_homeKeyword) || g_persistentCells->HasForm(cell)) {
 			if (IsHome()) {
 				RE::ScriptEventSourceHolder::GetSingleton()->RemoveEventSink<RE::TESCellFullyLoadedEvent>(EventListener::GetSingleton());
 				ToggleHomeMode(nullptr);
@@ -409,7 +433,7 @@ namespace ArtifactTracker
 			return;
 		}
 
-		if (!location || !cell->IsInteriorCell() || cell != RE::PlayerCharacter::GetSingleton()->GetParentCell() || !location->HasKeyword(g_homeKeyword)) {
+		if (!location || !cell->IsInteriorCell() || cell != RE::PlayerCharacter::GetSingleton()->GetParentCell() || !location->HasKeyword(g_homeKeyword) || g_persistentCells->HasForm(cell)) {
 			ToggleHomeMode(nullptr);
 			return;
 		}
@@ -551,7 +575,7 @@ namespace ArtifactTracker
 				if (count > 0 && !cellItems.contains(item->formID)) {
 					g_cellStorage->RemoveItem(item, count, RE::ITEM_REMOVE_REASON::kRemove, nullptr, nullptr);
 
-					if (IsArtifact(item) && !RefListHasItem(g_persistentStorage, item->formID)) {
+					if (IsArtifact(item) && !RefListHasItem(g_persistentStorage, item->formID) && !RefListHasItem(g_persistentCellStorageList, item->formID)) {
 						ListRemoveItem(g_listStored, item);
 						if (GetItemCount(RE::PlayerCharacter::GetSingleton(), item) || FollowersHaveItem(item)) {
 							ListRemoveItem(g_listNew, item);
@@ -827,6 +851,7 @@ namespace ArtifactTracker
 	{
 		ListRevert(g_listStored);
 		AddRefArtifactsToList(g_persistentStorage, g_listStored);
+		AddRefArtifactsToList(g_persistentCellStorageList, g_listStored);
 	}
 
 	void RescanNewArtifacts()

Source/ArtifactTrackerDLL/src/Util.h

@@ -182,7 +182,6 @@ inline void LoadINI(std::map<std::string, bool>* settings, const char* iniPath)
 	}
 }
 
-/*
 inline void RunBenchmark(std::function<void()> benchmark, std::string desc)
 {
 	const auto start = std::chrono::high_resolution_clock::now();
@@ -192,7 +191,6 @@ inline void RunBenchmark(std::function<void()> benchmark, std::string desc)
 	const auto elapsed = std::chrono::duration<double>(end - start);
 	log::info("{}: Elapsed time: {} seconds", desc, elapsed.count());
 }
-*/
 
 inline std::vector<RE::Actor*> GetPlayerFollowers()
 {

Source/ArtifactTrackerDLL/vcpkg-configuration.json

@@ -3,7 +3,7 @@
       {
         "kind": "git",
         "repository": "https://gitlab.com/colorglass/vcpkg-colorglass",
-        "baseline": "6309841a1ce770409708a67a9ba5c26c537d2937",
+        "baseline": "6fb127f7d425ae3cf3fab0f79005d907c885c0d8",
         "packages": [
           "commonlibsse-ng",
           "gluino",