Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 05:11:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Wintergrasp: Add number of players in ".wg status" command, by Spp. Closes #211

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-11-17 23:51:33 -08:00
parent 145ca6bbbd
commit 296d6791aa
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/FULL/world_trinity_string_full.sql
View File

@@ -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),

2
sql/updates/6275_trinity_string.sql Normal file
View File

@@ -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;

12
src/game/Level2.cpp
View File

@@ -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))
{

9
src/game/Wintergrasp.h
View File

@@ -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();