From d86e2671d933b20eb81a9a06d3a4b604ad844215 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 2 Dec 2024 15:21:02 +0100 Subject: Core/Commands: Handle more quest objective types with .quest complete command (cherry picked from commit e071c08526666e542088439a36481afc13ecbdc2) --- src/server/scripts/Commands/cs_quest.cpp | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'src/server/scripts/Commands') diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp index 57f1290d6d5..26b29e6fe79 100644 --- a/src/server/scripts/Commands/cs_quest.cpp +++ b/src/server/scripts/Commands/cs_quest.cpp @@ -169,17 +169,9 @@ public: } break; } - case QUEST_OBJECTIVE_MONSTER: + case QUEST_OBJECTIVE_CURRENCY: { - if (CreatureTemplate const* creatureInfo = sObjectMgr->GetCreatureTemplate(obj.ObjectID)) - for (uint16 z = 0; z < obj.Amount; ++z) - player->KilledMonster(creatureInfo, ObjectGuid::Empty); - break; - } - case QUEST_OBJECTIVE_GAMEOBJECT: - { - for (uint16 z = 0; z < obj.Amount; ++z) - player->KillCreditGO(obj.ObjectID); + player->ModifyCurrency(obj.ObjectID, obj.Amount, CurrencyGainSource::Cheat); break; } case QUEST_OBJECTIVE_MIN_REPUTATION: @@ -203,13 +195,11 @@ public: player->ModifyMoney(obj.Amount); break; } - case QUEST_OBJECTIVE_PLAYERKILLS: - { - for (uint16 z = 0; z < obj.Amount; ++z) - player->KilledPlayerCredit(ObjectGuid::Empty); + case QUEST_OBJECTIVE_PROGRESS_BAR: + // do nothing break; - } default: + player->UpdateQuestObjectiveProgress(static_cast(obj.Type), obj.ObjectID, obj.Amount); break; } } -- cgit v1.2.3