diff options
| -rw-r--r-- | sql/updates/2479_world.sql | 2 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp | 10 | ||||
| -rw-r--r-- | src/game/Language.h | 2 | ||||
| -rw-r--r-- | src/game/MapManager.cpp | 3 |
4 files changed, 10 insertions, 7 deletions
diff --git a/sql/updates/2479_world.sql b/sql/updates/2479_world.sql new file mode 100644 index 00000000000..e5f0e2fb772 --- /dev/null +++ b/sql/updates/2479_world.sql @@ -0,0 +1,2 @@ +DELETE FROM `trinity_string` WHERE `entry` = 5007; +INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (5007, 'You must be in a raid group to enter this instance.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp index c94e21c0be8..710268c0cff 100644 --- a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp +++ b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp @@ -501,12 +501,12 @@ CreatureAI* GetAI_npc_isla_starmaneAI(Creature *_Creature) bool GossipHello_go_skull_pile(Player *player, GameObject* _GO) { - if (player->GetQuestStatus(11885) == QUEST_STATUS_INCOMPLETE) + if ((player->GetQuestStatus(11885) == QUEST_STATUS_INCOMPLETE) || player->GetQuestRewardStatus(11885)) { - player->ADD_GOSSIP_ITEM(1, GOSSIP_S_DARKSCREECHER_AKKARAI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - player->ADD_GOSSIP_ITEM(2, GOSSIP_S_KARROG, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - player->ADD_GOSSIP_ITEM(3, GOSSIP_S_GEZZARAK_THE_HUNTRESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - player->ADD_GOSSIP_ITEM(4, GOSSIP_S_VAKKIZ_THE_WINDRAGER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); + player->ADD_GOSSIP_ITEM(0, GOSSIP_S_DARKSCREECHER_AKKARAI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + player->ADD_GOSSIP_ITEM(0, GOSSIP_S_KARROG, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + player->ADD_GOSSIP_ITEM(0, GOSSIP_S_GEZZARAK_THE_HUNTRESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); + player->ADD_GOSSIP_ITEM(0, GOSSIP_S_VAKKIZ_THE_WINDRAGER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); } player->SEND_GOSSIP_MENU(_GO->GetGOInfo()->questgiver.gossipID, _GO->GetGUID()); diff --git a/src/game/Language.h b/src/game/Language.h index 07985f62bd2..51df64227f8 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -842,7 +842,7 @@ enum TrinityStrings LANG_COMMAND_NO_FROZEN_PLAYERS = 5004, LANG_COMMAND_LIST_FREEZE = 5005, LANG_COMMAND_FROZEN_PLAYERS = 5006, - //LANG_INSTANCE_MUST_RAID_GRP = 5007, + LANG_INSTANCE_RAID_GROUP_ONLY = 5007, //LANG_INSTANCE_NOT_AS_GHOST = 5008, LANG_COMMAND_PLAYED_TO_ALL = 5009, // Room for more Trinity strings 5010-9999 diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp index e083302e045..061e0252a13 100644 --- a/src/game/MapManager.cpp +++ b/src/game/MapManager.cpp @@ -32,6 +32,7 @@ #include "CellImpl.h" #include "Corpse.h" #include "ObjectMgr.h" +#include "Language.h" #define CLASS_LOCK Trinity::ClassLevelLockable<MapManager, ZThread::Mutex> INSTANTIATE_SINGLETON_2(MapManager, CLASS_LOCK); @@ -165,7 +166,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player) { // probably there must be special opcode, because client has this string constant in GlobalStrings.lua // TODO: this is not a good place to send the message - player->GetSession()->SendAreaTriggerMessage(player->GetSession()->GetTrinityString(810), mapName); + player->GetSession()->SendAreaTriggerMessage(player->GetSession()->GetTrinityString(LANG_INSTANCE_RAID_GROUP_ONLY), mapName); sLog.outDebug("MAP: Player '%s' must be in a raid group to enter instance of '%s'", player->GetName(), mapName); return false; } |