skyrim/artifact-tracker
1
Fork 0
Code Releases Activity

Rebuild the artifact list if its size changed

Browse Source
This commit is contained in:
Eddoursul 2022-07-03 15:12:14 +02:00
parent a3cdd32cae
commit b598d8fe38
5 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
SKSE/Plugins/ArtifactTracker.dll
View File

Binary file not shown.

BIN
Scripts/ArtifactTrackerPlayer.pex
View File

Binary file not shown.

4
Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp
View File

@ -467,7 +467,7 @@ namespace ArtifactTracker
}
// NB: During OnContainerChanged, InventoryChanges do not have the current change included yet
if ((GetItemCount(RE::PlayerCharacter::GetSingleton(), form->formID) - a_event->itemCount <= 0) && !FollowersHaveItem(form)) {
if ((GetItemCount(RE::PlayerCharacter::GetSingleton(), form) - a_event->itemCount <= 0) && !FollowersHaveItem(form)) {
ListRemoveItem(g_listFound, form);
ListRemoveItem(g_listNew, form);
g_listNew->AddForm(form);
@ -506,7 +506,7 @@ namespace ArtifactTracker
}
// NB: During OnContainerChanged, InventoryChanges do not have the current change included yet
} else if (g_listFound->HasForm(form) && (GetItemCount(RE::PlayerCharacter::GetSingleton(), form->formID) - a_event->itemCount <= 0) && !FollowersHaveItem(form)) {
} else if (g_listFound->HasForm(form) && (GetItemCount(RE::PlayerCharacter::GetSingleton(), form) - a_event->itemCount <= 0) && !FollowersHaveItem(form)) {
ListRemoveItem(g_listFound, form);
g_listNew->AddForm(form);
}

7
Source/ArtifactTrackerDLL/src/PapyrusFunctions.h
View File

@ -20,6 +20,11 @@ namespace Papyrus::PapyrusFunctions
ArtifactTracker::SyncCellStorage();
}
inline std::uint32_t GetArtifactCount(RE::StaticFunctionTag*)
{
return (ArtifactTracker::g_artifactMap).size();
}
// From po3's Papyrus Extender
inline std::vector<RE::Actor*> GetPlayerFollowers(RE::StaticFunctionTag*)
{
@ -72,6 +77,8 @@ namespace Papyrus::PapyrusFunctions
{
BIND(IsLoaded);
logger::info("Registered IsLoaded"sv);
BIND(GetArtifactCount);
logger::info("Registered GetArtifactCount"sv);
BIND(RescanStoredArtifacts);
logger::info("Registered RescanStoredArtifacts"sv);
BIND(RescanFoundArtifacts);

12
Source/Scripts/ArtifactTrackerPlayer.psc
View File

@ -9,8 +9,9 @@ Keyword Property LocTypePlayerHouse Auto
Perk Property ETR_PickupPerk Auto
bool bAtHome = false
int iFollowerIndex
ObjectReference bookShelf = None
int iFollowerIndex = 0
int iArtifactCount = 0
event OnInit()
@ -51,6 +52,13 @@ Event OnPlayerLoadGame()
QuickLootEE.RegisterFoundItemsList(ETR_ItemsFound)
endif
int iNewArtifactCount = GetArtifactCount()
if iNewArtifactCount != iArtifactCount
iArtifactCount = iNewArtifactCount
Debug.Notification("Artifact list changed, rebuilding the list")
ETR_ItemsNew.Revert() ; rebuild the list
endif
; Rebuild all lists to avoid discrepancies, stale data, and broken records
RescanStoredArtifacts()
RescanFoundArtifacts()
@ -159,6 +167,8 @@ endstate
bool function IsLoaded() native global
int function GetArtifactCount() native global
function RescanStoredArtifacts() native global
function RescanFoundArtifacts() native global