diff --git a/sql/mangos.sql b/sql/mangos.sql index 22cd3b98f..14e7eab42 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -14902,7 +14902,7 @@ CREATE TABLE `spell_chain` ( LOCK TABLES `spell_chain` WRITE; /*!40000 ALTER TABLE `spell_chain` DISABLE KEYS */; -INSERT INTO spell_chain VALUES +INSERT INTO `spell_chain` VALUES -- ------------------ -- (0) Not associated with skills -- ------------------ @@ -15010,7 +15010,7 @@ INSERT INTO spell_chain VALUES (42198,42213,42208,7,0), (42937,42198,42208,8,0), (42938,42937,42208,9,0), -/* ConeofCold */ +/* Cone of Cold */ (120,0,120,1,0), (8492,120,120,2,0), (10159,8492,120,3,0), @@ -15019,18 +15019,18 @@ INSERT INTO spell_chain VALUES (27087,10161,120,6,0), (42930,27087,120,7,0), (42931,42930,120,8,0), -/* FrostArmor */ +/* Frost Armor */ (168,0,168,1,0), (7300,168,168,2,0), (7301,7300,168,3,0), -/* FrostNova */ +/* Frost Nova */ (122,0,122,1,0), (865,122,122,2,0), (6131,865,122,3,0), (10230,6131,122,4,0), (27088,10230,122,5,0), (42917,27088,122,6,0), -/* FrostWard */ +/* Frost Ward */ (6143,0,6143,1,0), (8461,6143,6143,2,0), (8462,8461,6143,3,0), @@ -15055,14 +15055,14 @@ INSERT INTO spell_chain VALUES (38697,27072,116,14,0), (42841,38697,116,15,0), (42842,42841,116,16,0), -/* IceArmor */ +/* Ice Armor */ (7302,0,7302,1,0), (7320,7302,7302,2,0), (10219,7320,7302,3,0), (10220,10219,7302,4,0), (27124,10220,7302,5,0), (43008,27124,7302,6,0), -/* IceBarrier */ +/* Ice Barrier */ (11426,0,11426,1,0), (13031,11426,11426,2,0), (13032,13031,11426,3,0), @@ -15071,14 +15071,14 @@ INSERT INTO spell_chain VALUES (33405,27134,11426,6,0), (43038,33405,11426,7,0), (43039,43038,11426,8,0), -/* IceLance */ +/* Ice Lance */ (30455,0,30455,1,0), (42913,30455,30455,2,0), (42914,42913,30455,3,0), -- ------------------ -- (8)Fire -- ------------------ -/*Blast Wave*/ +/* Blast Wave */ (11113,0,11113,1,0), (13018,11113,11113,2,0), (13019,13018,11113,3,0), @@ -15202,7 +15202,7 @@ INSERT INTO spell_chain VALUES (20190,20043,20043,2,0), (27045,20190,20043,3,0), (49071,27045,20043,4,0), -/* MendPet */ +/* Mend Pet */ (136,0,136,1,0), (3111,136,136,2,0), (3661,3111,136,3,0), @@ -15220,7 +15220,7 @@ INSERT INTO spell_chain VALUES -- ------------------ -- (51)Survival -- ------------------ -/*Black Arrow*/ +/* Black Arrow */ (3674,0,3674,1,0), (63668,3674,3674,2,0), (63669,63668,3674,3,0), @@ -15294,7 +15294,7 @@ INSERT INTO spell_chain VALUES (27014,14266,2973,9,0), (48995,27014,2973,10,0), (48996,48995,2973,11,0), -/* WyvernSting */ +/* Wyvern Sting */ (19386,0,19386,1,0), (24132,19386,19386,2,0), (24133,24132,19386,3,0), @@ -15489,14 +15489,14 @@ INSERT INTO spell_chain VALUES /* Mind Sear Trigger */ (49821,0,49821,1,0), (53022,49821,49821,2,0), -/* MindVision */ +/* Mind Vision */ (2096,0,2096,1,0), (10909,2096,2096,2,0), /* Prayer of Shadow Protection */ (27683,0,27683,1,0), (39374,27683,27683,2,0), (48170,39374,27683,3,0), -/* PsychicScream */ +/* Psychic Scream */ (8122,0,8122,1,0), (8124,8122,8122,2,0), (10888,8124,8122,3,0), @@ -15507,12 +15507,12 @@ INSERT INTO spell_chain VALUES (10958,10957,976,3,0), (25433,10958,976,4,0), (48169,25433,976,5,0), -/* ShadowWord:Death */ +/* Shadow Word: Death */ (32379,0,32379,1,0), (32996,32379,32379,2,0), (48157,32996,32379,3,0), (48158,48157,32379,4,0), -/* ShadowWord:Pain */ +/* Shadow Word: Pain */ (589,0,589,1,0), (594,589,589,2,0), (970,594,589,3,0), @@ -15575,7 +15575,7 @@ INSERT INTO spell_chain VALUES (27021,25294,2643,6,0), (49047,27021,2643,7,0), (49048,49047,2643,8,0), -/* SerpentSting */ +/* Serpent Sting */ (1978,0,1978,1,0), (13549,1978,1978,2,0), (13550,13549,1978,3,0), @@ -15588,7 +15588,7 @@ INSERT INTO spell_chain VALUES (27016,25295,1978,10,0), (49000,27016,1978,11,0), (49001,49000,1978,12,0), -/* SteadyShot */ +/* Steady Shot */ (56641,0,56641,1,0), (34120,56641,56641,2,0), (49051,34120,56641,3,0), @@ -15633,7 +15633,7 @@ INSERT INTO spell_chain VALUES -- ------------------ -- (184) Retribution (Paladin) -- ------------------ -/* Blessingof Might */ +/* Blessing of Might */ (19740,0,19740,1,0), (19834,19740,19740,2,0), (19835,19834,19740,3,0), @@ -15757,10 +15757,10 @@ INSERT INTO spell_chain VALUES (10054,10053,759,4,0), (27101,10054,759,5,0), (42985,27101,759,6,0), -/* ConjureRefreshment */ +/* Conjure Refreshment */ (42955,0,42955,1,0), (42956,42955,42955,2,0), -/* ConjureWater */ +/* Conjure Water */ (5504,0,5504,1,0), (5505,5504,5504,2,0), (5506,5505,5504,3,0), @@ -15774,7 +15774,7 @@ INSERT INTO spell_chain VALUES (61024,0,61024,1,27126), /* Dalaran Brilliance */ (61316,0,61316,1,27127), -/* DampenMagic */ +/* Dampen Magic */ (604,0,604,1,0), (8450,604,604,2,0), (8451,8450,604,3,0), @@ -15782,14 +15782,14 @@ INSERT INTO spell_chain VALUES (10174,10173,604,5,0), (33944,10174,604,6,0), (43015,33944,604,7,0), -/* MageArmor */ +/* Mage Armor */ (6117,0,6117,1,0), (22782,6117,6117,2,0), (22783,22782,6117,3,0), (27125,22783,6117,4,0), (43023,27125,6117,5,0), (43024,43023,6117,6,0), -/* ManaShield */ +/* Mana Shield */ (1463,0,1463,1,0), (8494,1463,1463,2,0), (8495,8494,1463,3,0), @@ -15804,13 +15804,13 @@ INSERT INTO spell_chain VALUES (12824,118,118,2,0), (12825,12824,118,3,0), (12826,12825,118,4,0), -/* RitualofRefreshment */ +/* Ritual of Refreshment */ (43987,0,43987,1,0), (58659,43987,43987,2,0), -- ------------------ -- (267) Protection (Paladin) -- ------------------ -/* Avenger'sShield */ +/* Avenger's Shield */ (31935,0,31935,1,0), (32699,31935,31935,2,0), (32700,32699,31935,3,0), @@ -15822,12 +15822,12 @@ INSERT INTO spell_chain VALUES /* Greater Blessing of Sanctuary */ (20911,0,20911,1,0), (25899,20911,20911,2,0), -/* HammerofJustice */ +/* Hammer of Justice */ (853,0,853,1,0), (5588,853,853,2,0), (5589,5588,853,3,0), (10308,5589,853,4,0), -/* HandofProtection */ +/* Hand of Protection */ (1022,0,1022,1,0), (5599,1022,1022,2,0), (10278,5599,1022,3,0), @@ -15847,7 +15847,7 @@ INSERT INTO spell_chain VALUES /* Banish */ (710,0,710,1,0), (18647,710,710,2,0), -/* CreateFirestone */ +/* Create Firestone */ (6366,0,6366,1,0), (17951,6366,6366,2,0), (17952,17951,6366,3,0), @@ -15855,7 +15855,7 @@ INSERT INTO spell_chain VALUES (27250,17953,6366,5,0), (60219,27250,6366,6,0), (60220,60219,6366,7,0), -/* CreateHealthstone */ +/* Create Healthstone */ (6201,0,6201,1,0), (6202,6201,6201,2,0), (5699,6202,6201,3,0), @@ -15864,7 +15864,7 @@ INSERT INTO spell_chain VALUES (27230,11730,6201,6,0), (47871,27230,6201,7,0), (47878,47871,6201,8,0), -/* CreateSoulstone */ +/* Create Soulstone */ (693,0,693,1,0), (20752,693,693,2,0), (20755,20752,693,3,0), @@ -15872,14 +15872,14 @@ INSERT INTO spell_chain VALUES (20757,20756,693,5,0), (27238,20757,693,6,0), (47884,27238,693,7,0), -/* CreateSpellstone */ +/* Create Spellstone */ (2362,0,2362,1,0), (17727,2362,2362,2,0), (17728,17727,2362,3,0), (28172,17728,2362,4,0), (47886,28172,2362,5,0), (47888,47886,2362,6,0), -/* DemonArmor */ +/* Demon Armor */ (706,0,706,1,0), (1086,706,706,2,0), (11733,1086,706,3,0), @@ -15888,20 +15888,20 @@ INSERT INTO spell_chain VALUES (27260,11735,706,6,0), (47793,27260,706,7,0), (47889,47793,706,8,0), -/* DemonSkin */ +/* Demon Skin */ (687,0,687,1,0), (696,687,687,2,0), -/* EnslaveDemon */ +/* Enslave Demon */ (1098,0,1098,1,0), (11725,1098,1098,2,0), (11726,11725,1098,3,0), (61191,11726,1098,4,0), -/* FelArmor */ +/* Fel Armor */ (28176,0,28176,1,0), (28189,28176,28176,2,0), (47892,28189,28176,3,0), (47893,47892,28176,4,0), -/* HealthFunnel */ +/* Health Funnel */ (755,0,755,1,0), (3698,755,755,2,0), (3699,3698,755,3,0), @@ -15911,10 +15911,10 @@ INSERT INTO spell_chain VALUES (11695,11694,755,7,0), (27259,11695,755,8,0), (47856,27259,755,9,0), -/* RitualofSouls */ +/* Ritual of Souls */ (29893,0,29893,1,0), (58887,29893,29893,2,0), -/* ShadowWard */ +/* Shadow Ward */ (6229,0,6229,1,0), (11739,6229,6229,2,0), (11740,11739,6229,3,0), @@ -15969,7 +15969,7 @@ INSERT INTO spell_chain VALUES (30909,27224,702,8,0), (50511,30909,702,9,0), /* Dark Pact */ -(18220,0, 18220,1,0), +(18220,0,18220,1,0), (18937,18220,18220,2,0), (18938,18937,18220,3,0), (27265,18938,18220,4,0), @@ -16132,7 +16132,7 @@ INSERT INTO spell_chain VALUES (25528,25361,8075,6,0), (57622,25528,8075,7,0), (58643,57622,8075,8,0), -/* WindfuryWeapon */ +/* Windfury Weapon */ (8232,0,8232,1,0), (8235,8232,8232,2,0), (10486,8235,8232,3,0), @@ -16144,7 +16144,7 @@ INSERT INTO spell_chain VALUES -- ------------------ -- (374) Restoration (Shaman) -- ------------------ -/* AncestralSpirit */ +/* Ancestral Spirit */ (2008,0,2008,1,0), (20609,2008,2008,2,0), (20610,20609,2008,3,0), @@ -16152,7 +16152,7 @@ INSERT INTO spell_chain VALUES (20777,20776,2008,5,0), (25590,20777,2008,6,0), (49277,25590,2008,7,0), -/* ChainHeal */ +/* Chain Heal */ (1064,0,1064,1,0), (10622,1064,1064,2,0), (10623,10622,1064,3,0), @@ -16160,20 +16160,20 @@ INSERT INTO spell_chain VALUES (25423,25422,1064,5,0), (55458,25423,1064,6,0), (55459,55458,1064,7,0), -/* EarthShield */ +/* Earth Shield */ (974,0,974,1,0), (32593,974,974,2,0), (32594,32593,974,3,0), (49283,32594,974,4,0), (49284,49283,974,5,0), -/* EarthlivingWeapon */ +/* Earthliving Weapon */ (51730,0,51730,1,0), (51988,51730,51730,2,0), (51991,51988,51730,3,0), (51992,51991,51730,4,0), (51993,51992,51730,5,0), (51994,51993,51730,6,0), -/* HealingStreamTotem */ +/* Healing Stream Totem */ (5394,0,5394,1,0), (6375,5394,5394,2,0), (6377,6375,5394,3,0), @@ -16183,7 +16183,7 @@ INSERT INTO spell_chain VALUES (58755,25567,5394,7,0), (58756,58755,5394,8,0), (58757,58756,5394,9,0), -/* HealingWave */ +/* Healing Wave */ (331,0,331,1,0), (332,331,331,2,0), (547,332,331,3,0), @@ -16198,7 +16198,7 @@ INSERT INTO spell_chain VALUES (25396,25391,331,12,0), (49272,25396,331,13,0), (49273,49272,331,14,0), -/* LesserHealingWave */ +/* Lesser Healing Wave */ (8004,0,8004,1,0), (8008,8004,8004,2,0), (8010,8008,8004,3,0), @@ -16347,12 +16347,12 @@ INSERT INTO spell_chain VALUES -- ------------------ -- (573)Restoration -- ------------------ -/* GiftoftheWild */ +/* Gift of the Wild */ (21849,0,21849,1,0), (21850,21849,21849,2,0), (26991,21850,21849,3,0), (48470,26991,21849,4,0), -/* HealingTouch */ +/* Healing Touch */ (5185,0,5185,1,0), (5186,5185,5185,2,0), (5187,5186,5185,3,0), @@ -16372,7 +16372,7 @@ INSERT INTO spell_chain VALUES (33763,0,33763,1,0), (48450,33763,33763,2,0), (48451,48450,33763,3,0), -/* MarkoftheWild */ +/* Mark of the Wild */ (1126,0,1126,1,0), (5232,1126,1126,2,0), (6756,5232,1126,3,0), @@ -16436,7 +16436,7 @@ INSERT INTO spell_chain VALUES (48446,26983,740,6,0), (48447,48446,740,7,0), /* Tranquility Triggered */ -(44203, 0,44203,1,0), +(44203,0,44203,1,0), (44205,44203,44203,2,0), (44206,44205,44203,3,0), (44207,44206,44203,4,0), @@ -16451,7 +16451,7 @@ INSERT INTO spell_chain VALUES -- ------------------ -- (574)Balance -- ------------------ -/* EntanglingRoots */ +/* Entangling Roots */ (339,0,339,1,0), (1062,339,339,2,0), (5195,1062,339,3,0), @@ -16460,7 +16460,7 @@ INSERT INTO spell_chain VALUES (9853,9852,339,6,0), (26989,9853,339,7,0), (53308,26989,339,8,0), -/* Nature'sGrasp */ +/* Nature's Grasp */ (16689,0,16689,1,339), (16810,16689,16689,2,1062), (16811,16810,16689,3,5195), @@ -16480,7 +16480,7 @@ INSERT INTO spell_chain VALUES (27012,17402,16914,4,0), (48467,27012,16914,5,0), /* Hurricane Triggered */ -(42231, 0,42231,1,0), +(42231,0,42231,1,0), (42232,42231,42231,2,0), (42233,42232,42231,3,0), (42230,42233,42231,4,0), @@ -16671,7 +16671,7 @@ INSERT INTO spell_chain VALUES (30414,30413,30283,3,0), (47846,30414,30283,4,0), (47847,47846,30283,5,0), -/* SoulFire */ +/* Soul Fire */ (6353,0,6353,1,0), (17924,6353,6353,2,0), (27211,17924,6353,3,0), @@ -16781,17 +16781,17 @@ INSERT INTO spell_chain VALUES -- ------------------ -- (613)Discipline -- ------------------ -/* DispelMagic */ +/* Dispel Magic*/ (527,0,527,1,0), (988,527,527,2,0), -/* DivineSpirit */ +/* Divine Spirit */ (14752,0,14752,1,0), (14818,14752,14752,2,0), (14819,14818,14752,3,0), (27841,14819,14752,4,0), (25312,27841,14752,5,0), (48073,25312,14752,6,0), -/* InnerFire */ +/* Inner Fire */ (588,0,588,1,0), (7128,588,588,2,0), (602,7128,588,3,0), @@ -16816,7 +16816,7 @@ INSERT INTO spell_chain VALUES (52983,47750,47750,2,0), (52984,52983,47750,3,0), (52985,52984,47750,4,0), -/* PowerWord:Fortitude */ +/* Power Word: Fortitude */ (1243,0,1243,1,0), (1244,1243,1243,2,0), (1245,1244,1243,3,0), @@ -16825,7 +16825,7 @@ INSERT INTO spell_chain VALUES (10938,10937,1243,6,0), (25389,10938,1243,7,0), (48161,25389,1243,8,0), -/* PowerWord:Shield */ +/* Power Word: Shield */ (17,0,17,1,0), (592,17,17,2,0), (600,592,17,3,0), @@ -16840,7 +16840,7 @@ INSERT INTO spell_chain VALUES (25218,25217,17,12,0), (48065,25218,17,13,0), (48066,48065,17,14,0), -/* PrayerofFortitude */ +/* Prayer of Fortitude */ (21562,0,21562,1,0), (21564,21562,21562,2,0), (25392,21564,21562,3,0), @@ -16849,7 +16849,7 @@ INSERT INTO spell_chain VALUES (27681,14752,14752,2,0), (32999,27681,14752,3,0), (48074,32999,14752,4,0), -/* ShackleUndead */ +/* Shackle Undead */ (9484,0,9484,1,0), (9485,9484,9484,2,0), (10955,9485,9484,3,0), @@ -16865,7 +16865,7 @@ INSERT INTO spell_chain VALUES -- ------------------ -- (771)Frost -- ------------------ -/* HornofWinter */ +/* Horn of Winter */ (57330,0,57330,1,0), (57623,57330,57330,2,0), /* Howling Blast */ @@ -17179,6 +17179,7 @@ UNLOCK TABLES; -- -- Table structure for table `spell_proc_event` -- + DROP TABLE IF EXISTS `spell_proc_event`; CREATE TABLE `spell_proc_event` ( `entry` mediumint(8) unsigned NOT NULL DEFAULT '0', diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp index 0f4d43dea..883223800 100644 --- a/src/game/BattleGround.cpp +++ b/src/game/BattleGround.cpp @@ -217,7 +217,7 @@ BattleGround::BattleGround() m_InvitedHorde = 0; m_ArenaType = ARENA_TYPE_NONE; m_IsArena = false; - m_Winner = 2; + m_Winner = TEAM_NONE; m_StartTime = 0; m_Events = 0; m_IsRated = false; @@ -687,21 +687,15 @@ void BattleGround::EndBattleGround(Team winner) winmsg_id = isBattleGround() ? LANG_BG_A_WINS : LANG_ARENA_GOLD_WINS; PlaySoundToAll(SOUND_ALLIANCE_WINS); // alliance wins sound - - SetWinner(WINNER_ALLIANCE); } else if (winner == HORDE) { winmsg_id = isBattleGround() ? LANG_BG_H_WINS : LANG_ARENA_GREEN_WINS; PlaySoundToAll(SOUND_HORDE_WINS); // horde wins sound + } - SetWinner(WINNER_HORDE); - } - else - { - SetWinner(3); - } + SetWinner(winner); SetStatus(STATUS_WAIT_LEAVE); //we must set it this way, because end time is sent in packet! @@ -1125,7 +1119,7 @@ void BattleGround::RemovePlayerAtLeave(ObjectGuid guid, bool Transport, bool Sen // this method is called when no players remains in battleground void BattleGround::Reset() { - SetWinner(WINNER_NONE); + SetWinner(TEAM_NONE); SetStatus(STATUS_WAIT_QUEUE); SetStartTime(0); SetEndTime(0); diff --git a/src/game/BattleGround.h b/src/game/BattleGround.h index 74ddaa047..6e4170b59 100644 --- a/src/game/BattleGround.h +++ b/src/game/BattleGround.h @@ -201,13 +201,6 @@ enum BattleGroundType TYPE_ARENA = 4 }; -enum BattleGroundWinner -{ - WINNER_HORDE = 0, - WINNER_ALLIANCE = 1, - WINNER_NONE = 2 -}; - enum BattleGroundTeamIndex { BG_TEAM_ALLIANCE = 0, @@ -323,7 +316,7 @@ class BattleGround int32 GetStartDelayTime() const { return m_StartDelayTime; } ArenaType GetArenaType() const { return m_ArenaType; } - uint8 GetWinner() const { return m_Winner; } + Team GetWinner() const { return m_Winner; } uint32 GetBattlemasterEntry() const; uint32 GetBonusHonorFromKill(uint32 kills) const; @@ -342,7 +335,7 @@ class BattleGround void SetRated(bool state) { m_IsRated = state; } void SetArenaType(ArenaType type) { m_ArenaType = type; } void SetArenaorBGType(bool _isArena) { m_IsArena = _isArena; } - void SetWinner(uint8 winner) { m_Winner = winner; } + void SetWinner(Team winner) { m_Winner = winner; } void ModifyStartDelayTime(int diff) { m_StartDelayTime -= diff; } void SetStartDelayTime(int Time) { m_StartDelayTime = Time; } @@ -580,7 +573,7 @@ class BattleGround ArenaType m_ArenaType; // 2=2v2, 3=3v3, 5=5v5 bool m_InBGFreeSlotQueue; // used to make sure that BG is only once inserted into the BattleGroundMgr.BGFreeSlotQueue[bgTypeId] deque bool m_IsArena; - uint8 m_Winner; // 0=alliance, 1=horde, 2=none + Team m_Winner; int32 m_StartDelayTime; bool m_IsRated; // is this battle rated? bool m_PrematureCountDown; diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp index 85bf947a6..486288313 100644 --- a/src/game/BattleGroundMgr.cpp +++ b/src/game/BattleGroundMgr.cpp @@ -1317,11 +1317,12 @@ void BattleGroundMgr::BuildPvpLogDataPacket(WorldPacket *data, BattleGround *bg) } else { - Player *plr = sObjectMgr.GetPlayer(itr->first); Team team = bg->GetPlayerTeam(itr->first); - if (!team && plr) - team = plr->GetTeam(); - if (( bg->GetWinner()==0 && team == ALLIANCE ) || ( bg->GetWinner()==1 && team==HORDE )) + if (!team) + if (Player* player = sObjectMgr.GetPlayer(itr->first)) + team = player->GetTeam(); + + if (bg->GetWinner() == team && team != TEAM_NONE) *data << uint8(1); else *data << uint8(0); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index ea0c132fe..cfe43534f 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 "12013" + #define REVISION_NR "12014" #endif // __REVISION_NR_H__