diff options
| -rw-r--r-- | sql/characters.sql | 2 | ||||
| -rw-r--r-- | sql/mangos.sql | 12 | ||||
| -rw-r--r-- | src/game/BattleGroundMgr.cpp | 12 | ||||
| -rw-r--r-- | src/game/BattleGroundMgr.h | 3 | ||||
| -rw-r--r-- | src/game/Chat.cpp | 1 | ||||
| -rw-r--r-- | src/game/Chat.h | 1 | ||||
| -rw-r--r-- | src/game/Debugcmds.cpp | 6 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
8 files changed, 30 insertions, 9 deletions
diff --git a/sql/characters.sql b/sql/characters.sql index c1159d1bd47..4cd29afd9d6 100644 --- a/sql/characters.sql +++ b/sql/characters.sql @@ -21,7 +21,7 @@ DROP TABLE IF EXISTS `character_db_version`; CREATE TABLE `character_db_version` ( - `required_7207_03_characters_corpse` bit(1) default NULL + `required_7251_02_characters_character_spell` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB'; -- diff --git a/sql/mangos.sql b/sql/mangos.sql index b3093d85bc3..e8b4dc98f74 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -22,7 +22,7 @@ DROP TABLE IF EXISTS `db_version`; CREATE TABLE `db_version` ( `version` varchar(120) default NULL, - `required_7249_01_mangos_spell_proc_event` bit(1) default NULL + `required_7251_01_mangos_spell_chain` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -15934,11 +15934,11 @@ INSERT INTO spell_chain VALUES (49937,49936,43265,3,0), (49938,49937,43265,4,0), /*DeathCoil*/ -(52375,0,52375,1,0), -(49892,52375,52375,2,0), -(49893,49892,52375,3,0), -(49894,49893,52375,4,0), -(49895,49894,52375,5,0), +(47541,0,47541,1,0), +(49892,47541,47541,2,0), +(49893,49892,47541,3,0), +(49894,49893,47541,4,0), +(49895,49894,47541,5,0), /*DeathStrike*/ (49998,0,49998,1,0), (49999,49998,49998,2,0), diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp index 90b7c2a02a8..83d2373ebe2 100644 --- a/src/game/BattleGroundMgr.cpp +++ b/src/game/BattleGroundMgr.cpp @@ -675,7 +675,7 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, uint32 queue_id, uin sLog.outDebug("Battleground: horde pool wasn't created"); // if selection pools are ready, create the new bg - if (bAllyOK && bHordeOK) + if ((bAllyOK && bHordeOK) || ( sBattleGroundMgr.isTesting() && (bAllyOK || bHordeOK))) { BattleGround * bg2 = 0; // special handling for arenas @@ -1031,6 +1031,7 @@ BattleGroundMgr::BattleGroundMgr() : m_AutoDistributionTimeChecker(0), m_ArenaTe { m_BattleGrounds.clear(); m_NextRatingDiscardUpdate = sWorld.getConfig(CONFIG_ARENA_RATING_DISCARD_TIMER); + m_Testing=false; } BattleGroundMgr::~BattleGroundMgr() @@ -1848,6 +1849,15 @@ uint8 BattleGroundMgr::BGArenaType(uint32 bgQueueTypeId) } } +void BattleGroundMgr::ToggleTesting() +{ + m_Testing = !m_Testing; + if(m_Testing) + sWorld.SendGlobalText("Battlegrounds are set to 1v0 for debugging.", NULL); + else + sWorld.SendGlobalText("Battlegrounds are set to normal playercount.", NULL); +} + void BattleGroundMgr::ToggleArenaTesting() { m_ArenaTesting = !m_ArenaTesting; diff --git a/src/game/BattleGroundMgr.h b/src/game/BattleGroundMgr.h index d9b517fc23b..578c9c3fe01 100644 --- a/src/game/BattleGroundMgr.h +++ b/src/game/BattleGroundMgr.h @@ -224,6 +224,7 @@ class BattleGroundMgr void InitAutomaticArenaPointDistribution(); void DistributeArenaPoints(); void ToggleArenaTesting(); + void ToggleTesting(); void SetHolidayWeekends(uint32 mask); void LoadBattleMastersEntry(); @@ -236,6 +237,7 @@ class BattleGroundMgr } bool isArenaTesting() const { return m_ArenaTesting; } + bool isTesting() const { return m_Testing; } static bool IsArenaType(BattleGroundTypeId bgTypeId); static bool IsBattleGroundType(BattleGroundTypeId bgTypeId) { return !BattleGroundMgr::IsArenaType(bgTypeId); } @@ -251,6 +253,7 @@ class BattleGroundMgr uint64 m_NextAutoDistributionTime; uint32 m_AutoDistributionTimeChecker; bool m_ArenaTesting; + bool m_Testing; }; #define sBattleGroundMgr Trinity::Singleton<BattleGroundMgr>::Instance() diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index 1fb6bad508e..42ea2724619 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -226,6 +226,7 @@ ChatCommand * ChatHandler::getCommandTable() { "anim", SEC_GAMEMASTER, false, &ChatHandler::HandleAnimCommand, "", NULL }, { "lootrecipient", SEC_GAMEMASTER, false, &ChatHandler::HandleGetLootRecipient, "", NULL }, { "arena", SEC_ADMINISTRATOR, false, &ChatHandler::HandleDebugArenaCommand, "", NULL }, + { "bg", SEC_ADMINISTRATOR, false, &ChatHandler::HandleDebugBattlegroundCommand, "", NULL }, { "sendlargepacket",SEC_ADMINISTRATOR, false, &ChatHandler::HandleSendLargePacketCommand, "", NULL }, { NULL, 0, false, NULL, "", NULL } }; diff --git a/src/game/Chat.h b/src/game/Chat.h index 111f8163093..da5cf93d397 100644 --- a/src/game/Chat.h +++ b/src/game/Chat.h @@ -496,6 +496,7 @@ class ChatHandler bool HandleUnPossessCommand(const char* args); bool HandleBindSightCommand(const char* args); bool HandleUnbindSightCommand(const char* args); + bool HandleDebugBattlegroundCommand(const char * args); bool HandleSpawnVehicle(const char * args); bool HandleSendLargePacketCommand(const char * args); diff --git a/src/game/Debugcmds.cpp b/src/game/Debugcmds.cpp index 22b7fb389fb..60f1536963f 100644 --- a/src/game/Debugcmds.cpp +++ b/src/game/Debugcmds.cpp @@ -535,6 +535,12 @@ bool ChatHandler::HandleGetItemState(const char* args) return true; } +bool ChatHandler::HandleDebugBattlegroundCommand(const char * /*args*/) +{ + sBattleGroundMgr.ToggleTesting(); + return true; +} + bool ChatHandler::HandleDebugArenaCommand(const char * /*args*/) { sBattleGroundMgr.ToggleArenaTesting(); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index a14834d0866..a1df9c63aca 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7250" + #define REVISION_NR "7251" #endif // __REVISION_NR_H__ |