Skip to content

Commit

Permalink
[ACID][Instance] The Botanica - rework part 3 (#1205)
Browse files Browse the repository at this point in the history
* Add spawn_groups and correct waypoints of patrols

add correct rp handling for channelers before first boss

* add sunseeker harvester to spell_list

* Nethervine Reaper and Nethervine Inciter into spell_list

* Add Sunseeker Herbalist to spell_list

there is no info about spade toss spell in sniffs/wotlk tests
entangling root cast on current

* Sunseeker Channeler into spell_list

* Add back Sunseeker Channeler channel RP

* update some more coords do be in line with sniffs
  • Loading branch information
miraco authored May 13, 2024
1 parent a6d463f commit fed7da9
Show file tree
Hide file tree
Showing 5 changed files with 258 additions and 145 deletions.
18 changes: 6 additions & 12 deletions ACID/acid_tbc.sql
Original file line number Diff line number Diff line change
Expand Up @@ -26581,27 +26581,21 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
('1858702','18587','8','0','100','1','34169','-1','1000','1000','0','0','11','34203','0','33','0','0','0','0','0','0','0','0','Frayer - Cast Fire Form on Rain of Fire SpellHit'),
('1858703','18587','8','0','100','1','34170','-1','1000','1000','0','0','11','34204','0','33','0','0','0','0','0','0','0','0','Frayer - Cast Arcane Form on Arcane Explosion SpellHit'),
-- Sunseeker Chemist - spell_list
-- Sunseeker Channeler 19505 (4.3.4 Official Data - Normal/Heroic)
-- Sunseeker Channeler 19505 - spell_list
('1950501','19505','4','0','100','0','0','0','0','0','0','0','52','3','0','0','0','0','0','0','0','0','0','0','Sunseeker Channeler - Interrupt Channelling on Aggro'),
('1950502','19505','0','0','100','1025','5000','10000','12000','18000','0','0','11','34634','0','0','0','0','0','0','0','0','0','0','Sunseeker Channeler - Cast Sunseeker Aura'),
('1950503','19505','0','0','100','1025','8100','14200','12100','27700','0','0','11','34637','16','512','0','0','0','0','0','0','0','0','Sunseeker Channeler - Cast Soul Channel on Random Player Mana User'),
-- guid based
('5530093','-5530093','1','0','100','1','0','0','55000','600000','0','0','53','5530013','0','0','0','0','0','0','0','0','0','0','Sunseeker Botanist - Start RelayScript OOC'),
('5530095','-5530095','1','0','100','1','0','0','55000','600000','0','0','53','5530014','0','0','0','0','0','0','0','0','0','0','Sunseeker Botanist - Start RelayScript OOC'),
-- Sunseeker Gene-Splicer (4.3.4 Official Data - Normal/Heroic)
('1950701','19507','0','0','100','1027','4800','15300','18100','25300','0','0','11','34642','1','0','0','0','0','0','0','0','0','0','Sunseeker Gene-Splicer (Normal) - Cast Death and Decay'),
('1950702','19507','0','0','100','1029','4800','15300','18100','25300','0','0','11','39347','1','0','0','0','0','0','0','0','0','0','Sunseeker Gene-Splicer (Heroic) - Cast Death and Decay'),
('1950703','19507','0','0','100','1025','22100','29400','34800','37700','0','0','11','34247','1','0','0','0','0','0','0','0','0','0','Sunseeker Gene-Splicer - Cast Summon Lasher Beast'),
-- Sunseeker Herbalist (4.3.4 Official Data - Normal/Heroic)
('1950801','19508','0','0','100','1025','6100','9600','12100','20500','0','0','11','22127','4','512','0','0','0','0','0','0','0','0','Sunseeker Herbalist - Cast Entangling Roots'),
('1950802','19508','0','0','100','1025','1000','4000','5000','8000','0','0','11','34641','4','512','0','0','0','0','0','0','0','0','Sunseeker Herbalist - Cast Spade Toss'),
-- Sunseeker Harvester (4.3.4 Official Data - Normal/Heroic) - (No Polymorph Data Available)
('1950901','19509','0','0','100','1025','3100','9700','8400','15700','0','0','11','34640','1','0','0','0','0','0','0','0','0','0','Sunseeker Harvester - Cast Wilting Touch'),
('1950902','19509','0','0','100','1025','9000','15000','12000','18000','0','0','11','34639','5','512','0','0','0','0','0','0','0','0','Sunseeker Harvester - Cast Polymorph'),
-- Sunseeker Herbalist - spell_list
-- Sunseeker Harvester - spell_list
-- Nethervine Inciter (19511,21563) - creature_spell_list
('1951101','19511','8','0','100','1','34222','-1','0','0','0','0','11','34173','0','0','0','0','0','0','0','0','0','0','Nethervine Inciter - Cast Sunseeker Blessing on Sunseeker Blessing Spellhit'),
('1951102','19511','0','0','100','1025','4300','9700','21700','38600','0','0','11','34615','16','544','0','0','0','0','0','0','0','0','Nethervine Inciter - Cast Mind Numbing Poison on Random Player Mana User'),
-- Nethervine Reaper 19512 (4.3.4 Official Data - Normal/Heroic)
('1951201','19512','8','0','100','1','34222','-1','0','0','0','0','11','34173','0','0','0','0','0','0','0','0','0','0','Nethervine Reaper - Cast Sunseeker Blessing on Sunseeker Blessing Spellhit'),
('1951202','19512','0','0','100','1029','17200','22600','21200','26400','0','0','11','34626','1','32','0','0','0','0','0','0','0','0','Nethervine Reaper (Heroic) - Cast Pale Death'),
('1951203','19512','0','0','100','1025','4300','16100','8100','12200','0','0','11','15284','1','0','0','0','0','0','0','0','0','0','Nethervine Reaper - Cast Cleave'),
-- Mutate Fear-Shrieker (FEAR SPELL WAS REMOVED IN 4.x.x)
('1951301','19513','0','0','100','1025','8000','24000','28000','36000','0','0','11','30584','0','0','0','0','0','0','0','0','0','0','Mutate Fear-Shrieker - Cast Fear'),
-- Greater Frayer - spell_list
Expand Down
12 changes: 11 additions & 1 deletion Updates/0394_bota_movement_corrections.sql
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,14 @@ UPDATE creature_template SET SpeedWalk = '1.6', SpeedRun = '1.428' WHERE entry I
-- Green Seedling, Blue Seedling, White Seedling, Red Seedling
-- WalkSpeed: 2
-- RunSpeed: 2
UPDATE creature_template SET SpeedWalk = '0.8', SpeedRun = '0.285' WHERE entry IN (19958, 19962, 19964, 19969, 21550, 21557, 21566, 21583);
UPDATE creature_template SET SpeedWalk = '0.8', SpeedRun = '0.285' WHERE entry IN (19958, 19962, 19964, 19969, 21550, 21557, 21566, 21583);

-- Nethervince Inciter / Nethervine Reaper
-- WalkSpeed: 2.5
-- RunSpeed: 8
UPDATE creature_template SET SpeedWalk = '1', SpeedRun = '1.14286' WHERE entry IN (19511, 21563, 19512, 21564);

-- Sunseeker Channeler
-- WalkSpeed: 2.5
-- RunSpeed: 8
UPDATE creature_template SET SpeedWalk = '1', SpeedRun = '1.14286' WHERE entry IN (19505, 21571);
96 changes: 96 additions & 0 deletions Updates/0395_bota_spell_list.sql
Original file line number Diff line number Diff line change
Expand Up @@ -245,3 +245,99 @@ INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `Combat
UPDATE `creature_template` SET `SpellList` = 1955701 WHERE `entry` = 19557;
UPDATE `creature_template` SET `SpellList` = 2155501 WHERE `entry` = 21555;

-- Sunseeker Harvester 19509
DELETE FROM `creature_template_spells` WHERE `entry` IN (19509, 21575);

DELETE FROM `creature_spell_list_entry` WHERE `Id` IN (1950901, 2157501);
INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
(1950901, 'Botanica - Sunseeker Harvester - Normal', 0, 0),
(2157501, 'Botanica - Sunseeker Harvester - Heroic', 0, 0);

DELETE FROM `creature_spell_list` WHERE `Id` IN (1950901, 2157501);
INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
(1950901, 1, 34639, 0, -1, 101, 0, 100, 0, 7000, 17000, 15000, 21000, 'Sunseeker Harvester - Polymorph - random not tank'),
(1950901, 2, 34640, 0, -1, 1, 0, 100, 0, 4000, 14000, 6000, 16000, 'Sunseeker Harvester - Wilting Touch - current'),
(2157501, 1, 34639, 0, -1, 101, 0, 100, 0, 7000, 17000, 15000, 21000, 'Sunseeker Harvester - Polymorph - random not tank'),
(2157501, 2, 34640, 0, -1, 1, 0, 100, 0, 4000, 14000, 6000, 16000, 'Sunseeker Harvester - Wilting Touch - current');

UPDATE `creature_template` SET `SpellList` = 1950901 WHERE `entry` = 19509;
UPDATE `creature_template` SET `SpellList` = 2157501 WHERE `entry` = 21575;


-- Nethervine Inciter 19511
DELETE FROM `creature_template_spells` WHERE `entry` IN (19511, 21563);

DELETE FROM `creature_spell_list_entry` WHERE `Id` IN (1951101, 2156301);
INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
(1951101, 'Botanica - Nethervine Inciter - Normal', 0, 0),
(2156301, 'Botanica - Nethervine Inciter - Heroic', 0, 0);

DELETE FROM `creature_spell_list` WHERE `Id` IN (1951101, 2156301);
INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
(1951101, 1, 30621, 0, -1, 1, 0, 100, 0, 10000, 22000, 20000, 32000, 'Nethervine Inciter - Kidney Shot - current'),
(1951101, 2, 34616, 0, -1, 1, 0, 100, 0, 6000, 18000, 120000, 130000, 'Nethervine Inciter - Deadly Poison - current'),
(1951101, 3, 34615, 0, -1, 105, 0, 100, 0, 6000, 18000, 22000, 32000, 'Nethervine Inciter - Mind Numbing Poison - random mana user'),

(2156301, 1, 30621, 0, -1, 1, 0, 100, 0, 10000, 22000, 20000, 32000, 'Nethervine Inciter - Kidney Shot - current'),
(2156301, 2, 34616, 0, -1, 1, 0, 100, 0, 6000, 18000, 120000, 130000, 'Nethervine Inciter - Deadly Poison - current'),
(2156301, 3, 34615, 0, -1, 105, 0, 100, 0, 6000, 18000, 22000, 32000, 'Nethervine Inciter - Mind Numbing Poison - random mana user');

UPDATE `creature_template` SET `SpellList` = 1951101 WHERE `entry` = 19511;
UPDATE `creature_template` SET `SpellList` = 2156301 WHERE `entry` = 21563;


-- Nethervine Reaper 19512
DELETE FROM `creature_template_spells` WHERE `entry` IN (19512, 21564);

DELETE FROM `creature_spell_list_entry` WHERE `Id` IN (1951201, 2156401);
INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
(1951201, 'Botanica - Nethervine Reaper - Normal', 0, 0),
(2156401, 'Botanica - Nethervine Reaper - Heroic', 0, 0);

DELETE FROM `creature_spell_list` WHERE `Id` IN (1951201, 2156401);
INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
(1951201, 1, 34626, 0, -1, 100, 0, 100, 0, 6000, 17000, 20000, 30000, 'Nethervine Reaper - Pale Death - random'),
(1951201, 2, 15284, 0, -1, 1, 0, 100, 0, 8000, 21000, 8000, 21000, 'Nethervine Reaper - Cleave - current'),
(2156401, 1, 34626, 0, -1, 100, 0, 100, 0, 6000, 17000, 20000, 30000, 'Nethervine Reaper - Pale Death - random'),
(2156401, 2, 15284, 0, -1, 1, 0, 100, 0, 8000, 21000, 8000, 21000, 'Nethervine Reaper - Cleave - current');


UPDATE `creature_template` SET `SpellList` = 1951201 WHERE `entry` = 19512;
UPDATE `creature_template` SET `SpellList` = 2156401 WHERE `entry` = 21564;


-- Sunseeker Herbalist 19508
DELETE FROM `creature_template_spells` WHERE `entry` IN (19508, 21576);

DELETE FROM `creature_spell_list_entry` WHERE `Id` IN (1950801, 2157601);
INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
(1950801, 'Botanica - Sunseeker Herbalist - Normal', 0, 0),
(2157601, 'Botanica - Sunseeker Herbalist - Heroic', 0, 0);

DELETE FROM `creature_spell_list` WHERE `Id` IN (1950801, 2157601);
INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
(1950801, 1, 22127, 0, -1, 1, 0, 100, 0, 7000, 16000, 13000, 19000, 'Sunseeker Herbalist - Entangling Roots - current'),
(2157601, 1, 22127, 0, -1, 1, 0, 100, 0, 7000, 16000, 13000, 19000, 'Sunseeker Herbalist - Entangling Roots - current');

UPDATE `creature_template` SET `SpellList` = 1950801 WHERE `entry` = 19508;
UPDATE `creature_template` SET `SpellList` = 2157601 WHERE `entry` = 21576;


-- Sunseeker Channeler 19505
DELETE FROM `creature_template_spells` WHERE `entry` IN (19505, 21571);

DELETE FROM `creature_spell_list_entry` WHERE `Id` IN (1950501, 2157101);
INSERT INTO `creature_spell_list_entry` (`Id`, `Name`, `ChanceSupportAction`, `ChanceRangedAttack`) VALUES
(1950501, 'Botanica - Sunseeker Channeler - Normal', 0, 0),
(2157101, 'Botanica - Sunseeker Channeler - Heroic', 0, 0);

DELETE FROM `creature_spell_list` WHERE `Id` IN (1950501, 2157101);
INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `Flags`, `CombatCondition`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Comments`) VALUES
(1950501, 1, 34634, 0, -1, 2, 0, 100, 0, 6000, 15000, 9000, 22000, 'Sunseeker Channeler - Sunseeker Aura - self'),
(1950501, 2, 34637, 0, -1, 105, 0, 100, 0, 7000, 16000, 12000, 27000, 'Sunseeker Channeler - Soul Channel - random mana user'),
(2157101, 1, 34634, 0, -1, 2, 0, 100, 0, 6000, 15000, 9000, 22000, 'Sunseeker Channeler - Sunseeker Aura - self'),
(2157101, 2, 34637, 0, -1, 105, 0, 100, 0, 7000, 16000, 12000, 27000, 'Sunseeker Channeler - Soul Channel - random mana user');

UPDATE `creature_template` SET `SpellList` = 1950501 WHERE `entry` = 19505;
UPDATE `creature_template` SET `SpellList` = 2157101 WHERE `entry` = 21571;

7 changes: 6 additions & 1 deletion Updates/0396_bota_cleanup.sql
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,9 @@ INSERT INTO spell_script_target(entry, type, targetEntry, inverseEffectMask) VAL
(39126,1,21583,0), -- 19958 normal entry
(39126,1,21550,0), -- 19962 normal entry
(39126,1,21566,0), -- 19964 normal entry
(39126,1,21557,0); -- 19969 normal entry
(39126,1,21557,0); -- 19969 normal entry

-- Crystal Channel
DELETE FROM spell_script_target WHERE entry IN(34156);
INSERT INTO spell_script_target(entry, type, targetEntry, inverseEffectMask) VALUES
(34156,1,19555,0);
Loading

0 comments on commit fed7da9

Please sign in to comment.