diff options
| -rw-r--r-- | sql/FULL/world_trinity_string_full.sql | 2 | ||||
| -rw-r--r-- | sql/updates/6275_trinity_string.sql | 2 | ||||
| -rw-r--r-- | src/game/Level2.cpp | 12 | ||||
| -rw-r--r-- | src/game/Wintergrasp.h | 9 |
4 files changed, 19 insertions, 6 deletions
diff --git a/sql/FULL/world_trinity_string_full.sql b/sql/FULL/world_trinity_string_full.sql index fd0b34c7251..4e8faf821f0 100644 --- a/sql/FULL/world_trinity_string_full.sql +++ b/sql/FULL/world_trinity_string_full.sql @@ -604,7 +604,7 @@ INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `conte (765, 'Wintergrasp timer set to %s.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (766, 'Wintergrasp battle started.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (767, 'Wintergrasp battle finished.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), -(768, 'Wintergrasp info: %s controled. Timer: %s. Wartime: %s', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(768, 'Wintergrasp info: %s controlled. Timer: %s. Wartime: %s. Number of Players: (Horde: %u, Alliance: %u)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (769, 'Wintergrasp outdoorPvP is disabled.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (770, 'Wintergrasp outdoorPvP is enabled.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (771, 'You have reached Rank 1: Corporal', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), diff --git a/sql/updates/6275_trinity_string.sql b/sql/updates/6275_trinity_string.sql new file mode 100644 index 00000000000..a7f833d7460 --- /dev/null +++ b/sql/updates/6275_trinity_string.sql @@ -0,0 +1,2 @@ + +UPDATE `trinity_string` SET `content_default` = 'Wintergrasp info: %s controlled. Timer: %s. Wartime: %s. Number of Players: (Horde: %u, Alliance: %u)' WHERE `entry` = 768; diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index 9b25a5216c3..5965a9f283b 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -4240,9 +4240,6 @@ bool ChatHandler::HandleNpcSetLinkCommand(const char* args) bool ChatHandler::HandleWintergraspStatusCommand(const char* args) { - if(!*args) - return false; - OPvPWintergrasp *pvpWG = (OPvPWintergrasp*)sOutdoorPvPMgr.GetOutdoorPvPToZoneId(4197); if (!pvpWG || !sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED)) @@ -4252,7 +4249,12 @@ bool ChatHandler::HandleWintergraspStatusCommand(const char* args) return false; } - PSendSysMessage(LANG_BG_WG_STATUS, objmgr.GetTrinityStringForDBCLocale(pvpWG->GetTeam() == TEAM_ALLIANCE ? LANG_BG_AB_ALLY : LANG_BG_AB_HORDE), secsToTimeString(pvpWG->GetTimer(), true).c_str(), pvpWG->isWarTime() ? "Yes" : "No"); + PSendSysMessage(LANG_BG_WG_STATUS, objmgr.GetTrinityStringForDBCLocale( + pvpWG->GetTeam() == TEAM_ALLIANCE ? LANG_BG_AB_ALLY : LANG_BG_AB_HORDE), + secsToTimeString(pvpWG->GetTimer(), true).c_str(), + pvpWG->isWarTime() ? "Yes" : "No", + pvpWG->GetNumPlayersH(), + pvpWG->GetNumPlayersA()); return true; } @@ -4298,7 +4300,7 @@ bool ChatHandler::HandleWintergraspEnableCommand(const char* args) SendSysMessage(LANG_BG_WG_DISABLE); SetSentErrorMessage(true); return false; - } + } if (!strncmp(args, "on", 3)) { diff --git a/src/game/Wintergrasp.h b/src/game/Wintergrasp.h index 59ffefb1411..a06f585d21a 100644 --- a/src/game/Wintergrasp.h +++ b/src/game/Wintergrasp.h @@ -215,6 +215,15 @@ class OPvPWintergrasp : public OutdoorPvP if (timer >= 0) m_timer = timer; }; + uint32 GetNumPlayersA() const + { + return m_players[TEAM_ALLIANCE].size(); + } + + uint32 GetNumPlayersH() const + { + return m_players[TEAM_HORDE].size(); + } void forceChangeTeam(); void forceStopBattle(); void forceStartBattle(); |