Skip to content

Commit

Permalink
[WDB][ACID] Port Zzarc Vul 300 to spell_list and Add Aggro Texts
Browse files Browse the repository at this point in the history 
Revamp Splinter Fist Ogres and Add Dynguid & creature_spawn_entry

wotlkmangos misses alot of chest pooling backports! (5 chests spawned in
that cave and compound with no pooling.

Resolves cmangos/wotlk-db#698
Resolves cmangos/wotlk-db#699

(cherry picked from commit cmangos/wotlk-db@84ae122
  • Loading branch information
@AnonXS
AnonXS committed Aug 13, 2023
1 parent df658ea commit ef7546e
Show file tree
Hide file tree
Showing 2 changed files with 159 additions and 17 deletions.
30 changes: 13 additions & 17 deletions ACID/acid_tbc.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1818,9 +1818,8 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
-- Bone Chewer (3.0.3 Official Data)
('21001','210','11','0','100','0','0','0','0','0','0','0','11','26047','0','0','0','0','0','0','0','0','0','0','Bone Chewer - Cast Birth on Spawn'),
('21002','210','0','0','100','1025','2000','12100','46200','66200','0','0','11','6016','1','0','0','0','0','0','0','0','0','0','Bone Chewer - Cast Pierce Armor'),
-- Splinter Fist Warrior (3.0.3 Official Data)
-- Splinter Fist Warrior 212 - creature_spell_list
('21201','212','4','0','10','0','0','0','0','0','0','0','1','1925','1926','1927','0','0','0','0','0','0','0','0','Splinter Fist Warrior - Random Say on Aggro'),
('21202','212','0','0','100','1025','500','3700','1000','9800','0','0','11','5242','0','32','0','0','0','0','0','0','0','0','Splinter Fist Warrior - Cast Battle Shout'),
-- Starving Dire Wolf (213) - NSR
-- Defias Night Runner (3.0.3 Official Data)
('21501','215','1','0','100','0','1000','1000','0','0','0','0','11','22766','0','32','0','0','0','0','0','0','0','0','Defias Night Runner - Cast Sneak OOC'),
Expand Down Expand Up @@ -1859,8 +1858,8 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
-- Jitters (3.0.3 Official Data)
('28801','288','2','0','100','0','15','0','0','0','0','0','25','0','0','0','1','1150','0','0','0','0','0','0','Jitters - Flee at 15% HP'),
-- Abercrombie (289) - NSR
-- Zzarc' Vul (3.0.3 Official Data)
('30001','300','0','0','100','1025','4800','14500','11900','25400','0','0','11','8716','1','0','0','0','0','0','0','0','0','0','Zzarc'' Vul - Cast Low Swipe'),
-- Zzarc' Vul 300 - creature_spell_list
('30001','300','4','0','15','0','0','0','0','0','0','0','1','1925','1926','1927','0','0','0','0','0','0','0','0','Zzarc\' Vul - Say on Aggro'),
-- Blind Mary (302) - NSR
-- Sven Yorgen (311) - NSR
-- Eliza 314 (3.0.3 Official Data)
Expand Down Expand Up @@ -1948,16 +1947,13 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
-- Watcher Dodds 888
('88801','888','11','0','100','0','0','0','0','0','0','0','18','512','0','0','0','0','0','0','0','0','0','0','Watcher Dodds - Set UnitFlag IMMUNE_TO_NPC on Spawn'),
('88802','888','21','0','100','0','0','0','0','0','0','0','18','512','0','0','0','0','0','0','0','0','0','0','Watcher Dodds - Restore UnitFlag IMMUNE_TO_NPC on Reached Home'),
-- Splinter Fist Ogre (3.0.3 Official Data)
-- Splinter Fist Ogre 889
('88901','889','4','0','10','0','0','0','0','0','0','0','1','1925','1926','1927','0','0','0','0','0','0','0','0','Splinter Fist Ogre - Random Say on Aggro'),
-- Splinter Fist Fire Weaver 891 (3.0.3 Official Data)
-- Splinter Fist Fire Weaver 891 - creature_spell_list
('89102','891','11','0','100','0','0','0','0','0','0','0','57','2','35','0','0','0','0','0','0','0','0','0','Splinter Fist Fire Weaver - Enable Range Mode on Spawn'),
('89101','891','4','0','10','0','0','0','0','0','0','0','1','1925','1926','1927','0','0','0','0','0','0','0','0','Splinter Fist Fire Weaver - Say on Aggro'),
('89102','891','4','0','100','0','0','0','0','0','0','0','57','2','35','0','0','0','0','0','0','0','0','0','Splinter Fist Fire Weaver - Enable Range Mode on Aggro'),
('89103','891','0','0','100','1025','1600','4700','18400','19100','0','0','11','20296','1','32','0','0','0','0','0','0','0','0','Splinter Fist Fire Weaver - Cast Flamestrike'),
('89104','891','9','0','100','1025','0','40','3300','5200','0','0','11','19816','1','256','0','0','0','0','0','0','0','0','Splinter Fist Fire Weaver - Cast Fireball'),
-- Splinter Fist Taskmaster (3.0.3 Official Data)
-- Splinter Fist Taskmaster 892 - creature_spell_list
('89201','892','4','0','10','0','0','0','0','0','0','0','1','1925','1926','1927','0','0','0','0','0','0','0','0','Splinter Fist Taskmaster - Random Say on Aggro'),
('89202','892','0','0','100','1025','800','3100','1500','5000','0','0','11','3631','0','32','0','0','0','0','0','0','0','0','Splinter Fist Taskmaster - Cast Battle Fury'),
-- Lars (893) - NSR
-- Nightbane Worgen (898) - NSR
-- Defias Night Blade 909 (3.0.3 Official Data)
Expand Down Expand Up @@ -2002,20 +1998,20 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
('120007','1200','21','7','100','0','0','0','0','0','0','0','36','1200','0','0','22','1','0','0','0','0','0','0','Morbent Fel - Change Template and Set Phase 1 on Reached Home (Phase 3)(Quest: 55)'),
-- Watcher Sarys (1203) - NSR
-- Watcher Corwin (1204) - NSR
-- Splinter Fist Firemonger (3.0.3 Official Data)
-- Splinter Fist Firemonger 1251 - creature_spell_list
('125101','1251','4','0','10','0','0','0','0','0','0','0','1','1925','1926','1927','0','0','0','0','0','0','0','0','Splinter Fist Firemonger - Random Say on Aggro'),
('125102','1251','0','0','100','1025','1300','5300','61600','71200','0','0','11','184','0','0','0','0','0','0','0','0','0','0','Splinter Fist Firemonger - Cast Fire Shield II'),
('125102','1251','8','0','100','1','0','4','15000','30000','0','0','11','4979','0','32','0','0','0','0','0','0','0','0','Splinter Fist Firemonger - Cast Fire Ward on Fire Spellhit'),
-- Black Ravager Mastiff (3.0.3 Official Data)
('125801','1258','0','0','100','1025','6300','8900','30200','47300','0','0','11','3149','0','0','0','0','0','0','0','0','0','0','Black Ravager Mastiff - Cast Furious Howl'),
('125802','1258','0','0','100','1025','9000','12800','15900','25400','0','0','11','13443','1','0','0','0','0','0','0','0','0','0','Black Ravager Mastiff - Cast Rend'),
-- Fetid Corpse (3.0.3 Official Data)
('127001','1270','11','0','100','0','0','0','0','0','0','0','11','26047','0','0','0','0','0','0','0','0','0','0','Fetid Corpse - Cast Birth on Spawn'),
('127002','1270','0','0','100','1025','2200','18500','120200','125700','0','0','11','7102','4','0','0','0','0','0','0','0','0','0','Fetid Corpse - Cast Contagion of Rot'),
-- Watcher Cutford (1436) - NSR
-- Splinter Fist Enslaver 1487 (3.0.3 Official Data)
('148701','1487','4','0','100','0','0','0','0','0','0','0','57','2','25','0','0','0','0','0','0','0','0','0','Splinter Fist Enslaver - Enable Range Mode on Aggro'),
('148702','1487','0','0','100','1025','0','3200','21100','42100','0','0','11','6533','1','1024','0','0','0','0','0','0','0','0','Splinter Fist Enslaver - Cast Net'),
('148703','1487','9','0','100','1025','5','30','3400','5100','0','0','11','10277','1','256','0','0','0','0','0','0','0','0','Splinter Fist Enslaver - Cast Throw'),
-- Splinter Fist Enslaver 1487 - creature_spell_list
('148701','1487','11','0','100','0','0','0','0','0','0','0','57','2','25','0','0','0','0','0','0','0','0','0','Splinter Fist Enslaver - Enable Range Mode on Spawn'),
('148702','1487','4','0','10','0','0','0','0','0','0','0','1','1925','1926','1927','0','0','0','0','0','0','0','0','Splinter Fist Enslaver - Random Say on Aggro'),
('148703','1487','0','0','100','1025','3000','20000','20000','40000','0','0','11','6533','1','1024','0','0','0','0','0','0','0','0','Splinter Fist Enslaver - Cast Net, Distance'),
-- Lohgan Eva (1672) - NSR
-- Alyssa Eva (1673) - NSR
-- Finbus Geargrind (1676) - NSR
Expand Down
146 changes: 146 additions & 0 deletions Updates/0162_WDB-4867_Zzarc_Vul_c.300.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@

-- 300,1251,1487,212,889,891,892
-- https://www.youtube.com/watch?v=sGc9jbAPW50&ab_channel=Andy%27sHighlights
-- https://www.youtube.com/watch?v=0Y_ZfPJNm_U&ab_channel=CasualGamerGirl
-- https://www.youtube.com/watch?v=vzVAcw50pUU&ab_channel=ShuredGaming
-- https://www.youtube.com/watch?v=hdEuLt5DHj0&ab_channel=BRNChannel

-- Zzarc' Vul 300
-- https://www.wowhead.com/wotlk/npc=300/zzarc-vul#abilities
UPDATE `creature_template` SET `SpellList` = 30001, `ExtraFlags` = `ExtraFlags`|1048576 WHERE `entry` = 300;

-- 300 0 8716 0 0 0 0 0 0 0 0 0
DELETE FROM `creature_template_spells` WHERE `entry` = 300;

DELETE FROM `creature_spell_list_entry` WHERE `Id` = 30001;
INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
(30001, 'Duskwood - Zzarc\' Vul (300)', 0, 0);

DELETE FROM `creature_spell_list` WHERE `Id` = 30001;
INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
(30001, 1, 8716, 0, -1, 1, 0, 100, 1, 4000, 16000, 11000, 25000, 'Zzarc\' Vul - Low Swipe');

-- ===============================================================

-- https://www.wowhead.com/wotlk/npc=1251/splinter-fist-firemonger
-- CCSDB never shows Fire Immune Aura so it just has to be triggered on firespellcasthit
UPDATE `creature_template` SET `SpellList` = 125101, `ExtraFlags` = `ExtraFlags`|1048576 WHERE `entry` = 1251;

-- 1251 0 184 4979 0 0 0 0 0 0 0 0
DELETE FROM `creature_template_spells` WHERE `entry` = 1251;

DELETE FROM `creature_spell_list_entry` WHERE `Id` = 125101;
INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
(125101, 'Duskwood - Splinter Fist Firemonger (1251)', 0, 0);

DELETE FROM `creature_spell_list` WHERE `Id` = 125101;
INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
(125101, 1, 184, 0, -1, 2, 0, 100, 1, 0, 10000, 60000, 70000, 'Splinter Fist Firemonger - Fire Shield II');

-- ===============================================================

-- https://www.wowhead.com/wotlk/npc=1487/splinter-fist-enslaver#abilities
UPDATE `creature_template` SET `SpellList` = 148701, `ExtraFlags` = `ExtraFlags`|1048576 WHERE `entry` = 1487;

-- 1487 0 6533 10277 0 0 0 0 0 0 0 0
DELETE FROM `creature_template_spells` WHERE `entry` = 1487;

DELETE FROM `creature_spell_list_entry` WHERE `Id` = 148701;
INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
(148701, 'Duskwood - Splinter Fist Enslaver (1487)', 0, 75);

DELETE FROM `creature_spell_list` WHERE `Id` = 148701;
INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
-- (148701, 1, 6533, 0, -1, 1, 0, 100, 1, 3000, 20000, 20000, 40000, 'Splinter Fist Enslaver - Net'), -- Distance cant be scripted atm.
(148701, 2, 10277, 2, -1, 1, 0, 100, 1, 0, 1000, 2000, 4000, 'Splinter Fist Enslaver - Throw');

-- ===============================================================

-- https://www.wowhead.com/tbc/npc=212/splinter-fist-warrior
UPDATE `creature_template` SET `SpellList` = 21201, `ExtraFlags` = `ExtraFlags`|1048576 WHERE `entry` = 212;

-- 212 0 5242 0 0 0 0 0 0 0 0 0
DELETE FROM `creature_template_spells` WHERE `entry` = 212;

DELETE FROM `creature_spell_list_entry` WHERE `Id` = 21201;
INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
(21201, 'Duskwood - Splinter Fist Warrior (212)', 0, 0);

DELETE FROM `creature_spell_list` WHERE `Id` = 21201;
INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
(21201, 1, 5242, 0, -1, 2, 0, 100, 1, 0, 10000, 120000, 130000, 'Splinter Fist Warrior - Battle Shout'); -- does not work currently! die to TARGET_ENUM_UNITS_PARTY_WITHIN_CASTER_RANGE

-- ===============================================================

-- https://www.wowhead.com/tbc/npc=889/splinter-fist-ogre#comments
UPDATE `creature_template` SET `ExtraFlags` = `ExtraFlags`|1048576 WHERE `entry` = 889;

-- ===============================================================

-- https://www.wowhead.com/tbc/npc=891/splinter-fist-fire-weaver

UPDATE `creature_template` SET `SpellList` = 89101, `ExtraFlags` = `ExtraFlags`|1048576 WHERE `entry` = 891;

-- 891 0 19816 20296 0 0 0 0 0 0 0 0
DELETE FROM `creature_template_spells` WHERE `entry` = 891;

DELETE FROM `creature_spell_list_entry` WHERE `Id` = 89101;
INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
(89101, 'Duskwood - Splinter Fist Fire Weaver (891)', 0, 75);

DELETE FROM `creature_spell_list` WHERE `Id` = 89101;
INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
(89101, 1, 19816, 2, -1, 1, 0, 100, 1, 0, 1000, 0, 0, 'Splinter Fist Fire Weaver - Fireball'),
(89101, 2, 20296, 0, -1, 1, 0, 100, 1, 5000, 20000, 18000, 20000, 'Splinter Fist Fire Weaver - Flamestrike');

-- ===============================================================

-- https://www.wowhead.com/tbc/npc=892/splinter-fist-taskmaster

UPDATE `creature_template` SET `SpellList` = 89201, `ExtraFlags` = `ExtraFlags`|1048576 WHERE `entry` = 892;

-- 892 0 3631 0 0 0 0 0 0 0 0 0
DELETE FROM `creature_template_spells` WHERE `entry` = 892;

DELETE FROM `creature_spell_list_entry` WHERE `Id` = 89201;
INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
(89201, 'Duskwood - Splinter Fist Taskmaster (892)', 0, 0);

DELETE FROM `creature_spell_list` WHERE `Id` = 89201;
INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
(89201, 1, 3631, 0, -1, 0, 0, 100, 1, 0, 10000, 240000, 240000, 'Splinter Fist Taskmaster - Battle Fury');

-- ===============================================================

-- Dynguid
-- 1 missing patrol Splinter Fist Ogre Patrol at Entrance to the Ogre Mount (5033)
-- 5064 mixed patrol (warrior/firemonger)
-- 5069 mixed patrol (warrior/firemonger)
UPDATE `creature` SET `spawntimesecsmin` = 240, `spawntimesecsmax` = 300 WHERE `id` IN (300,1251,1487,212,889,891,892);

REPLACE INTO `creature_spawn_entry` (`guid`, `entry`) SELECT `guid`, 889 FROM `creature` WHERE `guid` IN (5053,5055,5057,5059,5060); -- Splinter Fist Ogre
REPLACE INTO `creature_spawn_entry` (`guid`, `entry`) SELECT `guid`, 891 FROM `creature` WHERE `guid` IN (5053,5055,5057,5059,5060); -- Splinter Fist Fire Weaver

REPLACE INTO `creature_spawn_entry` (`guid`, `entry`) SELECT `guid`, 891 FROM `creature` WHERE `guid` IN (5028,5046,5048,5058,5061); -- Splinter Fist Fire Weaver
REPLACE INTO `creature_spawn_entry` (`guid`, `entry`) SELECT `guid`, 892 FROM `creature` WHERE `guid` IN (5028,5046,5048,5058,5061); -- Splinter Fist Taskmaster

REPLACE INTO `creature_spawn_entry` (`guid`, `entry`) SELECT `guid`, 892 FROM `creature` WHERE `guid` IN (5047,5077,5078,5082); -- Splinter Fist Taskmaster
REPLACE INTO `creature_spawn_entry` (`guid`, `entry`) SELECT `guid`, 1251 FROM `creature` WHERE `guid` IN (5047,5077,5078,5082); -- Splinter Fist Firemonger

REPLACE INTO `creature_spawn_entry` (`guid`, `entry`) SELECT `guid`, 212 FROM `creature` WHERE `guid` IN (5064,5065,5068,5069,5072,5073); -- Splinter Fist Warrior
REPLACE INTO `creature_spawn_entry` (`guid`, `entry`) SELECT `guid`, 1251 FROM `creature` WHERE `guid` IN (5064,5065,5068,5069,5072,5073); -- Splinter Fist Firemonger

REPLACE INTO `creature_spawn_entry` (`guid`, `entry`) SELECT `guid`, 212 FROM `creature` WHERE `guid` IN (5067,5070,5071); -- Splinter Fist Warrior
REPLACE INTO `creature_spawn_entry` (`guid`, `entry`) SELECT `guid`, 1487 FROM `creature` WHERE `guid` IN (5067,5070,5071); -- Splinter Fist Enslaver

UPDATE `creature` SET `id` = 0 WHERE `guid` IN (5053,5055,5057,5059,5060,5028,5046,5048,5058,5061,5047,5077,5078,5082,5064,5065,5068,5069,5072,5073,5067,5070,5071);

UPDATE `creature` SET `spawndist` = 3, `MovementType` = 1 WHERE `guid` = 5065;
UPDATE `creature` SET `spawndist` = 3, `MovementType` = 1 WHERE `guid` = 5074;
UPDATE `creature` SET `spawndist` = 5, `MovementType` = 1 WHERE `guid` = 5079;
UPDATE `creature` SET `spawndist` = 5, `MovementType` = 1 WHERE `guid` = 5080;

DELETE FROM `creature` WHERE `id` = 212 AND `guid` = 5324;
INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecsmin`, `spawntimesecsmax`, `spawndist`, `MovementType`) VALUES
(5324, 212, 0, 1, -11101.70, -86.99, 17.5261, 0, 240, 300, 3, 1);

0 comments on commit ef7546e

Please sign in to comment.