DB/Quest: Earth Sapta

By tkrokli
Closes #17334
(cherry picked from commit 951d0f5794)

DB/Quest: Improvements for quest "Bitter Rivals"

By SnapperRy
Closes  #17267
(cherry picked from commit 16fa581768)

DB/SAI: Mebok Mizzyrix

By Rushor
(cherry picked from commit 51a34eb135)

DB/SAI: Cabal Ritualists

By Malcrom
Closes  #17212
(cherry picked from commit cc7adf9f9c)

DB/Creature: RP event with Jane, Nova & Jessel

Closes #17164
By lyn1337
(cherry picked from commit cf398f2d2e)

DB: Fix a DB error
(cherry picked from commit 88f1de12e4)

DB/Loot: Fix some drop rates

Closes #17139
(cherry picked from commit bd3bfc4ce1)

DB/Creature: Add FLAG_EXTRA_NO_PLAYER_DAMAGE_REQ to some npcs

Closes #17045
(cherry picked from commit 777910141c)

DB/Quest: Fix locales for Nessa Shadowsong quest

Closes #17345
(cherry picked from commit 0676622f4e)
This commit is contained in:
Killyana
2016-06-11 18:58:48 +02:00
committed by joschiwald
parent 2e5550758c
commit 0179bd9943
6 changed files with 109 additions and 0 deletions

View File

@@ -0,0 +1,32 @@
--
-- Mebok Mizzyrix SAI
SET @ENTRY := 3446;
DELETE FROM `creature_text` WHERE `entry`= @ENTRY AND `GroupId`=2;
INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
(@ENTRY,2,0,"Hey $n! Don't forget to grab a crate, a manual and a command stick!", 12,0,100,0,0,0,1788,0,'Mebok Mizzyrix on Quest 1221 taken');
UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
(@ENTRY,0,0,0,20,0,100,0,865,0,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mebok Mizzyrix - On Quest 'Raptor Horns' Finished - Run Script"),
(@ENTRY,0,1,0,19,0,100,0,1221,0,0,0,80,@ENTRY*100+01,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mebok Mizzyrix - On Quest 'Blueleaf Tubers' Taken - Run Script");
-- Actionlist SAI
SET @ENTRY := 344600;
DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mebok Mizzyrix - On Script - Say Line 0"),
(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,11,17550,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mebok Mizzyrix - On Script - Cast 'Purification'"),
(@ENTRY,9,2,0,0,0,100,0,4000,4000,0,0,5,34,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mebok Mizzyrix - On Script - Play Emote 34"),
(@ENTRY,9,3,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mebok Mizzyrix - On Script - Say Line 1");
-- Actionlist SAI
SET @ENTRY := 344601;
DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,1,2,0,0,0,0,0,7,0,0,0,0,0,0,0,"Mebok Mizzyrix - On Script - Say Line 2"),
(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,69,0,0,0,0,0,0,8,0,0,0,-929.023,-3696.98,7.97395,1.7352,"Mebok Mizzyrix - On Script - Move To Position"),
(@ENTRY,9,2,0,0,0,100,0,3000,3000,0,0,5,25,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mebok Mizzyrix - On Script - Play Emote 25"),
(@ENTRY,9,3,0,0,0,100,0,3000,3000,0,0,69,0,0,0,0,0,0,8,0,0,0,-928.778,-3697.25,7.99705,6.17741,"Mebok Mizzyrix - On Script - Move To Position"),
(@ENTRY,9,4,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-928.982,-3697.23,8.06642,3.08923,"Mebok Mizzyrix - On Script - Move To Position");

View File

@@ -0,0 +1,24 @@
--
UPDATE `creature_template` SET `InhabitType`=4 WHERE `Entry` IN (21159, 18793, 20654);
DELETE FROM `smart_scripts` WHERE `entryorguid`=18794;
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
(18794, 0, 0, 0, 1, 0, 100, 7, 1000, 1000, 0, 0, 11, 32958, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - Out of Combat - Cast \'Crystal Channel\ (Dungeon)'),
(18794, 0, 1, 0, 1, 0, 100, 5, 0, 0, 0, 0, 30, 1, 4, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - Out of Combat - Set Random Phase(1, 4) (No Repeat) (Dungeon)'),
(18794, 0, 2, 0, 0, 0, 100, 2, 6000, 10000, 4000, 6000, 11, 20795, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - In Combat - Cast \'Fire Blast\' (Normal Dungeon)'),
(18794, 0, 3, 0, 0, 0, 100, 4, 6000, 10000, 4000, 6000, 11, 14145, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - In Combat - Cast \'Fire Blast\' (Heroic Dungeon)'),
(18794, 0, 4, 0, 0, 0, 100, 6, 2000, 2000, 10000, 12000, 11, 9574, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - In Combat - Cast \'Flame Buffet\' (Dungeon)'),
(18794, 0, 5, 0, 0, 0, 100, 6, 4000, 4000, 6000, 8000, 11, 12540, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - In Combat - Cast \'Gouge\' (Dungeon)'),
(18794, 0, 6, 0, 4, 1, 100, 6, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - On Aggro - Increment Phase By 1 (Phase 1) (No Repeat) (Dungeon)'),
(18794, 0, 7, 0, 0, 1, 100, 2, 0, 0, 2400, 3800, 11, 15497, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - Combat CMC - Cast \'Frostbolt\' (Phase 1) (Normal Dungeon)'),
(18794, 0, 8, 0, 0, 1, 100, 4, 0, 0, 2400, 3800, 11, 12675, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - Combat CMC - Cast \'Frostbolt\' (Phase 1) (Heroic Dungeon)'),
(18794, 0, 9, 0, 0, 1, 100, 2, 7000, 7000, 7000, 12000, 11, 15532, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - In Combat - Cast \'Frost Nova\' (Phase 1) (Normal Dungeon)'),
(18794, 0, 10, 0, 0, 1, 100, 4, 7000, 7000, 7000, 12000, 11, 15063, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - In Combat - Cast \'Frost Nova\' (Phase 1) (Heroic Dungeon)'),
(18794, 0, 11, 0, 0, 2, 100, 6, 4000, 4000, 6000, 8000, 11, 12540, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - In Combat - Cast \'Gouge\' (Phase 2) (Dungeon)'),
(18794, 0, 12, 0, 3, 2, 100, 6, 30, 100, 100, 100, 23, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - Between 30-100% Mana - Decrement Phase By 1 (Phase 2) (Dungeon)'),
(18794, 0, 13, 0, 4, 4, 100, 0, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - On Aggro - Increment Phase By 1 (Phase 4) (Dungeon)'),
(18794, 0, 14, 0, 0, 4, 100, 2, 0, 0, 2400, 3800, 11, 33833, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - Combat CMC - Cast \'Arcane Missiles\' (Phase 4) (Normal Dungeon)'),
(18794, 0, 15, 0, 0, 4, 100, 4, 0, 0, 2400, 3800, 11, 38264, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - Combat CMC - Cast \'Arcane Missiles\' (Phase 4) (Heroic Dungeon)'),
(18794, 0, 16, 0, 3, 4, 100, 0, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - Between 0-15% Mana - Increment Phase By 1 (Phase 4) (No Repeat) (Dungeon)'),
(18794, 0, 17, 0, 0, 4, 100, 6, 9000, 12000, 12000, 16000, 11, 33487, 1, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - In Combat - Cast \'Addle Humanoid\' (Phase 4) (Dungeon)'),
(18794, 0, 18, 0, 0, 8, 100, 6, 4000, 4000, 6000, 8000, 11, 12540, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - In Combat - Cast \'Gouge\' (Phase 8) (Dungeon)'),
(18794, 0, 19, 0, 3, 8, 100, 6, 30, 100, 100, 100, 23, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cabal Ritualist - Between 30-100% Mana - Decrement Phase By 1 (Phase 8) (Dungeon)');

View File

@@ -0,0 +1,45 @@
--
-- Add missing Emote & Say lines for NPC entry 20098(Jane), 20100(Jessel) and 20244(Nova)
SET @Jane := 20098;
SET @Jessel := 20100;
SET @Nova := 20244;
-- Set random movement around a new set spawndist for Nova
UPDATE `creature` SET `position_x`= 10512.0615,`position_y`= -6499.652,`position_z`= 3.6119,`orientation`= 0.855017,`spawndist`= 8,`MovementType`= 1 WHERE `id`= @Nova;
UPDATE `creature` SET `position_x`= 10512.0615,`position_y`= -6499.652,`position_z`= 3.6119,`orientation`= 0.855017,`spawndist`= 8,`MovementType`= 1 WHERE `id`= 20246;
UPDATE `creature` SET `MovementType`=1, `spawndist`=8 WHERE `id` IN (20098,20247,20246);
DELETE FROM `creature_text` WHERE `entry`= @Jane AND `groupid`= 1 AND `id`= 0;
DELETE FROM `creature_text` WHERE `entry`= @Jessel AND `groupid`= 2 AND `id`= 0;
DELETE FROM `creature_text` WHERE `entry`= @Nova AND `groupid` IN (0,1) AND `id` IN (0,1,2,3);
INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
(@Jessel,2,0,'%s wakes up, startled.', 16,10,100,0,0,0,17595,0,'Jessel'),
(@Jane, 1,0,'%s resumes playing on the beach.', 16,10,100,0,0,0,17599,0,'Jane'),
(@Nova, 1,0,'I think I can see the Sunwell from here!', 12,10,100,1,0,0,17918,0,'Nova'),
(@Nova, 1,1,'Can you really hear the ocean from one of these shells?',12,10,100,1,0,0,17919,0,'Nova'),
(@Nova, 1,2,'Oooh! Look, a shiny one!', 12,10,100,1,0,0,17920,0,'Nova'),
(@Nova, 1,3,'Jane will love this one!', 12,10,100,1,0,0,17921,0,'Nova'),
(@Nova, 0,0,'%s picks up a sea shell.', 16,10,100,0,0,0,17922,0,'Nova'),
(@Nova, 0,1,'%s holds a sea shell up to her ear.', 16,10,100,0,0,0,17923,0,'Nova'),
(@Nova, 0,2,'%s shakes the dirt loose from the shell.', 16,10,100,0,0,0,17924,0,'Nova');
-- Add SmartAI script lines for Jane, Jessel and Nova
UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`= @Nova;
DELETE FROM `smart_scripts` WHERE `entryorguid`= @Jane AND `source_type`= 0;
DELETE FROM `smart_scripts` WHERE `entryorguid`= @Jessel AND `source_type`= 0;
DELETE FROM `smart_scripts` WHERE `entryorguid`= @Jessel*100 AND `source_type`= 9;
DELETE FROM `smart_scripts` WHERE `entryorguid`= @Nova AND `source_type`= 0 AND `id` IN (0,1);
INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
(@Nova, 0,0,0,1,0,100,0, 10000, 10000, 25000, 60000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Nova - Out Of Combat - Say Line'),
(@Nova, 0,1,0,1,0,100,0, 11000, 11000, 25000, 60000,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Nova - Out Of Combat - Say Line'),
(20100, 0, 0, 0, 1, 0, 100, 0, 0, 0, 300000, 300000, 80, 2010000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jessel - Ooc - Action list"),
(2010000, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 50917, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jessel - Action list - Cast sleep aura"),
(2010000, 9, 1, 0, 0, 0, 100, 0, 10000, 10000, 0, 0, 28, 50917, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jessel - Action list - rrmove sleep aura"),
(2010000, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jessel - Action list - Say Line 2"),
(2010000, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 90, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jessel - Action list - Set bytes 1"),
(2010000, 9, 4, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jessel - Action list - Say Line 0"),
(2010000, 9, 5, 0, 0, 0, 100, 0, 9000, 9000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, @Jane, 50, 0, 0, 0, 0, 0, "Jessel - Action list - Say Line 0"),
(2010000, 9, 6, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jessel - Action list - Say Line 1"),
(2010000, 9, 7, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 19, @Jane, 50, 0, 0, 0, 0, 0, "Jessel - Action list - Say Line 1"),
(2010000, 9, 8, 6, 0, 0, 100, 0, 3000, 3000, 0, 0, 91, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jessel - Action list - remove bytes 1"),
(2010000, 9, 9, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 50917, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Jessel - Action list - Cast sleep");

View File

@@ -0,0 +1,2 @@
--
UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`= 2010000 AND `source_type`= 9;

View File

@@ -0,0 +1,3 @@
--
UPDATE `creature_loot_template` SET `chance`=5.4 WHERE `entry` IN (3100, 3196, 3244, 3123, 3196, 3268) AND `item`=6514;
UPDATE `creature_loot_template` SET `chance`=0.7 WHERE `entry`=3100 AND `item`=4663;

View File

@@ -0,0 +1,3 @@
--
-- Set CREATURE_FLAG_EXTRA_NO_PLAYER_DAMAGE_REQ on Iron Sentinel Credit & Iron Dwarf Assailant & Corpulent Horror Credit
UPDATE `creature_template` SET `flags_extra`=`flags_extra`|2097152 WHERE `entry` IN (30296,30297,30696);