whole lot of fixes

This commit is contained in:
Nico committed 2026-10-01 00:23:36 +02:00
1 parent fec36215f6
commit 3cf7e70283
14 files changed
+3174 -83

No files matched your search

+53 -20
View File
@@ -15837,15 +15837,26 @@ void Player::KilledMonsterCredit(uint32 entry, ObjectGuid guid /*= ObjectGuid::E
uint16 curkillcount = q_status.CreatureOrGOCount[j];
if (curkillcount < reqkillcount)
{
q_status.CreatureOrGOCount[j] = curkillcount + addkillcount;
uint16 newCount = curkillcount + addkillcount;
m_QuestStatusSave[questid] = QUEST_DEFAULT_SAVE_TYPE;
q_status.CreatureOrGOCount[j] = newCount;
uint16 log_slot = FindQuestSlot(questid);
if (log_slot < MAX_QUEST_LOG_SIZE)
SetQuestSlotCounter(log_slot, j, curkillcount + addkillcount);
m_QuestStatusSave[questid] = QUEST_DEFAULT_SAVE_TYPE;
SendQuestUpdateAddCredit(qInfo, guid, j, curkillcount + addkillcount);
uint16 log_slot = FindQuestSlot(questid);
if (log_slot < MAX_QUEST_LOG_SIZE)
SetQuestSlotCounter(log_slot, j, newCount);
sScriptMgr->OnQuestObjectiveCredit(
this,
questid,
j,
qInfo->RequiredNpcOrGo[j],
curkillcount,
newCount,
guid);
SendQuestUpdateAddCredit(qInfo, guid, j, newCount);
}
if (CanCompleteQuest(questid))
CompleteQuest(questid);
@@ -15949,17 +15960,28 @@ void Player::KillCreditGO(uint32 entry, ObjectGuid guid)
uint32 reqCastCount = qInfo->RequiredNpcOrGoCount[j];
uint16 curCastCount = q_status.CreatureOrGOCount[j];
if (curCastCount < reqCastCount)
{
q_status.CreatureOrGOCount[j] = curCastCount + addCastCount;
{
uint16 newCount = curCastCount + addCastCount;
m_QuestStatusSave[questid] = QUEST_DEFAULT_SAVE_TYPE;
q_status.CreatureOrGOCount[j] = newCount;
uint16 log_slot = FindQuestSlot(questid);
if (log_slot < MAX_QUEST_LOG_SIZE)
SetQuestSlotCounter(log_slot, j, curCastCount + addCastCount);
m_QuestStatusSave[questid] = QUEST_DEFAULT_SAVE_TYPE;
SendQuestUpdateAddCredit(qInfo, guid, j, curCastCount + addCastCount);
}
uint16 log_slot = FindQuestSlot(questid);
if (log_slot < MAX_QUEST_LOG_SIZE)
SetQuestSlotCounter(log_slot, j, newCount);
sScriptMgr->OnQuestObjectiveCredit(
this,
questid,
j,
qInfo->RequiredNpcOrGo[j],
curCastCount,
newCount,
guid);
SendQuestUpdateAddCredit(qInfo, guid, j, newCount);
}
if (CanCompleteQuest(questid))
CompleteQuest(questid);
@@ -16011,15 +16033,26 @@ void Player::TalkedToCreature(uint32 entry, ObjectGuid guid)
uint16 curTalkCount = q_status.CreatureOrGOCount[j];
if (curTalkCount < reqTalkCount)
{
q_status.CreatureOrGOCount[j] = curTalkCount + addTalkCount;
uint16 newCount = curTalkCount + addTalkCount;
m_QuestStatusSave[questid] = QUEST_DEFAULT_SAVE_TYPE;
q_status.CreatureOrGOCount[j] = newCount;
uint16 log_slot = FindQuestSlot(questid);
if (log_slot < MAX_QUEST_LOG_SIZE)
SetQuestSlotCounter(log_slot, j, curTalkCount + addTalkCount);
m_QuestStatusSave[questid] = QUEST_DEFAULT_SAVE_TYPE;
SendQuestUpdateAddCredit(qInfo, guid, j, curTalkCount + addTalkCount);
uint16 log_slot = FindQuestSlot(questid);
if (log_slot < MAX_QUEST_LOG_SIZE)
SetQuestSlotCounter(log_slot, j, newCount);
sScriptMgr->OnQuestObjectiveCredit(
this,
questid,
j,
qInfo->RequiredNpcOrGo[j],
curTalkCount,
newCount,
guid);
SendQuestUpdateAddCredit(qInfo, guid, j, newCount);
}
if (CanCompleteQuest(questid))
CompleteQuest(questid);