public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 07:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Script/Commands): output lookup quest and npc near (#19243)

Browse Source 
* close https://github.com/azerothcore/azerothcore-wotlk/issues/19216
This commit is contained in:
Kitzunu
2024-07-01 12:24:54 +02:00
committed by GitHub
parent 688d7e2fdf
commit 1289e351a2
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/sql/updates/pending_db_world/rev_1719791096484121500.sql Normal file
View File

@@ -0,0 +1,4 @@
--
DELETE FROM `acore_string` WHERE `entry` = 602;
INSERT INTO `acore_string` (`entry`, `content_default`) VALUES
(602, ' [rewarded]');

7
src/server/game/Miscellaneous/Language.h
View File

@@ -655,12 +655,12 @@ enum AcoreStrings
LANG_GMLIST_HEADER = 598, LANG_GMLIST_HEADER = 598,
LANG_GMLIST_EMPTY = 599, LANG_GMLIST_EMPTY = 599,
// End Level 3 list, continued at 1100
LANG_EVENT_STARTED = 600, LANG_EVENT_STARTED = 600,
LANG_EVENT_STOPPED = 601, LANG_EVENT_STOPPED = 601,
// 602-704 - free LANG_REWARDED = 602,
// 603-704 - free
LANG_WAIT_BEFORE_SPEAKING = 705, LANG_WAIT_BEFORE_SPEAKING = 705,
LANG_NOT_EQUIPPED_ITEM = 706, LANG_NOT_EQUIPPED_ITEM = 706,
@@ -844,6 +844,7 @@ enum AcoreStrings
LANG_ACCESS_REQUIREMENT_LEADER_COMPLETE_QUESTS = 889, LANG_ACCESS_REQUIREMENT_LEADER_COMPLETE_QUESTS = 889,
LANG_ACCESS_REQUIREMENT_LEADER_COMPLETE_ACHIEVEMENTS = 890, LANG_ACCESS_REQUIREMENT_LEADER_COMPLETE_ACHIEVEMENTS = 890,
LANG_ACCESS_REQUIREMENT_LEADER_OBTAIN_ITEMS = 891, LANG_ACCESS_REQUIREMENT_LEADER_OBTAIN_ITEMS = 891,
// End Level 3 list, continued at 1100
// Level 4 (CLI only commands) // Level 4 (CLI only commands)
LANG_COMMAND_EXIT = 1000, LANG_COMMAND_EXIT = 1000,

12
src/server/scripts/Commands/cs_lookup.cpp
View File

@@ -812,13 +812,13 @@ public:
switch (status) switch (status)
{ {
case QUEST_STATUS_COMPLETE: case QUEST_STATUS_COMPLETE:
statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_COMPLETE); statusStr = handler->GetAcoreString(LANG_COMPLETE);
break; break;
case QUEST_STATUS_INCOMPLETE: case QUEST_STATUS_INCOMPLETE:
statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_ACTIVE); statusStr = handler->GetAcoreString(LANG_ACTIVE);
break; break;
case QUEST_STATUS_REWARDED: case QUEST_STATUS_REWARDED:
statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_REWARDED); statusStr = handler->GetAcoreString(LANG_REWARDED);
break; break;
default: default:
break; break;
@@ -868,13 +868,13 @@ public:
switch (status) switch (status)
{ {
case QUEST_STATUS_COMPLETE: case QUEST_STATUS_COMPLETE:
statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_COMPLETE); statusStr = handler->GetAcoreString(LANG_COMPLETE);
break; break;
case QUEST_STATUS_INCOMPLETE: case QUEST_STATUS_INCOMPLETE:
statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_ACTIVE); statusStr = handler->GetAcoreString(LANG_ACTIVE);
break; break;
case QUEST_STATUS_REWARDED: case QUEST_STATUS_REWARDED:
statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_REWARDED); statusStr = handler->GetAcoreString(LANG_REWARDED);
break; break;
default: default:
break; break;

9
src/server/scripts/Commands/cs_npc.cpp
View File

@@ -686,10 +686,11 @@ public:
ObjectGuid::LowType guid = fields[0].Get<uint32>(); ObjectGuid::LowType guid = fields[0].Get<uint32>();
uint32 entry = fields[1].Get<uint32>(); uint32 entry = fields[1].Get<uint32>();
//uint32 entry2 = fields[2].Get<uint32>(); //uint32 entry2 = fields[2].Get<uint32>();
float x = fields[3].Get<float>(); //uint32 entry3 = fields[3].Get<uint32>();
float y = fields[4].Get<float>(); float x = fields[4].Get<float>();
float z = fields[5].Get<float>(); float y = fields[5].Get<float>();
uint16 mapId = fields[6].Get<uint16>(); float z = fields[6].Get<float>();
uint16 mapId = fields[7].Get<uint16>();
CreatureTemplate const* creatureTemplate = sObjectMgr->GetCreatureTemplate(entry); CreatureTemplate const* creatureTemplate = sObjectMgr->GetCreatureTemplate(entry);
if (!creatureTemplate) if (!creatureTemplate)