Skip to content

Commit

Permalink
Merge pull request #21 from azerothcore/master
Browse files Browse the repository at this point in the history
rebase
  • Loading branch information
hatersgit authored Nov 2, 2023
2 parents fdbafae + fb83c22 commit c5b678e
Show file tree
Hide file tree
Showing 82 changed files with 762 additions and 201 deletions.
3 changes: 3 additions & 0 deletions data/sql/updates/db_world/2023_10_24_00.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- DB update 2023_10_22_09 -> 2023_10_24_00
-- Shadow Labyrinth Enterance Door
UPDATE `gameobject_template_addon` SET `flags` = 0 WHERE (`entry` = 183518);
24 changes: 24 additions & 0 deletions data/sql/updates/db_world/2023_10_25_00.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
-- DB update 2023_10_24_00 -> 2023_10_25_00
-- Wanton Hostess
UPDATE `smart_scripts` SET `action_param1`=0, `comment`='Wanton Hostess - Between 0-50% Health - Remove All Auras' WHERE `entryorguid`=16459 AND `source_type`=0 AND `id`=4;

-- Wanton Hostess Transform (Still doesn't fix it for some reason, core issue?)
DELETE FROM `creature_text` WHERE `CreatureID`=17063;
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
(17063, 0, 0, 'So I said, "Yeah, but that\'ll cost you extra."', 12, 0, 100, 0, 0, 0, 13883, 0, 'Wanton Hostess Transform - Out of Combat'),
(17063, 0, 1, 'Five seconds. I\'m not kidding!', 12, 0, 100, 0, 0, 0, 13884, 0, 'Wanton Hostess Transform - Out of Combat'),
(17063, 0, 2, 'He asked if the imp could join in--can you believe it? Actually, it wasn\'t half bad....', 12, 0, 100, 0, 0, 0, 13885, 0, 'Wanton Hostess Transform - Out of Combat'),
(17063, 0, 3, 'They fall asleep after. Me, I fall asleep during....', 12, 0, 100, 0, 0, 0, 13886, 0, 'Wanton Hostess Transform - Out of Combat'),
(17063, 1, 0, 'Come play with me!', 12, 0, 100, 0, 0, 0, 13880, 0, 'Wanton Hostess Transform - On Aggro'),
(17063, 1, 1, 'You WILL be mine.', 12, 0, 100, 0, 0, 0, 13881, 0, 'Wanton Hostess Transform - On Aggro'),
(17063, 1, 2, 'Come here, pretty. You have what I need!', 12, 0, 100, 0, 0, 0, 13882, 0, 'Wanton Hostess Transform - On Aggro'),
(17063, 2, 0, 'It was fun while it lasted....', 12, 0, 100, 0, 0, 0, 13889, 0, 'Wanton Hostess Transform - On Death'),
(17063, 2, 1, '<sigh> It\'s always over too soon.', 12, 0, 100, 0, 0, 0, 13890, 0, 'Wanton Hostess Transform - On Death'),
(17063, 2, 2, 'Just when things were getting interesting.', 12, 0, 100, 0, 0, 0, 13897, 0, 'Wanton Hostess Transform - On Death'),
(17063, 2, 3, 'We could have had so much fun!', 12, 0, 100, 0, 0, 0, 13898, 0, 'Wanton Hostess Transform - On Death'),
(17063, 3, 0, 'Come any closer, and I\'ll scream.', 12, 0, 100, 0, 0, 0, 13887, 0, 'Wanton Hostess Transform - On Transform'),
(17063, 3, 1, 'I want to show you a different side of me....', 12, 0, 100, 0, 0, 0, 13888, 0, 'Wanton Hostess Transform - On Transform'),
(17063, 3, 2, 'I want you to be with me... forever and ever.', 12, 0, 100, 0, 0, 0, 13891, 0, 'Wanton Hostess Transform - On Transform'),
(17063, 3, 3, 'Shhh... I have a little secret I\'ve been keeping.\n', 12, 0, 100, 0, 0, 0, 13892, 0, 'Wanton Hostess Transform - On Transform'),
(17063, 3, 4, 'I\'ve been very, very naughty....', 12, 0, 100, 0, 0, 0, 13895, 0, 'Wanton Hostess Transform - On Transform'),
(17063, 3, 5, 'Enough foreplay. Let\'s get down to business.', 12, 0, 100, 0, 0, 0, 13896, 0, 'Wanton Hostess Transform - On Transform');
3 changes: 3 additions & 0 deletions data/sql/updates/db_world/2023_10_25_01.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- DB update 2023_10_25_00 -> 2023_10_25_01
--
UPDATE `creature_text` SET `Type` = 41 WHERE `CreatureId` = 16816 AND `GroupId` = 2 AND `ID` = 0;
3 changes: 3 additions & 0 deletions data/sql/updates/db_world/2023_10_25_02.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- DB update 2023_10_25_01 -> 2023_10_25_02
--
UPDATE`smart_scripts` SET `action_param2` = 2 WHERE `source_type` = 0 AND `id` = 0 AND `entryorguid` IN (19007,19006);
5 changes: 5 additions & 0 deletions data/sql/updates/db_world/2023_10_29_00.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-- DB update 2023_10_25_02 -> 2023_10_29_00
-- Judgement Group Heal (Ranged Ability -> Physical Ability)
DELETE FROM `spell_proc_event` WHERE `entry`=37195;
INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `procPhase`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
(37195, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0);
7 changes: 7 additions & 0 deletions data/sql/updates/db_world/2023_10_29_01.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
-- DB update 2023_10_29_00 -> 2023_10_29_01
-- Unyielding Knight
DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 16906);
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
(16906, 0, 0, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 0, 11, 22911, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Unyielding Knight - On Aggro - Cast \'Charge\''),
(16906, 0, 1, 0, 74, 0, 100, 0, 0, 0, 22000, 22000, 50, 40, 11, 33910, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Unyielding Knight - On Friendly Below 50% Health - Cast \'Heal Other\''),
(16906, 0, 2, 0, 2, 0, 100, 0, 0, 30, 0, 0, 0, 0, 39, 25, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Unyielding Knight - Between 0-30% Health - Call For Help (25 yards)');
4 changes: 4 additions & 0 deletions data/sql/updates/db_world/2023_10_31_00.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-- DB update 2023_10_29_01 -> 2023_10_31_00
-- Venom Sting
DELETE FROM `spell_custom_attr` WHERE `spell_id`=5416;
INSERT INTO `spell_custom_attr` (`spell_id`, `attributes`) VALUES (5416, 4194304);
4 changes: 4 additions & 0 deletions data/sql/updates/db_world/2023_10_31_01.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-- DB update 2023_10_31_00 -> 2023_10_31_01
-- Blistering Rot
DELETE FROM `spell_custom_attr` WHERE `spell_id`=32722;
INSERT INTO `spell_custom_attr` (`spell_id`, `attributes`) VALUES (32722, 4194304);
3 changes: 3 additions & 0 deletions data/sql/updates/db_world/2023_10_31_02.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- DB update 2023_10_31_01 -> 2023_10_31_02
-- Fire Nova Totem VII - Cast Fire Nova (Rank 7)
UPDATE `creature_template_spell` SET `Spell` = 25537, `VerifiedBuild` = 42328 WHERE `CreatureID` = 15483 AND `Index` = 0;
Loading

0 comments on commit c5b678e

Please sign in to comment.