nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-03-15 05:25:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2024-02-06 17:51:47 +08:00
parent 1ef5b9a6b4 401c0e045a
commit 9784f932e9
32 changed files with 1008 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/Entities/Player/Player.h
View File

@@ -771,6 +771,14 @@ struct ItemPosCount
};
typedef std::vector<ItemPosCount> ItemPosCountVec;
struct SavedItem
{
Item* item;
uint16 dstpos;
SavedItem(Item* _item, uint16 dstpos) : item(_item), dstpos(dstpos) {}
};
enum TransferAbortReason
{
TRANSFER_ABORT_NONE = 0x00,

24
src/server/game/Globals/ObjectMgr.cpp
View File

@@ -4413,27 +4413,27 @@ void ObjectMgr::LoadQuests()
"ID, QuestType, QuestLevel, MinLevel, QuestSortID, QuestInfoID, SuggestedGroupNum, TimeAllowed, AllowableRaces,"
// 9 10 11 12
"RequiredFactionId1, RequiredFactionId2, RequiredFactionValue1, RequiredFactionValue2, "
// 13 14 15 16 17 18 19 20 21
"RewardNextQuest, RewardXPDifficulty, RewardMoney, RewardMoneyDifficulty, RewardBonusMoney, RewardDisplaySpell, RewardSpell, RewardHonor, RewardKillHonor, "
// 22 23 24 25 26 27
// 13 14 15 16 17 18 19 20
"RewardNextQuest, RewardXPDifficulty, RewardMoney, RewardMoneyDifficulty, RewardDisplaySpell, RewardSpell, RewardHonor, RewardKillHonor, "
// 21 22 23 24 25 26
"StartItem, Flags, RewardTitle, RequiredPlayerKills, RewardTalents, RewardArenaPoints, "
// 28 29 30 31 32 33 34 35
// 27 28 29 30 31 32 33 34
"RewardItem1, RewardAmount1, RewardItem2, RewardAmount2, RewardItem3, RewardAmount3, RewardItem4, RewardAmount4, "
// 36 37 38 39 40 41 42 43 44 45 46 47
// 35 36 37 38 39 40 41 42 43 44 45 46
"RewardChoiceItemID1, RewardChoiceItemQuantity1, RewardChoiceItemID2, RewardChoiceItemQuantity2, RewardChoiceItemID3, RewardChoiceItemQuantity3, RewardChoiceItemID4, RewardChoiceItemQuantity4, RewardChoiceItemID5, RewardChoiceItemQuantity5, RewardChoiceItemID6, RewardChoiceItemQuantity6, "
// 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
// 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61
"RewardFactionID1, RewardFactionValue1, RewardFactionOverride1, RewardFactionID2, RewardFactionValue2, RewardFactionOverride2, RewardFactionID3, RewardFactionValue3, RewardFactionOverride3, RewardFactionID4, RewardFactionValue4, RewardFactionOverride4, RewardFactionID5, RewardFactionValue5, RewardFactionOverride5,"
// 62 64 65 66
// 61 63 64 65
"POIContinent, POIx, POIy, POIPriority, "
// 67 68 69 70 71
// 66 67 68 69 70
"LogTitle, LogDescription, QuestDescription, AreaDescription, QuestCompletionLog, "
// 72 73 74 75 76 77 78 79
// 71 72 73 74 75 76 77 78
"RequiredNpcOrGo1, RequiredNpcOrGo2, RequiredNpcOrGo3, RequiredNpcOrGo4, RequiredNpcOrGoCount1, RequiredNpcOrGoCount2, RequiredNpcOrGoCount3, RequiredNpcOrGoCount4, "
// 80 81 82 83 84 85 86 87
// 79 80 81 82 83 84 85 86
"ItemDrop1, ItemDrop2, ItemDrop3, ItemDrop4, ItemDropQuantity1, ItemDropQuantity2, ItemDropQuantity3, ItemDropQuantity4, "
// 88 89 90 91 92 93 94 95 96 97 98 99
// 87 88 89 90 91 92 93 94 95 96 97 98
"RequiredItemId1, RequiredItemId2, RequiredItemId3, RequiredItemId4, RequiredItemId5, RequiredItemId6, RequiredItemCount1, RequiredItemCount2, RequiredItemCount3, RequiredItemCount4, RequiredItemCount5, RequiredItemCount6, "
// 100 101 102 103 104
// 99 100 101 102 103
"Unknown0, ObjectiveText1, ObjectiveText2, ObjectiveText3, ObjectiveText4"
" FROM quest_template");
if (!result)

15
src/server/game/Handlers/CharacterHandler.cpp
View File

@@ -1799,6 +1799,8 @@ void WorldSession::HandleEquipmentSetUse(WorldPacket& recvData)
{
LOG_DEBUG("network", "CMSG_EQUIPMENT_SET_USE");
std::vector<std::unique_ptr<SavedItem>> savedItems;
uint8 errorId = 0;
for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
{
ObjectGuid itemGuid;
@@ -1824,7 +1826,6 @@ void WorldSession::HandleEquipmentSetUse(WorldPacket& recvData)
uint16 dstpos = i | (INVENTORY_SLOT_BAG_0 << 8);
InventoryResult msg;
Item* uItem = _player->GetItemByPos(INVENTORY_SLOT_BAG_0, i);
if (uItem)
{
@@ -1844,11 +1845,19 @@ void WorldSession::HandleEquipmentSetUse(WorldPacket& recvData)
msg = _player->CanStoreItem(NULL_BAG, NULL_SLOT, sDest, uItem, false);
if (msg == EQUIP_ERR_OK)
{
savedItems.emplace_back(std::make_unique<SavedItem>(uItem, dstpos));
_player->RemoveItem(INVENTORY_SLOT_BAG_0, i, true);
_player->StoreItem(sDest, uItem, true);
}
else
_player->SendEquipError(msg, uItem, nullptr);
{
errorId = 4;
for (uint8_t j = 0; j < savedItems.size(); ++j)
{
_player->SwapItem(savedItems[j].get()->item->GetPos(), savedItems[j].get()->dstpos);
}
break;
}
continue;
}
@@ -1875,7 +1884,7 @@ void WorldSession::HandleEquipmentSetUse(WorldPacket& recvData)
}
WorldPacket data(SMSG_EQUIPMENT_SET_USE_RESULT, 1);
data << uint8(0); // 4 - equipment swap failed - inventory is full
data << uint8(errorId); // 4 - equipment swap failed - inventory is full
SendPacket(&data);
}

79
src/server/game/Quests/QuestDef.cpp
View File

@@ -47,22 +47,21 @@ Quest::Quest(Field* questRecord)
RewardXPDifficulty = questRecord[14].Get<uint8>();
RewardMoney = questRecord[15].Get<int32>();
RewardMoneyDifficulty = questRecord[16].Get<uint32>();
RewardBonusMoney = questRecord[17].Get<uint32>();
RewardDisplaySpell = questRecord[18].Get<uint32>();
RewardSpell = questRecord[19].Get<int32>();
RewardHonor = questRecord[20].Get<uint32>();
RewardKillHonor = questRecord[21].Get<float>();
StartItem = questRecord[22].Get<uint32>();
Flags = questRecord[23].Get<uint32>();
RewardTitleId = questRecord[24].Get<uint8>();
RequiredPlayerKills = questRecord[25].Get<uint8>();
RewardTalents = questRecord[26].Get<uint8>();
RewardArenaPoints = questRecord[27].Get<uint16>();
RewardDisplaySpell = questRecord[17].Get<uint32>();
RewardSpell = questRecord[18].Get<int32>();
RewardHonor = questRecord[19].Get<uint32>();
RewardKillHonor = questRecord[20].Get<float>();
StartItem = questRecord[21].Get<uint32>();
Flags = questRecord[22].Get<uint32>();
RewardTitleId = questRecord[23].Get<uint8>();
RequiredPlayerKills = questRecord[24].Get<uint8>();
RewardTalents = questRecord[25].Get<uint8>();
RewardArenaPoints = questRecord[26].Get<uint16>();
for (int i = 0; i < QUEST_REWARDS_COUNT; ++i)
{
RewardItemId[i] = questRecord[28 + i * 2].Get<uint32>();
RewardItemIdCount[i] = questRecord[29 + i * 2].Get<uint16>();
RewardItemId[i] = questRecord[27 + i * 2].Get<uint32>();
RewardItemIdCount[i] = questRecord[28 + i * 2].Get<uint16>();
if (RewardItemId[i])
++_rewItemsCount;
@@ -70,8 +69,8 @@ Quest::Quest(Field* questRecord)
for (int i = 0; i < QUEST_REWARD_CHOICES_COUNT; ++i)
{
RewardChoiceItemId[i] = questRecord[36 + i * 2].Get<uint32>();
RewardChoiceItemCount[i] = questRecord[37 + i * 2].Get<uint16>();
RewardChoiceItemId[i] = questRecord[35 + i * 2].Get<uint32>();
RewardChoiceItemCount[i] = questRecord[36 + i * 2].Get<uint16>();
if (RewardChoiceItemId[i])
++_rewChoiceItemsCount;
@@ -79,26 +78,26 @@ Quest::Quest(Field* questRecord)
for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)
{
RewardFactionId[i] = questRecord[48 + i * 3].Get<uint16>();
RewardFactionValueId[i] = questRecord[49 + i * 3].Get<int32>();
RewardFactionValueIdOverride[i] = questRecord[50 + i * 3].Get<int32>();
RewardFactionId[i] = questRecord[47 + i * 3].Get<uint16>();
RewardFactionValueId[i] = questRecord[48 + i * 3].Get<int32>();
RewardFactionValueIdOverride[i] = questRecord[49 + i * 3].Get<int32>();
}
POIContinent = questRecord[63].Get<uint16>();
POIx = questRecord[64].Get<float>();
POIy = questRecord[65].Get<float>();
POIPriority = questRecord[66].Get<uint32>();
Title = questRecord[67].Get<std::string>();
Objectives = questRecord[68].Get<std::string>();
Details = questRecord[69].Get<std::string>();
AreaDescription = questRecord[70].Get<std::string>();
CompletedText = questRecord[71].Get<std::string>();
POIContinent = questRecord[62].Get<uint16>();
POIx = questRecord[63].Get<float>();
POIy = questRecord[64].Get<float>();
POIPriority = questRecord[65].Get<uint32>();
Title = questRecord[66].Get<std::string>();
Objectives = questRecord[67].Get<std::string>();
Details = questRecord[68].Get<std::string>();
AreaDescription = questRecord[69].Get<std::string>();
CompletedText = questRecord[70].Get<std::string>();
for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
{
RequiredNpcOrGo[i] = questRecord[72 + i].Get<int32>();
RequiredNpcOrGoCount[i] = questRecord[76 + i].Get<uint16>();
ObjectiveText[i] = questRecord[101 + i].Get<std::string>();
RequiredNpcOrGo[i] = questRecord[71 + i].Get<int32>();
RequiredNpcOrGoCount[i] = questRecord[75 + i].Get<uint16>();
ObjectiveText[i] = questRecord[100 + i].Get<std::string>();
if (RequiredNpcOrGo[i])
++_reqCreatureOrGOcount;
@@ -106,14 +105,14 @@ Quest::Quest(Field* questRecord)
for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
{
ItemDrop[i] = questRecord[80 + i].Get<uint32>();
ItemDropQuantity[i] = questRecord[84 + i].Get<uint16>();
ItemDrop[i] = questRecord[79 + i].Get<uint32>();
ItemDropQuantity[i] = questRecord[83 + i].Get<uint16>();
}
for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
{
RequiredItemId[i] = questRecord[88 + i].Get<uint32>();
RequiredItemCount[i] = questRecord[94 + i].Get<uint16>();
RequiredItemId[i] = questRecord[87 + i].Get<uint32>();
RequiredItemCount[i] = questRecord[93 + i].Get<uint16>();
if (RequiredItemId[i])
++_reqItemsCount;
@@ -252,15 +251,19 @@ int32 Quest::GetRewOrReqMoney(uint8 playerLevel) const
}
}
return static_cast<int32>(rewardedMoney * sWorld->getRate(RATE_REWARD_BONUS_MONEY));
return static_cast<int32>(rewardedMoney * sWorld->getRate(RATE_REWARD_QUEST_MONEY));
}
uint32 Quest::GetRewMoneyMaxLevel() const
{
if (HasFlag(QUEST_FLAGS_NO_MONEY_FROM_XP))
return 0;
uint32 rewMoney = 0;
return static_cast<int32>(RewardBonusMoney * sWorld->getRate(RATE_REWARD_BONUS_MONEY));
if (HasFlag(QUEST_FLAGS_NO_MONEY_FROM_XP))
return rewMoney;
rewMoney = (XPValue(sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) * (6 * COPPER));
// https://wowpedia.fandom.com/wiki/Quest?oldid=1035002 Formula is XP gained * 6c
return static_cast<int32>(rewMoney * sWorld->getRate(RATE_REWARD_BONUS_MONEY));
}
bool Quest::IsAutoAccept() const

1
src/server/game/Quests/QuestDef.h
View File

@@ -371,7 +371,6 @@ protected:
float RewardKillHonor;
int32 RewardMoney;
uint32 RewardMoneyDifficulty;
uint32 RewardBonusMoney;
uint32 RewardDisplaySpell;
int32 RewardSpell;
uint32 POIContinent;

4
src/server/game/Spells/Spell.cpp
View File

@@ -4699,7 +4699,7 @@ void Spell::SendSpellStart()
uint32 castFlags = CAST_FLAG_HAS_TRAJECTORY;
if (((IsTriggered() && !m_spellInfo->IsAutoRepeatRangedSpell()) || m_triggeredByAuraSpell) && !m_cast_count && !m_spellInfo->IsChanneled())
if (((IsTriggered() && !m_spellInfo->IsAutoRepeatRangedSpell()) || m_triggeredByAuraSpell) && !m_cast_count && !(m_spellInfo->IsChanneled() || m_spellInfo->CastTimeEntry->CastTime > 0))
castFlags |= CAST_FLAG_PENDING;
if (m_spellInfo->HasAttribute(SPELL_ATTR0_USES_RANGED_SLOT) || m_spellInfo->HasAttribute(SPELL_ATTR0_CU_NEEDS_AMMO_DATA))
@@ -4781,7 +4781,7 @@ void Spell::SendSpellGo()
uint32 castFlags = CAST_FLAG_UNKNOWN_9;
// triggered spells with spell visual != 0
if (((IsTriggered() && !m_spellInfo->IsAutoRepeatRangedSpell()) || m_triggeredByAuraSpell) && !m_cast_count && !m_spellInfo->IsChanneled())
if (((IsTriggered() && !m_spellInfo->IsAutoRepeatRangedSpell()) || m_triggeredByAuraSpell) && !m_cast_count && !(m_spellInfo->IsChanneled() || m_spellInfo->CastTimeEntry->CastTime > 0))
castFlags |= CAST_FLAG_PENDING;
if (m_spellInfo->HasAttribute(SPELL_ATTR0_USES_RANGED_SLOT) || m_spellInfo->HasAttribute(SPELL_ATTR0_CU_NEEDS_AMMO_DATA))

1
src/server/game/World/IWorld.h
View File

@@ -460,6 +460,7 @@ enum Rates
RATE_BUYVALUE_ITEM_ARTIFACT,
RATE_BUYVALUE_ITEM_HEIRLOOM,
RATE_DROP_MONEY,
RATE_REWARD_QUEST_MONEY,
RATE_REWARD_BONUS_MONEY,
RATE_XP_KILL,
RATE_XP_BG_KILL_AV,

1
src/server/game/World/World.cpp
View File

@@ -495,6 +495,7 @@ void World::LoadConfigSettings(bool reload)
_rate_values[RATE_DROP_ITEM_GROUP_AMOUNT] = sConfigMgr->GetOption<float>("Rate.Drop.Item.GroupAmount", 1.0f);
_rate_values[RATE_DROP_MONEY] = sConfigMgr->GetOption<float>("Rate.Drop.Money", 1.0f);
_rate_values[RATE_REWARD_QUEST_MONEY] = sConfigMgr->GetOption<float>("Rate.RewardQuestMoney", 1.0f);
_rate_values[RATE_REWARD_BONUS_MONEY] = sConfigMgr->GetOption<float>("Rate.RewardBonusMoney", 1.0f);
_rate_values[RATE_XP_KILL] = sConfigMgr->GetOption<float>("Rate.XP.Kill", 1.0f);
_rate_values[RATE_XP_BG_KILL_AV] = sConfigMgr->GetOption<float>("Rate.XP.BattlegroundKillAV", 1.0f);