typo fix

1 files changed, 26 insertions, 32 deletions

diff --git a/sql/updates/world/master/2017_11_11_00_world.sql b/sql/updates/world/master/2017_11_11_00_world.sql
index baa859fa682..cc76c0b590c 100644
--- a/sql/updates/world/master/2017_11_11_00_world.sql
+++ b/sql/updates/world/master/2017_11_11_00_world.sql
@@ -3,24 +3,23 @@ SET @ENTRY := 37951;
 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,1,19,0,100,0,24750,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
+(@ENTRY,0,0,1,19,0,100,0,24750,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
 (@ENTRY,0,1,0,61,0,100,0,0,0,0,0,11,71035,0,0,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Invoker Cast 'Troll Introduction Tracking Quest'"),
-(@ENTRY,0,2,3,19,0,100,0,24758,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
+(@ENTRY,0,2,3,19,0,100,0,24758,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
 (@ENTRY,0,3,0,61,0,100,0,0,0,0,0,11,71035,0,0,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Invoker Cast 'Troll Introduction Tracking Quest'"),
-(@ENTRY,0,4,5,19,0,100,0,24770,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
+(@ENTRY,0,4,5,19,0,100,0,24770,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
 (@ENTRY,0,5,0,61,0,100,0,0,0,0,0,11,71035,0,0,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Invoker Cast 'Troll Introduction Tracking Quest'"),
-(@ENTRY,0,6,7,19,0,100,0,24776,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
+(@ENTRY,0,6,7,19,0,100,0,24776,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
 (@ENTRY,0,7,0,61,0,100,0,0,0,0,0,11,71035,0,0,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Invoker Cast 'Troll Introduction Tracking Quest'"),
-(@ENTRY,0,8,9,19,0,100,0,24782,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
+(@ENTRY,0,8,9,19,0,100,0,24782,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
 (@ENTRY,0,9,0,61,0,100,0,0,0,0,0,11,71035,0,0,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Invoker Cast 'Troll Introduction Tracking Quest'"),
-(@ENTRY,0,10,11,19,0,100,0,24607,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
+(@ENTRY,0,10,11,19,0,100,0,24607,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
 (@ENTRY,0,11,0,61,0,100,0,0,0,0,0,11,71035,0,0,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Invoker Cast 'Troll Introduction Tracking Quest'"),
-(@ENTRY,0,12,13,19,0,100,0,24764,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
+(@ENTRY,0,12,13,19,0,100,0,24764,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
 (@ENTRY,0,13,0,61,0,100,0,0,0,0,0,11,71035,0,0,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Invoker Cast 'Troll Introduction Tracking Quest'"),
-(@ENTRY,0,14,15,19,0,100,0,26272,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
+(@ENTRY,0,14,15,19,0,100,0,26272,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
 (@ENTRY,0,15,0,61,0,100,0,0,0,0,0,11,71035,0,0,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Invoker Cast 'Troll Introduction Tracking Quest'"),
--- Master
-(@ENTRY,0,16,17,19,0,100,0,31159,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
+(@ENTRY,0,16,17,19,0,100,0,31159,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
 (@ENTRY,0,17,0,61,0,100,0,0,0,0,0,11,71035,0,0,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Invoker Cast 'Troll Introduction Tracking Quest'");
 
 -- Jin'thala
@@ -31,7 +30,7 @@ INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language
 
 DELETE FROM `playercreateinfo_cast_spell` WHERE `spell`=71033;
 INSERT INTO `playercreateinfo_cast_spell` (`raceMask`,`classMask`,`spell`,`note`) VALUES
-(128,1503,71033, 'Troll - Calm of the Novice'); -- classMask = 2015 on master
+(128,2015,71033, 'Troll - Calm of the Novice');
 
 DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=71035;
 INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
@@ -55,30 +54,25 @@ DELETE FROM `creature_template_addon` WHERE `entry` IN (38217,37988);
 INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
 (38217,0,0,0,257,0, '18950'),(37988,0,0,1,0,0, '');
 
--- Jin'thala
-SET @ENTRY := 37951;
+-- Zuni Lvl 1 SAI
+SET @ENTRY := 37988;
 UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
 DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY*100,@ENTRY*100+1) 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,0,0,1,19,0,100,0,24750,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
-(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,11,71035,0,0,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Invoker Cast 'Troll Introduction Tracking Quest'"),
-(@ENTRY,0,2,3,19,0,100,0,24758,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
-(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,11,71035,0,0,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Invoker Cast 'Troll Introduction Tracking Quest'"),
-(@ENTRY,0,4,5,19,0,100,0,24770,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
-(@ENTRY,0,5,0,61,0,100,0,0,0,0,0,11,71035,0,0,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Invoker Cast 'Troll Introduction Tracking Quest'"),
-(@ENTRY,0,6,7,19,0,100,0,24776,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
-(@ENTRY,0,7,0,61,0,100,0,0,0,0,0,11,71035,0,0,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Invoker Cast 'Troll Introduction Tracking Quest'"),
-(@ENTRY,0,8,9,19,0,100,0,24782,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
-(@ENTRY,0,9,0,61,0,100,0,0,0,0,0,11,71035,0,0,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Invoker Cast 'Troll Introduction Tracking Quest'"),
-(@ENTRY,0,10,11,19,0,100,0,24607,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
-(@ENTRY,0,11,0,61,0,100,0,0,0,0,0,11,71035,0,0,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Invoker Cast 'Troll Introduction Tracking Quest'"),
-(@ENTRY,0,12,13,19,0,100,0,24764,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
-(@ENTRY,0,13,0,61,0,100,0,0,0,0,0,11,71035,0,0,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Invoker Cast 'Troll Introduction Tracking Quest'"),
-(@ENTRY,0,14,15,19,0,100,0,26272,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
-(@ENTRY,0,15,0,61,0,100,0,0,0,0,0,11,71035,0,0,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Invoker Cast 'Troll Introduction Tracking Quest'"),
--- Master
-(@ENTRY,0,16,17,19,0,100,0,31159,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Say 0"),
-(@ENTRY,0,17,0,61,0,100,0,0,0,0,0,11,71035,0,0,0,0,0,7,0,0,0,0,0,0,0,"Jin''thala - On Quest Accept - Invoker Cast 'Troll Introduction Tracking Quest'");
+(@ENTRY,0,1,2,25,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.2298513,"Zuni Lvl 1 - On Reset - Turn to"),
+(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zuni Lvl 1 - On Reset - Set Event Phase 1"),
+(@ENTRY,0,3,4,8,1,100,0,71037,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zuni Lvl 1 - On Spellhit - Play script"),
+(@ENTRY,0,4,0,61,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zuni Lvl 1 - On Reset - Set Event Phase 0"),
+(@ENTRY,0,5,6,40,0,100,0,5,@ENTRY,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"S.A.F.E. Operative - On Reached WP5 - Turn to invoker"),
+(@ENTRY,0,6,7,61,0,100,0,0,0,0,0,1,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"S.A.F.E. Operative - On Reached 5 - Say 1"),
+(@ENTRY,0,7,8,61,0,100,0,0,0,0,0,41,20000,0,0,0,0,0,1,0,0,0,0,0,0,0,"S.A.F.E. Operative - On Reached 5 - Despawn in 20 seconds"),
+(@ENTRY,0,8,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zuni Lvl 1 - On Reached 5 - Play script"),
+(@ENTRY*100,9,0,0,0,0,100,0,4000,4000,0,0,91,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zuni Lvl 1 - Script - REMOVE_UNIT_FIELD_BYTES_1"),
+(@ENTRY*100,9,1,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Zuni Lvl 1 - Script - Turn to invoker"),
+(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Zuni Lvl 1 - Script - Say 0"),
+(@ENTRY*100,9,3,0,0,0,100,0,4000,4000,0,0,53,1,37988,0,0,0,0,1,0,0,0,0,0,0,0,"Zuni Lvl 1 - Script - Move path"),
+(@ENTRY*100+1,9,0,0,0,0,100,0,7000,7000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,3.490659,"S.A.F.E. Operative - Script - Turn to");
 
 -- Zuni Lvl 1
 SET @ENTRY := 37988;