2 files changed, 106 insertions, 21 deletions
diff --git a/sql/updates/world/2013_06_16_04_world_creature_text.sql b/sql/updates/world/2013_06_16_04_world_creature_text.sql
index d6333628a0e..3f08495f884 100644
--- a/sql/updates/world/2013_06_16_04_world_creature_text.sql
+++ b/sql/updates/world/2013_06_16_04_world_creature_text.sql
@@ -2,23 +2,23 @@
 DELETE FROM `creature_text` WHERE `entry`=28205;
 INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
 -- Events 1,2,3
-(28205,0,0,'Quickly, get me some...',42,0,100,1,0,0,'Alchemist Finklestein'),
-(28205,0,1,'I think it needs...',42,0,100,1,0,0,'Alchemist Finklestein'),
-(28205,0,2,'Find me some...',42,0,100,1,0,0,'Alchemist Finklestein'),
-(28205,0,3,'It simply must have some...',42,0,100,1,0,0,'Alchemist Finklestein'),
-(28205,0,4,'We need some...',42,0,100,1,0,0,'Alchemist Finklestein'),
-(28205,0,5,'It simply must have some...',42,0,100,1,0,0,'Alchemist Finklestein'),
+(28205,0,0,'Quickly, get me some...',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,0,1,'I think it needs...',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,0,2,'Find me some...',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,0,3,'It simply must have some...',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,0,4,'We need some...',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,0,5,'It simply must have some...',42,0,100,0,0,0,'Alchemist Finklestein'),
 -- Event 4
-(28205,1,0,'I think it''s time for...',42,0,100,1,0,0,'Alchemist Finklestein'),
-(28205,1,1,'Next, we''ll need...',42,0,100,1,0,0,'Alchemist Finklestein'),
-(28205,1,2,'Tastes like it needs more....',42,0,100,1,0,0,'Alchemist Finklestein'),
-(28205,1,3,'Alright, now find me some...',42,0,100,1,0,0,'Alchemist Finklestein'),
+(28205,1,0,'I think it''s time for...',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,1,1,'Next, we''ll need...',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,1,2,'Tastes like it needs more....',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,1,3,'Alright, now find me some...',42,0,100,0,0,0,'Alchemist Finklestein'),
 -- Event 5
-(28205,2,0,'Coming along nicely, but still needs...',42,0,100,1,0,0,'Alchemist Finklestein'),
-(28205,2,1,'Before it thickens, we must add...',42,0,100,1,0,0,'Alchemist Finklestein'),
+(28205,2,0,'Coming along nicely, but still needs...',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,2,1,'Before it thickens, we must add...',42,0,100,0,0,0,'Alchemist Finklestein'),
 -- Event 6
-(28205,3,0,'Before it boils over, I need...',42,0,100,1,0,0,'Alchemist Finklestein'),
-(28205,3,1,'It''s thickening! Quickly, get some...',42,0,100,1,0,0,'Alchemist Finklestein'),
+(28205,3,0,'Before it boils over, I need...',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,3,1,'It''s thickening! Quickly, get some...',42,0,100,0,0,0,'Alchemist Finklestein'),
 -- Fail
 (28205,4,0,'You''re too late. I must start again from the beginning....',42,0,100,0,0,0,'Alchemist Finklestein'),
 (28205,4,1,'No! The serum is ruined!',42,0,100,0,0,0,'Alchemist Finklestein'),
@@ -38,10 +38,9 @@ INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`pr
 (28205,17,0,'Prismatic Mojo!',42,0,100,0,0,0,'Alchemist Finklestein'),
 (28205,18,0,'Raptor Claw!',42,0,100,0,0,0,'Alchemist Finklestein'),
 (28205,19,0,'Amberseed!',42,0,100,0,0,0,'Alchemist Finklestein'),
-(28205,20,0,'Burning Ice!',42,0,100,0,0,0,'Alchemist Finklestein'),
-(28205,21,0,'Shrunken Dragon''s Claw!',42,0,100,0,0,0,'Alchemist Finklestein'),
-(28205,22,0,'Chilled Serpent Mucus!',42,0,100,0,0,0,'Alchemist Finklestein'),
-(28205,23,0,'Crystallized Hogsnot!',42,0,100,0,0,0,'Alchemist Finklestein'),
-(28205,24,0,'Crushed Basilisk Crystals!',42,0,100,0,0,0,'Alchemist Finklestein'),
-(28205,25,0,'Trollbane!',42,0,100,0,0,0,'Alchemist Finklestein'),
-(28205,26,0,'Frozen Spider Ichor!',42,0,100,0,0,0,'Alchemist Finklestein');
+(28205,20,0,'Shrunken Dragon''s Claw!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,21,0,'Chilled Serpent Mucus!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,22,0,'Crystallized Hogsnot!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,23,0,'Crushed Basilisk Crystals!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,24,0,'Trollbane!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,25,0,'Frozen Spider Ichor!',42,0,100,0,0,0,'Alchemist Finklestein');
diff --git a/sql/updates/world/2013_06_17_02_world_misc.sql b/sql/updates/world/2013_06_17_02_world_misc.sql
new file mode 100644
index 00000000000..b938ea45e95
--- /dev/null
+++ b/sql/updates/world/2013_06_17_02_world_misc.sql
@@ -0,0 +1,86 @@
+-- Add option conditions for Alchemist Finklestein
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (9668) AND `SourceEntry` IN (0) AND `ConditionValue1` IN (51216);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,9668,0,1,1,51216,0,0,1,0,'','Alchemist Finklestein - Show gossip option only if player does not have aura 51216');
+
+UPDATE `creature_template` SET `AIName`= '',`ScriptName`= 'npc_alchemist_finklestein' WHERE `entry`=28205;
+UPDATE `gameobject_template` SET `ScriptName`= 'go_finklesteins_cauldron' WHERE `entry`=190498;
+
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (51134,51105,51107,51015,51154,51157,51046,51018,51055,51057,
+51059,51062,51064,51067,51069,51072,51077,51079,51081,51083,51085,51087,51091,51093,51095,51097,51100,51102);
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES 
+(51134,'spell_random_ingredient_easy'),
+(51105,'spell_random_ingredient_medium'),
+(51107,'spell_random_ingredient_hard'),
+(51015,'spell_random_ingredient_aura'),
+(51154,'spell_random_ingredient_aura'),
+(51157,'spell_random_ingredient_aura'),
+(51046,'spell_pot_check'),
+(51018,'spell_fetch_ingredient_aura'),
+(51055,'spell_fetch_ingredient_aura'),
+(51057,'spell_fetch_ingredient_aura'),
+(51059,'spell_fetch_ingredient_aura'),
+(51062,'spell_fetch_ingredient_aura'),
+(51064,'spell_fetch_ingredient_aura'),
+(51067,'spell_fetch_ingredient_aura'),
+(51069,'spell_fetch_ingredient_aura'),
+(51072,'spell_fetch_ingredient_aura'),
+(51077,'spell_fetch_ingredient_aura'),
+(51079,'spell_fetch_ingredient_aura'),
+(51081,'spell_fetch_ingredient_aura'),
+(51083,'spell_fetch_ingredient_aura'),
+(51085,'spell_fetch_ingredient_aura'),
+(51087,'spell_fetch_ingredient_aura'),
+(51091,'spell_fetch_ingredient_aura'),
+(51093,'spell_fetch_ingredient_aura'),
+(51095,'spell_fetch_ingredient_aura'),
+(51097,'spell_fetch_ingredient_aura'),
+(51100,'spell_fetch_ingredient_aura'),
+(51102,'spell_fetch_ingredient_aura');
+
+-- Add texts for Alchemist Finklestein
+DELETE FROM `creature_text` WHERE `entry`=28205;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+-- Events 1,2,3
+(28205,0,0,'Quickly, get me some...',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,0,1,'I think it needs...',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,0,2,'Find me some...',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,0,3,'It simply must have some...',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,0,4,'We need some...',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,0,5,'It simply must have some...',42,0,100,0,0,0,'Alchemist Finklestein'),
+-- Event 4
+(28205,1,0,'I think it''s time for...',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,1,1,'Next, we''ll need...',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,1,2,'Tastes like it needs more....',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,1,3,'Alright, now find me some...',42,0,100,0,0,0,'Alchemist Finklestein'),
+-- Event 5
+(28205,2,0,'Coming along nicely, but still needs...',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,2,1,'Before it thickens, we must add...',42,0,100,0,0,0,'Alchemist Finklestein'),
+-- Event 6
+(28205,3,0,'Before it boils over, I need...',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,3,1,'It''s thickening! Quickly, get some...',42,0,100,0,0,0,'Alchemist Finklestein'),
+-- Fail
+(28205,4,0,'You''re too late. I must start again from the beginning....',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,4,1,'No! The serum is ruined!',42,0,100,0,0,0,'Alchemist Finklestein'),
+-- Item request
+(28205,5,0,'Knotroot!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,6,0,'Pickled Eagle Egg!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,7,0,'Speckled Guano!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,8,0,'Withered Batwing!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,9,0,'Seasoned Slider Cider!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,10,0,'Pulverized Gargoyle Teeth!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,11,0,'Muddy Mire Maggot!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,12,0,'Spiky Spider Egg!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,13,0,'Hairy Herring Head!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,14,0,'Putrid Pirate Perspiration!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,15,0,'Icecrown Bottled Water!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,16,0,'Wasp''s Wings!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,17,0,'Prismatic Mojo!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,18,0,'Raptor Claw!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,19,0,'Amberseed!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,20,0,'Shrunken Dragon''s Claw!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,21,0,'Chilled Serpent Mucus!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,22,0,'Crystallized Hogsnot!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,23,0,'Crushed Basilisk Crystals!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,24,0,'Trollbane!',42,0,100,0,0,0,'Alchemist Finklestein'),
+(28205,25,0,'Frozen Spider Ichor!',42,0,100,0,0,0,'Alchemist Finklestein');