josh/ThordekkCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: josh/ThordekkCore:b41cd95bb87d79816b429a77f490656a9c19f4c4
Branches Tags
josh/ThordekkCore:main josh/ThordekkCore:exiles-reach-test josh/ThordekkCore:exiles-reach josh/ThordekkCore:playerbotv2-integration
...
compare: josh/ThordekkCore:7288b8fedcd685df9eef414778766142efba5a05
Branches Tags
josh/ThordekkCore:main josh/ThordekkCore:exiles-reach-test josh/ThordekkCore:exiles-reach josh/ThordekkCore:playerbotv2-integration
8 Commits
b41cd95bb8 ... 7288b8fedc
Author SHA1 Message Date
luis 7288b8fedc del 2026-09-26 22:32:10 -03:00
luis 36b30fd12a Scripts/Spells: Implement hunter talent Horsehair Tether 2026-09-26 20:47:50 -03:00
luis 18ba84dd4e db fix 2026-09-26 20:37:08 -03:00
luis 1e80d7d867 Scripts/Spells: Implement hunter talent Trailblazer 2026-09-26 20:32:03 -03:00
luis 72a879d9cb Core/Spells: Fixed Rapid Fire being interrupted by Auto Shot 2026-09-26 20:30:31 -03:00
luis aa08843e07 Scripts/Spells: Add missing action bar glow for hunter talent Surging Shots proc 2026-09-26 20:29:23 -03:00
luis f2abcf67f6 Scripts/Spells: Update hunter talent Surging Shots 2026-09-26 20:28:14 -03:00
luis cd572e8c6c i will add sql later not assign spell script 2026-09-26 20:26:05 -03:00
4 changed files with 348 additions and 17 deletions
Expand all files Collapse all files
sql/updates/world/master/2026_09_26_01_world.sql
+242
View File
@@ -0,0 +1,242 @@
DELETE FROM `creature_equip_template` WHERE (`ID`=1 AND `CreatureID` IN (253836,253746,263618,258755,265177,258068,257091,265186,259231,253690,271147,253689,253686,253691)) OR (`ID`=2 AND `CreatureID`=267123);
INSERT INTO `creature_equip_template` (`CreatureID`, `ID`, `ItemID1`, `AppearanceModID1`, `ItemVisual1`, `ItemID2`, `AppearanceModID2`, `ItemVisual2`, `ItemID3`, `AppearanceModID3`, `ItemVisual3`, `VerifiedBuild`) VALUES
(253836, 1, 155799, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Quartermaster Grof
(253746, 1, 235234, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Yona
(263618, 1, 0, 0, 0, 0, 0, 0, 235240, 0, 0, 69933), -- Scout Oma'ema
(258755, 1, 160435, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Captain Tokka
(265177, 1, 235241, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Gerodka
(258068, 1, 235241, 0, 0, 235245, 0, 0, 0, 0, 0, 69933), -- Olawu
(257091, 1, 242519, 0, 0, 235231, 0, 0, 0, 0, 0, 69933), -- Ra'kamu
(265186, 1, 235241, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Kokona
(259231, 1, 155369, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Jin'dan Deadtusk
(253690, 1, 235236, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Amani Talon
(271147, 1, 235237, 0, 0, 235231, 0, 0, 235240, 0, 0, 69933), -- Amani Defender
(253689, 1, 265869, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Shadowpine Wing
(253686, 1, 235241, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Witherbark Fang
(253691, 1, 235242, 0, 0, 265884, 0, 0, 0, 0, 0, 69933), -- Revantusk Basher
(267123, 2, 2202, 0, 0, 0, 0, 0, 0, 0, 0, 69933); -- Brewfest Celebrant
UPDATE `creature_equip_template` SET `VerifiedBuild`=69933 WHERE (`ID`=1 AND `CreatureID` IN (246605,249753,240840,246626,240392,242487,243154,243049,253269,250584,222127,259567,250664,260573,241703,240936,242803,242802,260535,261304,260519,241425,208623,259667,251071,259777,250975,244493,258660,246231)) OR (`ID`=2 AND `CreatureID`=260519) OR (`ID`=3 AND `CreatureID` IN (260519,251071)) OR (`ID`=4 AND `CreatureID` IN (260519,251071)) OR (`ID`=6 AND `CreatureID`=260519) OR (`ID`=5 AND `CreatureID`=251071);
DELETE FROM `gameobject_template_addon` WHERE `entry` IN (454765 /*HDressing 2.0 - Standing, Kite02 Hanging - Children - JZB*/, 656417 /*Mysterious Tablet*/, 642665 /*Ruin Door*/, 654283 /*Door*/, 674231 /*Instance Portal*/, 648564 /*Vul'zahn's Smuggled Treasure*/, 672536 /*Thalassian Lumber*/, 653064 /*Ossified Relic*/, 642673 /*Box of Lukewarm Fish Guts*/, 642672 /*Scavenged Pepperplant*/, 642671 /*Box of Stale Hardtack*/, 642668 /*Basket of Salted Split Boar*/, 653410 /*Hearty Forage*/, 656382 /*Bar Tab Barrel*/, 454770 /*HDressing 2.0 - Poster, Medium - Trial of Style/Noblegarde/Children/Pilgrim/Midsummer/Brewfest - JZB*/);
INSERT INTO `gameobject_template_addon` (`entry`, `faction`, `flags`, `WorldEffectID`, `AIAnimKitID`) VALUES
(454765, 114, 0x0, 0, 0), -- HDressing 2.0 - Standing, Kite02 Hanging - Children - JZB
(656417, 0, 0x40020, 0, 0), -- Mysterious Tablet
(642665, 0, 0x30, 0, 0), -- Ruin Door
(654283, 0, 0x30, 0, 0), -- Door
(674231, 0, 0x20, 0, 0), -- Instance Portal
(648564, 0, 0x204000, 31586, 0), -- Vul'zahn's Smuggled Treasure
(672536, 94, 0x44000, 0, 0), -- Thalassian Lumber
(653064, 0, 0x40005, 0, 0), -- Ossified Relic
(642673, 0, 0x40000, 0, 0), -- Box of Lukewarm Fish Guts
(642672, 0, 0x40000, 0, 0), -- Scavenged Pepperplant
(642671, 0, 0x40000, 0, 0), -- Box of Stale Hardtack
(642668, 0, 0x40000, 0, 0), -- Basket of Salted Split Boar
(653410, 0, 0x1, 0, 0), -- Hearty Forage
(656382, 35, 0x20800004, 0, 0), -- Bar Tab Barrel
(454770, 114, 0x0, 0, 0); -- HDressing 2.0 - Poster, Medium - Trial of Style/Noblegarde/Children/Pilgrim/Midsummer/Brewfest - JZB
DELETE FROM `quest_offer_reward` WHERE `ID` IN (96525 /*Prey: Out of Our Depth*/, 96474 /*Prey: Something for Astalor*/, 96466 /*Prey: Anguish Island*/);
INSERT INTO `quest_offer_reward` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `RewardText`, `VerifiedBuild`) VALUES
(96525, 0, 0, 0, 0, 0, 0, 0, 0, 'You reek of fear and desperation.\n\nFascinating.', 69933), -- Prey: Out of Our Depth
(96474, 0, 0, 0, 0, 0, 0, 0, 0, '<Ethrandil sighs heavily.>\n\nOf course there are ghosts.', 69933), -- Prey: Something for Astalor
(96466, 0, 0, 0, 0, 0, 0, 0, 0, 'Snakes. \n\nWhy\'d it have to be snakes?', 69933); -- Prey: Anguish Island
DELETE FROM `quest_poi` WHERE (`QuestID`=96525 AND `BlobIndex`=0 AND `Idx1`=2) OR (`QuestID`=96525 AND `BlobIndex`=0 AND `Idx1`=1) OR (`QuestID`=96525 AND `BlobIndex`=0 AND `Idx1`=0) OR (`QuestID`=96474 AND `BlobIndex`=0 AND `Idx1`=2) OR (`QuestID`=96474 AND `BlobIndex`=0 AND `Idx1`=1) OR (`QuestID`=96474 AND `BlobIndex`=0 AND `Idx1`=0) OR (`QuestID`=96744 AND `BlobIndex`=0 AND `Idx1`=2) OR (`QuestID`=96744 AND `BlobIndex`=0 AND `Idx1`=1) OR (`QuestID`=96744 AND `BlobIndex`=0 AND `Idx1`=0) OR (`QuestID`=98234 AND `BlobIndex`=0 AND `Idx1`=1) OR (`QuestID`=98234 AND `BlobIndex`=0 AND `Idx1`=0) OR (`QuestID`=96635 AND `BlobIndex`=0 AND `Idx1`=1) OR (`QuestID`=96635 AND `BlobIndex`=0 AND `Idx1`=0);
INSERT INTO `quest_poi` (`QuestID`, `BlobIndex`, `Idx1`, `ObjectiveIndex`, `QuestObjectiveID`, `QuestObjectID`, `MapID`, `UiMapID`, `Priority`, `Flags`, `WorldEffectID`, `PlayerConditionID`, `NavigationPlayerConditionID`, `SpawnTrackingID`, `AlwaysAllowMergingBlobs`, `VerifiedBuild`) VALUES
(96525, 0, 2, 32, 0, 0, 0, 2512, 0, 0, 0, 0, 0, 3257755, 0, 69933), -- Prey: Out of Our Depth
(96525, 0, 1, 0, 473479, 265504, 0, 2512, 0, 0, 0, 0, 0, 3260539, 0, 69933), -- Prey: Out of Our Depth
(96525, 0, 0, -1, 0, 0, 0, 2393, 0, 0, 0, 0, 0, 2853599, 0, 69933), -- Prey: Out of Our Depth
(96474, 0, 2, 32, 0, 0, 0, 2512, 0, 0, 0, 0, 0, 0, 0, 69933), -- Prey: Something for Astalor
(96474, 0, 1, 1, 473364, 265318, 0, 2512, 0, 0, 0, 0, 0, 3258102, 0, 69933), -- Prey: Something for Astalor
(96474, 0, 0, -1, 0, 0, 0, 2512, 0, 0, 0, 0, 0, 3257755, 0, 69933), -- Prey: Something for Astalor
(96744, 0, 2, 32, 0, 0, 3075, 2600, 0, 2, 0, 0, 0, 0, 0, 69933), -- Bouncy Mushrooms
(96744, 0, 1, 31, 0, 0, 3075, 2600, 0, 2, 0, 0, 0, 0, 0, 69933), -- Bouncy Mushrooms
(96744, 0, 0, -1, 0, 0, 3075, 2600, 0, 2, 0, 0, 0, 0, 0, 69933), -- Bouncy Mushrooms
(98234, 0, 1, 32, 0, 0, 0, 2393, 0, 0, 0, 0, 0, 3118247, 0, 69933), -- Week 1 of 3: Gladiator's Distinction
(98234, 0, 0, -1, 0, 0, 0, 2393, 0, 0, 0, 0, 0, 3118247, 0, 69933), -- Week 1 of 3: Gladiator's Distinction
(96635, 0, 1, 32, 0, 0, 0, 2393, 0, 0, 0, 0, 0, 0, 0, 69933), -- Upgrade Practicum
(96635, 0, 0, -1, 0, 0, 0, 2393, 0, 0, 0, 0, 0, 2736116, 0, 69933); -- Upgrade Practicum
UPDATE `quest_poi` SET `VerifiedBuild`=69933 WHERE (`QuestID`=92150 AND `BlobIndex`=0 AND `Idx1`=1) OR (`QuestID`=92150 AND `BlobIndex`=0 AND `Idx1`=0) OR (`QuestID`=98218 AND `BlobIndex`=0 AND `Idx1`=0) OR (`QuestID`=96472 AND `BlobIndex`=0 AND `Idx1`=2) OR (`QuestID`=96472 AND `BlobIndex`=0 AND `Idx1`=1) OR (`QuestID`=96472 AND `BlobIndex`=0 AND `Idx1`=0) OR (`QuestID`=71242 AND `BlobIndex`=0 AND `Idx1`=0);
DELETE FROM `quest_poi_points` WHERE (`QuestID`=96525 AND `Idx1`=2 AND `Idx2`=0) OR (`QuestID`=96525 AND `Idx1`=1 AND `Idx2`=0) OR (`QuestID`=96525 AND `Idx1`=0 AND `Idx2`=0) OR (`QuestID`=96474 AND `Idx1`=2 AND `Idx2`=0) OR (`QuestID`=96474 AND `Idx1`=1 AND `Idx2`=0) OR (`QuestID`=96474 AND `Idx1`=0 AND `Idx2`=0) OR (`QuestID`=96744 AND `Idx1`=2 AND `Idx2`=0) OR (`QuestID`=96744 AND `Idx1`=1 AND `Idx2`=11) OR (`QuestID`=96744 AND `Idx1`=1 AND `Idx2`=10) OR (`QuestID`=96744 AND `Idx1`=1 AND `Idx2`=9) OR (`QuestID`=96744 AND `Idx1`=1 AND `Idx2`=8) OR (`QuestID`=96744 AND `Idx1`=1 AND `Idx2`=7) OR (`QuestID`=96744 AND `Idx1`=1 AND `Idx2`=6) OR (`QuestID`=96744 AND `Idx1`=1 AND `Idx2`=5) OR (`QuestID`=96744 AND `Idx1`=1 AND `Idx2`=4) OR (`QuestID`=96744 AND `Idx1`=1 AND `Idx2`=3) OR (`QuestID`=96744 AND `Idx1`=1 AND `Idx2`=2) OR (`QuestID`=96744 AND `Idx1`=1 AND `Idx2`=1) OR (`QuestID`=96744 AND `Idx1`=1 AND `Idx2`=0) OR (`QuestID`=96744 AND `Idx1`=0 AND `Idx2`=0) OR (`QuestID`=98234 AND `Idx1`=1 AND `Idx2`=0) OR (`QuestID`=98234 AND `Idx1`=0 AND `Idx2`=0) OR (`QuestID`=96635 AND `Idx1`=1 AND `Idx2`=0) OR (`QuestID`=96635 AND `Idx1`=0 AND `Idx2`=0);
INSERT INTO `quest_poi_points` (`QuestID`, `Idx1`, `Idx2`, `X`, `Y`, `Z`, `VerifiedBuild`) VALUES
(96525, 2, 0, 5940, -12071, 140, 69933), -- Prey: Out of Our Depth
(96525, 1, 0, 5937, -12073, 138, 69933), -- Prey: Out of Our Depth
(96525, 0, 0, 8548, -4927, 25, 69933), -- Prey: Out of Our Depth
(96474, 2, 0, 5937, -12072, 139, 69933), -- Prey: Something for Astalor
(96474, 1, 0, 5935, -12074, 138, 69933), -- Prey: Something for Astalor
(96474, 0, 0, 5940, -12071, 140, 69933), -- Prey: Something for Astalor
(96744, 2, 0, -2132, -1740, 0, 69933), -- Bouncy Mushrooms
(96744, 1, 11, -2208, -1787, 0, 69933), -- Bouncy Mushrooms
(96744, 1, 10, -2236, -1777, 0, 69933), -- Bouncy Mushrooms
(96744, 1, 9, -2247, -1730, 0, 69933), -- Bouncy Mushrooms
(96744, 1, 8, -2206, -1667, 0, 69933), -- Bouncy Mushrooms
(96744, 1, 7, -2176, -1631, 0, 69933), -- Bouncy Mushrooms
(96744, 1, 6, -2122, -1592, 0, 69933), -- Bouncy Mushrooms
(96744, 1, 5, -2057, -1592, 0, 69933), -- Bouncy Mushrooms
(96744, 1, 4, -2034, -1633, 0, 69933), -- Bouncy Mushrooms
(96744, 1, 3, -2029, -1676, 0, 69933), -- Bouncy Mushrooms
(96744, 1, 2, -2034, -1710, 0, 69933), -- Bouncy Mushrooms
(96744, 1, 1, -2065, -1780, 0, 69933), -- Bouncy Mushrooms
(96744, 1, 0, -2144, -1790, 0, 69933), -- Bouncy Mushrooms
(96744, 0, 0, -2121, -1740, 0, 69933), -- Bouncy Mushrooms
(98234, 1, 0, 8565, -4706, 19, 69933), -- Week 1 of 3: Gladiator's Distinction
(98234, 0, 0, 8565, -4706, 19, 69933), -- Week 1 of 3: Gladiator's Distinction
(96635, 1, 0, 8612, -4698, 20, 69933), -- Upgrade Practicum
(96635, 0, 0, 8612, -4698, 20, 69933); -- Upgrade Practicum
UPDATE `quest_poi_points` SET `VerifiedBuild`=69933 WHERE (`QuestID`=92150 AND `Idx1`=1 AND `Idx2`=0) OR (`QuestID`=92150 AND `Idx1`=0 AND `Idx2`=10) OR (`QuestID`=92150 AND `Idx1`=0 AND `Idx2`=9) OR (`QuestID`=92150 AND `Idx1`=0 AND `Idx2`=8) OR (`QuestID`=92150 AND `Idx1`=0 AND `Idx2`=7) OR (`QuestID`=92150 AND `Idx1`=0 AND `Idx2`=6) OR (`QuestID`=92150 AND `Idx1`=0 AND `Idx2`=5) OR (`QuestID`=92150 AND `Idx1`=0 AND `Idx2`=4) OR (`QuestID`=92150 AND `Idx1`=0 AND `Idx2`=3) OR (`QuestID`=92150 AND `Idx1`=0 AND `Idx2`=2) OR (`QuestID`=92150 AND `Idx1`=0 AND `Idx2`=1) OR (`QuestID`=92150 AND `Idx1`=0 AND `Idx2`=0) OR (`QuestID`=98218 AND `Idx1`=0 AND `Idx2`=0) OR (`QuestID`=96472 AND `Idx1`=2 AND `Idx2`=0) OR (`QuestID`=96472 AND `Idx1`=1 AND `Idx2`=11) OR (`QuestID`=96472 AND `Idx1`=1 AND `Idx2`=10) OR (`QuestID`=96472 AND `Idx1`=1 AND `Idx2`=9) OR (`QuestID`=96472 AND `Idx1`=1 AND `Idx2`=8) OR (`QuestID`=96472 AND `Idx1`=1 AND `Idx2`=7) OR (`QuestID`=96472 AND `Idx1`=1 AND `Idx2`=6) OR (`QuestID`=96472 AND `Idx1`=1 AND `Idx2`=5) OR (`QuestID`=96472 AND `Idx1`=1 AND `Idx2`=4) OR (`QuestID`=96472 AND `Idx1`=1 AND `Idx2`=3) OR (`QuestID`=96472 AND `Idx1`=1 AND `Idx2`=2) OR (`QuestID`=96472 AND `Idx1`=1 AND `Idx2`=1) OR (`QuestID`=96472 AND `Idx1`=1 AND `Idx2`=0) OR (`QuestID`=96472 AND `Idx1`=0 AND `Idx2`=0) OR (`QuestID`=71242 AND `Idx1`=0 AND `Idx2`=0);
DELETE FROM `quest_details` WHERE `ID` IN (96525 /*Prey: Out of Our Depth*/, 96474 /*Prey: Something for Astalor*/);
INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
(96525, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Prey: Out of Our Depth
(96474, 0, 0, 0, 0, 0, 0, 0, 0, 69933); -- Prey: Something for Astalor
UPDATE `ui_map_quest_line` SET `VerifiedBuild`=69933 WHERE (`UIMapId`=2512 AND `QuestLineId` IN (6329,6302,6277,6276,6274,6271,6264,6232,6231,6230,6229,6227,6224,6128,6123,6118,6115,6114,6090,6089,6087,6086,6055,6050,6045,6031,5999,5988,5981,5979,5975,5971,5939,5938,5905,5901,5778,5724,5723,5722));
UPDATE `ui_map_quest` SET `VerifiedBuild`=69933 WHERE (`UIMapId`=2395 AND `QuestId`=92122) OR (`UIMapId`=2393 AND `QuestId`=92122) OR (`UIMapId`=2512 AND `QuestId` IN (93440,93051,93050,93049,93048,93047,91930));
DELETE FROM `creature_queststarter` WHERE (`id`=265267 AND `quest` IN (96525,96474));
INSERT INTO `creature_queststarter` (`id`, `quest`, `VerifiedBuild`) VALUES
(265267, 96525, 69933), -- Prey: Out of Our Depth offered by Sanctum Attendant Ethrandil
(265267, 96474, 69933); -- Prey: Something for Astalor offered by Sanctum Attendant Ethrandil
DELETE FROM `creature_questender` WHERE (`id`=246231 AND `quest`=96525) OR (`id`=265267 AND `quest` IN (96474,96466));
INSERT INTO `creature_questender` (`id`, `quest`, `VerifiedBuild`) VALUES
(246231, 96525, 69933), -- Prey: Out of Our Depth ended by Astalor Bloodsworn
(265267, 96474, 69933), -- Prey: Something for Astalor ended by Sanctum Attendant Ethrandil
(265267, 96466, 69933); -- Prey: Anguish Island ended by Sanctum Attendant Ethrandil
DELETE FROM `world_quest_template` WHERE `QuestID` IN (93905 /*Ongoing Stoppage*/, 93704 /*Traditional Harvests*/, 83529 /*Hallowfall Fishing Derby*/, 53229 /*Arathi Donations: Enchant Ring - Seal of Critical Strike*/, 69931 /*Swoop And Grab*/, 81622 /*Bells of the Light*/, 53706 /*Salvage the Supplies*/, 53717 /*Hold the Highland*/, 53265 /*Arathi Donations: Gold*/, 96640 /*Bounty of the Cursed*/, 53219 /*Arathi Donations: Monel-Hardened Stirrups*/, 54266 /*Mortar Master Zapfritz*/);
INSERT INTO `world_quest_template` (`QuestID`, `Duration`, `VariableID`, `Value`) VALUES
(93905, 302400, 29850, 1), -- Ongoing Stoppage
(93704, 604800, 30194, 5), -- Traditional Harvests
(83529, 604800, 26597, 2), -- Hallowfall Fishing Derby
(53229, 86400, 16728, 1), -- Arathi Donations: Enchant Ring - Seal of Critical Strike
(69931, 302400, 22194, 1), -- Swoop And Grab
(81622, 86400, 25937, 1), -- Bells of the Light
(53706, 25200, 16289, 1), -- Salvage the Supplies
(53717, 25200, 16289, 1), -- Hold the Highland
(53265, 86400, 16717, 1), -- Arathi Donations: Gold
(96640, 86400, 31553, 1), -- Bounty of the Cursed
(53219, 86400, 16721, 1), -- Arathi Donations: Monel-Hardened Stirrups
(54266, 25200, 16289, 1); -- Mortar Master Zapfritz
UPDATE `world_quest_template` SET `VariableID`=14247 WHERE `QuestID`=49096; -- Invasion Point: Naigtal
DELETE FROM `spawn_tracking_template` WHERE `SpawnTrackingId` IN (3260539 /*Map: 0 (Eastern Kingdoms) - Phase: 29042*/, 3258102 /*Map: 0 (Eastern Kingdoms) - Phase: 0*/);
INSERT INTO `spawn_tracking_template` (`SpawnTrackingId`, `MapId`, `PhaseId`, `PhaseGroup`, `PhaseUseFlags`, `VerifiedBuild`) VALUES
(3260539, 0, 29042, 0, 0, 69933), -- Map: 0 (Eastern Kingdoms) - Phase: 29042
(3258102, 0, 0, 0, 0, 69933); -- Map: 0 (Eastern Kingdoms) - Phase: 0
UPDATE `spawn_tracking_template` SET `PhaseId`=29045 WHERE `SpawnTrackingId`=3257755;
UPDATE `spawn_tracking_template` SET `PhaseId`=27393 WHERE `SpawnTrackingId`=2853599;
UPDATE `spawn_tracking_template` SET `VerifiedBuild`=69933 WHERE `SpawnTrackingId` IN (3118247, 3235595, 2736116, 2265851);
UPDATE `spawn_tracking_template` SET `PhaseId`=0, `VerifiedBuild`=69933 WHERE `SpawnTrackingId` IN (3246680, 3246676); -- Map: 3075 (Naigtal) - Phase: 0
DELETE FROM `spawn_tracking_quest_objective` WHERE (`SpawnTrackingId`=3260539 AND `QuestObjectiveId`=473479) OR (`SpawnTrackingId`=3258102 AND `QuestObjectiveId`=473364);
INSERT INTO `spawn_tracking_quest_objective` (`SpawnTrackingId`, `QuestObjectiveId`, `VerifiedBuild`) VALUES
(3260539, 473479, 69933), -- 3260539
(3258102, 473364, 69933); -- 3258102
DELETE FROM `spell_target_position` WHERE (`ID`=1294999 AND `EffectIndex`=0 AND `OrderIndex`=0);
INSERT INTO `spell_target_position` (`ID`, `EffectIndex`, `OrderIndex`, `MapID`, `PositionX`, `PositionY`, `PositionZ`, `VerifiedBuild`) VALUES
(1294999, 0, 0, 0, 8516.7900390625, -4928.5, 26.53000068664550781, 69933); -- Spell: 1294999 ([DNT] The Coiled Isle to Sanctum) Effect 0: 252 (SPELL_EFFECT_TELEPORT_UNITS)
UPDATE `creature_model_info` SET `VerifiedBuild`=69933 WHERE `DisplayID` IN (30184, 136591, 68157, 99826, 128652, 85945, 129212, 129213, 42741, 124183, 59003, 128634, 124457, 128650, 89802, 126522, 99827, 99832, 128622, 86546, 16065, 126891, 126897, 99831, 126893, 129211, 129208, 128633, 89418, 129979, 128680, 115399, 126895, 126896, 128631, 129210, 129209, 26907, 137094, 120336, 136919, 139428, 138985, 138984, 136696, 138901, 136851, 138652, 124216, 131065, 130720, 138072, 130816, 131061, 131162, 131069, 130813, 130968, 130810, 131059, 130808, 130798, 131161, 104521, 130719, 131075, 131076, 130836, 131168, 131290, 130796, 114621, 125982, 131163, 87552, 87543, 130795, 130717, 131074, 130970, 130979, 130973, 56187, 124959, 130725, 130814, 130972, 130726, 130793, 28998, 131160, 114623, 131165, 130982, 131070, 28111, 136712, 136665, 136733, 138983, 5554, 136747, 136848, 137096, 137683);
UPDATE `creature_model_info` SET `BoundingRadius`=0.5, `CombatReach`=0.5, `VerifiedBuild`=69933 WHERE `DisplayID`=143389;
UPDATE `creature_model_info` SET `BoundingRadius`=0.790108144283294677, `CombatReach`=1.65000009536743164 WHERE `DisplayID`=131956;
UPDATE `creature_model_info` SET `BoundingRadius`=1.201061129570007324, `VerifiedBuild`=69933 WHERE `DisplayID`=125877;
UPDATE `creature_model_info` SET `BoundingRadius`=1.980034708976745605, `CombatReach`=3.20000004768371582 WHERE `DisplayID`=136107;
UPDATE `creature_model_info` SET `BoundingRadius`=1.231379508972167968, `CombatReach`=1.20000004768371582 WHERE `DisplayID`=129981;
UPDATE `creature_model_info` SET `BoundingRadius`=0.300000011920928955, `VerifiedBuild`=69933 WHERE `DisplayID`=144522;
UPDATE `creature_model_info` SET `BoundingRadius`=1.254667878150939941, `CombatReach`=1.65000009536743164, `VerifiedBuild`=69933 WHERE `DisplayID`=137937;
UPDATE `creature_model_info` SET `BoundingRadius`=0.401224195957183837, `CombatReach`=1, `VerifiedBuild`=69933 WHERE `DisplayID` IN (143769, 143767);
UPDATE `creature_model_info` SET `BoundingRadius`=0.382999986410140991, `CombatReach`=1.5, `VerifiedBuild`=69933 WHERE `DisplayID`=144432;
UPDATE `creature_model_info` SET `BoundingRadius`=1, `VerifiedBuild`=69933 WHERE `DisplayID` IN (138073, 138071);
UPDATE `creature_model_info` SET `BoundingRadius`=1.596849918365478515, `CombatReach`=2.099999904632568359, `VerifiedBuild`=69933 WHERE `DisplayID`=145432;
UPDATE `creature_model_info` SET `BoundingRadius`=0.521591424942016601, `CombatReach`=1.299999952316284179, `VerifiedBuild`=69933 WHERE `DisplayID`=144389;
UPDATE `creature_model_info` SET `BoundingRadius`=1.017498612403869628, `CombatReach`=1.10000002384185791, `VerifiedBuild`=69933 WHERE `DisplayID` IN (139947, 141422);
UPDATE `creature_model_info` SET `BoundingRadius`=0.561713874340057373, `CombatReach`=1.399999976158142089, `VerifiedBuild`=69933 WHERE `DisplayID`=144393;
UPDATE `creature_model_info` SET `BoundingRadius`=0.5, `CombatReach`=1, `VerifiedBuild`=69933 WHERE `DisplayID` IN (113180, 113182);
UPDATE `creature_model_info` SET `DisplayID_Other_Gender`=0, `VerifiedBuild`=69933 WHERE `DisplayID`=21838;
UPDATE `creature_template_spell` SET `Spell`=264667, `VerifiedBuild`=69933 WHERE (`CreatureID`=165189 AND `Index`=6); -- Generic Hunter Pet
UPDATE `creature_template_spell` SET `Spell`=2649, `VerifiedBuild`=69933 WHERE (`CreatureID`=165189 AND `Index`=5); -- Generic Hunter Pet
UPDATE `creature_template_spell` SET `Spell`=159953, `VerifiedBuild`=69933 WHERE (`CreatureID`=165189 AND `Index`=4); -- Generic Hunter Pet
UPDATE `creature_template_spell` SET `Spell`=54680, `VerifiedBuild`=69933 WHERE (`CreatureID`=165189 AND `Index`=3); -- Generic Hunter Pet
DELETE FROM `npc_vendor` WHERE (`entry`=259939 AND `item`=267400 AND `ExtendedCost`=11494 AND `type`=1) OR (`entry`=259939 AND `item`=267399 AND `ExtendedCost`=11494 AND `type`=1) OR (`entry`=259939 AND `item`=256756 AND `ExtendedCost`=11030 AND `type`=1) OR (`entry`=259939 AND `item`=256754 AND `ExtendedCost`=11030 AND `type`=1) OR (`entry`=259939 AND `item`=264666 AND `ExtendedCost`=11397 AND `type`=1) OR (`entry`=259939 AND `item`=263933 AND `ExtendedCost`=11140 AND `type`=1) OR (`entry`=259939 AND `item`=278241 AND `ExtendedCost`=11351 AND `type`=1) OR (`entry`=259939 AND `item`=266199 AND `ExtendedCost`=11351 AND `type`=1) OR (`entry`=259939 AND `item`=266198 AND `ExtendedCost`=11351 AND `type`=1) OR (`entry`=259939 AND `item`=266197 AND `ExtendedCost`=11351 AND `type`=1) OR (`entry`=259939 AND `item`=266196 AND `ExtendedCost`=11351 AND `type`=1) OR (`entry`=259939 AND `item`=258030 AND `ExtendedCost`=11144 AND `type`=1) OR (`entry`=259939 AND `item`=258026 AND `ExtendedCost`=11144 AND `type`=1) OR (`entry`=259939 AND `item`=258028 AND `ExtendedCost`=11144 AND `type`=1) OR (`entry`=259939 AND `item`=258024 AND `ExtendedCost`=10948 AND `type`=1) OR (`entry`=259939 AND `item`=258022 AND `ExtendedCost`=10948 AND `type`=1) OR (`entry`=259939 AND `item`=257192 AND `ExtendedCost`=10951 AND `type`=1) OR (`entry`=259939 AND `item`=257191 AND `ExtendedCost`=10950 AND `type`=1) OR (`entry`=259939 AND `item`=264434 AND `ExtendedCost`=11360 AND `type`=1) OR (`entry`=259939 AND `item`=259991 AND `ExtendedCost`=10991 AND `type`=1);
INSERT INTO `npc_vendor` (`entry`, `slot`, `item`, `maxcount`, `ExtendedCost`, `type`, `PlayerConditionID`, `IgnoreFiltering`, `VerifiedBuild`) VALUES
(259939, 21, 267400, 0, 11494, 1, 0, 0, 69933), -- Technique: Wild Hanging Scroll
(259939, 20, 267399, 0, 11494, 1, 0, 0, 69933), -- Technique: Sturdy Ren'dorei Cask
(259939, 19, 256756, 0, 11030, 1, 0, 0, 69933), -- Formula: Enchant Boots - Farstrider's Hunt
(259939, 18, 256754, 0, 11030, 1, 0, 0, 69933), -- Formula: Enchant Shoulders - Nature's Embrace
(259939, 17, 264666, 0, 11397, 1, 0, 0, 69933), -- Rod of Exanguishation
(259939, 16, 263933, 0, 11140, 1, 0, 0, 69933), -- Preyseeker's Hearthstone
(259939, 15, 278241, 0, 11351, 1, 0, 0, 69933), -- Arsenal: Preyseeker's Lost Armaments
(259939, 14, 266199, 0, 11351, 1, 0, 0, 69933), -- Ensemble: Preyseeker's Polished Armor
(259939, 13, 266198, 0, 11351, 1, 0, 0, 69933), -- Ensemble: Preyseeker's Rugged Armor
(259939, 12, 266197, 0, 11351, 1, 0, 0, 69933), -- Ensemble: Preyseeker's Sleek Armor
(259939, 11, 266196, 0, 11351, 1, 0, 0, 69933), -- Ensemble: Preyseeker's Refined Armor
(259939, 10, 258030, 0, 11144, 1, 0, 0, 69933), -- Famed Preyseeker's Knapsack
(259939, 9, 258026, 0, 11144, 1, 0, 0, 69933), -- Famed Preyseeker's Shoulder-spikes
(259939, 8, 258028, 0, 11144, 1, 0, 0, 69933), -- Famed Preyseeker's Plumed Helm
(259939, 7, 258024, 0, 10948, 1, 0, 0, 69933), -- Skilled Preyseeker's Shoulder-spikes
(259939, 6, 258022, 0, 10948, 1, 0, 0, 69933), -- Skilled Preyseeker's Plumed Helm
(259939, 5, 257192, 0, 10951, 1, 0, 0, 69933), -- Preyseeker's Wrath
(259939, 4, 257191, 0, 10950, 1, 0, 0, 69933), -- Preyseeker's Hubris
(259939, 3, 264434, 0, 11360, 1, 0, 0, 69933), -- Voldy
(259939, 2, 259991, 0, 10991, 1, 0, 0, 69933); -- Lil' Preyseeker
DELETE FROM `gameobject_template` WHERE `entry` IN (656417 /*Mysterious Tablet*/, 642665 /*Ruin Door*/, 654283 /*Door*/, 674231 /*Instance Portal*/, 654266 /*Camfire*/, 672536 /*Thalassian Lumber*/, 648564 /*Vul'zahn's Smuggled Treasure*/, 587292 /*Mailbox*/, 653399 /*Medicinal Herbs*/, 653410 /*Hearty Forage*/, 653467 /*Reclaimed Weaponry*/, 653394 /*Crate of Supplies*/, 653395 /*Crate of Supplies*/, 653397 /*Basket of Supplies*/, 653064 /*Ossified Relic*/, 642822 /*Stale Hardtack*/, 642804 /*Army Stew Pot*/, 642668 /*Basket of Salted Split Boar*/, 642672 /*Scavenged Pepperplant*/, 642821 /*Salted Split Boar*/, 642671 /*Box of Stale Hardtack*/, 642811 /*Crate*/, 642673 /*Box of Lukewarm Fish Guts*/, 642809 /*Fish?*/, 587291 /*Forge*/, 587290 /*Anvil*/);
INSERT INTO `gameobject_template` (`entry`, `type`, `displayId`, `name`, `IconName`, `castBarCaption`, `unk1`, `size`, `Data0`, `Data1`, `Data2`, `Data3`, `Data4`, `Data5`, `Data6`, `Data7`, `Data8`, `Data9`, `Data10`, `Data11`, `Data12`, `Data13`, `Data14`, `Data15`, `Data16`, `Data17`, `Data18`, `Data19`, `Data20`, `Data21`, `Data22`, `Data23`, `Data24`, `Data25`, `Data26`, `Data27`, `Data28`, `Data29`, `Data30`, `Data31`, `Data32`, `Data33`, `Data34`, `RequiredLevel`, `ContentTuningId`, `VerifiedBuild`) VALUES
(656417, 10, 105670, 'Mysterious Tablet', 'questinteract', 'Investigating', '', 1, 2722, 0, 0, 3000, 0, 0, 0, 10703, 0, 2, 1298114, 0, 0, 1, 56085, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 500, 0, 80, 3085, 69933), -- Mysterious Tablet
(642665, 0, 113515, 'Ruin Door', '', '', '', 1, 0, 0, 3000, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Ruin Door
(654283, 0, 125627, 'Door', '', '', '', 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Door
(674231, 5, 129861, 'Instance Portal', '', '', '', 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Instance Portal
(654266, 8, 110245, 'Camfire', '', '', '', 1, 4, 10, 2061, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Camfire
(672536, 50, 106528, 'Thalassian Lumber', 'axe', '', '', 1, 4098, 133662, 0, 0, 0, 0, 30, 0, 0, 0, 0, 147322, 0, 1, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 5937, 69933), -- Thalassian Lumber
(648564, 3, 108890, 'Vul\'zahn\'s Smuggled Treasure', '', 'Opening', '', 0.800000011920928955, 4393, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 37521, 0, 0, 0, 0, 5, 32768, 0, 0, 0, 0, 0, 1289548, 0, 0, 7610, 140507, 0, 0, 0, 0, 90, 5381, 69933), -- Vul'zahn's Smuggled Treasure
(587292, 19, 49487, 'Mailbox', '', '', '', 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Mailbox
(653399, 10, 30842, 'Medicinal Herbs', 'questinteract', '', '', 1.20000004768371582, 0, 0, 0, 3000, 0, 0, 0, 0, 0, 0, 1294511, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Medicinal Herbs
(653410, 10, 125466, 'Hearty Forage', 'questinteract', '', '', 0.699999988079071044, 0, 0, 0, 3000, 0, 0, 0, 0, 0, 0, 1294926, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Hearty Forage
(653467, 10, 105896, 'Reclaimed Weaponry', 'questinteract', '', '', 1, 0, 0, 0, 3000, 0, 0, 0, 0, 0, 0, 1294991, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Reclaimed Weaponry
(653394, 5, 106299, 'Crate of Supplies', '', '', '', 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Crate of Supplies
(653395, 5, 106299, 'Crate of Supplies', '', '', '', 1.20000004768371582, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Crate of Supplies
(653397, 5, 108410, 'Basket of Supplies', '', '', '', 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Basket of Supplies
(653064, 10, 122674, 'Ossified Relic', 'questinteract', '', '', 1, 4426, 96474, 0, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Ossified Relic
(642822, 5, 105279, 'Stale Hardtack', '', '', '', 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90, 5381, 69933), -- Stale Hardtack
(642804, 5, 49777, 'Army Stew Pot', '', '', '', 0.800000011920928955, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90, 5381, 69933), -- Army Stew Pot
(642668, 10, 102872, 'Basket of Salted Split Boar', 'questinteract', '', '', 1, 3039, 0, 0, 0, 0, 0, 0, 0, 0, 0, 417169, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 154166, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 2699, 69933), -- Basket of Salted Split Boar
(642672, 10, 47067, 'Scavenged Pepperplant', 'questinteract', '', '', 1, 3039, 0, 0, 1, 0, 0, 0, 0, 0, 0, 417162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 154166, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 2699, 69933), -- Scavenged Pepperplant
(642821, 5, 75162, 'Salted Split Boar', '', '', '', 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90, 5381, 69933), -- Salted Split Boar
(642671, 10, 102863, 'Box of Stale Hardtack', 'questinteract', '', '', 1, 3039, 0, 0, 0, 0, 0, 0, 0, 0, 0, 417165, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 154166, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 2699, 69933), -- Box of Stale Hardtack
(642811, 5, 45884, 'Crate', '', '', '', 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90, 5381, 69933), -- Crate
(642673, 10, 102863, 'Box of Lukewarm Fish Guts', 'questinteract', '', '', 1, 3039, 0, 0, 0, 0, 0, 0, 0, 0, 0, 417164, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 154166, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 2699, 69933), -- Box of Lukewarm Fish Guts
(642809, 5, 78259, 'Fish?', '', '', '', 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90, 5381, 69933), -- Fish?
(587291, 8, 75301, 'Forge', '', '', '', 1, 3, 10, 0, 0, 0, 0, 0, 0, 103829, 0, 30092, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 69933), -- Forge
(587290, 8, 48031, 'Anvil', '', '', '', 1, 1, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 69933); -- Anvil
DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_hun_no_hard_feelings';
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(34477, 'spell_hun_no_hard_feelings');
DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_hun_trailblazer';
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(199921, 'spell_hun_trailblazer');
src/server/game/Battlegrounds/ArenaTeam.cpp
+4 -10
View File
@@ -395,17 +395,11 @@ void ArenaTeam::Disband()
sArenaTeamMgr->RemoveArenaTeam(TeamId); sArenaTeamMgr->RemoveArenaTeam(TeamId);
} }
void ArenaTeam::SendStats(WorldSession* session) void ArenaTeam::SendStats(WorldSession* /*session*/)
{ {
WorldPacket data(SMSG_ARENA_TEAM_STATS, 4*7); // Retail has no arena team stats packet since arena teams were replaced by rated
data << uint32(GetId()); // team id // matchmaking - SMSG_ARENA_TEAM_STATS only survives in Opcodes.h as a compile
data << uint32(Stats.Rating); // rating // placeholder with no value, so sending it would put opcode 0xBADD on the wire.
data << uint32(Stats.WeekGames); // games this week
data << uint32(Stats.WeekWins); // wins this week
data << uint32(Stats.SeasonGames); // played this season
data << uint32(Stats.SeasonWins); // wins this season
data << uint32(Stats.Rank); // rank
session->SendPacket(&data);
} }
void ArenaTeam::NotifyStatsChanged() void ArenaTeam::NotifyStatsChanged()
src/server/game/Entities/Unit/Unit.cpp
+5 -3
View File
@@ -3307,8 +3307,10 @@ bool Unit::IsNonMeleeSpellCast(bool withDelayed, bool skipChanneled /*= false*/,
if (!skipChanneled && m_currentSpells[CURRENT_CHANNELED_SPELL] && if (!skipChanneled && m_currentSpells[CURRENT_CHANNELED_SPELL] &&
(m_currentSpells[CURRENT_CHANNELED_SPELL]->getState() != SPELL_STATE_FINISHED)) (m_currentSpells[CURRENT_CHANNELED_SPELL]->getState() != SPELL_STATE_FINISHED))
{ {
if ((!isAutoshoot || !m_currentSpells[CURRENT_CHANNELED_SPELL]->m_spellInfo->HasAttribute(SPELL_ATTR2_DO_NOT_RESET_COMBAT_TIMERS)) && SpellInfo const* channeledSpellInfo = m_currentSpells[CURRENT_CHANNELED_SPELL]->m_spellInfo;
(!skipChanneledAllowingActions || !m_currentSpells[CURRENT_CHANNELED_SPELL]->m_spellInfo->HasAttribute(SPELL_ATTR5_ALLOW_ACTIONS_DURING_CHANNEL)))
if ((!isAutoshoot || !channeledSpellInfo->HasAttribute(SPELL_ATTR2_DO_NOT_RESET_COMBAT_TIMERS) || channeledSpellInfo->HasChannelInterruptFlag(SpellAuraInterruptFlags::Action | SpellAuraInterruptFlags::ActionDelayed)) &&
(!skipChanneledAllowingActions || !channeledSpellInfo->HasAttribute(SPELL_ATTR5_ALLOW_ACTIONS_DURING_CHANNEL)))
return true; return true;
} }
// autorepeat spells may be finished or delayed, but they are still considered cast // autorepeat spells may be finished or delayed, but they are still considered cast
@@ -4389,7 +4391,7 @@ void Unit::RemoveAurasWithInterruptFlags(InterruptFlags flag, SpellInfo const* s
&& spell->GetSpellInfo()->HasChannelInterruptFlag(flag) && spell->GetSpellInfo()->HasChannelInterruptFlag(flag)
&& (!source || spell->GetSpellInfo()->Id != source->Id) && (!source || spell->GetSpellInfo()->Id != source->Id)
&& !IsInterruptFlagIgnoredForSpell(flag, this, spell->GetSpellInfo(), true, source)) && !IsInterruptFlagIgnoredForSpell(flag, this, spell->GetSpellInfo(), true, source))
InterruptNonMeleeSpells(false); InterruptSpell(CURRENT_CHANNELED_SPELL, false, false);
UpdateInterruptMask(); UpdateInterruptMask();
} }
src/server/scripts/Spells/spell_hunter.cpp
+97 -4
View File
@@ -63,6 +63,8 @@ enum HunterSpells
SPELL_HUNTER_GREVIOUS_INJURY = 1217789, SPELL_HUNTER_GREVIOUS_INJURY = 1217789,
SPELL_HUNTER_HIGH_EXPLOSIVE_TRAP = 236775, SPELL_HUNTER_HIGH_EXPLOSIVE_TRAP = 236775,
SPELL_HUNTER_HIGH_EXPLOSIVE_TRAP_DAMAGE = 236777, SPELL_HUNTER_HIGH_EXPLOSIVE_TRAP_DAMAGE = 236777,
SPELL_HUNTER_HORSEHAIR_TETHER_TALENT = 472729,
SPELL_HUNTER_HORSEHAIR_TETHER_GRIP = 472731,
SPELL_HUNTER_IMPLOSIVE_TRAP = 462032, SPELL_HUNTER_IMPLOSIVE_TRAP = 462032,
SPELL_HUNTER_IMPLOSIVE_TRAP_DAMAGE = 462033, SPELL_HUNTER_IMPLOSIVE_TRAP_DAMAGE = 462033,
SPELL_HUNTER_INTIMIDATION = 19577, SPELL_HUNTER_INTIMIDATION = 19577,
@@ -80,6 +82,8 @@ enum HunterSpells
SPELL_HUNTER_MISDIRECTION = 34477, SPELL_HUNTER_MISDIRECTION = 34477,
SPELL_HUNTER_MISDIRECTION_PROC = 35079, SPELL_HUNTER_MISDIRECTION_PROC = 35079,
SPELL_HUNTER_MULTI_SHOT_FOCUS = 213363, SPELL_HUNTER_MULTI_SHOT_FOCUS = 213363,
SPELL_HUNTER_NO_HARD_FEELINGS_TALENT = 459546,
SPELL_HUNTER_NO_HARD_FEELINGS_AURA = 459547,
SPELL_HUNTER_PET_HEART_OF_THE_PHOENIX_TRIGGERED = 54114, SPELL_HUNTER_PET_HEART_OF_THE_PHOENIX_TRIGGERED = 54114,
SPELL_HUNTER_PET_HEART_OF_THE_PHOENIX_DEBUFF = 55711, SPELL_HUNTER_PET_HEART_OF_THE_PHOENIX_DEBUFF = 55711,
SPELL_HUNTER_POSTHASTE_INCREASE_SPEED = 118922, SPELL_HUNTER_POSTHASTE_INCREASE_SPEED = 118922,
@@ -99,12 +103,14 @@ enum HunterSpells
SPELL_HUNTER_STEADY_SHOT_FOCUS = 77443, SPELL_HUNTER_STEADY_SHOT_FOCUS = 77443,
SPELL_HUNTER_STREAMLINE_TALENT = 260367, SPELL_HUNTER_STREAMLINE_TALENT = 260367,
SPELL_HUNTER_STREAMLINE_BUFF = 342076, SPELL_HUNTER_STREAMLINE_BUFF = 342076,
SPELL_HUNTER_SURGING_SHOTS_ACTION_BAR_GLOW = 391561,
SPELL_HUNTER_T9_4P_GREATNESS = 68130, SPELL_HUNTER_T9_4P_GREATNESS = 68130,
SPELL_HUNTER_T29_2P_MARKSMANSHIP_DAMAGE = 394371, SPELL_HUNTER_T29_2P_MARKSMANSHIP_DAMAGE = 394371,
SPELL_HUNTER_TAKE_AIM = 1273132, SPELL_HUNTER_TAKE_AIM = 1273132,
SPELL_HUNTER_TAR_TRAP = 187699, SPELL_HUNTER_TAR_TRAP = 187699,
SPELL_HUNTER_TAR_TRAP_AREATRIGGER = 187700, SPELL_HUNTER_TAR_TRAP_AREATRIGGER = 187700,
SPELL_HUNTER_TAR_TRAP_SLOW = 135299, SPELL_HUNTER_TAR_TRAP_SLOW = 135299,
SPELL_HUNTER_TRAILBLAZER = 231390,
SPELL_HUNTER_WILDERNESS_MEDICINE_TALENT = 343242, SPELL_HUNTER_WILDERNESS_MEDICINE_TALENT = 343242,
SPELL_HUNTER_WILDERNESS_MEDICINE_DISPEL = 384784, SPELL_HUNTER_WILDERNESS_MEDICINE_DISPEL = 384784,
SPELL_ROAR_OF_SACRIFICE_TRIGGERED = 67481, SPELL_ROAR_OF_SACRIFICE_TRIGGERED = 67481,
@@ -346,6 +352,9 @@ struct at_hun_binding_shot : AreaTriggerAI
{ {
caster->CastSpell(unit, SPELL_HUNTER_BINDING_SHOT_STUN, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); caster->CastSpell(unit, SPELL_HUNTER_BINDING_SHOT_STUN, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR);
caster->CastSpell(unit, SPELL_HUNTER_BINDING_SHOT_IMMUNE, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR); caster->CastSpell(unit, SPELL_HUNTER_BINDING_SHOT_IMMUNE, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR);
if (caster->HasAura(SPELL_HUNTER_HORSEHAIR_TETHER_TALENT))
unit->CastSpell(at->GetPosition(), SPELL_HUNTER_HORSEHAIR_TETHER_GRIP, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR);
} }
} }
} }
@@ -976,6 +985,38 @@ class spell_hun_beast_cleave_pet : public AuraScript
} }
}; };
// 459546 - No Hard Feelings (attached to 34477 - Misdirection)
class spell_hun_no_hard_feelings : public SpellScript
{
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_NO_HARD_FEELINGS_TALENT, SPELL_HUNTER_NO_HARD_FEELINGS_AURA });
}
bool Load() override
{
return GetCaster()->HasAura(SPELL_HUNTER_NO_HARD_FEELINGS_TALENT);
}
void HandleHitTarget(SpellEffIndex /*effIndex*/) const
{
Unit* caster = GetCaster();
Unit* target = GetHitUnit();
if (!target->IsPet() || target->GetOwnerGUID() != caster->GetGUID())
return;
caster->CastSpell(target, SPELL_HUNTER_NO_HARD_FEELINGS_AURA, CastSpellExtraArgsInit{
.TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
.TriggeringSpell = GetSpell()
});
}
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hun_no_hard_feelings::HandleHitTarget, EFFECT_0, SPELL_EFFECT_REDIRECT_THREAT);
}
};
// 2643 - Multi-Shot // 2643 - Multi-Shot
class spell_hun_multi_shot : public SpellScript class spell_hun_multi_shot : public SpellScript
{ {
@@ -1662,17 +1703,25 @@ class spell_hun_surging_shots : public AuraScript
{ {
bool Validate(SpellInfo const* /*spellInfo*/) override bool Validate(SpellInfo const* /*spellInfo*/) override
{ {
return ValidateSpellInfo({ SPELL_HUNTER_RAPID_FIRE }); return ValidateSpellInfo({ SPELL_HUNTER_RAPID_FIRE, SPELL_HUNTER_SURGING_SHOTS_ACTION_BAR_GLOW });
} }
void HandleProc(ProcEventInfo const& /*eventInfo*/) const static bool RollProc(AuraScript const&, AuraEffect const* aurEff, ProcEventInfo const& /*procInfo*/)
{ {
GetTarget()->GetSpellHistory()->ResetCooldown(SPELL_HUNTER_RAPID_FIRE, true); return roll_chance(aurEff->GetAmount());
}
static void HandleProc(AuraScript const&, AuraEffect const* /*aurEff*/, ProcEventInfo const& eventInfo)
{
Unit* caster = eventInfo.GetActor();
caster->GetSpellHistory()->ResetCooldown(SPELL_HUNTER_RAPID_FIRE, true);
caster->CastSpell(caster, SPELL_HUNTER_SURGING_SHOTS_ACTION_BAR_GLOW, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR);
} }
void Register() override void Register() override
{ {
OnProc += AuraProcFn(spell_hun_surging_shots::HandleProc); DoCheckEffectProc += AuraCheckEffectProcFn(spell_hun_surging_shots::RollProc, EFFECT_2, SPELL_AURA_DUMMY);
OnEffectProc += AuraEffectProcFn(spell_hun_surging_shots::HandleProc, EFFECT_2, SPELL_AURA_DUMMY);
} }
}; };
@@ -1828,6 +1877,48 @@ struct areatrigger_hun_tar_trap_activate : AreaTriggerAI
} }
}; };
// 199921 - Trailblazer
class spell_hun_trailblazer : public AuraScript
{
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_TRAILBLAZER });
}
static void CalcPeriodic(AuraScript const&, AuraEffect const* /*aurEff*/, bool& isPeriodic, int32& amplitude)
{
isPeriodic = true;
amplitude = 3 * IN_MILLISECONDS;
}
void HandleDummyTick(AuraEffect const* /*aurEff*/) const
{
Unit* caster = GetTarget();
if (!caster->HasAura(SPELL_HUNTER_TRAILBLAZER))
caster->CastSpell(caster, SPELL_HUNTER_TRAILBLAZER, TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR);
}
static void HandleProc(AuraScript const&, AuraEffect* aurEff, ProcEventInfo const& eventInfo)
{
aurEff->ResetPeriodic(true);
eventInfo.GetActor()->RemoveAurasDueToSpell(SPELL_HUNTER_TRAILBLAZER);
}
void HandleOnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) const
{
GetTarget()->RemoveAurasDueToSpell(SPELL_HUNTER_TRAILBLAZER);
}
void Register() override
{
DoEffectCalcPeriodic += AuraEffectCalcPeriodicFn(spell_hun_trailblazer::CalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_hun_trailblazer::HandleDummyTick, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc += AuraEffectProcFn(spell_hun_trailblazer::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
AfterEffectRemove += AuraEffectRemoveFn(spell_hun_trailblazer::HandleOnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
// 67151 - Item - Hunter T9 4P Bonus (Steady Shot) // 67151 - Item - Hunter T9 4P Bonus (Steady Shot)
class spell_hun_t9_4p_bonus : public AuraScript class spell_hun_t9_4p_bonus : public AuraScript
{ {
@@ -2567,6 +2658,7 @@ void AddSC_hunter_spell_scripts()
RegisterSpellScript(spell_hun_misdirection); RegisterSpellScript(spell_hun_misdirection);
RegisterSpellScript(spell_hun_misdirection_proc); RegisterSpellScript(spell_hun_misdirection_proc);
RegisterSpellScript(spell_hun_multi_shot); RegisterSpellScript(spell_hun_multi_shot);
RegisterSpellScript(spell_hun_no_hard_feelings);
RegisterSpellScript(spell_hun_penetrating_shots); RegisterSpellScript(spell_hun_penetrating_shots);
RegisterSpellScript(spell_hun_pet_heart_of_the_phoenix); RegisterSpellScript(spell_hun_pet_heart_of_the_phoenix);
RegisterSpellScript(spell_hun_posthaste); RegisterSpellScript(spell_hun_posthaste);
@@ -2588,6 +2680,7 @@ void AddSC_hunter_spell_scripts()
RegisterSpellScript(spell_hun_tame_beast); RegisterSpellScript(spell_hun_tame_beast);
RegisterAreaTriggerAI(areatrigger_hun_tar_trap); RegisterAreaTriggerAI(areatrigger_hun_tar_trap);
RegisterAreaTriggerAI(areatrigger_hun_tar_trap_activate); RegisterAreaTriggerAI(areatrigger_hun_tar_trap_activate);
RegisterSpellScript(spell_hun_trailblazer);
RegisterSpellScript(spell_hun_t9_4p_bonus); RegisterSpellScript(spell_hun_t9_4p_bonus);
RegisterSpellScript(spell_hun_t29_2p_marksmanship_bonus); RegisterSpellScript(spell_hun_t29_2p_marksmanship_bonus);
RegisterSpellScript(spell_hun_wilderness_medicine); RegisterSpellScript(spell_hun_wilderness_medicine);