diff --git a/data/sql/updates/db_world/2024_04_14_03.sql b/data/sql/updates/db_world/2024_04_14_03.sql new file mode 100644 index 000000000..c067cb882 --- /dev/null +++ b/data/sql/updates/db_world/2024_04_14_03.sql @@ -0,0 +1,47 @@ +-- DB update 2024_04_14_02 -> 2024_04_14_03 +-- +UPDATE `creature` SET `comment` = 'GUID SAI - Mechanar Bridge Event Stage 1 Wave 1' WHERE `guid` = 138817; +UPDATE `creature` SET `comment` = 'GUID SAI - Mechanar Bridge Event Stage 1 Wave 1' WHERE `guid` = 138818; +UPDATE `creature` SET `comment` = 'GUID SAI - Mechanar Bridge Event Stage 2 Wave 1' WHERE `guid` = 138819; +UPDATE `creature` SET `comment` = 'GUID SAI, SAI Target - Mechanar Bridge Event Stage 2 Wave 3' WHERE `guid` = 138820; +UPDATE `creature` SET `comment` = 'GUID SAI - Mechanar Bridge Event Stage 1 Wave 1' WHERE `guid` = 138831; +UPDATE `creature` SET `comment` = 'GUID SAI, SAI Target - Mechanar Bridge Event Stage 1 Wave 2' WHERE `guid` = 138863; +UPDATE `creature` SET `comment` = 'GUID SAI, SAI Target - Mechanar Bridge Event Stage 2 Wave 2' WHERE `guid` = 138864; +UPDATE `creature` SET `comment` = 'GUID SAI, SAI Target - Mechanar Bridge Event Stage 2 Wave 3' WHERE `guid` = 138869; +UPDATE `creature` SET `comment` = 'GUID SAI, SAI Target - Mechanar Bridge Event Stage 1 Wave 3' WHERE `guid` = 138876; +UPDATE `creature` SET `comment` = 'GUID SAI, SAI Target - Mechanar Bridge Event Stage 1 Wave 3' WHERE `guid` = 138877; +UPDATE `creature` SET `comment` = 'GUID SAI - Mechanar Bridge Event Stage 2 Wave 1' WHERE `guid` = 138878; +UPDATE `creature` SET `comment` = 'GUID SAI, SAI Target - Mechanar Bridge Event Stage 2 Wave 3' WHERE `guid` = 138879; +UPDATE `creature` SET `comment` = 'GUID SAI - Mechanar Bridge Event Stage 1 Wave 1' WHERE `guid` = 138890; +UPDATE `creature` SET `comment` = 'GUID SAI, SAI Target - Mechanar Bridge Event Stage 1 Wave 3' WHERE `guid` = 138891; +UPDATE `creature` SET `comment` = 'GUID SAI - Mechanar Bridge Event Stage 2 Wave 1' WHERE `guid` = 138892; +UPDATE `creature` SET `comment` = 'GUID SAI, SAI Target - Mechanar Bridge Event Stage 2 Wave 3' WHERE `guid` = 138893; +UPDATE `creature` SET `comment` = 'GUID SAI - Original Orientation: 3.141592741012573242' WHERE `guid` = 146209; +UPDATE `creature` SET `comment` = 'GUID SAI, SAI Target, Condition Target - Shattered Halls Legionnaire Gauntlet Group 1' WHERE `guid` = 151019; +UPDATE `creature` SET `comment` = 'GUID SAI - Shattered Halls Legionnaire Gauntlet Group 1' WHERE `guid` = 151020; +UPDATE `creature` SET `comment` = 'GUID SAI - Shattered Halls Legionnaire Gauntlet Group 1' WHERE `guid` = 151021; +UPDATE `creature` SET `comment` = 'GUID SAI - Shattered Halls Legionnaire Gauntlet Group 1' WHERE `guid` = 151022; +UPDATE `creature` SET `comment` = 'GUID SAI - Shattered Halls Legionnaire Gauntlet Group 1' WHERE `guid` = 151023; +UPDATE `creature` SET `comment` = 'GUID SAI, Condition Target - Shattered Halls Legionnaire Gauntlet Group 2' WHERE `guid` = 151024; +UPDATE `creature` SET `comment` = 'GUID SAI - Shattered Halls Legionnaire Gauntlet Group 2' WHERE `guid` = 151025; +UPDATE `creature` SET `comment` = 'GUID SAI - Shattered Halls Legionnaire Gauntlet Group 2' WHERE `guid` = 151026; +UPDATE `creature` SET `comment` = 'GUID SAI - Shattered Halls Legionnaire Gauntlet Group 2' WHERE `guid` = 151027; +UPDATE `creature` SET `comment` = 'GUID SAI - Shattered Halls Legionnaire Gauntlet Group 2' WHERE `guid` = 151028; +UPDATE `creature` SET `comment` = 'GUID SAI, Condition Target - Shattered Halls Legionnaire Gauntlet Group 3' WHERE `guid` = 151029; +UPDATE `creature` SET `comment` = 'GUID SAI - Shattered Halls Legionnaire Gauntlet Group 3' WHERE `guid` = 151030; +UPDATE `creature` SET `comment` = 'GUID SAI - Shattered Halls Legionnaire Gauntlet Group 3' WHERE `guid` = 151031; +UPDATE `creature` SET `comment` = 'GUID SAI - Shattered Halls Legionnaire Gauntlet Group 3' WHERE `guid` = 151032; +UPDATE `creature` SET `comment` = 'GUID SAI - Shattered Halls Legionnaire Gauntlet Group 3' WHERE `guid` = 151033; +UPDATE `creature` SET `comment` = 'GUID SAI - Shattered Halls Legionnaire Gauntlet Group 3' WHERE `guid` = 151034; +UPDATE `creature` SET `comment` = 'GUID SAI, SAI Target - Tempest Keep Entrance Scripted Patrol' WHERE `guid` = 158000; +UPDATE `creature` SET `comment` = 'GUID SAI - Tempest Keep Falconer Scripted Patrol' WHERE `guid` = 158021; +UPDATE `creature` SET `comment` = 'GUID SAI - Tempest Keep Falconer Scripted Patrol' WHERE `guid` = 158029; + +UPDATE `creature` SET `comment` = 'GUID SAI' WHERE `guid` IN (139532,139533,139538,139539,139546,139547,153022,153023,153024,153031,153032,153033,153040,153041,153042,153049,153050,153051,153058,153059,153060,153067,153068,153069,153102,153103,153107,153108,158072,158073,158074,158079,158084,158088,3345,3346,3347,3348,6523,6524,6525,6526,6527,7372,7373,7374,7375,7376,11212,12481,13751,16238,16239,16240,16241,19403,21707,23426,23429,23432,23433,23436,23437,23438,23439,23440,23712,23713,23714,23715,23716,25065,25120,25121,25122,25123,25124,27554,27555,27794,28368,28654,28655,28656,28657,31268,31271,39745,42875,42876,43456,43457,43458,44268,45537,45570,45571,47704,47708,47712,47716,47717,47721,47725,47729,48172,52144,52330,53790,53927,53928,53955,53963,53968,54069,54079,54204,54219,54994,54996,55062,55064,55065,56028,56029,57492,57542,57543,57890,57891,58137,58449,58450,58451,61966,61994,61995,61996,62851,62852,62853,62854,63548,63549,63582,63583,63584,63585,63690,63691,63693,63694,63695,63697,64950,64951,64952,64953,65612,65622,65623,65631,65632,65633,65694,65695,65696,65697,65698,65699,65700,65702,68293,68311,68312,68313,68314,68744,69122,69123,69124,69125,69126,69127,69714,69715,69716,69725,70100,70101,70103,70104,70107,70108,70109,70110,70111,70612,70613,70614,70615,71997,71998,71999,74081,74082,74506,74507,74508,74518,74519,74520,74522,74523,74524,74528,74529,74530,74531,74532,74533,74534,74535,74536,74537,74538,74618,74651,74662,74948,74949,74950,74951,75104,75105,75106,75734,75735,75736,75737,75738,75739,76351,76353,76354,76355,76358,76360,76362,76364,76365,76366,76367,76368,76369,76370,76371,76374,76375,76742,77757,78496,79399,80152,80184,80188,80201,81626,81627,81628,82289,82291,82824,82826,82863,82871,82874,82886,82903,82927,83106,83503,83504,83505,83512,83513,83518,83631,83632,83704,83705,84603,84605,84606,84614,84615,84616,84660,84661,84664,84665,84989,85098,85118,85175,85176,88701,88702,88703,88704,88779,88780,88781,88782,88783,88784,88785,88786,88787,88788,88789,88790,88791,88792,90884,90985,90986,90987,91064,91247,91248,91249,96556,96595,96596,96600,96603,96604,96610,96611,96612,97862,97863,97869,97872,98042,98043,98174,98534,98535,98537,98539,98550,98551,98562,98564,98575,98576,98599,98617,100088,100089,100090,100091,100092,100093,100094,100095,100333,100334,100335,100336,102199,102326,102327,102328,102329,102330,102333,102341,102741,102745,103996,103997,103998,103999,104000,104001,104002,104003,104004,104005,104006,104007,104008,104065,104066,104068,104069,104070,104071,105309,105315,105316,105487,105488,105489,105495,105869,105870,105871,105872,105997,106069,107574,107575,107662,108034,108035,108036,108037,109558,109559,109560,109561,109563,109564,109565,109569,109570,109571,109572,109573,109574,109575,109576,109577,109578,109652,109653,109654,109655,110263,110276,110298,111145,111146,111147,111377,111378,111379,111380,111382,111383,111726,111742,111746,112848,112853,112854,112858,112860,112874,112879,113473,113478,113481,113482,113483,113548,113549,113551,113558,113874,113876,113878,113879,113880,113881,114098,114101,114109,114110,114111,114112,114115,114829,114831,115920,115921,115922,115923,115924,115925,115926,115927,115945,115946,115947,115948,115958,115959,115973,115974,115975,115976,116602,117197,117205,117305,117306,117307,117309,117788,117794,118375,118405,118407,118408,118409,118421,118422,118423,118425,118426,118427,118428,118429,118614,118615,118616,118617,118618,118746,118747,118748,118803,118804,119784,119944,119945,119947,119949,119951,119968,119991,121192,121544,121545,121546,121547,121548,121549,121550,121555,121556,121557,121558,121563,121615,121616,121617,121618,121619,121620,121621,121622,121623,121624,121625,121626,121627,121628,124405,124406,124967,124968,124969,124970,124971,124972,124973,124974,124975,124976,124977,124978,124979,124980,124981,124982,124983,124984,124985,124986,124987,124988,124989,124990,124991,124992,124993,124994,124995,124996,124997,124998,124999,125000,125001,125002,126160,126235,126236,126237,126238,126434,126435,126436,126437,126438,126439,127203,127410,127420,127493,127495,127496,127497,127596,129390,129391,130405,131055,131056,131058,131059,135351,135352,135354,135356,135359,135362,135367,135368,135370,135373,135376,135377,136271,136348,136523,136524,136525,136526,136527,136537,136538,136539,136545,136546,136552,136553,137507,137508,137509,138519,138520,138521,138522,138523,138801,138803,138901,138902,138907,138909,138910,138916,138918,138920,138922,138924,138927,138930,138937,138938,138940,138945,138949,142040,142046,142071,142072,142116,142120,142122,142407,142408,146029,146035,146036,146050,146058,146059,146066,146074,146075,146089,146090,146093,146095,146096,146097,146099,146136,146137,146138,146139,146140,146141,146142,146143,146144,146145,146146,146147,146148,146149,146150,146151,146152,146153,146154,146155,146179,146206,146207,146208,146210,146211,146212,146213,146214,146215,146216,146217,146218,146219,146220,146221,146222,146223,146224,146225,146226,146227,146228,146229,147005,147006,147007,147014,147015,147018,147019,147020,147021,147022,147023,147024,147025,147026,147027,147028,147029,147030,147031,147032,147034,147035,147039,147040,147041,147051,147052,147058,147065,147066,147090,147091,147094,147095,148267,148268,148272,148287,148289,148290,148291,148292,148293,148294,148295,148296,148309,148310,148314,148315,148316,148360,148365,148367,148368,148370,148371,148372,148373,148374,148375,148376,148377,148378,148418,148419,148420,148421,148422,148423,148537,148538,148539,148540,148552,148563,148567,148571,148572,148576,148577,148580,148586,148589,148592,148602,148603,148608,148610,148618,148623,148627,148628,148629,148637,148638,148639,148640,148641,148646,148647,148649,148651,148656,148660,148675,148692,148697,148698,148699,148700,148701,148702,148703,148704,148705,148706,148707,148708,148709,148710,148711,148712,148713,148714,151000,151001,151002,151003,151004,151005,151008,151009,151010,151011,151012,151013,151014,151015,151016,151017,151018,151035,151036,151037,151038,151039,151040,151041,151042,151043,151044,151045,151090,151091,151092,151093,151131,151137,151144,151145,151146,151147,151149,151150,151151,151152,151154,151155,151156,151157,151159,151160,151161,151162,151163,151165,151167,151169,151171,151173,151284,151285,151286,151287,151288,151289,151290,151291,152070,152071,152072,152073,152076,152077,152079,200011,200012,200966,200987,201043,201066,201108,201130,201479,201482,201646,201659,201686,201800,202279,202280,202283,202284,202285,202286,202287,202288,202337,202405,202775,202776,202777,202778,203372,203373,203457,209019,209020,209021,209022,209023,209024,209025,209026,209153,209154,209155,209156,209157,209158,209187,209188,239022,239023,239024,239025,239026,239027,239028,239029,239030,245800,245801,246904,246915,247235,247236); + +UPDATE `creature` SET `comment` = 'SAI Target' WHERE `guid` IN (158005,158009,158017,1219,3254,4180,4182,4185,4194,5799,5937,5938,5960,6127,6133,8279,9432,10873,11235,13772,14007,15891,15892,15893,19428,20588,21145,21549,21563,21680,21681,21682,23427,24762,25119,25125,29979,31075,32783,36625,45501,45841,48191,48230,48937,49141,49142,50062,50063,50064,50065,50066,50067,50068,50069,50070,50071,50072,50073,53171,53937,56027,57487,57906,58455,58457,58461,58462,59238,59240,59473,59515,60157,60159,60165,60166,60167,61963,62841,62842,62843,62844,62921,63509,63692,63696,65554,65672,65673,65674,66480,68291,68635,68745,68758,70009,70102,70166,70376,70377,70731,70967,70975,71631,72910,73132,73864,74239,74619,74872,76000,77086,77278,78289,78738,78759,78837,78838,78839,78840,79267,79337,79450,79700,79702,79815,79816,79817,80151,80185,80189,80200,81519,81524,83459,83685,83686,83689,83690,83691,83692,84028,84085,84386,85140,85222,85226,85322,86039,86053,86056,86596,86597,87023,87082,87088,87089,87090,87091,87092,88793,88794,88795,88796,88797,88798,88799,88800,88801,88802,88803,88804,88805,88806,89294,90439,90440,90443,90984,91250,91254,95366,95460,96298,98229,99764,100797,101497,101661,101662,101663,101665,101666,101667,101668,101669,102082,103225,103289,103591,103993,103994,106191,106192,106200,106201,106338,106544,107491,107492,107602,107742,107998,108027,108509,110277,110278,110382,110613,111111,111281,111307,111376,111381,112373,113431,113479,113550,113907,114077,114368,114932,114958,115101,117198,117202,117789,117790,117793,117888,118574,119586,121005,121049,122301,122302,122303,122304,122305,123287,124407,124408,124409,124410,124411,125421,126115,126234,127298,127299,127300,127301,127302,127303,127304,127305,127306,127307,127308,127309,127310,127311,127424,127425,127426,127429,127434,127435,127436,127437,127439,127507,129307,129459,130292,130312,131075,131077,133302,133303,133304,133305,133694,133695,133697,133698,133699,133700,133701,133702,136253,136281,136605,136761,136767,136778,137510,137511,137927,138524,138823,139701,142409,142410,142712,142813,143599,143600,146037,146038,146046,146047,146053,146055,146056,146057,146070,146071,146104,148236,148358,148693,151845,151848,151866,151874,151881,201466,201815,201851,201976,202083,202184,202276,203520,203572,203573,203574,203575,203576,203577,246900,246901,246902,246905,246906,246907,247201,247202,247203,247204,247206,247207,247208,247209,247211,247212,247213,247214,247216,247217,247218,247219,247237,300001,300002,300003,300004,300005,300006,300007,300008,300009,300010,300011,300012,300013,300014,300015,1955080); +UPDATE `creature` SET `comment` = 'GUID SAI, SAI Target' WHERE `guid` IN (12481,21707,25120,25122,25123,27554,27555,27794,28368,43456,43457,43458,61994,61995,61996,62851,63582,63583,63584,63585,68744,70614,74081,74082,74518,74519,74520,74522,74523,74524,74528,74529,74530,74531,74532,74533,74534,74535,74536,74537,74538,74948,74949,74950,74951,81627,81628,83513,83632,83705,84603,84605,84606,84614,84615,84616,84989,85098,85118,85175,85176,98539,98562,98576,100088,100089,100090,100091,100092,100093,100094,100095,106069,111726,111742,111746,113473,113478,113548,113549,113551,114831,115948,127493,127495,127496,127497,129390,129391,130405,136271,136348,136524,136525,136526,136537,137507,137508,137509,138519,138520,138521,138522,138523,138901,138902,142072,142120,142122,146089,146093,147005,147006,147007,147018,147020,147022,147023,147024,147025,147026,147029,147030,147031,147032,147034,147035,151042,151043,151044,151045,151163,151165,151167,151169,151171,151173,202279,202280,202283,202284,202285,202286,202287,202288); + +UPDATE `creature` SET `comment` = 'Condition Target' WHERE `guid` IN (25125,63609,63610,63611,96886,98546,98547,98548,98549,132012,132013); +UPDATE `creature` SET `comment` = 'GUID SAI, Condition Target' WHERE `guid` IN (146225,146226,146227,146228,146229,151010,151090,151091,151092,151093); +UPDATE `creature` SET `comment` = 'SAI Target, Condition Target' WHERE `guid` = 25125; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 1a4df42d9..ab34d8e50 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -87,6 +87,7 @@ public: Milliseconds GetMarkRepeatTimer() { + ++_markCounter; Milliseconds timer = 45000ms - (5000ms * _markCounter); if (timer <= 10000ms) return 10000ms; @@ -160,7 +161,7 @@ public: { Unit* target = GetTarget(); - if (target->GetPower(POWER_MANA) < aurEff->GetBaseAmount()) + if ((int32)target->GetPower(POWER_MANA) < aurEff->GetBaseAmount()) { target->CastSpell(target, SPELL_MARK_DAMAGE, true, nullptr, aurEff); // Remove aura