# HG changeset patch
# Parent 0e8159958774d1c8b0809abfd773e5bad2678f24
balance battleground

diff -r 0e8159958774 src/server/game/Battlegrounds/Battleground.cpp
--- a/src/server/game/Battlegrounds/Battleground.cpp Sat Dec 18 11:37:43 2010 +0100
+++ b/src/server/game/Battlegrounds/Battleground.cpp Sat Dec 18 11:42:39 2010 +0100
@@ -156,6 +156,7 @@
m_MaxPlayers = 0;
m_MinPlayersPerTeam = 0;
m_MinPlayers = 0;
+ m_balance = 0;

m_MapId = 0;
m_Map = NULL;
@@ -331,6 +332,7 @@
/*********************************************************/

// if less then minimum players are in on one side, then start premature finish timer
+ UpdateBalance();
if (GetStatus() == STATUS_IN_PROGRESS && !isArena() && sBattlegroundMgr.GetPrematureFinishTime() && (GetPlayersCountByTeam(ALLIANCE) < GetMinPlayersPerTeam() || GetPlayersCountByTeam(HORDE) < GetMinPlayersPerTeam()))
{
if (!m_PrematureCountDown)
@@ -1020,8 +1022,8 @@
if (isBattleground() && GetStatus() < STATUS_WAIT_LEAVE)
{
// a player has left the battleground, so there are free slots -> add to queue
- AddToBGFreeSlotQueue();
- sBattlegroundMgr.ScheduleQueueUpdate(0, 0, bgQueueTypeId, bgTypeId, GetBracketId());
+ AddToBGFreeSlotQueue();
+ sBattlegroundMgr->ScheduleQueueUpdate(0, 0, bgQueueTypeId, bgTypeId, GetBracketId());
}
// Let others know
WorldPacket data;
@@ -1268,6 +1270,8 @@
// returns the number how many players can join battleground to MaxPlayersPerTeam
uint32 Battleground::GetFreeSlotsForTeam(uint32 Team) const
{
+ if (HasBalanceTeam(Team))
+ return 0;
//if BG is starting ... invite anyone
if (GetStatus() == STATUS_WAIT_JOIN)
return (GetInvitedCount(Team) < GetMaxPlayersPerTeam()) ? GetMaxPlayersPerTeam() - GetInvitedCount(Team) : 0;
@@ -1326,6 +1330,28 @@
return GetPlayersSize() < GetMaxPlayers();
}

+void Battleground::UpdateBalance()
+{
+ if (GetPlayersCountByTeam(ALLIANCE) < GetPlayersCountByTeam(HORDE))
+ m_balance = GetPlayersCountByTeam(HORDE) - GetPlayersCountByTeam(ALLIANCE);
+ else if (GetPlayersCountByTeam(HORDE) < GetPlayersCountByTeam(ALLIANCE))
+ m_balance = GetPlayersCountByTeam(ALLIANCE) - GetPlayersCountByTeam(HORDE);
+ else
+ m_balance = 0;
+}
+
+bool Battleground::HasBalanceTeam(uint32 TeamId) const
+{
+ if (sWorld->getIntConfig(CONFIG_BALANCE_MINIMUM) < 0)
+ return false;
+ if (m_balance > sWorld->getIntConfig(CONFIG_BALANCE_MINIMUM))
+ {
+ if (GetPlayersCountByTeam(TeamId) > GetPlayersCountByTeam(GetOtherTeam(TeamId)))
+ return true;
+ }
+ return false;
+}
+
void Battleground::UpdatePlayerScore(Player *Source, uint32 type, uint32 value, bool doAddHonor)
{
//this procedure is called from virtual function implemented in bg subclass
diff -r 0e8159958774 src/server/game/Battlegrounds/Battleground.h
--- a/src/server/game/Battlegrounds/Battleground.h Sat Dec 18 11:37:43 2010 +0100
+++ b/src/server/game/Battlegrounds/Battleground.h Sat Dec 18 11:42:39 2010 +0100
@@ -417,6 +417,8 @@
return m_InvitedHorde;
}
bool HasFreeSlots() const;
+ bool HasBalanceTeam(uint32 TeamId) const;
+ void UpdateBalance();
uint32 GetFreeSlotsForTeam(uint32 Team) const;

bool isArena() const { return m_IsArena; }
@@ -630,6 +632,7 @@
bool m_IsRated; // is this battle rated?
bool m_PrematureCountDown;
uint32 m_PrematureCountDownTimer;
+ uint32 m_balance;
char const *m_Name;

/* Player lists */
diff -r 0e8159958774 src/server/game/Battlegrounds/BattlegroundQueue.cpp
--- a/src/server/game/Battlegrounds/BattlegroundQueue.cpp Sat Dec 18 11:37:43 2010 +0100
+++ b/src/server/game/Battlegrounds/BattlegroundQueue.cpp Sat Dec 18 11:42:39 2010 +0100
@@ -761,10 +761,10 @@
FillPlayersToBG(bg, bracket_id);

// now everything is set, invite players
- for (GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_ALLIANCE].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_ALLIANCE].SelectedGroups.end(); ++citr)
- InviteGroupToBG((*citr), bg, (*citr)->Team);
- for (GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_HORDE].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_HORDE].SelectedGroups.end(); ++citr)
- InviteGroupToBG((*citr), bg, (*citr)->Team);
+ for (GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_ALLIANCE].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_ALLIANCE].SelectedGroups.end(); ++citr)
+ InviteGroupToBG((*citr), bg, (*citr)->Team);
+ for (GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_HORDE].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_HORDE].SelectedGroups.end(); ++citr)
+ InviteGroupToBG((*citr), bg, (*citr)->Team);

if (!bg->HasFreeSlots())
{
diff -r 0e8159958774 src/server/game/World/World.cpp
--- a/src/server/game/World/World.cpp Sat Dec 18 11:37:43 2010 +0100
+++ b/src/server/game/World/World.cpp Sat Dec 18 11:42:39 2010 +0100
@@ -1196,6 +1196,10 @@
m_int_configs[CONFIG_WINTERGRASP_BATTLETIME] = sConfig.GetIntDefault("Wintergrasp.BattleTimer", 30);
m_int_configs[CONFIG_WINTERGRASP_NOBATTLETIME] = sConfig.GetIntDefault("Wintergrasp.NoBattleTimer", 150);

+
+ // Balance Battleground
+ m_int_configs[CONFIG_BALANCE_MINIMUM] = ConfigMgr::GetIntDefault("Battleground.Balance", -1);
+
sScriptMgr.OnConfigLoad(reload);
}

diff -r 0e8159958774 src/server/game/World/World.h
--- a/src/server/game/World/World.h Sat Dec 18 11:37:43 2010 +0100
+++ b/src/server/game/World/World.h Sat Dec 18 11:42:39 2010 +0100
@@ -316,6 +316,7 @@
CONFIG_WINTERGRASP_BATTLETIME,
CONFIG_WINTERGRASP_NOBATTLETIME,
CONFIG_PRESERVE_CUSTOM_CHANNEL_DURATION,
+ CONFIG_BALANCE_MINIMUM,
INT_CONFIG_VALUE_COUNT
};

diff -r 0e8159958774 src/server/worldserver/worldserver.conf.dist
--- a/src/server/worldserver/worldserver.conf.dist Sat Dec 18 11:37:43 2010 +0100
+++ b/src/server/worldserver/worldserver.conf.dist Sat Dec 18 11:42:39 2010 +0100
@@ -2364,6 +2364,7 @@
# Default: 6 - (06:00 AM)

Battleground.Random.ResetHour = 6
+Battleground.Balance = -1

diff -r 0aa7b4961541 -r fe99770612e0 src/server/game/Miscellaneous/Language.h
--- a/src/server/game/Miscellaneous/Language.h Tue Apr 19 15:24:31 2011 +0300
+++ b/src/server/game/Miscellaneous/Language.h Tue Apr 19 16:20:04 2011 +0300
@@ -1070,6 +1070,7 @@
// Use for custom patches 11000-11999
LANG_AUTO_BROADCAST = 11000,
LANG_INVALID_REALMID = 11001,
+ LANG_NOT_ENOUGHT_HONOR = 11002,

// NOT RESERVED IDS 12000-1999999999
// `db_script_string` table index 2000000000-2000009999 (MIN_DB_SCRIPT_STRING_ID-MAX_DB_SCRIPT_STRING_ID)
diff -r 0aa7b4961541 -r fe99770612e0 src/server/game/Server/Protocol/Handlers/ChatHandler.cpp
--- a/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp Tue Apr 19 15:24:31 2011 +0300
+++ b/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp Tue Apr 19 16:20:04 2011 +0300
@@ -422,6 +422,18 @@
{
sScriptMgr->OnPlayerChat(_player, type, lang, msg, chn);

+ if (chn->IsLFG())
+ {
+ uint32 cost = sWorld->getIntConfig(CONFIG_LFG_COST);
+
+ if (_player->GetHonorPoints() < cost)
+ {
+ ChatHandler(this).PSendSysMessage(LANG_NOT_ENOUGHT_HONOR);
+ break;
+ }
+ _player->ModifyHonorPoints(-(int32)cost);
+ }
+
chn->Say(_player->GetGUID(), msg.c_str(), lang);
}
}
diff -r 0aa7b4961541 -r fe99770612e0 src/server/game/World/World.cpp
--- a/src/server/game/World/World.cpp Tue Apr 19 15:24:31 2011 +0300
+++ b/src/server/game/World/World.cpp Tue Apr 19 16:20:04 2011 +0300
@@ -585,6 +585,7 @@
m_int_configs[CONFIG_INTERVAL_SAVE] = sConfig->GetIntDefault("PlayerSaveInterval", 15 * MINUTE * IN_MILLISECONDS);
m_int_configs[CONFIG_INTERVAL_DISCONNECT_TOLERANCE] = sConfig->GetIntDefault("DisconnectToleranceInterval", 0);
m_bool_configs[CONFIG_STATS_SAVE_ONLY_ON_LOGOUT] = sConfig->GetBoolDefault("PlayerSave.Stats.SaveOnlyOnLogout", true);
+ m_int_configs[CONFIG_LFG_COST] = ConfigMgr::GetIntDefault("LFGMsg.Cost", 0);

m_int_configs[CONFIG_MIN_LEVEL_STAT_SAVE] = sConfig->GetIntDefault("PlayerSave.Stats.MinLevel", 0);
if (m_int_configs[CONFIG_MIN_LEVEL_STAT_SAVE] > MAX_LEVEL)
diff -r 0aa7b4961541 -r fe99770612e0 src/server/game/World/World.h
--- a/src/server/game/World/World.h Tue Apr 19 15:24:31 2011 +0300
+++ b/src/server/game/World/World.h Tue Apr 19 16:20:04 2011 +0300
@@ -266,6 +266,7 @@
CONFIG_TICKET_LEVEL_REQ,
CONFIG_AUCTION_LEVEL_REQ,
CONFIG_MAIL_LEVEL_REQ,
+ CONFIG_LFG_COST,
CONFIG_CORPSE_DECAY_NORMAL,
CONFIG_CORPSE_DECAY_RARE,
CONFIG_CORPSE_DECAY_ELITE,
diff -r 0aa7b4961541 -r fe99770612e0 src/server/worldserver/worldserver.conf.dist
--- a/src/server/worldserver/worldserver.conf.dist Tue Apr 19 15:24:31 2011 +0300
+++ b/src/server/worldserver/worldserver.conf.dist Tue Apr 19 16:20:04 2011 +0300
@@ -2777,6 +2777,12 @@
LevelReq.Mail = 1

#
+# LFGMsg.Cost
+# Default: 0
+
+LFGMsg.Cost = 5
+
+#

DELETE FROM `trinity_string` WHERE `entry` = 11002;
INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc8`) VALUES
('11002', 'not enought honor.', 'недостаточно хонора.');

# HG changeset patch
# User BananaVodka@Valera
# Date 1329557811 -14400
# Node ID 14b1cfd493358176e24160d652e4c822b3b8f234
# Parent 37536e6e494d4180e243ddf08bd98e7e3eb1322b
LFG all location
diff -r 37536e6e494d4180e243ddf08bd98e7e3eb1322b -r 14b1cfd493358176e24160d652e4c822b3b8f234 src/server/game/Entities/Player/Player.cpp
--- a/src/server/game/Entities/Player/Player.cpp Sat Feb 18 13:30:49 2012 +0400
+++ b/src/server/game/Entities/Player/Player.cpp Sat Feb 18 13:36:51 2012 +0400
@@ -5554,6 +5554,10 @@

bool Player::CanJoinConstantChannelInZone(ChatChannelsEntry const* channel, AreaTableEntry const* zone)
{
+ // Player can join LFG anywhere
+ if (channel->flags & CHANNEL_DBC_FLAG_LFG && sWorld->getBoolConfig(CONFIG_LFG_LOCATION_ALL))
+ return true;
+
if (channel->flags & CHANNEL_DBC_FLAG_ZONE_DEP && zone->flags & AREA_FLAG_ARENA_INSTANCE)
return false;

diff -r 37536e6e494d4180e243ddf08bd98e7e3eb1322b -r 14b1cfd493358176e24160d652e4c822b3b8f234 src/server/game/World/World.cpp
--- a/src/server/game/World/World.cpp Sat Feb 18 13:30:49 2012 +0400
+++ b/src/server/game/World/World.cpp Sat Feb 18 13:36:51 2012 +0400
@@ -1274,6 +1274,8 @@

// MySQL ping time interval
m_int_configs[CONFIG_DB_PING_INTERVAL] = ConfigMgr::GetIntDefault("MaxPingTime", 30);
+
+ m_bool_configs[CONFIG_LFG_LOCATION_ALL] = ConfigMgr::GetBoolDefault("LFG.Location.All", true);

// misc
m_bool_configs[CONFIG_PDUMP_NO_PATHS] = ConfigMgr::GetBoolDefault("PlayerDump.DisallowPaths", true);
diff -r 37536e6e494d4180e243ddf08bd98e7e3eb1322b -r 14b1cfd493358176e24160d652e4c822b3b8f234 src/server/game/World/World.h
--- a/src/server/game/World/World.h Sat Feb 18 13:30:49 2012 +0400
+++ b/src/server/game/World/World.h Sat Feb 18 13:36:51 2012 +0400
@@ -156,6 +156,7 @@
CONFIG_DUNGEON_FINDER_ENABLE,
CONFIG_AUTOBROADCAST,
CONFIG_ALLOW_TICKETS,
+ CONFIG_LFG_LOCATION_ALL,
CONFIG_DBC_ENFORCE_ITEM_ATTRIBUTES,
CONFIG_PRESERVE_CUSTOM_CHANNELS,
CONFIG_PDUMP_NO_PATHS,
diff -r 37536e6e494d4180e243ddf08bd98e7e3eb1322b -r 14b1cfd493358176e24160d652e4c822b3b8f234 src/server/worldserver/worldserver.conf.dist
--- a/src/server/worldserver/worldserver.conf.dist Sat Feb 18 13:30:49 2012 +0400
+++ b/src/server/worldserver/worldserver.conf.dist Sat Feb 18 13:36:51 2012 +0400
@@ -2846,6 +2846,13 @@

PlayerDump.DisallowOverwrite = 1

+#
+# Includes satellite to search for work elsewhere LFG
+# Default: 0 - Disable
+# 1 - Enable
+
+LFG.Location.All = 0
+
#