diff options
author | Shauren <none@none> | 2010-10-16 16:34:21 +0200 |
---|---|---|
committer | Shauren <none@none> | 2010-10-16 16:34:21 +0200 |
commit | 4ce274dbcdeba8b9647bc445efda4a211b730a8e (patch) | |
tree | 81e12625d17b3d64a4c5caac3a9c13ca1126c3a7 /sql | |
parent | 8154f7243cfa6221662615993b2bd17b75f06c38 (diff) |
Scripts/Icecrown Citadel: Added Professor Putricide script
Scripts/Icecrown Citadel: Fixed Professor Putricide gate opening when both Rotface and Festergut are dead
Scripts/Icecrown Citadel: Added script updating entries of NPCs at Light's Hammer depending on faction
Scripts/Icecrown Citadel: Rotface should not pick main tank as target for Slime Spray (removed debugging code)
Core/Spells/Conditions : Spell script target condition now accepts ConditionValue3 as affecting effect mask (only search targets with matching mask)
--HG--
branch : trunk
Diffstat (limited to 'sql')
-rw-r--r-- | sql/base/world_database.sql | 38 | ||||
-rw-r--r-- | sql/scripts/world_script_texts.sql | 13 | ||||
-rw-r--r-- | sql/scripts/world_scripts_full.sql | 1 | ||||
-rw-r--r-- | sql/updates/10230_world_script_texts.sql | 13 | ||||
-rw-r--r-- | sql/updates/10230_world_scriptname.sql | 1 | ||||
-rw-r--r-- | sql/updates/10230_world_spell_proc_event.sql | 6 | ||||
-rw-r--r-- | sql/updates/10230_world_spell_script_names.sql | 47 |
7 files changed, 118 insertions, 1 deletions
diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql index 172d036b3e2..01119ed3c4e 100644 --- a/sql/base/world_database.sql +++ b/sql/base/world_database.sql @@ -19363,9 +19363,13 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam ( 72419, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 60), -- Item - Icecrown Reputation Ring Healer Trigger ( 71404, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 45), -- Item - Icecrown Dungeon Melee Trinket ( 71564, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Nevermelting Ice Crystal - (71545, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 50, 0), -- Tiny Abomination in a Jar (Heroic) +( 71545, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 50, 0), -- Tiny Abomination in a Jar (Heroic) ( 71406, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 50, 0), -- Tiny Abomination in a Jar ( 71903, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 20, 0), -- Item - Shadowmourne Legendary +( 70215, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0, 100, 0), -- Gaseous Bloat +( 72858, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0, 100, 0), -- Gaseous Bloat +( 72859, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0, 100, 0), -- Gaseous Bloat +( 72860, 0x00, 0, 0x00000000, 0x00000000, 0x00000000 ,0x00000004, 0x00000000, 0, 100, 0), -- Gaseous Bloat ( 75474, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Charred Twilight Scale (Heroic) ( 75465, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Charred Twilight Scale ( 75457, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Sharpened Twilight Scale (Heroic) @@ -26825,6 +26829,38 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES ( 69839, 'spell_rotface_unstable_ooze_explosion_init'), ( 69832, 'spell_rotface_unstable_ooze_explosion'), ( 71441, 'spell_rotface_unstable_ooze_explosion_suicide'), +( 70701, 'spell_putricide_expunged_gas'), +( 70343, 'spell_putricide_slime_puddle'), +( 70351, 'spell_putricide_unstable_experiment'), +( 71966, 'spell_putricide_unstable_experiment'), +( 71967, 'spell_putricide_unstable_experiment'), +( 71968, 'spell_putricide_unstable_experiment'), +( 71412, 'spell_putricide_ooze_summon'), +( 71415, 'spell_putricide_ooze_summon'), +( 70672, 'spell_putricide_gaseous_bloat'), +( 72455, 'spell_putricide_gaseous_bloat'), +( 72832, 'spell_putricide_gaseous_bloat'), +( 72833, 'spell_putricide_gaseous_bloat'), +( 70459, 'spell_putricide_ooze_eruption_searcher'), +( 71255, 'spell_putricide_choking_gas_bomb'), +( 70920, 'spell_putricide_unbound_plague'), +( 70360, 'spell_putricide_eat_ooze'), +( 72527, 'spell_putricide_eat_ooze'), +( 72451, 'spell_putricide_mutated_plague'), +( 72463, 'spell_putricide_mutated_plague'), +( 72671, 'spell_putricide_mutated_plague'), +( 72672, 'spell_putricide_mutated_plague'), +( 70308, 'spell_putricide_mutation_init'), +( 70311, 'spell_putricide_mutated_transformation'), +( 71503, 'spell_putricide_mutated_transformation'), +( 70405, 'spell_putricide_mutated_transformation_dismiss'), +( 72508, 'spell_putricide_mutated_transformation_dismiss'), +( 72509, 'spell_putricide_mutated_transformation_dismiss'), +( 72510, 'spell_putricide_mutated_transformation_dismiss'), +( 70539, 'spell_putricide_regurgitated_ooze'), +( 72457, 'spell_putricide_regurgitated_ooze'), +( 72875, 'spell_putricide_regurgitated_ooze'), +( 72876, 'spell_putricide_regurgitated_ooze'), ( 62717, 'spell_ignis_slag_pot'), ( 63477, 'spell_ignis_slag_pot'), -- quest diff --git a/sql/scripts/world_script_texts.sql b/sql/scripts/world_script_texts.sql index 060edbccb96..344f65ca71d 100644 --- a/sql/scripts/world_script_texts.sql +++ b/sql/scripts/world_script_texts.sql @@ -2888,6 +2888,19 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1` (36627,-1631102,'Sleepy Time!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16990,1,0,0,'SAY_BERSERK'), (36627,-1631103,'Bad news daddy...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16989,1,0,0,'SAY_DEATH'), +-- Professor Putricide + (36678,-1631104,'Good news, everyone! I think I perfected a plague that will destroy all life on Azeroth!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,17114,1,0,0,'SAY_AGGRO'), + (36678,-1631105,'%s begins to cast Unstable Experiment!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,3,0,0,'EMOTE_UNSTABLE_EXPERIMENT'), + (36678,-1631106,'Two oozes, one room! So many delightful possibilities...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,17122,1,0,0,'SAY_PHASE_TRANSITION_HEROIC'), + (36678,-1631107,'Hmm. I don''t feel a thing. Whaa...? Where''d those come from?',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,17120,1,0,15,'SAY_TRANSFORM_1'), + (36678,-1631108,'Tastes like... Cherry! Oh! Excuse me!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,17121,1,0,15,'SAY_TRANSFORM_2'), + (36678,-1631109,'|TInterface\Icons\inv_misc_herb_evergreenmoss.blp:16|t%s cast |cFF00FF00Malleable Goo!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,3,0,0,'EMOTE_MALLEABLE_GOO'), + (36678,-1631110,'%s cast |cFFFF7F00Choking Gas Bomb!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,3,0,0,'EMOTE_CHOKING_GAS_BOMB'), + (36678,-1631111,'Hmm... Interesting...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,17115,1,0,0,'SAY_KILL_1'), + (36678,-1631112,'That was unexpected!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,17116,1,0,0,'SAY_KILL_2'), + (36678,-1631113,'Great news, everyone!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,17118,1,0,0,'SAY_BERSERK'), + (36678,-1631114,'Bad news, everyone! I don''t think I''m going to make it.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,17117,1,0,0,'SAY_DEATH'), + -- -1 632 000 ICECROWN CITADEL: FROZEN HALLS: FORGE OF SOULS -- Bronjham (36497,-1632001,'Finally...a captive audience!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16595,1,0,0,'Bronjham SAY_AGGRO'), diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql index 5b2cf232c50..e4388049d95 100644 --- a/sql/scripts/world_scripts_full.sql +++ b/sql/scripts/world_scripts_full.sql @@ -848,6 +848,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_little_ooze' WHERE `entry`=3689 UPDATE `creature_template` SET `ScriptName`='npc_big_ooze' WHERE `entry`=36899; UPDATE `creature_template` SET `ScriptName`='npc_precious_icc' WHERE `entry`=37217; UPDATE `creature_template` SET `ScriptName`='boss_professor_putricide' WHERE `entry`=36678; +UPDATE `creature_template` SET `ScriptName`='npc_volatile_ooze' WHERE `entry`=37697; /* IRONFORGE */ UPDATE `creature_template` SET `ScriptName`='npc_royal_historian_archesonus' WHERE `entry`=8879; diff --git a/sql/updates/10230_world_script_texts.sql b/sql/updates/10230_world_script_texts.sql new file mode 100644 index 00000000000..8256982cd36 --- /dev/null +++ b/sql/updates/10230_world_script_texts.sql @@ -0,0 +1,13 @@ +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1631114 AND -1631104; +INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES +(36678,-1631104,'Good news, everyone! I think I perfected a plague that will destroy all life on Azeroth!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,17114,1,0,0,'SAY_AGGRO'), +(36678,-1631105,'%s begins to cast Unstable Experiment!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,3,0,0,'EMOTE_UNSTABLE_EXPERIMENT'), +(36678,-1631106,'Two oozes, one room! So many delightful possibilities...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,17122,1,0,0,'SAY_PHASE_TRANSITION_HEROIC'), +(36678,-1631107,'Hmm. I don''t feel a thing. Whaa...? Where''d those come from?',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,17120,1,0,15,'SAY_TRANSFORM_1'), +(36678,-1631108,'Tastes like... Cherry! Oh! Excuse me!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,17121,1,0,15,'SAY_TRANSFORM_2'), +(36678,-1631109,'|TInterface\Icons\inv_misc_herb_evergreenmoss.blp:16|t%s cast |cFF00FF00Malleable Goo!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,3,0,0,'EMOTE_MALLEABLE_GOO'), +(36678,-1631110,'%s cast |cFFFF7F00Choking Gas Bomb!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,3,0,0,'EMOTE_CHOKING_GAS_BOMB'), +(36678,-1631111,'Hmm... Interesting...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,17115,1,0,0,'SAY_KILL_1'), +(36678,-1631112,'That was unexpected!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,17116,1,0,0,'SAY_KILL_2'), +(36678,-1631113,'Great news, everyone!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,17118,1,0,0,'SAY_BERSERK'), +(36678,-1631114,'Bad news, everyone! I don''t think I''m going to make it.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,17117,1,0,0,'SAY_DEATH'); diff --git a/sql/updates/10230_world_scriptname.sql b/sql/updates/10230_world_scriptname.sql new file mode 100644 index 00000000000..73976c60658 --- /dev/null +++ b/sql/updates/10230_world_scriptname.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `ScriptName`='npc_volatile_ooze' WHERE `entry`=37697; diff --git a/sql/updates/10230_world_spell_proc_event.sql b/sql/updates/10230_world_spell_proc_event.sql new file mode 100644 index 00000000000..6db2a01575e --- /dev/null +++ b/sql/updates/10230_world_spell_proc_event.sql @@ -0,0 +1,6 @@ +DELETE FROM `spell_proc_event` WHERE `entry` IN (70215,72858,72859,72860); +INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES +(70215,0x00,0,0x00000000,0x00000000,0x00000000,0x00000004,0x00000000,0,100,0), -- Gaseous Bloat +(72858,0x00,0,0x00000000,0x00000000,0x00000000,0x00000004,0x00000000,0,100,0), -- Gaseous Bloat +(72859,0x00,0,0x00000000,0x00000000,0x00000000,0x00000004,0x00000000,0,100,0), -- Gaseous Bloat +(72860,0x00,0,0x00000000,0x00000000,0x00000000,0x00000004,0x00000000,0,100,0); -- Gaseous Bloat diff --git a/sql/updates/10230_world_spell_script_names.sql b/sql/updates/10230_world_spell_script_names.sql new file mode 100644 index 00000000000..c98b3e7c995 --- /dev/null +++ b/sql/updates/10230_world_spell_script_names.sql @@ -0,0 +1,47 @@ +DELETE FROM `spell_script_names` WHERE `spell_id`=70701 AND `ScriptName`='spell_putricide_expunged_gas'; +DELETE FROM `spell_script_names` WHERE `spell_id`=70343 AND `ScriptName`='spell_putricide_slime_puddle'; +DELETE FROM `spell_script_names` WHERE `spell_id` IN (70351,71966,71967,71968) AND `ScriptName`='spell_putricide_unstable_experiment'; +DELETE FROM `spell_script_names` WHERE `spell_id` IN (71412,71415) AND `ScriptName`='spell_putricide_ooze_summon'; +DELETE FROM `spell_script_names` WHERE `spell_id` IN (70672,72455,72832,72833) AND `ScriptName`='spell_putricide_gaseous_bloat'; +DELETE FROM `spell_script_names` WHERE `spell_id`=70459 AND `ScriptName`='spell_putricide_ooze_eruption_searcher'; +DELETE FROM `spell_script_names` WHERE `spell_id`=71255 AND `ScriptName`='spell_putricide_choking_gas_bomb'; +DELETE FROM `spell_script_names` WHERE `spell_id`=70920 AND `ScriptName`='spell_putricide_unbound_plague'; +DELETE FROM `spell_script_names` WHERE `spell_id` IN (70360,72527) AND `ScriptName`='spell_putricide_eat_ooze'; +DELETE FROM `spell_script_names` WHERE `spell_id` IN (72451,72463,72671,72672) AND `ScriptName`='spell_putricide_mutated_plague'; +DELETE FROM `spell_script_names` WHERE `spell_id`=70308 AND `ScriptName`='spell_putricide_mutation_init'; +DELETE FROM `spell_script_names` WHERE `spell_id` IN (70311,71503) AND `ScriptName`='spell_putricide_mutated_transformation'; +DELETE FROM `spell_script_names` WHERE `spell_id` IN (70405,72508,72509,72510) AND `ScriptName`='spell_putricide_mutated_transformation_dismiss'; +DELETE FROM `spell_script_names` WHERE `spell_id` IN (70539,72457,72875,72876) AND `ScriptName`='spell_putricide_regurgitated_ooze'; +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(70701,'spell_putricide_expunged_gas'), +(70343,'spell_putricide_slime_puddle'), +(70351,'spell_putricide_unstable_experiment'), +(71966,'spell_putricide_unstable_experiment'), +(71967,'spell_putricide_unstable_experiment'), +(71968,'spell_putricide_unstable_experiment'), +(71412,'spell_putricide_ooze_summon'), +(71415,'spell_putricide_ooze_summon'), +(70672,'spell_putricide_gaseous_bloat'), +(72455,'spell_putricide_gaseous_bloat'), +(72832,'spell_putricide_gaseous_bloat'), +(72833,'spell_putricide_gaseous_bloat'), +(70459,'spell_putricide_ooze_eruption_searcher'), +(71255,'spell_putricide_choking_gas_bomb'), +(70920,'spell_putricide_unbound_plague'), +(70360,'spell_putricide_eat_ooze'), +(72527,'spell_putricide_eat_ooze'), +(72451,'spell_putricide_mutated_plague'), +(72463,'spell_putricide_mutated_plague'), +(72671,'spell_putricide_mutated_plague'), +(72672,'spell_putricide_mutated_plague'), +(70308,'spell_putricide_mutation_init'), +(70311,'spell_putricide_mutated_transformation'), +(71503,'spell_putricide_mutated_transformation'), +(70405,'spell_putricide_mutated_transformation_dismiss'), +(72508,'spell_putricide_mutated_transformation_dismiss'), +(72509,'spell_putricide_mutated_transformation_dismiss'), +(72510,'spell_putricide_mutated_transformation_dismiss'), +(70539,'spell_putricide_regurgitated_ooze'), +(72457,'spell_putricide_regurgitated_ooze'), +(72875,'spell_putricide_regurgitated_ooze'), +(72876,'spell_putricide_regurgitated_ooze'); |