diff --git a/data/sql/updates/db_world/2024_10_01_00.sql b/data/sql/updates/db_world/2024_10_01_00.sql new file mode 100644 index 000000000..a21d391bf --- /dev/null +++ b/data/sql/updates/db_world/2024_10_01_00.sql @@ -0,0 +1,2 @@ +-- DB update 2024_09_28_02 -> 2024_10_01_00 +UPDATE `creature_model_info` SET `BoundingRadius` = 4, `CombatReach` = 8 WHERE `DisplayID` = 20431; diff --git a/data/sql/updates/db_world/2024_10_01_01.sql b/data/sql/updates/db_world/2024_10_01_01.sql new file mode 100644 index 000000000..a18bb59eb --- /dev/null +++ b/data/sql/updates/db_world/2024_10_01_01.sql @@ -0,0 +1,4 @@ +-- DB update 2024_10_01_00 -> 2024_10_01_01 +-- +-- visibilityDistanceType to infinite for Orgrim's Hammer and The Skybreaker marker npcs +UPDATE `creature_addon` SET `visibilityDistanceType` = 5 WHERE `guid` IN (134846, 134847); diff --git a/data/sql/updates/db_world/2024_10_01_02.sql b/data/sql/updates/db_world/2024_10_01_02.sql new file mode 100644 index 000000000..89210a931 --- /dev/null +++ b/data/sql/updates/db_world/2024_10_01_02.sql @@ -0,0 +1,25 @@ +-- DB update 2024_10_01_01 -> 2024_10_01_02 + -- Rogue, elementalist, spiritbinder +UPDATE `creature_template` SET `faction` = 16, `VerifiedBuild` = 53788 WHERE `entry` IN (23318, 23523, 23524); + + -- Shade of Akama +UPDATE `creature_template` SET `faction` = 1692, `VerifiedBuild` = 53788 WHERE `entry` = 22841; + + -- Ashtongue Defender +UPDATE `creature_template` SET `faction` = 1847, `VerifiedBuild` = 53788 WHERE `entry` = 23216; + + -- Sorcerer, channeler +UPDATE `creature_template` SET `faction` = 1849, `VerifiedBuild` = 53788 WHERE `entry` IN (23215, 23421); + +-- SAI +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 23318) AND (`source_type` = 0) AND (`id` IN (2)); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(23318, 0, 2, 0, 7, 0, 100, 0, 0, 0, 0, 0, 0, 0, 223, 4, 0, 0, 0, 0, 0, 9, 23210, 0, 100, 0, 0, 0, 0, 0, 'Ashtongue Rogue - On Evade - Do Action'); + +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 23523) AND (`source_type` = 0) AND (`id` IN (2)); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(23523, 0, 2, 0, 7, 0, 100, 0, 0, 0, 0, 0, 0, 0, 223, 4, 0, 0, 0, 0, 0, 9, 23210, 0, 100, 0, 0, 0, 0, 0, 'Ashtongue Elementalist - On Evade - Do Action'); + +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 23524) AND (`source_type` = 0) AND (`id` IN (2)); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(23524, 0, 2, 0, 7, 0, 100, 0, 0, 0, 0, 0, 0, 0, 223, 4, 0, 0, 0, 0, 0, 9, 23210, 0, 100, 0, 0, 0, 0, 0, 'Ashtongue Spiritbinder - On Evade - Do Action'); diff --git a/data/sql/updates/db_world/2024_10_01_03.sql b/data/sql/updates/db_world/2024_10_01_03.sql new file mode 100644 index 000000000..5c67409f0 --- /dev/null +++ b/data/sql/updates/db_world/2024_10_01_03.sql @@ -0,0 +1,60 @@ +-- DB update 2024_10_01_02 -> 2024_10_01_03 +-- add gameobjects to transports + +DELETE FROM `gameobject` WHERE (`id` IN (164759, 164760, 164761, 164762, 164763, 164764, 164765, 164766, 164767, 186408, 186409, 186410, 186411, 186412, 186413, 186414, 186415, 186416, 186417, 193031, 193032, 193033, 193034, 193035, 193036, 193037, 191640)) +AND (`guid` BETWEEN 1288 AND 1332); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`) VALUES +-- Wooden Chair +-- 588 Ship (The Bravery) - Auberdine, Darkshore and Stormwind Harbor (Boat, Alliance ("The Bravery")) +(1288, 164759, 588, 0, 0, 1, 1, 17.23059654235839843, -0.62951797246932983, 6.063879013061523437, 0.671952366828918457, 0, 0, 0.329690933227539062, 0.944088935852050781, 120, 255, 1, "", 48632), +(1289, 164760, 588, 0, 0, 1, 1, 18.34792137145996093, 0.407492995262145996, 6.063879013061523437, 3.892086982727050781, 0, 0, -0.93041706085205078, 0.366502493619918823, 120, 255, 1, "", 48632), +(1290, 164761, 588, 0, 0, 1, 1, 14.03516578674316406, -0.71994698047637939, 6.096680164337158203, 3.892086982727050781, 0, 0, -0.93041706085205078, 0.366502493619918823, 120, 255, 1, "", 48632), +(1291, 164762, 588, 0, 0, 1, 1, 12.84190177917480468, -1.87944495677947998, 6.096680164337158203, 0.671952366828918457, 0, 0, 0.329690933227539062, 0.944088935852050781, 120, 255, 1, "", 49345), +(1292, 164763, 588, 0, 0, 1, 1, 11.21061420440673828, 2.581463098526000976, 6.096820831298828125, 4.773476600646972656, 0, 0, -0.68518257141113281, 0.728371381759643554, 120, 255, 1, "", 48632), +(1293, 164764, 588, 0, 0, 1, 1, 11.28876590728759765, 1.464622020721435546, 6.096820831298828125, 1.553344011306762695, 0, 0, 0.700909614562988281, 0.71325010061264038, 120, 255, 1, "", 48632), +(1294, 164765, 588, 0, 0, 1, 1, 5.51160287857055664, 10.92694664001464843, 6.099214076995849609, 3.892086982727050781, 0, 0, -0.93041706085205078, 0.366502493619918823, 120, 255, 1, "", 48632), +(1295, 164766, 588, 0, 0, 1, 1, 4.39427804946899414, 9.889936447143554687, 6.099214076995849609, 0.671952366828918457, 0, 0, 0.329690933227539062, 0.944088935852050781, 120, 255, 1, "", 48632), +(1296, 164767, 588, 0, 0, 1, 1, 39.2127532958984375, -2.40047001838684082, 6.098138809204101562, 2.679079532623291015, 0, 0, 0.973379135131835937, 0.229200854897499084, 120, 255, 1, "", 48632), +-- 584 Ship (The Lady Mehley) - Menethil Harbor, Wetlands and Theramore Isle, Dustwallow Marsh (Boat, Alliance ("The Lady Mehley")) +(1297, 164759, 584, 0, 0, 1, 1, 17.23059654235839843, -0.62951797246932983, 6.063879013061523437, 0.671952366828918457, 0, 0, 0.329690933227539062, 0.944088935852050781, 120, 255, 1, "", 48632), +(1298, 164760, 584, 0, 0, 1, 1, 18.34792137145996093, 0.407492995262145996, 6.063879013061523437, 3.892086982727050781, 0, 0, -0.93041706085205078, 0.366502493619918823, 120, 255, 1, "", 48632), +(1299, 164761, 584, 0, 0, 1, 1, 14.03516578674316406, -0.71994698047637939, 6.096680164337158203, 3.892086982727050781, 0, 0, -0.93041706085205078, 0.366502493619918823, 120, 255, 1, "", 48632), +(1300, 164762, 584, 0, 0, 1, 1, 12.84190177917480468, -1.87944495677947998, 6.096680164337158203, 0.671952366828918457, 0, 0, 0.329690933227539062, 0.944088935852050781, 120, 255, 1, "", 49345), +(1301, 164763, 584, 0, 0, 1, 1, 11.21061420440673828, 2.581463098526000976, 6.096820831298828125, 4.773476600646972656, 0, 0, -0.68518257141113281, 0.728371381759643554, 120, 255, 1, "", 48632), +(1302, 164764, 584, 0, 0, 1, 1, 11.28876590728759765, 1.464622020721435546, 6.096820831298828125, 1.553344011306762695, 0, 0, 0.700909614562988281, 0.71325010061264038, 120, 255, 1, "", 48632), +(1303, 164765, 584, 0, 0, 1, 1, 5.51160287857055664, 10.92694664001464843, 6.099214076995849609, 3.892086982727050781, 0, 0, -0.93041706085205078, 0.366502493619918823, 120, 255, 1, "", 48632), +(1304, 164766, 584, 0, 0, 1, 1, 4.39427804946899414, 9.889936447143554687, 6.099214076995849609, 0.671952366828918457, 0, 0, 0.329690933227539062, 0.944088935852050781, 120, 255, 1, "", 48632), +(1305, 164767, 584, 0, 0, 1, 1, 39.2127532958984375, -2.40047001838684082, 6.098138809204101562, 2.679079532623291015, 0, 0, 0.973379135131835937, 0.229200854897499084, 120, 255, 1, "", 48632), +-- 593 Ship (The Maiden's Fancy) - Booty Bay, Stranglethorn Vale and Ratchet, The Barrens (Boat, Neutral ("The Maiden's Fancy")) +(1306, 164759, 593, 0, 0, 1, 1, 17.23059654235839843, -0.62951797246932983, 6.063879013061523437, 0.671952366828918457, 0, 0, 0.329690933227539062, 0.944088935852050781, 120, 255, 1, "", 48632), +(1307, 164760, 593, 0, 0, 1, 1, 18.34792137145996093, 0.407492995262145996, 6.063879013061523437, 3.892086982727050781, 0, 0, -0.93041706085205078, 0.366502493619918823, 120, 255, 1, "", 48632), +(1308, 164761, 593, 0, 0, 1, 1, 14.03516578674316406, -0.71994698047637939, 6.096680164337158203, 3.892086982727050781, 0, 0, -0.93041706085205078, 0.366502493619918823, 120, 255, 1, "", 48632), +(1309, 164762, 593, 0, 0, 1, 1, 12.84190177917480468, -1.87944495677947998, 6.096680164337158203, 0.671952366828918457, 0, 0, 0.329690933227539062, 0.944088935852050781, 120, 255, 1, "", 49345), +(1310, 164763, 593, 0, 0, 1, 1, 11.21061420440673828, 2.581463098526000976, 6.096820831298828125, 4.773476600646972656, 0, 0, -0.68518257141113281, 0.728371381759643554, 120, 255, 1, "", 48632), +(1311, 164764, 593, 0, 0, 1, 1, 11.28876590728759765, 1.464622020721435546, 6.096820831298828125, 1.553344011306762695, 0, 0, 0.700909614562988281, 0.71325010061264038, 120, 255, 1, "", 48632), +(1312, 164765, 593, 0, 0, 1, 1, 5.51160287857055664, 10.92694664001464843, 6.099214076995849609, 3.892086982727050781, 0, 0, -0.93041706085205078, 0.366502493619918823, 120, 255, 1, "", 48632), +(1313, 164766, 593, 0, 0, 1, 1, 4.39427804946899414, 9.889936447143554687, 6.099214076995849609, 0.671952366828918457, 0, 0, 0.329690933227539062, 0.944088935852050781, 120, 255, 1, "", 48632), +(1314, 164767, 593, 0, 0, 1, 1, 39.2127532958984375, -2.40047001838684082, 6.098138809204101562, 2.679079532623291015, 0, 0, 0.973379135131835937, 0.229200854897499084, 120, 255, 1, "", 48632), +-- Chair +-- 594 Sister Mercy - Garvan's Reef (Boat, Neutral ("Sister Mercy")) +(1315, 186408, 594, 0, 0, 1, 1, 17.0715179443359375, -0.77082198858261108, 8.6925811767578125, 0.671952366828918457, 0, 0, 0.329690933227539062, 0.944088935852050781, 120, 255, 1, "", 51739), +(1316, 186409, 594, 0, 0, 1, 1, 18.51146888732910156, 0.749058008193969726, 8.6925811767578125, 3.892086982727050781, 0, 0, -0.93041706085205078, 0.366502493619918823, 120, 255, 1, "", 51739), +(1317, 186410, 594, 0, 0, 1, 1, 14.273040771484375, -0.45916301012039184, 8.725382804870605468, 3.892086982727050781, 0, 0, -0.93041706085205078, 0.366502493619918823, 120, 255, 1, "", 51739), +(1318, 186411, 594, 0, 0, 1, 1, 12.84190177917480468, -2.01827406883239746, 8.725382804870605468, 0.671952366828918457, 0, 0, 0.329690933227539062, 0.944088935852050781, 120, 255, 1, "", 51739), +(1319, 186412, 594, 0, 0, 1, 1, 11.21061420440673828, 3.044408082962036132, 8.725523948669433593, 4.773476600646972656, 0, 0, -0.68518257141113281, 0.728371381759643554, 120, 255, 1, "", 51739), +(1320, 186413, 594, 0, 0, 1, 1, 11.28876686096191406, 0.989736020565032958, 8.725523948669433593, 1.553344011306762695, 0, 0, 0.700909614562988281, 0.71325010061264038, 120, 255, 1, "", 51739), +(1321, 186414, 594, 0, 0, 1, 1, 5.768925189971923828, 11.23967456817626953, 8.727916717529296875, 3.892086982727050781, 0, 0, -0.93041706085205078, 0.366502493619918823, 120, 255, 1, "", 51739), +(1322, 186415, 594, 0, 0, 1, 1, 4.191449165344238281, 9.616560935974121093, 8.727916717529296875, 0.671952366828918457, 0, 0, 0.329690933227539062, 0.944088935852050781, 120, 255, 1, "", 51739), +(1323, 186416, 594, 0, 0, 1, 1, 39.2127532958984375, -2.40047001838684082, 8.726841926574707031, 2.679079532623291015, 0, 0, 0.973379135131835937, 0.229200854897499084, 120, 255, 1, "", 45942), +(1324, 186417, 594, 0, 0, 1, 1, 35.6175537109375, -2.70943593978881835, 1.750810027122497558, 2.52683424949645996, 0, 0, 0.953129768371582031, 0.302561759948730468, 120, 255, 1, "", 51739), +-- 623 The Skybreaker - Icecrown (Gunship, Alliance ("The Skybreaker")) +(1325, 193031, 623, 0, 0, 1, 1, 45.25848388671875, 2.574336051940917968, 9.179107666015625, 1.48352813720703125, 0, 0, 0.675589561462402343, 0.737277925014495849, 120, 255, 1, "", 51739), +(1326, 193032, 623, 0, 0, 1, 1, 47.61293411254882812, 3.14569401741027832, 9.179107666015625, 2.268925428390502929, 0, 0, 0.906307220458984375, 0.422619491815567016, 120, 255, 1, "", 51739), +(1327, 193033, 623, 0, 0, 1, 1, 43.37488174438476562, 6.605104923248291015, 9.179107666015625, 5.759587764739990234, 0, 0, -0.25881862640380859, 0.965925931930541992, 120, 255, 1, "", 51739), +(1328, 193034, 623, 0, 0, 1, 1, 45.37456893920898437, 8.219777107238769531, 9.179107666015625, 4.886921405792236328, 0, 0, -0.64278793334960937, 0.766044199466705322, 120, 255, 1, "", 51739), +(1329, 193035, 623, 0, 0, 1, 1, 47.77638626098632812, 7.090052127838134765, 9.179107666015625, 3.926995515823364257, 0, 0, -0.92387866973876953, 0.38268551230430603, 120, 255, 1, "", 51739), +(1330, 193036, 623, 0, 0, 1, 1, 48.41291427612304687, 5.049696922302246093, 9.179545402526855468, 2.879789113998413085, 0, 0, 0.991444587707519531, 0.130528271198272705, 120, 255, 1, "", 51739), +(1331, 193037, 623, 0, 0, 1, 1, 43.42211532592773437, 4.230630874633789062, 9.179107666015625, 0.610865473747253417, 0, 0, 0.300705909729003906, 0.953716933727264404, 120, 255, 1, "", 51739), +-- Anvil +-- 622 Orgrim's Hammer - Icecrown (Gunship, Horde ("Orgrim's Hammer")) +(1332, 191640, 622, 0, 0, 1, 1, 42.08454513549804687, 14.60722732543945312, 10.65548419952392578, 4.244587898254394531, -0.00322771072387695, 0.005247116088867187, -0.85172462463378906, 0.523953437805175781, 120, 255, 1, "", 46368); diff --git a/data/sql/updates/db_world/2024_10_02_00.sql b/data/sql/updates/db_world/2024_10_02_00.sql new file mode 100644 index 000000000..e860907d5 --- /dev/null +++ b/data/sql/updates/db_world/2024_10_02_00.sql @@ -0,0 +1,176 @@ +-- DB update 2024_10_01_03 -> 2024_10_02_00 +-- +DELETE FROM `creature_template_model` WHERE `CreatureID` IN (21876, 22986, 23040, 23046, 23058, 23322, 23327, 23583, 23751, 23752, 23753, 23832, 23868, 23869, 23893, 24042, 24335, 24336, 24861, 24865, 24938, 25047, 25115, 25219, 25534, 26086, 26093, 26114, 26161, 26248, 26249, 26403, 26785, 26855, 26856, 26857, 27263, 27264, 27265, 27366, 27802, 28019, 28230, 28332, 28758, 29055, 29056, 29057, 29058, 29069, 29105, 29752, 30209, 30211, 30212, 31641, 32504, 33552, 33874, 34281, 34381, 34562, 36209, 36715, 37094, 37158, 37601, 37704, 37745, 37746, 37852, 38340, 38341, 38342, 38903, 38907, 39135, 39581, 39672, 40006, 40037, 40038, 40039, 40141, 40218, 40363); +INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES +(21876, 0, 20570, 1, 0, 51831), +(21876, 1, 16925, 1, 1, 51831), +(22986, 0, 20570, 1, 0, 51831), +(22986, 1, 17188, 1, 1, 51831), +(23040, 0, 20570, 1, 0, 51831), +(23040, 1, 11686, 1, 1, 51831), +(23046, 0, 20570, 1, 0, 51831), +(23046, 1, 19595, 1, 1, 51831), +(23058, 0, 20570, 1, 0, 51831), +(23058, 1, 19595, 1, 1, 51831), +(23322, 0, 20570, 1, 0, 51831), +(23322, 1, 11686, 1, 1, 51831), +(23327, 0, 20570, 1, 0, 51831), +(23327, 1, 11686, 1, 1, 51831), +(23583, 0, 20570, 1, 0, 51831), +(23583, 1, 17188, 1, 1, 51831), +(23751, 0, 20570, 1, 0, 51831), +(23751, 1, 17188, 1, 1, 51831), +(23752, 0, 20570, 1, 0, 51831), +(23752, 1, 17188, 1, 1, 51831), +(23753, 0, 20570, 1, 0, 51831), +(23753, 1, 17188, 1, 1, 51831), +(23832, 0, 20570, 1, 0, 51831), +(23832, 1, 21888, 1, 1, 51831), +(23868, 0, 20570, 1, 0, 51831), +(23868, 1, 17188, 1, 1, 51831), +(23869, 0, 20570, 1, 0, 51831), +(23869, 1, 17188, 1, 1, 51831), +(23893, 0, 20570, 1, 0, 51831), +(23893, 1, 21888, 1, 1, 51831), +(24042, 0, 20570, 1, 0, 51831), +(24042, 1, 11686, 1, 1, 51831), +(24335, 0, 20570, 1, 0, 51831), +(24335, 1, 17188, 1, 1, 51831), +(24336, 0, 20570, 1, 0, 51831), +(24336, 1, 17200, 1, 1, 51831), +(24861, 0, 20570, 1, 0, 51831), +(24861, 1, 17188, 1, 1, 51831), +(24865, 0, 20570, 1, 0, 51831), +(24865, 1, 11686, 1, 1, 51831), +(24938, 0, 20570, 1, 0, 51831), +(24938, 1, 11686, 1, 1, 51831), +(25047, 0, 20570, 1, 0, 51831), +(25047, 1, 11686, 1, 1, 51831), +(25115, 0, 20570, 1, 0, 51831), +(25115, 1, 11686, 1, 1, 51831), +(25219, 0, 20570, 1, 0, 51831), +(25219, 1, 11686, 1, 1, 51831), +(25534, 0, 20570, 1, 0, 51831), +(25534, 1, 24826, 1, 1, 51831), +(26086, 0, 20570, 1, 0, 51831), +(26086, 1, 23258, 1, 1, 51831), +(26093, 0, 20570, 1, 0, 51831), +(26093, 1, 11686, 1, 1, 51831), +(26114, 0, 20570, 1, 0, 51831), +(26114, 1, 17612, 1, 100, 51831), +(26161, 0, 20570, 1, 0, 51831), +(26161, 1, 17612, 1, 100, 51831), +(26248, 0, 20570, 1, 0, 51831), +(26248, 1, 17612, 1, 100, 51831), +(26249, 0, 20570, 1, 0, 51831), +(26249, 1, 17612, 1, 100, 51831), +(26403, 0, 20570, 1, 0, 51831), +(26403, 1, 11686, 1, 1, 51831), +(26785, 0, 20570, 1, 0, 51831), +(26785, 1, 16946, 1, 1, 51831), +(26855, 0, 20570, 1, 0, 51831), +(26855, 1, 11686, 1, 1, 51831), +(26856, 0, 20570, 1, 0, 51831), +(26856, 1, 11686, 1, 1, 51831), +(26857, 0, 20570, 1, 0, 51831), +(26857, 1, 11686, 1, 1, 51831), +(27263, 0, 20570, 1, 0, 51831), +(27263, 1, 15880, 1, 100, 51831), +(27264, 0, 20570, 1, 0, 51831), +(27264, 1, 15880, 1, 100, 51831), +(27265, 0, 20570, 1, 0, 51831), +(27265, 1, 15880, 1, 100, 51831), +(27366, 0, 20570, 1, 0, 51831), +(27366, 1, 17612, 1, 100, 51831), +(27802, 0, 20570, 1, 0, 51831), +(27802, 1, 17200, 1, 1, 51831), +(28019, 0, 20570, 1, 0, 51831), +(28019, 1, 17612, 1, 100, 51831), +(28230, 0, 20570, 1, 0, 51831), +(28230, 1, 15294, 1, 1, 51831), +(28332, 0, 20570, 1, 0, 51831), +(28332, 1, 11686, 1, 1, 51831), +(28758, 0, 20570, 1, 0, 51831), +(28758, 1, 17612, 1, 100, 51831), +(29055, 0, 20570, 1, 0, 51831), +(29055, 1, 17612, 1, 100, 51831), +(29056, 0, 20570, 1, 0, 51831), +(29056, 1, 17612, 1, 100, 51831), +(29057, 0, 20570, 1, 0, 51831), +(29057, 1, 17612, 1, 100, 51831), +(29058, 0, 20570, 1, 0, 51831), +(29058, 1, 17612, 1, 100, 51831), +(29069, 0, 20570, 1, 0, 51831), +(29069, 1, 17612, 1, 100, 51831), +(29105, 0, 20570, 1, 0, 51831), +(29105, 1, 11686, 1, 1, 51831), +(29752, 0, 20570, 1, 0, 51831), +(29752, 1, 11686, 1, 1, 51831), +(30209, 0, 20570, 1, 0, 51831), +(30209, 1, 11686, 1, 1, 51831), +(30211, 0, 20570, 1, 0, 51831), +(30211, 1, 11686, 1, 1, 51831), +(30212, 0, 20570, 1, 0, 51831), +(30212, 1, 11686, 1, 1, 51831), +(31641, 0, 20570, 1, 0, 51831), +(31641, 1, 21072, 1, 1, 51831), +(32504, 0, 20570, 1, 0, 51831), +(32504, 1, 11686, 1, 1, 51831), +(33552, 0, 20570, 1, 0, 51831), +(33552, 1, 23767, 1, 1, 51831), +(33874, 0, 20570, 1, 0, 51831), +(33874, 1, 11686, 1, 1, 51831), +(34281, 0, 20570, 1, 0, 51831), +(34281, 1, 11686, 1, 1, 51831), +(34381, 0, 20570, 1, 0, 51831), +(34381, 1, 11686, 1, 1, 51831), +(34562, 0, 20570, 1, 0, 51831), +(34562, 1, 11686, 1, 1, 51831), +(36209, 0, 20570, 1, 0, 51831), +(36209, 1, 11686, 1, 1, 51831), +(36715, 0, 20570, 1, 0, 51831), +(36715, 1, 17612, 1, 100, 51831), +(37094, 0, 20570, 1, 0, 51831), +(37094, 1, 30822, 1, 1, 51831), +(37158, 0, 20570, 1, 0, 51831), +(37158, 1, 30547, 1, 1, 51831), +(37601, 0, 20570, 1, 0, 51831), +(37601, 1, 17612, 1, 100, 51831), +(37704, 0, 20570, 1, 0, 51831), +(37704, 1, 17612, 1, 100, 51831), +(37745, 0, 20570, 1, 0, 51831), +(37745, 1, 30547, 1, 1, 51831), +(37746, 0, 20570, 1, 0, 51831), +(37746, 1, 17612, 1, 100, 51831), +(37852, 0, 20570, 1, 0, 51831), +(37852, 1, 17612, 1, 100, 51831), +(38340, 0, 20570, 1, 0, 51831), +(38340, 1, 17612, 1, 100, 51831), +(38341, 0, 20570, 1, 0, 51831), +(38341, 1, 17612, 1, 100, 51831), +(38342, 0, 20570, 1, 0, 51831), +(38342, 1, 17612, 1, 100, 51831), +(38903, 0, 20570, 1, 0, 51831), +(38903, 1, 11686, 1, 1, 51831), +(38907, 0, 20570, 1, 0, 51831), +(38907, 1, 11686, 1, 1, 51831), +(39135, 0, 20570, 1, 0, 51831), +(39135, 1, 17612, 1, 100, 51831), +(39581, 0, 20570, 1, 0, 51831), +(39581, 1, 27823, 1, 1, 51831), +(39672, 0, 20570, 1, 0, 51831), +(39672, 1, 27823, 1, 1, 51831), +(40006, 0, 31687, 1, 1, 51831), +(40006, 1, 20570, 1, 0, 51831), +(40037, 0, 23257, 1, 1, 51831), +(40037, 1, 20570, 1, 0, 51831), +(40038, 0, 21072, 1, 1, 51831), +(40038, 1, 20570, 1, 0, 51831), +(40039, 0, 11686, 1, 1, 51831), +(40039, 1, 20570, 1, 0, 51831), +(40141, 0, 31687, 1, 1, 51831), +(40141, 1, 20570, 1, 0, 51831), +(40218, 0, 20570, 1, 0, 51831), +(40218, 1, 19595, 1, 1, 51831), +(40363, 0, 20570, 1, 0, 51831), +(40363, 1, 22769, 1, 1, 51831); diff --git a/data/sql/updates/db_world/2024_10_02_01.sql b/data/sql/updates/db_world/2024_10_02_01.sql new file mode 100644 index 000000000..14818df3d --- /dev/null +++ b/data/sql/updates/db_world/2024_10_02_01.sql @@ -0,0 +1,5 @@ +-- DB update 2024_10_02_00 -> 2024_10_02_01 +-- +DELETE FROM `smart_scripts` WHERE (`entryorguid` = 3672) AND (`source_type` = 0) AND (`id` IN (3)); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(3672, 0, 3, 0, 2, 0, 100, 1, 0, 50, 0, 0, 0, 0, 11, 8041, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Boahn - Between 0-50% Health - Cast \'Snake Form\''); diff --git a/data/sql/updates/db_world/2024_10_03_00.sql b/data/sql/updates/db_world/2024_10_03_00.sql new file mode 100644 index 000000000..1c96f6146 --- /dev/null +++ b/data/sql/updates/db_world/2024_10_03_00.sql @@ -0,0 +1,11 @@ +-- DB update 2024_10_02_01 -> 2024_10_03_00 +UPDATE `waypoint_data` SET `move_type` = 0 WHERE `id` IN ( +1480150, -- Aqueous Spawn +1480210, -- Aqueous Spawn +1480170, -- Aqueous Spawn +1480130, -- Aqueous Spawn +1480190, -- Aqueous Spawn +1483640, -- Bonechewer Behemoth +1483630, -- Bonechewer Behemoth +1483600 -- Bonechewer Behemoth +); diff --git a/src/server/apps/authserver/Authentication/AuthCodes.h b/src/server/apps/authserver/Authentication/AuthCodes.h index 35037e0a3..8482b3acf 100644 --- a/src/server/apps/authserver/Authentication/AuthCodes.h +++ b/src/server/apps/authserver/Authentication/AuthCodes.h @@ -19,7 +19,6 @@ #define _AUTHCODES_H #include "Define.h" -#include enum AuthResult { diff --git a/src/server/apps/authserver/Main.cpp b/src/server/apps/authserver/Main.cpp index 4c110db7a..dd07cf0ae 100644 --- a/src/server/apps/authserver/Main.cpp +++ b/src/server/apps/authserver/Main.cpp @@ -30,7 +30,6 @@ #include "DatabaseEnv.h" #include "DatabaseLoader.h" #include "DeadlineTimer.h" -#include "GitRevision.h" #include "IPLocation.h" #include "IoContext.h" #include "Log.h" diff --git a/src/server/apps/authserver/Server/AuthSession.cpp b/src/server/apps/authserver/Server/AuthSession.cpp index bd9e0c61f..f07735615 100644 --- a/src/server/apps/authserver/Server/AuthSession.cpp +++ b/src/server/apps/authserver/Server/AuthSession.cpp @@ -23,7 +23,6 @@ #include "CryptoHash.h" #include "CryptoRandom.h" #include "DatabaseEnv.h" -#include "Errors.h" #include "IPLocation.h" #include "Log.h" #include "RealmList.h" diff --git a/src/server/apps/authserver/Server/AuthSession.h b/src/server/apps/authserver/Server/AuthSession.h index b85421327..f6f7c9dde 100644 --- a/src/server/apps/authserver/Server/AuthSession.h +++ b/src/server/apps/authserver/Server/AuthSession.h @@ -28,7 +28,6 @@ #include "SRP6.h" #include "Socket.h" #include -#include using boost::asio::ip::tcp; diff --git a/src/server/apps/worldserver/ACSoap/ACSoap.h b/src/server/apps/worldserver/ACSoap/ACSoap.h index fd62012b5..4463edf64 100644 --- a/src/server/apps/worldserver/ACSoap/ACSoap.h +++ b/src/server/apps/worldserver/ACSoap/ACSoap.h @@ -20,7 +20,6 @@ #include "Define.h" #include -#include void process_message(struct soap* soap_message); void ACSoapThread(const std::string& host, uint16 port); diff --git a/src/server/apps/worldserver/RemoteAccess/RASession.h b/src/server/apps/worldserver/RemoteAccess/RASession.h index b2c8ab948..2addfd262 100644 --- a/src/server/apps/worldserver/RemoteAccess/RASession.h +++ b/src/server/apps/worldserver/RemoteAccess/RASession.h @@ -18,11 +18,9 @@ #ifndef __RASESSION_H__ #define __RASESSION_H__ -#include "Common.h" #include #include #include -#include using boost::asio::ip::tcp; diff --git a/src/server/database/Database/AdhocStatement.cpp b/src/server/database/Database/AdhocStatement.cpp index cb39769ca..1eafaa728 100644 --- a/src/server/database/Database/AdhocStatement.cpp +++ b/src/server/database/Database/AdhocStatement.cpp @@ -16,7 +16,6 @@ */ #include "AdhocStatement.h" -#include "Errors.h" #include "MySQLConnection.h" #include "QueryResult.h" diff --git a/src/server/database/Database/DatabaseEnv.h b/src/server/database/Database/DatabaseEnv.h index a7bc68ee3..31d2dabe3 100644 --- a/src/server/database/Database/DatabaseEnv.h +++ b/src/server/database/Database/DatabaseEnv.h @@ -29,7 +29,6 @@ #include "Implementation/PlayerbotsDatabase.h" #endif -#include "Field.h" #include "PreparedStatement.h" #include "QueryCallback.h" #include "QueryResult.h" diff --git a/src/server/database/Database/DatabaseEnvFwd.h b/src/server/database/Database/DatabaseEnvFwd.h index 94fe14405..357a0a9da 100644 --- a/src/server/database/Database/DatabaseEnvFwd.h +++ b/src/server/database/Database/DatabaseEnvFwd.h @@ -19,7 +19,6 @@ #define DatabaseEnvFwd_h__ #include -#include struct QueryResultFieldMetadata; class Field; diff --git a/src/server/database/Database/Field.cpp b/src/server/database/Database/Field.cpp index ad552699d..1120b754e 100644 --- a/src/server/database/Database/Field.cpp +++ b/src/server/database/Database/Field.cpp @@ -20,7 +20,6 @@ #include "Log.h" #include "MySQLHacks.h" #include "StringConvert.h" -#include "Types.h" Field::Field() { diff --git a/src/server/database/Database/Field.h b/src/server/database/Database/Field.h index 6af5cb807..bfdd3cc1a 100644 --- a/src/server/database/Database/Field.h +++ b/src/server/database/Database/Field.h @@ -18,7 +18,6 @@ #ifndef _FIELD_H #define _FIELD_H -#include "DatabaseEnvFwd.h" #include "Define.h" #include "Duration.h" #include diff --git a/src/server/database/Database/MySQLConnection.cpp b/src/server/database/Database/MySQLConnection.cpp index ebe2bb894..e889ea65a 100644 --- a/src/server/database/Database/MySQLConnection.cpp +++ b/src/server/database/Database/MySQLConnection.cpp @@ -20,7 +20,6 @@ #include "Log.h" #include "MySQLHacks.h" #include "MySQLPreparedStatement.h" -#include "MySQLWorkaround.h" #include "PreparedStatement.h" #include "QueryResult.h" #include "StringConvert.h" diff --git a/src/server/database/Database/MySQLConnection.h b/src/server/database/Database/MySQLConnection.h index 9241b7123..4b87a0171 100644 --- a/src/server/database/Database/MySQLConnection.h +++ b/src/server/database/Database/MySQLConnection.h @@ -21,7 +21,6 @@ #include "DatabaseEnvFwd.h" #include "Define.h" #include -#include #include #include #include diff --git a/src/server/database/Database/PreparedStatement.cpp b/src/server/database/Database/PreparedStatement.cpp index 4b8f870ea..bc9056f36 100644 --- a/src/server/database/Database/PreparedStatement.cpp +++ b/src/server/database/Database/PreparedStatement.cpp @@ -19,7 +19,6 @@ #include "Errors.h" #include "Log.h" #include "MySQLConnection.h" -#include "MySQLPreparedStatement.h" #include "MySQLWorkaround.h" #include "QueryResult.h" diff --git a/src/server/database/Database/PreparedStatement.h b/src/server/database/Database/PreparedStatement.h index 766a8e8e2..de04749fe 100644 --- a/src/server/database/Database/PreparedStatement.h +++ b/src/server/database/Database/PreparedStatement.h @@ -20,7 +20,6 @@ #include "Define.h" #include "Duration.h" -#include "Optional.h" #include "SQLOperation.h" #include #include diff --git a/src/server/database/Database/QueryCallback.h b/src/server/database/Database/QueryCallback.h index c1ee4ea98..9710f35da 100644 --- a/src/server/database/Database/QueryCallback.h +++ b/src/server/database/Database/QueryCallback.h @@ -24,7 +24,6 @@ #include #include #include -#include class AC_DATABASE_API QueryCallback { diff --git a/src/server/database/Database/Transaction.h b/src/server/database/Database/Transaction.h index 448925053..973e657fb 100644 --- a/src/server/database/Database/Transaction.h +++ b/src/server/database/Database/Transaction.h @@ -24,7 +24,6 @@ #include "StringFormat.h" #include #include -#include #include /*! Transactions, high level class. */ diff --git a/src/server/database/Updater/DBUpdater.cpp b/src/server/database/Updater/DBUpdater.cpp index a2ab7dacd..70f8c681c 100644 --- a/src/server/database/Updater/DBUpdater.cpp +++ b/src/server/database/Updater/DBUpdater.cpp @@ -20,7 +20,6 @@ #include "Config.h" #include "DatabaseEnv.h" #include "DatabaseLoader.h" -#include "GitRevision.h" #include "Log.h" #include "StartProcess.h" #include "UpdateFetcher.h" diff --git a/src/server/database/Updater/UpdateFetcher.cpp b/src/server/database/Updater/UpdateFetcher.cpp index d0ade9880..d1008ba5d 100644 --- a/src/server/database/Updater/UpdateFetcher.cpp +++ b/src/server/database/Updater/UpdateFetcher.cpp @@ -25,6 +25,8 @@ #include #include +#include "QueryResult.h" + using namespace std::filesystem; struct UpdateFetcher::DirectoryEntry diff --git a/src/server/game/AI/CoreAI/GameObjectAI.h b/src/server/game/AI/CoreAI/GameObjectAI.h index 384fca1ec..b366d3c2b 100644 --- a/src/server/game/AI/CoreAI/GameObjectAI.h +++ b/src/server/game/AI/CoreAI/GameObjectAI.h @@ -23,7 +23,6 @@ #include "GameObject.h" #include "Object.h" #include "QuestDef.h" -#include class Creature; class GameObject; diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp index 86c6fc1f0..4ba087cf8 100644 --- a/src/server/game/AI/CoreAI/GuardAI.cpp +++ b/src/server/game/AI/CoreAI/GuardAI.cpp @@ -60,6 +60,9 @@ void GuardAI::EnterEvadeMode(EvadeReason /*why*/) void GuardAI::JustDied(Unit* killer) { + if (!killer) + return; + if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) me->SendZoneUnderAttackMessage(player); } diff --git a/src/server/game/AI/CoreAI/PassiveAI.cpp b/src/server/game/AI/CoreAI/PassiveAI.cpp index a34ce30d8..0fbfaef99 100644 --- a/src/server/game/AI/CoreAI/PassiveAI.cpp +++ b/src/server/game/AI/CoreAI/PassiveAI.cpp @@ -17,7 +17,6 @@ #include "PassiveAI.h" #include "Creature.h" -#include "TemporarySummon.h" PassiveAI::PassiveAI(Creature* c) : CreatureAI(c) { me->SetReactState(REACT_PASSIVE); } PossessedAI::PossessedAI(Creature* c) : CreatureAI(c) { me->SetReactState(REACT_PASSIVE); } diff --git a/src/server/game/AI/CoreAI/ReactorAI.cpp b/src/server/game/AI/CoreAI/ReactorAI.cpp index e50356f34..9286c0ee3 100644 --- a/src/server/game/AI/CoreAI/ReactorAI.cpp +++ b/src/server/game/AI/CoreAI/ReactorAI.cpp @@ -17,7 +17,6 @@ #include "ReactorAI.h" #include "CreatureAIImpl.h" -#include "Errors.h" int32 ReactorAI::Permissible(Creature const* creature) { diff --git a/src/server/game/AI/CoreAI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h index 91de5e2ea..355f7dfb5 100644 --- a/src/server/game/AI/CoreAI/TotemAI.h +++ b/src/server/game/AI/CoreAI/TotemAI.h @@ -19,7 +19,6 @@ #define ACORE_TOTEMAI_H #include "CreatureAI.h" -#include "Timer.h" class Creature; class Totem; diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h index a354b603b..5d969b865 100644 --- a/src/server/game/AI/CreatureAI.h +++ b/src/server/game/AI/CreatureAI.h @@ -19,7 +19,6 @@ #define ACORE_CREATUREAI_H #include "AreaBoundary.h" -#include "Common.h" #include "Creature.h" #include "EventMap.h" #include "TaskScheduler.h" diff --git a/src/server/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h index 4da88c623..7f63be9f8 100644 --- a/src/server/game/AI/CreatureAIImpl.h +++ b/src/server/game/AI/CreatureAIImpl.h @@ -18,13 +18,10 @@ #ifndef CREATUREAIIMPL_H #define CREATUREAIIMPL_H -#include "Common.h" #include "CreatureAI.h" #include "Define.h" #include "SpellMgr.h" #include "TemporarySummon.h" -#include -#include template static inline First const& RAND(First const& first, Second const& second, Rest const& ... rest) diff --git a/src/server/game/AI/GameObjectAIFactory.h b/src/server/game/AI/GameObjectAIFactory.h index 3bc101b7c..2de110f7b 100644 --- a/src/server/game/AI/GameObjectAIFactory.h +++ b/src/server/game/AI/GameObjectAIFactory.h @@ -20,7 +20,6 @@ #include "FactoryHolder.h" #include "GameObjectAI.h" -#include "ObjectRegistry.h" typedef FactoryHolder GameObjectAICreator; diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index 327f36c06..19580b3d6 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -18,7 +18,6 @@ #ifndef ACORE_SMARTAI_H #define ACORE_SMARTAI_H -#include "Common.h" #include "Creature.h" #include "CreatureAI.h" #include "GameObjectAI.h" diff --git a/src/server/game/Battlefield/Battlefield.h b/src/server/game/Battlefield/Battlefield.h index 12bae2338..e04b180ba 100644 --- a/src/server/game/Battlefield/Battlefield.h +++ b/src/server/game/Battlefield/Battlefield.h @@ -22,8 +22,6 @@ #include "GameObject.h" #include "ObjectAccessor.h" #include "SharedDefines.h" -#include "Utilities/Util.h" -#include "WorldPacket.h" #include "ZoneScript.h" enum BattlefieldTypes diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.h b/src/server/game/Battlefield/Zones/BattlefieldWG.h index 1c4cb586d..858288ad0 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.h +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.h @@ -22,7 +22,6 @@ #include "Log.h" #include "ObjectAccessor.h" #include "World.h" -#include "WorldPacket.h" class Group; class BattlefieldWG; diff --git a/src/server/game/Battlegrounds/ArenaScore.h b/src/server/game/Battlegrounds/ArenaScore.h index 3363c60f6..4535b6c14 100644 --- a/src/server/game/Battlegrounds/ArenaScore.h +++ b/src/server/game/Battlegrounds/ArenaScore.h @@ -19,6 +19,7 @@ #define _ARENA_SCORE_H #include "BattlegroundScore.h" +#include "SharedDefines.h" #include "StringFormat.h" struct AC_GAME_API ArenaScore : public BattlegroundScore diff --git a/src/server/game/Battlegrounds/ArenaTeam.h b/src/server/game/Battlegrounds/ArenaTeam.h index 5e7e95089..a7862d101 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.h +++ b/src/server/game/Battlegrounds/ArenaTeam.h @@ -21,7 +21,6 @@ #include "Map.h" #include "QueryResult.h" #include -#include class WorldSession; class WorldPacket; diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.h b/src/server/game/Battlegrounds/BattlegroundMgr.h index 27a702a06..3b07a9fc7 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.h +++ b/src/server/game/Battlegrounds/BattlegroundMgr.h @@ -20,10 +20,8 @@ #include "Battleground.h" #include "BattlegroundQueue.h" -#include "Common.h" #include "CreatureAIImpl.h" #include "DBCEnums.h" -#include #include typedef std::map BattlegroundContainer; diff --git a/src/server/game/Battlegrounds/BattlegroundScore.h b/src/server/game/Battlegrounds/BattlegroundScore.h index 4ed344b7e..33345bd8a 100644 --- a/src/server/game/Battlegrounds/BattlegroundScore.h +++ b/src/server/game/Battlegrounds/BattlegroundScore.h @@ -20,7 +20,6 @@ #include "Errors.h" #include "ObjectGuid.h" -#include "SharedDefines.h" class WorldPacket; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index e8cccc8c9..ae1a764af 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -21,7 +21,6 @@ #include "GameEventMgr.h" #include "GameGraveyard.h" #include "GameObject.h" -#include "Language.h" #include "ObjectMgr.h" #include "Player.h" #include "SpellAuras.h" diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h index 2a1a4c0fe..41ac26f1c 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h @@ -21,7 +21,6 @@ #include "Battleground.h" #include "BattlegroundScore.h" #include "EventMap.h" -#include "Language.h" enum BG_EY_Events { diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp index e61f496d2..4eccb3cf0 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp @@ -16,12 +16,10 @@ */ #include "BattlegroundRV.h" -#include "ArenaScore.h" #include "Battleground.h" #include "GameObject.h" #include "Log.h" #include "ObjectAccessor.h" -#include "Pet.h" #include "Player.h" #include "WorldPacket.h" diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 947a9293e..a0fa83d96 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -21,15 +21,12 @@ #include "Common.h" #include "GridNotifiersImpl.h" #include "Language.h" -#include "Log.h" #include "ObjectMgr.h" #include "Opcodes.h" #include "Player.h" #include "Realm.h" #include "ScriptMgr.h" -#include "SpellMgr.h" #include "Tokenize.h" -#include "UpdateMask.h" #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h index 42b0142e8..f2ea70c89 100644 --- a/src/server/game/Chat/Chat.h +++ b/src/server/game/Chat/Chat.h @@ -19,7 +19,6 @@ #define AZEROTHCORE_CHAT_H #include "ChatCommand.h" -#include "Errors.h" #include "Player.h" #include "SharedDefines.h" #include "WorldSession.h" diff --git a/src/server/game/Chat/ChatCommands/ChatCommand.h b/src/server/game/Chat/ChatCommands/ChatCommand.h index ce1ead8b5..2259553ea 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommand.h +++ b/src/server/game/Chat/ChatCommands/ChatCommand.h @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/src/server/game/Chat/ChatCommands/ChatCommandHelpers.cpp b/src/server/game/Chat/ChatCommands/ChatCommandHelpers.cpp index f8e0efe07..d39c99190 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommandHelpers.cpp +++ b/src/server/game/Chat/ChatCommands/ChatCommandHelpers.cpp @@ -17,7 +17,6 @@ #include "ChatCommandHelpers.h" #include "Chat.h" -#include "ObjectMgr.h" void Acore::Impl::ChatCommands::SendErrorMessageToHandler(ChatHandler* handler, std::string_view str) { diff --git a/src/server/game/Chat/ChatCommands/ChatCommandHelpers.h b/src/server/game/Chat/ChatCommands/ChatCommandHelpers.h index e7e803a5e..2ffe70900 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommandHelpers.h +++ b/src/server/game/Chat/ChatCommands/ChatCommandHelpers.h @@ -24,7 +24,6 @@ #include #include #include -#include #include class ChatHandler; diff --git a/src/server/game/Chat/ChatCommands/ChatCommandTags.h b/src/server/game/Chat/ChatCommands/ChatCommandTags.h index f5c25a639..450be4cc2 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommandTags.h +++ b/src/server/game/Chat/ChatCommands/ChatCommandTags.h @@ -25,14 +25,10 @@ #include "Util.h" #include #include -#include -#include #include #include #include #include -#include -#include #include class ChatHandler; diff --git a/src/server/game/Chat/Hyperlinks.h b/src/server/game/Chat/Hyperlinks.h index 245a70bb7..d67342017 100644 --- a/src/server/game/Chat/Hyperlinks.h +++ b/src/server/game/Chat/Hyperlinks.h @@ -23,8 +23,6 @@ #include #include #include -#include -#include struct AchievementEntry; struct GlyphPropertiesEntry; diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.cpp b/src/server/game/Entities/DynamicObject/DynamicObject.cpp index 3a6882ddc..d7fbd2483 100644 --- a/src/server/game/Entities/DynamicObject/DynamicObject.cpp +++ b/src/server/game/Entities/DynamicObject/DynamicObject.cpp @@ -21,8 +21,6 @@ #include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "Transport.h" -#include "UpdateMask.h" -#include "World.h" DynamicObject::DynamicObject(bool isWorldObject) : WorldObject(isWorldObject), MovableMapObject(), _aura(nullptr), _removedAura(nullptr), _caster(nullptr), _duration(0), _isViewpoint(false), _updateViewerVisibilityTimer(0) diff --git a/src/server/game/Entities/GameObject/GameObjectData.h b/src/server/game/Entities/GameObject/GameObjectData.h index 65566447b..70182a887 100644 --- a/src/server/game/Entities/GameObject/GameObjectData.h +++ b/src/server/game/Entities/GameObject/GameObjectData.h @@ -18,7 +18,6 @@ #ifndef GAMEOBJECTDATA_H #define GAMEOBJECTDATA_H -#include "Common.h" #include "SharedDefines.h" #include "WorldPacket.h" #include diff --git a/src/server/game/Entities/Player/PlayerStorage.cpp b/src/server/game/Entities/Player/PlayerStorage.cpp index fc41fafaa..50be736f1 100644 --- a/src/server/game/Entities/Player/PlayerStorage.cpp +++ b/src/server/game/Entities/Player/PlayerStorage.cpp @@ -26,12 +26,10 @@ #include "CharacterDatabaseCleaner.h" #include "Chat.h" #include "Common.h" -#include "ConditionMgr.h" #include "Config.h" #include "DatabaseEnv.h" #include "DisableMgr.h" #include "GameEventMgr.h" -#include "GameGraveyard.h" #include "GameObjectAI.h" #include "GameTime.h" #include "GridNotifiers.h" @@ -63,10 +61,8 @@ #include "StringConvert.h" #include "Tokenize.h" #include "Transport.h" -#include "UpdateData.h" #include "UpdateFieldFlags.h" #include "Util.h" -#include "Vehicle.h" #include "World.h" #include "WorldPacket.h" diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 44f29d484..1854dec24 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -57,7 +57,6 @@ #include "SpellAuras.h" #include "SpellInfo.h" #include "SpellMgr.h" -#include "StringConvert.h" #include "TargetedMovementGenerator.h" #include "TemporarySummon.h" #include "Tokenize.h" @@ -5076,6 +5075,14 @@ void Unit::RemoveAurasDueToItemSpell(uint32 spellId, ObjectGuid castItemGuid) else ++iter; } + + for (AuraMap::iterator iter = m_ownedAuras.begin(); iter != m_ownedAuras.end();) + { + if (iter->second->GetCastItemGUID() == castItemGuid) + RemoveOwnedAura(iter, AURA_REMOVE_BY_DEFAULT); + else + ++iter; + } } void Unit::RemoveAurasByType(AuraType auraType, ObjectGuid casterGUID, Aura* except, bool negative, bool positive) @@ -14279,14 +14286,14 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced) { if (IsCreature() && IsControlledByPlayer()) // not sure if good for pet { - main_speed_mod = GetMaxPositiveAuraModifier(SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED); - stack_bonus = GetTotalAuraMultiplier(SPELL_AURA_MOD_VEHICLE_SPEED_ALWAYS); + main_speed_mod = GetMaxPositiveAuraModifier(SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED); + stack_bonus = GetTotalAuraMultiplier(SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACKING); // for some spells this mod is applied on vehicle owner int32 owner_speed_mod = 0; if (Unit* owner = GetCharmer()) - owner_speed_mod = owner->GetMaxPositiveAuraModifier(SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED); + owner_speed_mod = owner->GetMaxPositiveAuraModifier(SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED); main_speed_mod = std::max(main_speed_mod, owner_speed_mod); } @@ -14294,11 +14301,14 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced) { main_speed_mod = GetMaxPositiveAuraModifier(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED); stack_bonus = GetTotalAuraMultiplier(SPELL_AURA_MOD_MOUNTED_FLIGHT_SPEED_ALWAYS); + non_stack_bonus += GetMaxPositiveAuraModifier(SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED_NOT_STACKING) / 100.0f; } else // Use not mount (shapeshift for example) auras (should stack) - main_speed_mod = GetTotalAuraModifier(SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED) + GetTotalAuraModifier(SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED); - - non_stack_bonus += GetMaxPositiveAuraModifier(SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK) / 100.0f; + { + main_speed_mod = GetMaxPositiveAuraModifier(SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED); + stack_bonus = GetTotalAuraModifier(SPELL_AURA_MOD_FLIGHT_SPEED_ALWAYS); + non_stack_bonus += GetMaxPositiveAuraModifier(SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACKING) / 100.0f; + } // Update speed for vehicle if available if (IsPlayer() && GetVehicle()) diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp index 19d8b6818..f9a4cb01e 100644 --- a/src/server/game/Globals/ObjectAccessor.cpp +++ b/src/server/game/Globals/ObjectAccessor.cpp @@ -21,16 +21,13 @@ #include "DynamicObject.h" #include "GameObject.h" #include "GridNotifiers.h" -#include "Log.h" #include "Map.h" #include "MapMgr.h" #include "ObjectDefines.h" #include "ObjectMgr.h" -#include "Opcodes.h" #include "Pet.h" #include "Player.h" #include "Transport.h" -#include "Vehicle.h" template void HashMapHolder::Insert(T* o) diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h index 7c6c003f5..2fbe70bf5 100644 --- a/src/server/game/Globals/ObjectAccessor.h +++ b/src/server/game/Globals/ObjectAccessor.h @@ -21,11 +21,7 @@ #include "Define.h" #include "GridDefines.h" #include "Object.h" -#include "UpdateData.h" -#include -#include #include -#include class Creature; class Corpse; diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 836f93f55..2efeecbb4 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -23,9 +23,7 @@ #include "Corpse.h" #include "Creature.h" #include "DatabaseEnv.h" -#include "DynamicObject.h" #include "GameObject.h" -#include "GossipDef.h" #include "ItemTemplate.h" #include "Log.h" #include "Mail.h" diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h index fe06dfe9d..86ce107b1 100644 --- a/src/server/game/Grids/Cells/Cell.h +++ b/src/server/game/Grids/Cells/Cell.h @@ -19,7 +19,6 @@ #define ACORE_CELL_H #include "GridDefines.h" -#include "TypeContainer.h" #include "TypeContainerVisitor.h" class Map; diff --git a/src/server/game/Grids/Cells/CellImpl.h b/src/server/game/Grids/Cells/CellImpl.h index 97eaa4f3f..f8cf0ed08 100644 --- a/src/server/game/Grids/Cells/CellImpl.h +++ b/src/server/game/Grids/Cells/CellImpl.h @@ -21,7 +21,6 @@ #include "Cell.h" #include "Map.h" #include "Object.h" -#include inline Cell::Cell(CellCoord const& p) { diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp index bfbf028d7..23b130b2a 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.cpp +++ b/src/server/game/Grids/Notifiers/GridNotifiers.cpp @@ -18,7 +18,6 @@ #include "GridNotifiers.h" #include "Map.h" #include "ObjectAccessor.h" -#include "SpellMgr.h" #include "Transport.h" #include "UpdateData.h" #include "WorldPacket.h" diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h index bc5e8e2fa..3be0d19d9 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h +++ b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h @@ -22,10 +22,7 @@ #include "CreatureAI.h" #include "GridNotifiers.h" #include "Object.h" -#include "Opcodes.h" #include "Player.h" -#include "SpellAuras.h" -#include "UpdateData.h" #include "WorldPacket.h" #include "WorldSession.h" diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp index 2c92ef675..2b7d6f8ef 100644 --- a/src/server/game/Grids/ObjectGridLoader.cpp +++ b/src/server/game/Grids/ObjectGridLoader.cpp @@ -24,7 +24,6 @@ #include "GridNotifiers.h" #include "ObjectMgr.h" #include "Transport.h" -#include "Vehicle.h" // for loading world object at grid loading (Corpses) //TODO: to implement npc on transport, also need to load npcs at grid loading diff --git a/src/server/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h index 863e5f15f..d6029ac7b 100644 --- a/src/server/game/Grids/ObjectGridLoader.h +++ b/src/server/game/Grids/ObjectGridLoader.h @@ -21,8 +21,6 @@ #include "Cell.h" #include "Define.h" #include "GridDefines.h" -#include "GridLoader.h" -#include "TypeList.h" class ObjectWorldLoader; diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h index 2f317ec48..4ddd4a1d4 100644 --- a/src/server/game/Movement/MovementGenerator.h +++ b/src/server/game/Movement/MovementGenerator.h @@ -18,11 +18,9 @@ #ifndef ACORE_MOVEMENTGENERATOR_H #define ACORE_MOVEMENTGENERATOR_H -#include "Common.h" #include "Define.h" #include "FactoryHolder.h" #include "MotionMaster.h" -#include "ObjectRegistry.h" class Unit; diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp index 2e36eb0d9..c331bf19f 100644 --- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp @@ -18,10 +18,8 @@ #include "ConfusedMovementGenerator.h" #include "Creature.h" #include "MapMgr.h" -#include "MoveSpline.h" #include "MoveSplineInit.h" #include "Player.h" -#include "VMapFactory.h" #ifdef MAP_BASED_RAND_GEN #define rand_norm() unit.rand_norm() diff --git a/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp index a25881893..14133dbe2 100644 --- a/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp @@ -18,8 +18,6 @@ #include "EscortMovementGenerator.h" #include "Creature.h" #include "CreatureAI.h" -#include "Errors.h" -#include "MoveSpline.h" #include "MoveSplineInit.h" #include "Player.h" diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp index c9bcbfd9b..2547e4ddf 100644 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp @@ -22,7 +22,6 @@ #include "MoveSplineInit.h" #include "ObjectAccessor.h" #include "Player.h" -#include "VMapFactory.h" #define MIN_QUIET_DISTANCE 28.0f #define MAX_QUIET_DISTANCE 43.0f diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp index e77fd9107..fdce94248 100644 --- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp @@ -18,7 +18,6 @@ #include "PointMovementGenerator.h" #include "Creature.h" #include "CreatureAI.h" -#include "Errors.h" #include "MoveSpline.h" #include "MoveSplineInit.h" #include "ObjectAccessor.h" diff --git a/src/server/game/Scripting/ScriptDefines/PlayerScript.h b/src/server/game/Scripting/ScriptDefines/PlayerScript.h index 59575562a..166f6b94a 100644 --- a/src/server/game/Scripting/ScriptDefines/PlayerScript.h +++ b/src/server/game/Scripting/ScriptDefines/PlayerScript.h @@ -19,6 +19,7 @@ #define SCRIPT_OBJECT_PLAYER_SCRIPT_H_ #include "ScriptObject.h" +#include "SharedDefines.h" #include // TODO to remove diff --git a/src/server/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h index 9847e89ae..cebfaf9a9 100644 --- a/src/server/game/Spells/Auras/SpellAuraDefines.h +++ b/src/server/game/Spells/Auras/SpellAuraDefines.h @@ -266,12 +266,12 @@ enum AuraType SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_DAMAGE = 203, SPELL_AURA_MOD_ATTACKER_RANGED_CRIT_DAMAGE = 204, SPELL_AURA_MOD_SCHOOL_CRIT_DMG_TAKEN = 205, - SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED = 206, + SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED = 206, SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED = 207, - SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED = 208, + SPELL_AURA_MOD_FLIGHT_SPEED_ALWAYS = 208, SPELL_AURA_MOD_MOUNTED_FLIGHT_SPEED_ALWAYS = 209, - SPELL_AURA_MOD_VEHICLE_SPEED_ALWAYS = 210, - SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK = 211, + SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACKING = 210, + SPELL_AURA_MOD_FLIGHT_SPEED_MOUNTED_NOT_STACKING = 211, SPELL_AURA_MOD_RANGED_ATTACK_POWER_OF_STAT_PERCENT = 212, SPELL_AURA_MOD_RAGE_FROM_DAMAGE_DEALT = 213, SPELL_AURA_214 = 214, diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index fcb9a7d35..b25ddd08b 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -267,11 +267,11 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS] = &AuraEffect::HandleNoImmediateEffect, //203 SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_DAMAGE implemented in Unit::CalculateMeleeDamage and Unit::CalculateSpellDamage &AuraEffect::HandleNoImmediateEffect, //204 SPELL_AURA_MOD_ATTACKER_RANGED_CRIT_DAMAGE implemented in Unit::CalculateMeleeDamage and Unit::CalculateSpellDamage &AuraEffect::HandleNULL, //205 SPELL_AURA_MOD_SCHOOL_CRIT_DMG_TAKEN - &AuraEffect::HandleAuraModIncreaseFlightSpeed, //206 SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED + &AuraEffect::HandleAuraModIncreaseFlightSpeed, //206 SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED &AuraEffect::HandleAuraModIncreaseFlightSpeed, //207 SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED - &AuraEffect::HandleAuraModIncreaseFlightSpeed, //208 SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED + &AuraEffect::HandleAuraModIncreaseFlightSpeed, //208 SPELL_AURA_MOD_FLIGHT_SPEED_ALWAYS &AuraEffect::HandleAuraModIncreaseFlightSpeed, //209 SPELL_AURA_MOD_MOUNTED_FLIGHT_SPEED_ALWAYS - &AuraEffect::HandleAuraModIncreaseFlightSpeed, //210 SPELL_AURA_MOD_VEHICLE_SPEED_ALWAYS + &AuraEffect::HandleAuraModIncreaseFlightSpeed, //210 SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACKING &AuraEffect::HandleAuraModIncreaseFlightSpeed, //211 SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK &AuraEffect::HandleAuraModRangedAttackPowerOfStatPercent, //212 SPELL_AURA_MOD_RANGED_ATTACK_POWER_OF_STAT_PERCENT &AuraEffect::HandleNoImmediateEffect, //213 SPELL_AURA_MOD_RAGE_FROM_DAMAGE_DEALT implemented in Player::RewardRage diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 33e821ec9..d6b6cb511 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -46,10 +46,8 @@ #include "SpellMgr.h" #include "SpellScript.h" #include "TemporarySummon.h" -#include "Totem.h" #include "Unit.h" #include "UpdateData.h" -#include "UpdateMask.h" #include "Util.h" #include "VMapFactory.h" #include "Vehicle.h" @@ -3160,8 +3158,9 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA if (m_spellAura) { - // Prevent aura application if target is immuned - if (m_targets.GetUnitTarget() && m_targets.GetUnitTarget()->IsImmunedToDamageOrSchool(m_spellAura->GetSpellInfo())) + // Prevent aura application if target is banished and immuned + if (m_targets.GetUnitTarget() && m_targets.GetUnitTarget()->IsImmunedToDamageOrSchool(m_spellAura->GetSpellInfo()) + && m_targets.GetUnitTarget()->HasUnitState(UNIT_STATE_ISOLATED)) { m_spellAura->Remove(); return SPELL_MISS_IMMUNE; diff --git a/src/server/game/Spells/SpellDefines.h b/src/server/game/Spells/SpellDefines.h index 08a76cba6..4da855467 100644 --- a/src/server/game/Spells/SpellDefines.h +++ b/src/server/game/Spells/SpellDefines.h @@ -19,7 +19,6 @@ #define SPELLDEFINES_H #include "Define.h" -#include "ObjectGuid.h" #include enum SpellInterruptFlags diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index fe5fef96d..8b7699a78 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -16,7 +16,6 @@ */ #include "Battleground.h" -#include "BattlegroundEY.h" #include "BattlegroundIC.h" #include "BattlegroundMgr.h" #include "BattlegroundSA.h" @@ -57,8 +56,6 @@ #include "Totem.h" #include "Transport.h" #include "Unit.h" -#include "UpdateData.h" -#include "UpdateMask.h" #include "Util.h" #include "Vehicle.h" #include "World.h" diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 11e7a8d80..7548c552f 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -30,7 +30,6 @@ #include "SharedDefines.h" #include "Spell.h" #include "SpellAuraDefines.h" -#include "SpellAuras.h" #include "SpellInfo.h" #include "World.h" diff --git a/src/server/game/World/IWorld.h b/src/server/game/World/IWorld.h index ffcd30ba0..6f5f78ab6 100644 --- a/src/server/game/World/IWorld.h +++ b/src/server/game/World/IWorld.h @@ -22,12 +22,7 @@ #include "Common.h" #include "Duration.h" #include "ObjectGuid.h" -#include "QueryResult.h" #include "SharedDefines.h" -#include -#include -#include -#include #include class WorldPacket; diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index a1b5df825..fcebe617a 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -86,7 +86,6 @@ #include "Util.h" #include "VMapFactory.h" #include "VMapMgr2.h" -#include "Vehicle.h" #include "Warden.h" #include "WardenCheckMgr.h" #include "WaypointMovementGenerator.h" diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 70b1db4f8..ff33de5a4 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -31,7 +31,6 @@ #include #include #include -#include #include class Object; diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 0c131834c..067970420 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -316,6 +316,7 @@ struct boss_illidan_stormrage : public BossAI DoStopAttack(); me->SetControlled(true, UNIT_STATE_ROOT); me->SetCombatMovement(false); + DoResetThreatList(); DoCastSelf(SPELL_DEMON_TRANSFORM_1, true); me->m_Events.AddEventAtOffset([&] { @@ -734,7 +735,10 @@ struct npc_akama_illidan : public ScriptedAI scheduler.CancelAll(); me->m_Events.KillAllEvents(true); me->SetReactState(REACT_AGGRESSIVE); - me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); + if (instance->GetBossState(DATA_ILLIDAN_STORMRAGE) == DONE) + me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP); + else + me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); me->setActive(false); summons.DespawnAll(); DoCastSelf(SPELL_REDUCED_THREAT, true); diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 69b8fad98..1cc778b25 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -27,67 +27,67 @@ enum Says { - SAY_BROKEN_FREE_0 = 0, - SAY_BROKEN_FREE_1 = 1, - SAY_BROKEN_FREE_2 = 2, - SAY_LOW_HEALTH = 3, - SAY_DEATH = 4, + SAY_BROKEN_FREE_0 = 0, + SAY_BROKEN_FREE_1 = 1, + SAY_BROKEN_FREE_2 = 2, + SAY_LOW_HEALTH = 3, + SAY_DEATH = 4, - SAY_BROKEN_S1 = 0, - SAY_BROKEN_S2 = 1 + SAY_BROKEN_S1 = 0, + SAY_BROKEN_S2 = 1 }; enum Spells { // Akama - SPELL_STEALTH = 34189, - SPELL_DESTRUCTIVE_POISON = 40874, - SPELL_CHAIN_LIGHTNING = 39945, - SPELL_AKAMA_SOUL_CHANNEL = 40447, - SPELL_FIXATE = 40607, - SPELL_AKAMA_SOUL_RETRIEVE = 40902, // epilogue - SPELL_AKAMA_SOUL_EXPEL_CHANNEL = 40927, // epilogue + SPELL_STEALTH = 34189, + SPELL_DESTRUCTIVE_POISON = 40874, + SPELL_CHAIN_LIGHTNING = 39945, + SPELL_AKAMA_SOUL_CHANNEL = 40447, + SPELL_FIXATE = 40607, + SPELL_AKAMA_SOUL_RETRIEVE = 40902, // epilogue + SPELL_AKAMA_SOUL_EXPEL_CHANNEL = 40927, // epilogue // Shade & Channelers - SPELL_SHADE_SOUL_CHANNEL = 40401, - SPELL_THREAT = 41602, - SPELL_SHADE_OF_AKAMA_TRIGGER = 40955, + SPELL_SHADE_SOUL_CHANNEL = 40401, + SPELL_THREAT = 41602, + SPELL_SHADE_OF_AKAMA_TRIGGER = 40955, // Summons - SPELL_ASHTONGUE_WAVE_A = 42073, // unused - SPELL_ASHTONGUE_WAVE_B = 42035, - SPELL_SUMMON_ASHTONGUE_SORCERER = 40476, - SPELL_SUMMON_ASHTONGUE_DEFENDER = 40474 + SPELL_ASHTONGUE_WAVE_A = 42073, // unused + SPELL_ASHTONGUE_WAVE_B = 42035, + SPELL_SUMMON_ASHTONGUE_SORCERER = 40476, + SPELL_SUMMON_ASHTONGUE_DEFENDER = 40474 }; enum Creatures { - NPC_ASHTONGUE_SORCERER = 23215, - NPC_ASHTONGUE_DEFENDER = 23216, - NPC_ASHTONGUE_ELEMENTAL = 23523, - NPC_ASHTONGUE_ROGUE = 23318, - NPC_ASHTONGUE_SPIRITBIND = 23524, - NPC_ASHTONGUE_BROKEN = 23319 + NPC_ASHTONGUE_SORCERER = 23215, + NPC_ASHTONGUE_DEFENDER = 23216, + NPC_ASHTONGUE_ELEMENTAL = 23523, + NPC_ASHTONGUE_ROGUE = 23318, + NPC_ASHTONGUE_SPIRITBIND = 23524, + NPC_ASHTONGUE_BROKEN = 23319 }; enum Misc { - SUMMON_GROUP_BROKENS = 1, + SUMMON_GROUP_BROKENS = 1, - POINT_ENGAGE = 0, - POINT_OUTRO = 1, + POINT_ENGAGE = 0, + POINT_OUTRO = 1, - ACTION_GENERATOR_START = 1, - ACTION_GENERATOR_STOP = 2, - ACTION_GENERATOR_DESPAWN_ALL = 3, + ACTION_GENERATOR_START = 1, + ACTION_GENERATOR_STOP = 2, + ACTION_GENERATOR_DESPAWN_ALL = 3, + ACTION_GENERATOR_DESPAWN_NON_DEFENDERS = 4, - COUNTER_SPAWNS_MAX = 20, // Max number of spawns for each generator, number chosen at random + COUNTER_SPAWNS_MAX = 20, // Max number of spawns for each generator, number chosen at random - ACTION_AKAMA_START_OUTRO = 1, + ACTION_AKAMA_START_OUTRO = 1, - FACTION_DEFAULT = 1820, - FACTION_ENGAGE = 1868, - FACTION_DEFENDER = 1847 + FACTION_DEFAULT = 1820, + FACTION_MONSTER_SPAR = 1847 }; Position AkamaEngage = { 517.4877f, 400.79926f, 112.77704f }; @@ -222,6 +222,7 @@ struct npc_akama_shade : public ScriptedAI _sayLowHealth = false; _died = false; scheduler.CancelAll(); + _generators.clear(); } void MovementInform(uint32 type, uint32 point) override @@ -232,7 +233,7 @@ struct npc_akama_shade : public ScriptedAI { case POINT_ENGAGE: me->SetHomePosition(me->GetPosition()); - me->SetFaction(FACTION_ENGAGE); + me->SetFaction(FACTION_MONSTER_SPAR_BUDDY); DoCastSelf(SPELL_AKAMA_SOUL_CHANNEL, true); break; case POINT_OUTRO: @@ -279,6 +280,10 @@ struct npc_akama_shade : public ScriptedAI else if (damage >= me->GetHealth() && !_died) { _died = true; + me->GetCreatureListWithEntryInGrid(_generators, NPC_CREATURE_GENERATOR_AKAMA, 100.0f); + for (Creature* generator : _generators) + generator->AI()->DoAction(ACTION_GENERATOR_DESPAWN_ALL); + damage = me->GetHealth() - 1; Talk(SAY_DEATH); if (Creature* shade = instance->GetCreature(DATA_SHADE_OF_AKAMA)) @@ -342,6 +347,7 @@ struct npc_akama_shade : public ScriptedAI private: bool _sayLowHealth; bool _died; + std::list _generators; }; struct npc_creature_generator_akama : public ScriptedAI @@ -355,7 +361,6 @@ struct npc_creature_generator_akama : public ScriptedAI void Reset() override { - summons.DespawnAll(); scheduler.CancelAll(); } @@ -363,6 +368,7 @@ struct npc_creature_generator_akama : public ScriptedAI { spawnCounter++; ScriptedAI::JustSummoned(summon); + summons.Summon(summon); switch (summon->GetEntry()) { @@ -374,13 +380,10 @@ struct npc_creature_generator_akama : public ScriptedAI summon->GetMotionMaster()->MovePoint(POINT_ENGAGE, x, y, z); } break; - case NPC_ASHTONGUE_DEFENDER: - summon->SetFaction(FACTION_DEFENDER); - if (Creature* akama = instance->GetCreature(DATA_AKAMA_SHADE)) - summon->AI()->AttackStart(akama); - break; default: summon->SetInCombatWithZone(); + if (Creature* akama = instance->GetCreature(DATA_AKAMA_SHADE)) + summon->AI()->AttackStart(akama); break; } } @@ -434,6 +437,14 @@ struct npc_creature_generator_akama : public ScriptedAI summons.DespawnAll(); scheduler.CancelAll(); break; + case ACTION_GENERATOR_DESPAWN_NON_DEFENDERS: + summons.DoForAllSummons([&](WorldObject* summon) + { + if (Creature* c = summon->ToCreature()) + if (c->GetEntry() != NPC_ASHTONGUE_DEFENDER && c->GetEntry() != NPC_ASHTONGUE_SORCERER) + c->DespawnOrUnsummon(); + }); + break; } } diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 2057df054..6b5ca263b 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -1017,7 +1017,7 @@ class spell_dru_swift_flight_passive : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_swift_flight_passive::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED); + DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_swift_flight_passive::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED); } }; diff --git a/src/server/shared/DataStores/DBCDatabaseLoader.cpp b/src/server/shared/DataStores/DBCDatabaseLoader.cpp index cd139243e..f7c43baec 100644 --- a/src/server/shared/DataStores/DBCDatabaseLoader.cpp +++ b/src/server/shared/DataStores/DBCDatabaseLoader.cpp @@ -18,6 +18,7 @@ #include "DBCDatabaseLoader.h" #include "DatabaseEnv.h" #include "Errors.h" +#include "QueryResult.h" #include "StringFormat.h" DBCDatabaseLoader::DBCDatabaseLoader(char const* tableName, char const* dbcFormatString, std::vector& stringPool) diff --git a/src/server/shared/DataStores/DBCDatabaseLoader.h b/src/server/shared/DataStores/DBCDatabaseLoader.h index 71e72b07f..4d7627ffb 100644 --- a/src/server/shared/DataStores/DBCDatabaseLoader.h +++ b/src/server/shared/DataStores/DBCDatabaseLoader.h @@ -19,7 +19,6 @@ #define DBCDatabaseLoader_h__ #include "DBCFileLoader.h" -#include #include struct DBCDatabaseLoader diff --git a/src/server/shared/DataStores/DBCStorageIterator.h b/src/server/shared/DataStores/DBCStorageIterator.h index a546cc8c8..c1ea3a071 100644 --- a/src/server/shared/DataStores/DBCStorageIterator.h +++ b/src/server/shared/DataStores/DBCStorageIterator.h @@ -19,7 +19,6 @@ #define DBCStorageIterator_h__ #include "Define.h" -#include template class DBCStorageIterator diff --git a/src/server/shared/DataStores/DBCStructure.h b/src/server/shared/DataStores/DBCStructure.h index cc3f71edf..44b22be40 100644 --- a/src/server/shared/DataStores/DBCStructure.h +++ b/src/server/shared/DataStores/DBCStructure.h @@ -20,7 +20,6 @@ #include "DBCEnums.h" #include "Define.h" -#include "SharedDefines.h" #include "Util.h" #include #include diff --git a/src/server/shared/Realms/Realm.cpp b/src/server/shared/Realms/Realm.cpp index f81637977..d5cb544f1 100644 --- a/src/server/shared/Realms/Realm.cpp +++ b/src/server/shared/Realms/Realm.cpp @@ -16,7 +16,6 @@ */ #include "Realm.h" -#include "IpAddress.h" #include "IpNetwork.h" #include diff --git a/src/server/shared/Realms/RealmList.h b/src/server/shared/Realms/RealmList.h index b82ed816b..f047af64c 100644 --- a/src/server/shared/Realms/RealmList.h +++ b/src/server/shared/Realms/RealmList.h @@ -22,7 +22,6 @@ #include "Realm.h" #include #include -#include #include struct RealmBuildInfo diff --git a/src/server/shared/Secrets/SecretMgr.cpp b/src/server/shared/Secrets/SecretMgr.cpp index 5f4d345b5..bb8602778 100644 --- a/src/server/shared/Secrets/SecretMgr.cpp +++ b/src/server/shared/Secrets/SecretMgr.cpp @@ -23,6 +23,7 @@ #include "DatabaseEnv.h" #include "Errors.h" #include "Log.h" +#include "QueryResult.h" #include "SharedDefines.h" #define SECRET_FLAG_FOR(key, val, server) server ## _ ## key = (val ## ull << (16*SERVER_PROCESS_ ## server)) diff --git a/src/server/shared/Secrets/SecretMgr.h b/src/server/shared/Secrets/SecretMgr.h index 8e891aa02..8c6ceb20d 100644 --- a/src/server/shared/Secrets/SecretMgr.h +++ b/src/server/shared/Secrets/SecretMgr.h @@ -19,7 +19,6 @@ #define __ACORE_SECRETMGR_H__ #include "BigNumber.h" -#include "Common.h" #include "Log.h" #include "Optional.h" #include