Skip to content

Commit

Permalink
[ACID][Instance] The Arcatraz rework part 3 (#1210)
Browse files Browse the repository at this point in the history
* Rework waypoints and spawns for warder/defender group and protean horror pat

* Finish spawn/grouping rework

* Ethereum Slayer into spell_list

Evasion only gets casted when Ethereum Slayer drops under 25% health, can refresh while being active

* Ethereum Wave-Caster into spell_list

Update timers for Arcane Haste buff

* Gargantuan Abyssal into spell_list

Fire Shield dont get casted on pull instantly

* Unchained Doombringer into spell_list

* Sargeron Archer into spell_list

This will need more testing how frost/fire gets handled

For now:
Its possible that they use Serpent Sting and directly after frost/immolation arrow
its seems that they either have frost arrow or immolation arrow

* Sargeron Hellcaller into spell_list

also add HellRain

* Ethereum Life-Binder into spell_list

Also adds Shadow Mend on friendly when missing 50%
  • Loading branch information
miraco committed Jun 16, 2024
1 parent 2fc51ef commit 424eec1
Show file tree
Hide file tree
Showing 3 changed files with 244 additions and 132 deletions.
53 changes: 11 additions & 42 deletions ACID/acid_tbc.sql
Original file line number Diff line number Diff line change
Expand Up @@ -26407,42 +26407,17 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
-- Spiteful Temptress 20883 - spell_list
-- Dalliah the Doomsayer (20885) - boss_dalliah
-- Wrath-Scryer Soccothrates (20886) - boss_soccothrates
-- Ethereum Slayer
('2089601','20896','9','0','100','1025','0','40','12000','15000','0','0','11','36839','1','0','0','0','0','0','0','0','0','0','Ethereum Slayer - Cast Impairing Poison'),
('2089602','20896','9','0','100','1027','0','5','7000','11000','0','0','11','36838','1','0','0','0','0','0','0','0','0','0','Ethereum Slayer (Normal) - Cast Slaying Strike'),
('2089603','20896','9','0','100','1029','0','5','7000','11000','0','0','11','38894','1','0','0','0','0','0','0','0','0','0','Ethereum Slayer (Heroic) - Cast Slaying Strike'),
('2089604','20896','0','0','100','1025','5000','9000','21000','25000','0','0','11','15087','0','0','0','0','0','0','0','0','0','0','Ethereum Slayer - Cast Evasion'),
-- Ethereum Wave-Caster 20897
('2089701','20897','0','0','100','1025','3000','20000','30000','33000','0','0','11','32693','0','0','0','0','0','0','0','0','0','0','Ethereum Wave-Caster - Cast Arcane Haste'),
('2089702','20897','0','0','100','1025','13000','17000','13000','17000','0','0','11','38897','16','512','0','0','0','0','0','0','0','0','Ethereum Wave-Caster - Cast Sonic Boom on Random Player Mana User'),
('2089703','20897','0','0','100','1027','10000','15000','17000','23000','0','0','11','36840','5','544','0','0','0','0','0','0','0','0','Ethereum Wave-Caster (Normal) - Cast Polymorph'),
('2089704','20897','0','0','100','1029','6000','12000','14000','21000','0','0','11','38896','5','544','0','0','0','0','0','0','0','0','Ethereum Wave-Caster (Heroic) - Cast Polymorph'),
-- Ethereum Slayer - spell_list
('2089601','20896','2','0','100','1025','25','0','12000','18000','0','0','11','15087','0','0','0','0','0','0','0','0','0','0','Ethereum Slayer - Cast Evasion at 25% Health'),
-- Ethereum Wave-Caster - spell_list
('2089701','20897','0','0','100','1025','4000','16000','30000','42000','0','0','11','32693','0','32','0','0','0','0','0','0','0','0','Ethereum Wave-Caster - Cast Arcane Haste'),
-- Gargantuan Abyssal
('2089801','20898','0','0','100','1027','1000','1000','600000','600000','0','0','11','38855','0','0','0','0','0','0','0','0','0','0','Gargantuan Abyssal (Normal) - Cast Fire Shield on Aggro'),
('2089802','20898','0','0','100','1029','1000','1000','600000','600000','0','0','11','38901','0','0','0','0','0','0','0','0','0','0','Gargantuan Abyssal (Heroic) - Cast Fire Shield on Aggro'),
('2089803','20898','0','0','100','1027','6000','15000','18000','28000','0','0','11','36837','8','0','0','0','0','0','0','0','0','0','Gargantuan Abyssal (Normal) - Cast Meteor'),
('2089804','20898','0','0','100','1029','6000','12000','16000','24000','0','0','11','38903','8','0','0','0','0','0','0','0','0','0','Gargantuan Abyssal (Heroic) - Cast Meteor'),
('2089805','20898','27','0','100','3','38855','1','15000','30000','0','0','11','38855','0','1','0','0','0','0','0','0','0','0','Gargantuan Abyssal (Normal) - Cast Fire Shield on Missing Buff'),
('2089806','20898','27','0','100','5','38901','1','15000','30000','0','0','11','38901','0','1','0','0','0','0','0','0','0','0','Gargantuan Abyssal (Heroic) - Cast Fire Shield on Missing Buff'),
-- Unchained Doombringer 20900
('2090001','20900','9','0','100','1024','0','40','0','0','0','0','11','36833','1','0','0','0','0','0','0','0','0','0','Unchained Doombringer - Cast Berserker Charge on Aggro'),
('2090002','20900','0','0','100','1025','14000','18000','25000','30000','0','0','11','36833','18','512','0','0','0','0','0','0','0','0','Unchained Doombringer - Cast Berserker Charge'),
('2090003','20900','0','0','100','1027','9000','14000','18000','24000','0','0','11','36835','15','0','0','0','0','0','0','0','0','0','Unchained Doombringer (Normal) - Cast War Stomp'),
('2090004','20900','0','0','100','1029','7000','12000','17000','21000','0','0','11','38911','15','0','0','0','0','0','0','0','0','0','Unchained Doombringer (Heroic) - Cast War Stomp'),
('2090005','20900','9','0','100','1025','0','5','7000','12000','0','0','11','36836','1','256','0','0','0','0','0','0','0','0','Unchained Doombringer - Cast Agonizing Armor'),
-- Sargeron Archer 20901
('2090101','20901','4','0','100','0','0','0','0','0','0','0','57','2','25','0','0','0','0','0','0','0','0','0','Sargeron Archer - Enable Range Mode on Aggro'),
('2090102','20901','2','0','100','1025','30','0','20000','35000','0','0','11','36828','0','0','0','0','0','0','0','0','0','0','Sargeron Archer - Cast Rapid Fire at 30% HP'),
('2090103','20901','0','0','100','1027','12000','18000','15000','19000','0','0','11','36827','1','1024','0','0','0','0','0','0','0','0','Sargeron Archer (Normal) - Cast Hooked Net'),
('2090104','20901','0','0','100','1029','12000','18000','15000','19000','0','0','11','38912','1','1024','0','0','0','0','0','0','0','0','Sargeron Archer (Heroic) - Cast Hooked Net'),
('2090105','20901','0','0','100','1059','12000','15000','17000','23000','0','0','11','35964','4','544','11','35932','4','544','11','36984','4','544','Sargeron Archer (Normal) - Random Cast Frost Arrow or Immolation Arrow or Serpent Sting'),
('2090106','20901','0','0','100','1061','12000','15000','17000','23000','0','0','11','38942','4','544','11','38943','4','544','11','38914','4','544','Sargeron Archer (Heroic) - Random Cast Frost Arrow or Immolation Arrow or Serpent Sting'),
('2090107','20901','9','0','100','1027','5','30','4000','7000','0','0','11','22907','1','256','0','0','0','0','0','0','0','0','Sargeron Archer (Normal) - Cast Shoot'),
('2090108','20901','9','0','100','1029','5','30','4000','7000','0','0','11','38940','1','256','0','0','0','0','0','0','0','0','Sargeron Archer (Heroic) - Cast Shoot'),
-- Sargeron Hellcaller 20902
('2090201','20902','0','0','100','1025','3000','9000','21000','27000','0','0','11','36831','4','544','0','0','0','0','0','0','0','0','Sargeron Hellcaller - Cast Curse of the Elements'),
('2090202','20902','9','0','100','1027','0','30','11000','17000','0','0','11','36832','4','512','0','0','0','0','0','0','0','0','Sargeron Hellcaller (Normal) - Cast Incinerate'),
('2090203','20902','9','0','100','1029','0','30','9000','15000','0','0','11','38918','4','512','0','0','0','0','0','0','0','0','Sargeron Hellcaller (Heroic) - Cast Incinerate'),
('2089801','20898','27','0','100','3','38855','1','2000','10000','0','0','11','38855','0','32','0','0','0','0','0','0','0','0','Gargantuan Abyssal (Normal) - Cast Fire Shield on Missing Buff'),
('2089802','20898','27','0','100','5','38901','1','2000','10000','0','0','11','38901','0','32','0','0','0','0','0','0','0','0','Gargantuan Abyssal (Heroic) - Cast Fire Shield on Missing Buff'),
-- Unchained Doombringer 20900 - spell_list
-- Sargeron Archer 20901 - spell_list
('2090101','20901','11','0','100','0','0','0','0','0','0','0','57','2','25','0','0','0','0','0','0','0','0','0','Sargeron Archer - Enable Range Mode on Spawn'),
-- Sargeron Hellcaller 20902 - spell_list
-- Warden Mellichar (20904) - npc_warden_mellichar
-- Blazing Trickster 20905
('2090501','20905','11','0','100','0','0','0','0','0','0','0','57','2','35','0','0','0','0','0','0','0','0','0','Blazing Trickster - Enable Range Mode on Spawn'),
Expand Down Expand Up @@ -26526,13 +26501,7 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
('2146702','21467','29','0','100','0','200','200','0','0','0','0','11','36937','0','0','19','2','0','0','0','0','0','0','Harbinger Skyriss Illusion 2 - Cast Blink Visual and remove NON_ATTACKABLE flag on Generic Timer'),
('2146703','21467','0','0','100','1027','5000','11000','9000','15000','0','0','11','36929','4','512','0','0','0','0','0','0','0','0','Harbinger Skyriss Illusion 2 (Normal) - Cast Mind Rend'),
('2146704','21467','0','0','100','1029','5000','11000','9000','15000','0','0','11','39021','4','512','0','0','0','0','0','0','0','0','Harbinger Skyriss Illusion 2 (Heroic) - Cast Mind Rend'),
-- Ethereum Life-Binder
('2170201','21702','9','0','100','1027','0','8','14000','20000','0','0','11','37480','1','0','0','0','0','0','0','0','0','0','Ethereum Life-Binder (Normal) - Cast Bind'),
('2170202','21702','9','0','100','1029','0','8','14000','20000','0','0','11','38900','1','0','0','0','0','0','0','0','0','0','Ethereum Life-Binder (Heroic) - Cast Bind'),
('2170203','21702','0','0','100','1027','7000','11000','18000','24000','0','0','11','15654','4','0','0','0','0','0','0','0','0','0','Ethereum Life-Binder (Normal) - Cast Shadow Word: Pain'),
('2170204','21702','0','0','100','1029','7000','11000','18000','24000','0','0','11','34941','4','0','0','0','0','0','0','0','0','0','Ethereum Life-Binder (Heroic) - Cast Shadow Word: Pain'),
('2170205','21702','14','0','100','1027','12000','40','25000','35000','0','0','11','37479','12','0','0','0','0','0','0','0','0','0','Ethereum Life-Binder (Normal) - Cast Shadow Mend on Friendly Missing HP'),
('2170206','21702','14','0','100','1029','15000','40','25000','35000','0','0','11','38899','12','0','0','0','0','0','0','0','0','0','Ethereum Life-Binder (Heroic) - Cast Shadow Mend on Friendly Missing HP'),
-- Ethereum Life-Binder - spell_list
-- Destroyed Sentinel
('2176101','21761','11','0','100','2','0','0','0','0','0','0','11','36716','0','0','0','0','0','0','0','0','0','0','Destroyed Sentinel (Normal) - Cast Energy Discharge on Spawn'),
('2176102','21761','11','0','100','4','0','0','0','0','0','0','11','38828','0','0','0','0','0','0','0','0','0','0','Destroyed Sentinel (Heroic) - Cast Energy Discharge on Spawn'),
Expand Down
Loading

0 comments on commit 424eec1

Please sign in to comment.