Support Quest Item Synchronization and Party Member Progression (#769)

* 1. sync quest items 2. support party member quest progression

* Optimize code

* Optimize code.

Author: otsffs

Code/client/Games/Skyrim/Actor.cpp

@@ -680,16 +680,22 @@ int32_t Actor::GetGoldAmount() const noexcept
     return TiltedPhoques::ThisCall(s_getGoldAmount, this);
 }
 
-void Actor::SetActorInventory(const Inventory& aInventory) noexcept
+void Actor::SetActorInventory(const Inventory& acInventory) noexcept
 {
     spdlog::info("Setting inventory for actor {:X}", formID);
 
     // The UnEquipAll() that used to be here is redundant,
     // as RemoveAllItems() unequips every item if needed.
     // Placing this UnEquipAll() here seems to trigger a Skyrim bug/race.
 
-    SetInventory(aInventory);
-    SetMagicEquipment(aInventory.CurrentMagicEquipment);
+    Inventory currentInventory = GetActorInventory();
+
+    if (!this->GetExtension()->IsPlayer() && currentInventory.ContainsQuestItems())
+        SetInventoryRetainingQuestItems(currentInventory, acInventory);
+    else
+        SetInventory(acInventory);
+
+    SetMagicEquipment(acInventory.CurrentMagicEquipment);
 }
 
 void Actor::SetMagicEquipment(const MagicEquipment& acEquipment) noexcept

Code/client/Games/Skyrim/TESObjectREFR.cpp

@@ -781,6 +781,56 @@ void TESObjectREFR::SetInventory(const Inventory& aInventory) noexcept
     }
 }
 
+Vector<uint32_t> TESObjectREFR::RemoveNonQuestItems(Inventory& aCurrentInventory) noexcept
+{
+    ScopedEquipOverride equipOverride_;
+
+    Vector<uint32_t> questEntries{};
+
+    auto& modSystem = World::Get().GetModSystem();
+
+    for (auto& entry : aCurrentInventory.Entries)
+    {
+        if (entry.IsQuestItem)
+        {
+            uint32_t gameId = modSystem.GetGameId(entry.BaseId);
+            questEntries.emplace_back(gameId);
+            continue;
+        }
+
+        if (entry.Count <= 0)
+            continue;
+
+        entry.Count = -entry.Count;
+        AddOrRemoveItem(entry, true);
+    }
+
+    return questEntries;
+}
+
+void TESObjectREFR::SetInventoryRetainingQuestItems(Inventory& aCurrentInventory, const Inventory& acSourceInventory) noexcept
+{
+    spdlog::debug("Setting inventory for {:X}", formID);
+
+    ScopedInventoryOverride _;
+
+    // Remove all non-quest items first
+    Vector<uint32_t> questItemIds = RemoveNonQuestItems(aCurrentInventory);
+    auto& modSystem = World::Get().GetModSystem();
+
+    for (const auto& entry : acSourceInventory.Entries)
+    {
+        uint32_t gameId = modSystem.GetGameId(entry.BaseId);
+
+        // If the item is not in the list of quest items, add it
+        if (std::find(questItemIds.begin(), questItemIds.end(), gameId) == questItemIds.end())
+        {
+            if (entry.Count != 0)
+                AddOrRemoveItem(entry, true);
+        }
+    }
+}
+
 void TESObjectREFR::AddOrRemoveItem(const Inventory::Entry& arEntry, bool aIsSettingInventory) noexcept
 {
     ModSystem& modSystem = World::Get().GetModSystem();

Code/client/Games/Skyrim/TESObjectREFR.h

@@ -178,6 +178,7 @@ struct TESObjectREFR : TESForm
     uint32_t GetAnimationVariableInt(BSFixedString* apVariableName) noexcept;
 
     void RemoveAllItems() noexcept;
+    Vector<uint32_t> RemoveNonQuestItems(Inventory& aCurrentInventory) noexcept;
     void Delete() const noexcept;
     void Disable() const noexcept;
     void Enable() const noexcept;
@@ -206,6 +207,7 @@ struct TESObjectREFR : TESForm
     bool IsItemInInventory(uint32_t aFormID) const noexcept;
 
     void SetInventory(const Inventory& acContainer) noexcept;
+    void SetInventoryRetainingQuestItems(Inventory& aCurrentInventory, const Inventory& acSourceInventory) noexcept;
     void AddOrRemoveItem(const Inventory::Entry& arEntry, bool aIsSettingInventory = false) noexcept;
     void UpdateItemList(TESForm* pUnkForm) noexcept;
 

Code/client/Services/Generic/ObjectService.cpp

@@ -185,7 +185,14 @@ void ObjectService::OnAssignObjectsResponse(const AssignObjectsResponse& acMessa
         }
 
         if (pObject->baseForm->formType == FormType::Container)
-            pObject->SetInventory(objectData.CurrentInventory);
+        {
+            Inventory currentInventory = pObject->GetInventory();
+
+            if (currentInventory.ContainsQuestItems())
+                pObject->SetInventoryRetainingQuestItems(currentInventory, objectData.CurrentInventory);
+            else
+                pObject->SetInventory(objectData.CurrentInventory);
+        }
     }
 }
 

Code/client/Services/Generic/PlayerService.cpp

@@ -153,7 +153,7 @@ void PlayerService::OnPlayerDialogueEvent(const PlayerDialogueEvent& acEvent) co
         return;
 
     const auto& partyService = m_world.GetPartyService();
-    if (!partyService.IsInParty() || !partyService.IsLeader())
+    if (!partyService.IsInParty())
         return;
 
     PlayerDialogueRequest request{};

Code/client/Services/Generic/QuestService.cpp

@@ -54,7 +54,7 @@ void QuestService::OnConnected(const ConnectedEvent&) noexcept
 
 BSTEventResult QuestService::OnEvent(const TESQuestStartStopEvent* apEvent, const EventDispatcher<TESQuestStartStopEvent>*)
 {
-    if (ScopedQuestOverride::IsOverriden() || !m_world.Get().GetPartyService().IsLeader())
+    if (ScopedQuestOverride::IsOverriden() || !m_world.Get().GetPartyService().IsInParty())
         return BSTEventResult::kOk;
 
     spdlog::info("Quest start/stop event: {:X}", apEvent->formId);
@@ -86,7 +86,7 @@ BSTEventResult QuestService::OnEvent(const TESQuestStartStopEvent* apEvent, cons
 
 BSTEventResult QuestService::OnEvent(const TESQuestStageEvent* apEvent, const EventDispatcher<TESQuestStageEvent>*)
 {
-    if (ScopedQuestOverride::IsOverriden() || !m_world.Get().GetPartyService().IsLeader())
+    if (ScopedQuestOverride::IsOverriden() || !m_world.Get().GetPartyService().IsInParty())
         return BSTEventResult::kOk;
 
     spdlog::info("Quest stage event: {:X}, stage: {}", apEvent->formId, apEvent->stageId);

Code/encoding/Structs/Inventory.cpp

@@ -193,3 +193,13 @@ void Inventory::RemoveByFilter(std::function<bool(const Entry&)> aFilter) noexce
 {
     Entries.erase(std::remove_if(Entries.begin(), Entries.end(), aFilter), Entries.end());
 }
+
+bool Inventory::ContainsQuestItems() const noexcept
+{
+    for (const auto& entry : Entries)
+    {
+        if (entry.IsQuestItem)
+            return true;
+    }
+    return false;
+}

Code/encoding/Structs/Inventory.h

@@ -83,6 +83,7 @@ struct Inventory
     void RemoveByFilter(std::function<bool(const Entry&)> aFilter) noexcept;
     void AddOrRemoveEntry(const Entry& acEntry) noexcept;
     void UpdateEquipment(const Inventory& acNewInventory) noexcept;
+    bool ContainsQuestItems() const noexcept;
 
     Vector<Entry> Entries{};
     MagicEquipment CurrentMagicEquipment{};