nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-13 09:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Loot): Fixed loading conditioned item loot. (#6337)

Browse Source 
- Fixes #6326
This commit is contained in:
UltraNix
2021-06-18 17:07:24 +02:00
committed by GitHub
parent 6bab704a02
commit 289f140ab1
6 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/sql/updates/pending_db_characters/rev_1623572783362357500.sql Normal file
View File

@@ -0,0 +1,6 @@
INSERT INTO `version_db_characters` (`sql_rev`) VALUES ('1623572783362357500');
ALTER TABLE `item_loot_storage`
ADD COLUMN `conditionLootId` INT NOT NULL AFTER `needs_quest`;

4
src/server/database/Database/Implementation/CharacterDatabase.cpp
View File

@@ -509,9 +509,9 @@ void CharacterDatabaseConnection::DoPrepareStatements()
PrepareStatement(CHAR_DEL_CHAR_ACTION_EXCEPT_SPEC, "DELETE FROM character_action WHERE spec<>? AND guid = ?", CONNECTION_ASYNC);
// Items that hold loot or money
PrepareStatement(CHAR_SEL_ITEMCONTAINER_ITEMS, "SELECT containerGUID, itemid, count, randomPropertyId, randomSuffix, follow_loot_rules, freeforall, is_blocked, is_counted, is_underthreshold, needs_quest FROM item_loot_storage", CONNECTION_SYNCH);
PrepareStatement(CHAR_SEL_ITEMCONTAINER_ITEMS, "SELECT containerGUID, itemid, count, randomPropertyId, randomSuffix, follow_loot_rules, freeforall, is_blocked, is_counted, is_underthreshold, needs_quest, conditionLootId FROM item_loot_storage", CONNECTION_SYNCH);
PrepareStatement(CHAR_DEL_ITEMCONTAINER_SINGLE_ITEM, "DELETE FROM item_loot_storage WHERE containerGUID = ? AND itemid = ? AND count = ? LIMIT 1", CONNECTION_ASYNC);
PrepareStatement(CHAR_INS_ITEMCONTAINER_SINGLE_ITEM, "INSERT INTO item_loot_storage (containerGUID, itemid, count, randomPropertyId, randomSuffix, follow_loot_rules, freeforall, is_blocked, is_counted, is_underthreshold, needs_quest) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC);
PrepareStatement(CHAR_INS_ITEMCONTAINER_SINGLE_ITEM, "INSERT INTO item_loot_storage (containerGUID, itemid, count, randomPropertyId, randomSuffix, follow_loot_rules, freeforall, is_blocked, is_counted, is_underthreshold, needs_quest, conditionLootId) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC);
PrepareStatement(CHAR_DEL_ITEMCONTAINER_CONTAINER, "DELETE FROM item_loot_storage WHERE containerGUID = ?", CONNECTION_ASYNC);
// Calendar

18
src/server/game/Loot/LootItemStorage.cpp
View File

@@ -41,7 +41,7 @@ void LootItemStorage::LoadStorageFromDB()
StoredLootItemList& itemList = lootItemStore[ObjectGuid::Create<HighGuid::Item>(fields[0].GetUInt32())];
itemList.push_back(StoredLootItem(fields[1].GetUInt32(), fields[2].GetUInt32(), fields[3].GetInt32(), fields[4].GetUInt32(), fields[5].GetBool(),
fields[6].GetBool(), fields[7].GetBool(), fields[8].GetBool(), fields[9].GetBool(), fields[10].GetBool()));
fields[6].GetBool(), fields[7].GetBool(), fields[8].GetBool(), fields[9].GetBool(), fields[10].GetBool(), fields[11].GetUInt32()));
++count;
} while (result->NextRow());
@@ -79,7 +79,7 @@ void LootItemStorage::AddNewStoredLoot(Loot* loot, Player* /*player*/)
// Gold at first
if (loot->gold)
{
itemList.push_back(StoredLootItem(0, loot->gold, 0, 0, false, false, false, false, false, false));
itemList.push_back(StoredLootItem(0, loot->gold, 0, 0, false, false, false, false, false, false, 0));
uint8 index = 0;
stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_ITEMCONTAINER_SINGLE_ITEM);
@@ -107,12 +107,18 @@ void LootItemStorage::AddNewStoredLoot(Loot* loot, Player* /*player*/)
//if (!li->AllowedForPlayer(player))
// continue;
const ItemTemplate* itemTemplate = sObjectMgr->GetItemTemplate(li->itemid);
ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(li->itemid);
if (!itemTemplate || itemTemplate->IsCurrencyToken())
continue;
uint32 conditionLootId = 0;
if (!li->conditions.empty())
{
conditionLootId = li->conditions.front()->SourceGroup;
}
itemList.push_back(StoredLootItem(li->itemid, li->count, li->randomPropertyId, li->randomSuffix, li->follow_loot_rules, li->freeforall, li->is_blocked, li->is_counted,
li->is_underthreshold, li->needs_quest));
li->is_underthreshold, li->needs_quest, conditionLootId));
uint8 index = 0;
stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_ITEMCONTAINER_SINGLE_ITEM);
@@ -127,6 +133,8 @@ void LootItemStorage::AddNewStoredLoot(Loot* loot, Player* /*player*/)
stmt->setBool(index++, li->is_counted);
stmt->setBool(index++, li->is_underthreshold);
stmt->setBool(index++, li->needs_quest);
stmt->setUInt32(index++, conditionLootId);
trans->Append(stmt);
}
@@ -172,7 +180,7 @@ bool LootItemStorage::LoadStoredLoot(Item* item, Player* player)
li.rollWinnerGUID = ObjectGuid::Empty;
// Copy the extra loot conditions from the item in the loot template
lt->CopyConditions(&li);
lt->CopyConditions(&li, it2->conditionLootId);
if (li.needs_quest)
{

6
src/server/game/Loot/LootItemStorage.h
View File

@@ -13,9 +13,10 @@ Xinef
struct StoredLootItem
{
StoredLootItem(uint32 i, uint32 c, int32 ri, uint32 rs, bool follow_loot_rules, bool freeforall, bool is_blocked, bool is_counted, bool is_underthreshold, bool needs_quest) :
StoredLootItem(uint32 i, uint32 c, int32 ri, uint32 rs, bool follow_loot_rules, bool freeforall,
bool is_blocked, bool is_counted, bool is_underthreshold, bool needs_quest, uint32 conditionLootId) :
itemid(i), count(c), randomPropertyId(ri), randomSuffix(rs), follow_loot_rules(follow_loot_rules), freeforall(freeforall), is_blocked(is_blocked),
is_counted(is_counted), is_underthreshold(is_underthreshold), needs_quest(needs_quest) { }
is_counted(is_counted), is_underthreshold(is_underthreshold), needs_quest(needs_quest), conditionLootId(conditionLootId) { }
// If itemid == 0 - money amount is stored in count value
uint32 itemid;
@@ -28,6 +29,7 @@ struct StoredLootItem
bool is_counted;
bool is_underthreshold;
bool needs_quest;
uint32 conditionLootId;
};
typedef std::list<StoredLootItem> StoredLootItemList;

23
src/server/game/Loot/LootMgr.cpp
View File

@@ -1380,7 +1380,7 @@ void LootTemplate::CopyConditions(ConditionList conditions)
group->CopyConditions(conditions);
}
bool LootTemplate::CopyConditions(LootItem* li) const
bool LootTemplate::CopyConditions(LootItem* li, uint32 conditionLootId) const
{
for (LootStoreItemList::const_iterator _iter = Entries.begin(); _iter != Entries.end(); ++_iter)
{
@@ -1389,7 +1389,7 @@ bool LootTemplate::CopyConditions(LootItem* li) const
{
if (LootTemplate const* Referenced = LootTemplates_Reference.GetLootFor(item->reference))
{
if (Referenced->CopyConditions(li))
if (Referenced->CopyConditions(li, conditionLootId))
{
return true;
}
@@ -1402,6 +1402,11 @@ bool LootTemplate::CopyConditions(LootItem* li) const
continue;
}
if (!item->conditions.empty() && conditionLootId && conditionLootId != item->conditions.front()->SourceGroup)
{
continue;
}
li->conditions = item->conditions;
return true;
}
@@ -1421,7 +1426,7 @@ bool LootTemplate::CopyConditions(LootItem* li) const
{
if (LootTemplate const* Referenced = LootTemplates_Reference.GetLootFor(item->reference))
{
if (Referenced->CopyConditions(li))
if (Referenced->CopyConditions(li, conditionLootId))
{
return true;
}
@@ -1434,6 +1439,11 @@ bool LootTemplate::CopyConditions(LootItem* li) const
continue;
}
if (!item->conditions.empty() && conditionLootId && conditionLootId != item->conditions.front()->SourceGroup)
{
continue;
}
li->conditions = item->conditions;
return true;
}
@@ -1447,7 +1457,7 @@ bool LootTemplate::CopyConditions(LootItem* li) const
{
if (LootTemplate const* Referenced = LootTemplates_Reference.GetLootFor(item->reference))
{
if (Referenced->CopyConditions(li))
if (Referenced->CopyConditions(li, conditionLootId))
{
return true;
}
@@ -1460,6 +1470,11 @@ bool LootTemplate::CopyConditions(LootItem* li) const
continue;
}
if (!item->conditions.empty() && conditionLootId && conditionLootId != item->conditions.front()->SourceGroup)
{
continue;
}
li->conditions = item->conditions;
return true;
}

2
src/server/game/Loot/LootMgr.h
View File

@@ -243,7 +243,7 @@ public:
// Rolls for every item in the template and adds the rolled items the the loot
void Process(Loot& loot, LootStore const& store, uint16 lootMode, Player const* player, uint8 groupId = 0) const;
void CopyConditions(ConditionList conditions);
bool CopyConditions(LootItem* li) const;
bool CopyConditions(LootItem* li, uint32 conditionLootId = 0) const;
// True if template includes at least 1 quest drop entry
[[nodiscard]] bool HasQuestDrop(LootTemplateMap const& store, uint8 groupId = 0) const;