Compare commits

...

11 commits

Author SHA1 Message Date
github-actions[bot]
55989205e7 chore(DB): import pending files
Referenced commit(s): e93bb0d610
2025-11-28 11:38:54 +00:00
Rocco Silipo
e93bb0d610
fix(DB/SAI): Ensure completion of the quest ‘The Flesh Giant Champion’. (#23946) 2025-11-28 12:37:51 +01:00
github-actions[bot]
abfc645adf chore(DB): import pending files
Referenced commit(s): 9ac7966bae
2025-11-28 10:04:15 +00:00
v-mstrs
e6f68c34d4
fix(DB/SAI): Cabal Assassin (#23335) 2025-11-28 11:04:12 +01:00
github-actions[bot]
9ac7966bae chore(DB): import pending files
Referenced commit(s): 7b6088f114
2025-11-28 10:03:07 +00:00
sudlud
7b6088f114
fix(DB/gameobject_loot_template): update loot of Deep Sea Monsterbell… (#23864) 2025-11-28 11:01:57 +01:00
github-actions[bot]
12107cd0c2 chore(DB): import pending files
Referenced commit(s): afbf47c761
2025-11-28 10:00:04 +00:00
sogladev
eee2900082
fix(DB/SmartAI): fix double quest credit for quest 'Of Keys and Cages' (#23940) 2025-11-28 10:59:40 +01:00
sogladev
afbf47c761
fix(Scripts/Northrend): Dalaran guards now ignore non-combat pets (#23939) 2025-11-28 10:58:59 +01:00
github-actions[bot]
a8b50ec9bf chore(DB): import pending files
Referenced commit(s): ab23583e88
2025-11-28 09:55:12 +00:00
Andrew
ab23583e88
fix(DB/Creature): Remove Cannibalize (visual) from Ruby Keepers (#23943) 2025-11-28 10:51:59 +01:00
6 changed files with 46 additions and 2 deletions

View file

@ -0,0 +1,3 @@
-- DB update 2025_11_27_10 -> 2025_11_28_00
--
UPDATE `creature_template_addon` SET `bytes2` = 3, `auras` = '49132 55795 61204' WHERE `entry` = 27530;

View file

@ -0,0 +1,7 @@
-- DB update 2025_11_28_00 -> 2025_11_28_01
--
-- Modify Target 9 - CREATURE_RANGE (can have multiple targets) to Target 19 - CLOSEST_CREATURE
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 18649100) AND (`source_type` = 9) AND (`id` IN (0, 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
(18649100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 24035, 10, 0, 0, 0, 0, 0, 0, 'Gjalerbron Cage - Script - Set Data'),
(18649100, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 19, 24035, 10, 0, 0, 0, 0, 0, 0, 'Gjalerbron Cage - Script - Send Targetlist');

View file

@ -0,0 +1,9 @@
-- DB update 2025_11_28_01 -> 2025_11_28_02
-- update loot of Deep Sea Monsterbelly School (192053)
-- Crystallized Water, Deep Sea Monsterbelly, Reinforced Crate
UPDATE `gameobject_loot_template` SET `GroupId` = 1 WHERE (`Entry` = 25671) AND (`Item` IN (37705, 41800, 44475));
-- Crystallized Water, Reinforced Crate
UPDATE `gameobject_loot_template` SET `Chance` = 0 WHERE (`Entry` = 25671) AND (`Item` IN (37705, 44475));
-- Pygmy Suckerfish, Sea Turtle, Blacktip Shark
UPDATE `gameobject_loot_template` SET `GroupId` = 2 WHERE (`Entry` = 25671) AND (`Item` IN (40199, 46109, 50289));

View file

@ -0,0 +1,8 @@
-- DB update 2025_11_28_02 -> 2025_11_28_03
--
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 18636) AND (`source_type` = 0) AND (`id` IN (1, 2, 3, 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
(18636, 0, 1, 0, 10, 0, 100, 1, 0, 8, 4000, 8000, 0, 0, 11, 30986, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Cabal Assassin - Out of Combat LoS - Cast \'Cheap Shot\''),
(18636, 0, 2, 0, 67, 0, 100, 0, 5000, 7000, 4500, 6500, 0, 5, 11, 30992, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Cabal Assassin - On Behind Target - Cast \'Backstab\''),
(18636, 0, 3, 0, 0, 0, 100, 0, 2000, 4500, 12000, 20000, 0, 0, 11, 30981, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Cabal Assassin - In Combat - Cast \'Crippling Poison\''),
(18636, 0, 4, 0, 0, 0, 100, 0, 8000, 11000, 22000, 25000, 0, 0, 11, 36974, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Cabal Assassin - In Combat - Cast \'Wound Poison\'');

View file

@ -0,0 +1,15 @@
-- DB update 2025_11_28_03 -> 2025_11_28_04
-- Morbidus send a set data to Dhakar on death.
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 30698;
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 30698) 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
(30698, 0, 2, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 45, 1, 2, 0, 0, 0, 0, 10, 74974, 31306, 0, 0, 0, 0, 0, 0, 'Morbidus - On Just Died - Set Data 1 2');
-- Margrave Dhakar gives credit to stored target on data set.
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 31306;
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 31306) AND (`source_type` = 0) AND (`id` IN (11));
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
(31306, 0, 11, 0, 38, 0, 100, 0, 1, 2, 0, 0, 0, 0, 33, 30698, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Margrave Dhakar - On Data Set 1 2 - Quest Credit \'Morbidus\'');

View file

@ -428,7 +428,7 @@ public:
struct npc_mageguard_dalaranAI : public ScriptedAI struct npc_mageguard_dalaranAI : public ScriptedAI
{ {
npc_mageguard_dalaranAI(Creature* creature) : ScriptedAI(creature) explicit npc_mageguard_dalaranAI(Creature* creature) : ScriptedAI(creature)
{ {
creature->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); creature->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_NORMAL, true); creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_NORMAL, true);
@ -449,6 +449,9 @@ public:
if (!me->IsWithinDist(who, 5.0f, false)) if (!me->IsWithinDist(who, 5.0f, false))
return; return;
if (who->IsCreature() && who->GetCreatureType() == CREATURE_TYPE_NON_COMBAT_PET)
return;
Player* player = who->GetCharmerOrOwnerPlayerOrPlayerItself(); Player* player = who->GetCharmerOrOwnerPlayerOrPlayerItself();
if (!player || player->IsGameMaster() || player->IsBeingTeleported() || (player->GetPositionZ() > 670 && player->GetVehicle()) || if (!player || player->IsGameMaster() || player->IsBeingTeleported() || (player->GetPositionZ() > 670 && player->GetVehicle()) ||
@ -484,7 +487,6 @@ public:
break; break;
} }
me->SetOrientation(me->GetHomePosition().GetOrientation()); me->SetOrientation(me->GetHomePosition().GetOrientation());
return;
} }
void UpdateAI(uint32 /*diff*/) override {} void UpdateAI(uint32 /*diff*/) override {}