diff --git a/data/sql/updates/pending_db_world/rev_1719791096484121500.sql b/data/sql/updates/pending_db_world/rev_1719791096484121500.sql new file mode 100644 index 000000000..127e37c84 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1719791096484121500.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `acore_string` WHERE `entry` = 602; +INSERT INTO `acore_string` (`entry`, `content_default`) VALUES +(602, ' [rewarded]'); diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index 88dfbeb11..f2ccc2724 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -655,12 +655,12 @@ enum AcoreStrings LANG_GMLIST_HEADER = 598, LANG_GMLIST_EMPTY = 599, - // End Level 3 list, continued at 1100 - LANG_EVENT_STARTED = 600, LANG_EVENT_STOPPED = 601, - // 602-704 - free + LANG_REWARDED = 602, + + // 603-704 - free LANG_WAIT_BEFORE_SPEAKING = 705, LANG_NOT_EQUIPPED_ITEM = 706, @@ -844,6 +844,7 @@ enum AcoreStrings LANG_ACCESS_REQUIREMENT_LEADER_COMPLETE_QUESTS = 889, LANG_ACCESS_REQUIREMENT_LEADER_COMPLETE_ACHIEVEMENTS = 890, LANG_ACCESS_REQUIREMENT_LEADER_OBTAIN_ITEMS = 891, + // End Level 3 list, continued at 1100 // Level 4 (CLI only commands) LANG_COMMAND_EXIT = 1000, diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp index ac66d0dba..040bcad67 100644 --- a/src/server/scripts/Commands/cs_lookup.cpp +++ b/src/server/scripts/Commands/cs_lookup.cpp @@ -812,13 +812,13 @@ public: switch (status) { case QUEST_STATUS_COMPLETE: - statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_COMPLETE); + statusStr = handler->GetAcoreString(LANG_COMPLETE); break; case QUEST_STATUS_INCOMPLETE: - statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_ACTIVE); + statusStr = handler->GetAcoreString(LANG_ACTIVE); break; case QUEST_STATUS_REWARDED: - statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_REWARDED); + statusStr = handler->GetAcoreString(LANG_REWARDED); break; default: break; @@ -868,13 +868,13 @@ public: switch (status) { case QUEST_STATUS_COMPLETE: - statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_COMPLETE); + statusStr = handler->GetAcoreString(LANG_COMPLETE); break; case QUEST_STATUS_INCOMPLETE: - statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_ACTIVE); + statusStr = handler->GetAcoreString(LANG_ACTIVE); break; case QUEST_STATUS_REWARDED: - statusStr = handler->GetAcoreString(LANG_COMMAND_QUEST_REWARDED); + statusStr = handler->GetAcoreString(LANG_REWARDED); break; default: break; diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 7b32bbd18..c0dff09ec 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -686,10 +686,11 @@ public: ObjectGuid::LowType guid = fields[0].Get(); uint32 entry = fields[1].Get(); //uint32 entry2 = fields[2].Get(); - float x = fields[3].Get(); - float y = fields[4].Get(); - float z = fields[5].Get(); - uint16 mapId = fields[6].Get(); + //uint32 entry3 = fields[3].Get(); + float x = fields[4].Get(); + float y = fields[5].Get(); + float z = fields[6].Get(); + uint16 mapId = fields[7].Get(); CreatureTemplate const* creatureTemplate = sObjectMgr->GetCreatureTemplate(entry); if (!creatureTemplate)