фикс aoe loot

2026-03-15 01:54:59 +04:00
parent 15c4cbf085
commit 31c61dd639
4 changed files with 85 additions and 32 deletions
@@ -16,6 +16,7 @@
 */

 #include "aoe_loot.h"
+#include "ObjectMgr.h"
 #include <algorithm>
 #include <limits>

@@ -60,7 +61,7 @@ bool AOELootServer::CanPacketReceive(WorldSession* session, WorldPacket& packet)
        return true;

    // Get configured loot range
-    float range = sConfigMgr->GetOption<float>("AOELoot.Range", 30.0f);
+    float range = sConfigMgr->GetOption<float>("AOELoot.Range", 55.0f);

    // Limit range to reasonable values
    if (range < 5.0f)
@@ -145,20 +146,69 @@ bool AOELootServer::CanPacketReceive(WorldSession* session, WorldPacket& packet)
        for (size_t i = 0; i < loot->items.size(); ++i)
        {
            // Check if there's still space
-            if ((mainLoot->items.size() + itemsToAdd.size() + mainLoot->quest_items.size() + questItemsToAdd.size()) >= 15)
+            if ((mainLoot->items.size() + itemsToAdd.size() + mainLoot->quest_items.size() + questItemsToAdd.size()) >= MAX_LOOT_ITEMS)
                break;

            itemsToAdd.push_back(loot->items[i]);
        }

-        // Collect quest items
+        // Collect quest items (only for active quests, limited to needed count)
        for (size_t i = 0; i < loot->quest_items.size(); ++i)
        {
            // Check if there's still space
-            if ((mainLoot->items.size() + itemsToAdd.size() + mainLoot->quest_items.size() + questItemsToAdd.size()) >= 15)
+            if ((mainLoot->items.size() + itemsToAdd.size() + mainLoot->quest_items.size() + questItemsToAdd.size()) >= MAX_LOOT_ITEMS)
                break;

-            questItemsToAdd.push_back(loot->quest_items[i]);
+            LootItem const& questItem = loot->quest_items[i];
+
+            // Skip items the player doesn't need for any active quest
+            if (!player->HasQuestForItem(questItem.itemid))
+                continue;
+
+            // Calculate how many the player still needs across all active quests
+            uint32 maxNeeded = 0;
+            for (uint8 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot)
+            {
+                uint32 questId = player->GetQuestSlotQuestId(slot);
+                if (!questId)
+                    continue;
+
+                Quest const* quest = sObjectMgr->GetQuestTemplate(questId);
+                if (!quest)
+                    continue;
+
+                for (uint8 j = 0; j < QUEST_ITEM_OBJECTIVES_COUNT; ++j)
+                {
+                    if (quest->RequiredItemId[j] == questItem.itemid && quest->RequiredItemCount[j] > maxNeeded)
+                        maxNeeded = quest->RequiredItemCount[j];
+                }
+            }
+
+            if (maxNeeded == 0)
+                continue;
+
+            // Count how many the player already has, plus pending adds
+            // and quest items already in the main loot window
+            uint32 ownedCount = player->GetItemCount(questItem.itemid, true);
+            for (auto const& pending : questItemsToAdd)
+            {
+                if (pending.itemid == questItem.itemid)
+                    ownedCount += pending.count;
+            }
+            for (auto const& mainQuestItem : mainLoot->quest_items)
+            {
+                if (mainQuestItem.itemid == questItem.itemid)
+                    ownedCount += mainQuestItem.count;
+            }
+
+            if (ownedCount >= maxNeeded)
+                continue;
+
+            uint32 stillNeeded = maxNeeded - ownedCount;
+            LootItem cappedItem = questItem;
+            cappedItem.count = std::min(static_cast<uint32>(questItem.count), stillNeeded);
+
+            questItemsToAdd.push_back(cappedItem);
        }

        // Clear source loot (but don't modify vector directly)
@@ -176,13 +226,16 @@ bool AOELootServer::CanPacketReceive(WorldSession* session, WorldPacket& packet)
    // Add regular items
    for (const auto& item : itemsToAdd)
    {
-        if (mainLoot->items.size() < 15)
+        if (mainLoot->items.size() < MAX_LOOT_ITEMS)
            mainLoot->items.push_back(item);
    }

-    // Add quest items to player inventory
+    // Add quest items directly to player inventory
    for (const auto& item : questItemsToAdd)
    {
+        if (!player->HasQuestForItem(item.itemid))
+            continue;
+
        player->AddItem(item.itemid, item.count);
    }