yolinlin/azerothcore-wotlk-pbot
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2025-11-29 17:38:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2024-01-07 22:41:44 +08:00
parent 213300bf66 a1f924050f
commit cb795ae5d4
4 changed files with 48 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
data/sql/updates/db_world/2023_11_12_07.sql
View File

@@ -28,16 +28,13 @@ DELETE FROM `smart_scripts` WHERE (`entryorguid` = 22337) AND (`source_type` = 0
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`, `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
(22337, 0, 2, 0, 1, 0, 100, 0, 0, 0, 0, 0, 0, 89, 5, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Malevolent Hatchling - Out of Combat - Start Random Movement');
DELETE FROM `gameobject` WHERE (`id` = 185211);
DELETE FROM `gameobject` WHERE `guid` IN (26093, 26094, 26095, 2135479, 2135531, 26096, 26097, 2135504, 2135505, 2135530) AND `id` IN (185211,185210);
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
(26093, 185211, 530, 3519, 3686, 1, 1, -3660.15, 5811.12, 0.02822, 1.98968, 0, 0, 0.838671, 0.544639, 181, 100, 1, '', 0),
(26094, 185211, 530, 3519, 3686, 1, 1, -3678.81, 5733.74, -1.00285, 0.733038, 0, 0, 0.358368, 0.93358, 181, 100, 1, '', 0),
(26095, 185211, 530, 3519, 3686, 1, 1, -3639.31, 5831.26, 0.07337, -2.44346, 0, 0, 0.939693, -0.34202, 181, 100, 1, '', 0),
(2135479, 185211, 530, 0, 0, 1, 1, -3579.06, 5817.54, -3.24684, 3.7348, 0, 0, -0.956334, 0.292275, 181, 100, 1, '', 0),
(2135531, 185211, 530, 0, 0, 1, 1, -3674.35, 5709.55, -0.758734, 1.02344, 0, 0, -0.489679, -0.871903, 181, 100, 1, '', 0);
DELETE FROM `gameobject` WHERE (`id` = 185210);
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
(2135531, 185211, 530, 0, 0, 1, 1, -3674.35, 5709.55, -0.758734, 1.02344, 0, 0, -0.489679, -0.871903, 181, 100, 1, '', 0),
(26096, 185210, 530, 3519, 3686, 1, 1, -3568.34, 5772.01, -2.86157, 2.72271, 0, 0, 0.978148, 0.207912, 181, 100, 1, '', 0),
(26097, 185210, 530, 3519, 3686, 1, 1, -3560.05, 5771.58, -3.12615, -0.506145, 0, 0, 0.25038, -0.968148, 181, 100, 1, '', 0),
(2135504, 185210, 530, 0, 0, 1, 1, -3550.81, 5709.02, 0.112858, 1.5979, 0, 0, -0.716625, -0.697459, 181, 100, 1, '', 0),

3
data/sql/updates/db_world/2024_01_06_01.sql Normal file
View File

@@ -0,0 +1,3 @@
-- DB update 2024_01_06_00 -> 2024_01_06_01
--
UPDATE `reference_loot_template` SET `Item`=33054, `Comment`='The Seal of Danzalar' WHERE `Entry`=34058 AND `Item`=30054;

27
data/sql/updates/db_world/2024_01_07_00.sql Normal file
View File

@@ -0,0 +1,27 @@
-- DB update 2024_01_06_01 -> 2024_01_07_00
-- update BroadcastTextId
UPDATE `creature_text` SET `BroadcastTextId`=9463 WHERE `CreatureID`=14383 AND `GroupID`=0 AND `ID`=0;
UPDATE `creature_text` SET `BroadcastTextId`=9464 WHERE `CreatureID`=14383 AND `GroupID`=1 AND `ID`=0;
UPDATE `creature_text` SET `BroadcastTextId`=9465 WHERE `CreatureID`=14383 AND `GroupID`=2 AND `ID`=0;
UPDATE `creature_text` SET `BroadcastTextId`=9475 WHERE `CreatureID`=14383 AND `GroupID`=3 AND `ID`=0;
-- Remove GroupID 1 add GroupID 0 BroadcastTextId
DELETE FROM `creature_text` WHERE `CreatureID`=11489;
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
(11489, 0, 0, 'You do not belong here! Ancients, rise up against these intruders!', 14, 0, 100, 0, 0, 0, 11727, 0, 'Tendris Warpwood');
-- Increase creature_text
DELETE FROM `creature_text` WHERE `CreatureID`=14566;
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
(14566, 0, 0, '%s breaks free of its spectral bonds with a tremendous crash of thunder!', 16, 0, 100, 0, 0, 0, 9763, 0, 'Ancient Equine Spirit');
-- Increase Talk
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 14566;
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 14566) AND (`source_type` = 0) AND (`id` IN (2, 4));
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
(14566, 0, 2, 4, 61, 0, 100, 512, 0, 0, 0, 0, 0, 0, 11, 10387, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Ancient Equine Spirit - On Update - Cast Lightning Surge'),
(14566, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Ancient Equine Spirit - Talk - Say 0');
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 11489;
-- Delete the wrong event This event should have been said by Creature 14566
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 11489) AND (`source_type` = 0) AND (`id` IN (4));

30
src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
View File

@@ -145,24 +145,25 @@ struct boss_hydross_the_unstable : public BossAI
me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true);
DoCastSelf(SPELL_CORRUPTION, true);
scheduler.Schedule(0s, GROUP_ABILITIES, [this](TaskContext)
scheduler.Schedule(15s, GROUP_ABILITIES, [this](TaskContext)
{
DoCastSelf(SPELL_MARK_OF_CORRUPTION1);
}).Schedule(15s, GROUP_ABILITIES, [this](TaskContext)
{
DoCastSelf(SPELL_MARK_OF_CORRUPTION2);
}).Schedule(30s, GROUP_ABILITIES, [this](TaskContext)
{
DoCastSelf(SPELL_MARK_OF_CORRUPTION3);
DoCastSelf(SPELL_MARK_OF_CORRUPTION2);
}).Schedule(45s, GROUP_ABILITIES, [this](TaskContext)
{
DoCastSelf(SPELL_MARK_OF_CORRUPTION4);
DoCastSelf(SPELL_MARK_OF_CORRUPTION3);
}).Schedule(60s, GROUP_ABILITIES, [this](TaskContext)
{
DoCastSelf(SPELL_MARK_OF_CORRUPTION5);
DoCastSelf(SPELL_MARK_OF_CORRUPTION4);
}).Schedule(75s, GROUP_ABILITIES, [this](TaskContext)
{
DoCastSelf(SPELL_MARK_OF_CORRUPTION5);
}).Schedule(90s, GROUP_ABILITIES, [this](TaskContext context)
{
DoCastSelf(SPELL_MARK_OF_CORRUPTION6);
context.Repeat(15s);
}).Schedule(12150ms, GROUP_ABILITIES, [this](TaskContext context)
{
DoCastRandomTarget(SPELL_VILE_SLUDGE, 0, 0.0f, true, true);
@@ -176,24 +177,25 @@ struct boss_hydross_the_unstable : public BossAI
me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, false);
me->RemoveAurasDueToSpell(SPELL_CORRUPTION);
scheduler.Schedule(0s, GROUP_ABILITIES, [this](TaskContext)
scheduler.Schedule(15s, GROUP_ABILITIES, [this](TaskContext)
{
DoCastSelf(SPELL_MARK_OF_HYDROSS1);
}).Schedule(15s, GROUP_ABILITIES, [this](TaskContext)
{
DoCastSelf(SPELL_MARK_OF_HYDROSS2);
}).Schedule(30s, GROUP_ABILITIES, [this](TaskContext)
{
DoCastSelf(SPELL_MARK_OF_HYDROSS3);
DoCastSelf(SPELL_MARK_OF_HYDROSS2);
}).Schedule(45s, GROUP_ABILITIES, [this](TaskContext)
{
DoCastSelf(SPELL_MARK_OF_HYDROSS4);
DoCastSelf(SPELL_MARK_OF_HYDROSS3);
}).Schedule(60s, GROUP_ABILITIES, [this](TaskContext)
{
DoCastSelf(SPELL_MARK_OF_HYDROSS5);
DoCastSelf(SPELL_MARK_OF_HYDROSS4);
}).Schedule(75s, GROUP_ABILITIES, [this](TaskContext)
{
DoCastSelf(SPELL_MARK_OF_HYDROSS5);
}).Schedule(90s, GROUP_ABILITIES, [this](TaskContext context)
{
DoCastSelf(SPELL_MARK_OF_HYDROSS6);
context.Repeat(15s);
}).Schedule(12150ms, GROUP_ABILITIES, [this](TaskContext context)
{
DoCastRandomTarget(SPELL_WATER_TOMB, 0, 0.0f, true, true);