Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into ShatteredWorld

Browse Source 
# Conflicts:
#	src/server/scripts/EasternKingdoms/Gilneas/chapter1.cpp
#	src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp
#	src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp
#	src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.h
#	src/server/scripts/Spells/spell_quest.cpp
This commit is contained in:
Ovahlord
2017-12-27 18:06:47 +01:00
parent 9783b86dae e7152e828a
commit 3e4451cab7
39 changed files with 608 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/updates/world/4.3.4/2017_12_19_00_world.sql Normal file
View File

@@ -0,0 +1,2 @@
--
UPDATE `playercreateinfo_skills` SET `classMask`= `classMask`| 8 WHERE `skill`= 44;

5
sql/updates/world/4.3.4/2017_12_19_01_world.sql Normal file
View File

@@ -0,0 +1,5 @@
--
DELETE FROM `spell_learn_spell` WHERE `entry`= 87840;
INSERT INTO `spell_learn_spell` (`entry`, `SpellID`, `Active`) VALUES
(87840, 33388, 1);
UPDATE `spell_bonus_data` SET `direct_bonus`= 0.654 WHERE `entry`= 133;

2
sql/updates/world/4.3.4/2017_12_26_00_world_from_335_was_2017_12_19_00_world.sql Normal file
View File

@@ -0,0 +1,2 @@
-- The Shadow Labyrinth door Lever
UPDATE `gameobject_template_addon` SET `flags`=0 WHERE `entry` IN (183518);

5
sql/updates/world/4.3.4/2017_12_26_01_world_from_335_was_2017_12_19_01_world.sql Normal file
View File

@@ -0,0 +1,5 @@
--
UPDATE `creature` SET `spawnMask`=3 WHERE `id` IN (18956,19511);
UPDATE `smart_scripts` SET `event_flags`=7 WHERE `entryorguid` IN (18956) AND `source_type`=0;
UPDATE `smart_scripts` SET `event_flags`=7 WHERE `entryorguid` IN (1895600) AND `source_type`=9;
UPDATE `gameobject` SET `spawnMask` = 3 WHERE `spawnMask` = 1 AND `id` IN (181278,181556,181557,181569,183051,182940,186633,185434,181275,184931,181276,181270,184956,184940,183296,183516,182942,182943,183036,183295,184941,183441) AND `map` NOT IN (530,548,568,571);

7
sql/updates/world/4.3.4/2017_12_26_02_world_from_335_was_2017_12_20_01_world_335.sql Normal file
View File

@@ -0,0 +1,7 @@
/*
--
UPDATE `creature_template` SET `maxgold` = 1093073 WHERE `entry` = 36855;
UPDATE `creature_template` SET `mingold` = 1674308, `maxgold` = 2186146 WHERE `entry` = 38106;
UPDATE `creature_template` SET `mingold` = 1925454, `maxgold` = 2514068 WHERE `entry` = 38296;
UPDATE `creature_template` SET `mingold` = 2092885, `maxgold` = 2732683 WHERE `entry` = 38297;
*/

15
sql/updates/world/4.3.4/2017_12_26_03_world_from_335_was_2017_12_20_02_world_335.sql Normal file
View File

@@ -0,0 +1,15 @@
/*
--
UPDATE `creature_template` SET `maxgold` = 22960 WHERE `entry` = 36829;
UPDATE `creature_template` SET `mingold` = 36640, `maxgold` = 45920 WHERE `entry` = 38074;
UPDATE `creature_template` SET `maxgold` = 7536 WHERE `entry` = 37028;
UPDATE `creature_template` SET `mingold` = 9214, `maxgold` = 15072 WHERE `entry` = 38094;
UPDATE `creature_template` SET `maxgold` = 07510 WHERE `entry` = 37031;
UPDATE `creature_template` SET `mingold` = 10912, `maxgold` = 15020 WHERE `entry` = 38090;
UPDATE `creature_template` SET `maxgold` = 07665 WHERE `entry` = 37029;
UPDATE `creature_template` SET `mingold` = 9494, `maxgold` = 15330 WHERE `entry` = 38092;
UPDATE `creature_template` SET `maxgold` = 7599 WHERE `entry` = 37662;
UPDATE `creature_template` SET `mingold` = 6720, `maxgold` = 15198 WHERE `entry` = 38102;
UPDATE `creature_template` SET `maxgold` = 7617 WHERE `entry` = 36805;
UPDATE `creature_template` SET `mingold` = 5346, `maxgold` = 15234 WHERE `entry` = 38075;
*/

28
sql/updates/world/4.3.4/2017_12_26_04_world_from_335_was_2017_12_20_03_world_335.sql Normal file
View File

@@ -0,0 +1,28 @@
/*
--
UPDATE `creature_template` SET `mingold` = 15123, `maxgold` = 19760 WHERE `entry` = 37328;
UPDATE `creature_template` SET `mingold` = 15123, `maxgold` = 19760 WHERE `entry` = 37408;
UPDATE `creature_template` SET `mingold` = 13913, `maxgold` = 18179 WHERE `entry` = 32009;
UPDATE `creature_template` SET `mingold` = 13913, `maxgold` = 18179 WHERE `entry` = 32087;
UPDATE `creature_template` SET `mingold` = 17046, `maxgold` = 17046 WHERE `entry` = 29356;
UPDATE `creature_template` SET `mingold` = 9262, `maxgold` = 17664 WHERE `entry` = 29574;
UPDATE `creature_template` SET `mingold` = 3988, `maxgold` = 23564 WHERE `entry` = 38110;
UPDATE `creature_template` SET `mingold` = 1278, `maxgold` = 25596 WHERE `entry` = 30818;
UPDATE `creature_template` SET `mingold` = 1278, `maxgold` = 25592 WHERE `entry` = 30817;
UPDATE `creature_template` SET `mingold` = 1282, `maxgold` = 25644 WHERE `entry` = 30816;
UPDATE `creature_template` SET `mingold` = 43710, `maxgold` = 47060 WHERE `entry` = 31001;
UPDATE `creature_template` SET `mingold` = 45162, `maxgold` = 49068 WHERE `entry` = 31000;
UPDATE `creature_template` SET `mingold` = 5460, `maxgold` = 5460 WHERE `entry` = 32368;
UPDATE `creature_template` SET `mingold` = 6968, `maxgold` = 15324 WHERE `entry` = 34016;
UPDATE `creature_template` SET `mingold` = 4132, `maxgold` = 25116 WHERE `entry` = 38076;
UPDATE `creature_template` SET `mingold` = 141844, `maxgold` = 141844 WHERE `entry` = 38031;
UPDATE `creature_template` SET `mingold` = 4890, `maxgold` = 24368 WHERE `entry` = 38061;
UPDATE `creature_template` SET `mingold` = 9090, `maxgold` = 18374 WHERE `entry` = 38059;
UPDATE `creature_template` SET `mingold` = 542268, `maxgold` = 542268 WHERE `entry` = 38444;
UPDATE `creature_template` SET `mingold` = 6532, `maxgold` = 23044 WHERE `entry` = 38108;
UPDATE `creature_template` SET `mingold` = 4804, `maxgold` = 24334 WHERE `entry` = 38062;
UPDATE `creature_template` SET `mingold` = 4380, `maxgold` = 26180 WHERE `entry` = 38063;
UPDATE `creature_template` SET `mingold` = 570506, `maxgold` = 570506 WHERE `entry` = 38103;
UPDATE `creature_template` SET `mingold` = 13390, `maxgold` = 24210 WHERE `entry` = 38197;
UPDATE `creature_template` SET `mingold` = 650000, `maxgold` = 700000 WHERE `entry` = 35349;
*/

11
sql/updates/world/4.3.4/2017_12_26_05_world_from_335_was_2017_12_20_04_world.sql Normal file
View File

@@ -0,0 +1,11 @@
--
DELETE FROM `gameobject` WHERE `id`=64922 AND `guid`=189980;
DELETE FROM `gameobject_addon` WHERE `guid`=189980;
DELETE FROM `pool_gameobject` WHERE `pool_entry`=5217 ;
DELETE FROM `pool_creature` WHERE `guid`=134515 AND `pool_entry`=1047;
DELETE FROM `pool_template` WHERE `entry` IN (5217,5450,5506,5517,5608);
INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES
(5450,1,"Icecrown node 3"),
(5506,1,"Icecrown node 59"),
(5517,1,"Icecrown node 70"),
(5608,1,"Icecrown node 161");

41
sql/updates/world/4.3.4/2017_12_26_06_world_from_335_was_2017_12_20_05_world.sql Normal file
View File

@@ -0,0 +1,41 @@
--
-- Add script and waypoints to Draenei Artificer
SET @ENTRY := 17228;
SET @GUID := -82823;
SET @ACTIONLIST_0 := 8282300;
SET @ACTIONLIST_1 := 8282301;
-- Remove emote from Draenei Artificer
DELETE FROM `creature_addon` WHERE `guid`=82823;
INSERT INTO `creature_addon` (`guid`, `emote`, `bytes2`) VALUES
(82823, 0, 4097);
-- Add weapon to Draenei Artificer
DELETE FROM `creature_equip_template` WHERE `CreatureID`=@ENTRY AND `ID`=2;
INSERT INTO `creature_equip_template` (`CreatureID`, `ID`, `ItemID1`, `ItemID2`, `ItemID3`, `VerifiedBuild`) VALUES (@ENTRY, 2, 2530, 0, 0, 18019);
DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
(@ENTRY, 1, -4189.97, -12460.97, 45.227, 'Draenei Artificer'),
(@ENTRY, 2, -4191.24, -12456.74, 45.444, 'Draenei Artificer'),
(@ENTRY, 3, -4192.75, -12453.75, 45.635, 'Draenei Artificer'),
(@ENTRY, 4, -4191.24, -12456.74, 45.444, 'Draenei Artificer'),
(@ENTRY, 5, -4189.97, -12460.97, 45.227, 'Draenei Artificer'),
(@ENTRY, 6, -4191.44, -12464.07, 45.340, 'Draenei Artificer');
-- Add SAI to Draenei Artificer + Actionlist 00/01
DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@GUID, @ACTIONLIST_0, @ACTIONLIST_1) AND `source_type` IN (0, 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
(@GUID,0,0,0,40,0,100,0,3,@ENTRY,0,0,80,@ACTIONLIST_0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Draenei Artificer - On Waypoint 3 Reached - Run Script"),
(@GUID,0,1,0,40,0,100,0,6,@ENTRY,0,0,80,@ACTIONLIST_1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Draenei Artificer - On Waypoint 6 Reached - Run Script"),
(@GUID,0,2,0,1,0,100,0,0,0,130000,130000,53,0,@ENTRY,1,0,0,2,1,0,0,0,0,0,0,0,"Draenei Artificer - Out of Combat - Start Waypoint"),
(@ACTIONLIST_0,9,0,0,0,0,100,0,0,0,0,0,54,60000,0,0,0,0,0,0,0,0,0,0,0,0,0,"Draenei Artificer - On Script - Pause Waypoint"),
(@ACTIONLIST_0,9,1,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.8356,"Draenei Artificer - On Script - Set Orientation 0,8356"),
(@ACTIONLIST_0,9,2,0,0,0,100,0,1500,1500,0,0,71,2,1,0,0,0,0,1,0,0,0,0,0,0,0,"Draenei Artificer - On Script - Change Equipment"),
(@ACTIONLIST_0,9,3,0,0,0,100,0,2000,2000,0,0,17,234,0,0,0,0,0,1,0,0,0,0,0,0,0,"Draenei Artificer - On Script - Set Emote State 234"),
(@ACTIONLIST_0,9,4,0,0,0,100,0,55000,55000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Draenei Artificer - On Script - Set Emote State 0"),
(@ACTIONLIST_1,9,0,0,0,0,100,0,0,0,0,0,54,60000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Draenei Artificer - On Script - Pause Waypoint"),
(@ACTIONLIST_1,9,1,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,3.8398,"Draenei Artificer - On Script - Set Orientation 3,8398"),
(@ACTIONLIST_1,9,3,0,0,0,100,0,1500,1500,0,0,71,1,1,0,0,0,0,1,0,0,0,0,0,0,0,"Draenei Artificer - On Script - Change Equipment"),
(@ACTIONLIST_1,9,4,0,0,0,100,0,2000,2000,0,0,17,234,0,0,0,0,0,1,0,0,0,0,0,0,0,"Draenei Artificer - On Script - Set Emote State 234"),
(@ACTIONLIST_1,9,5,0,0,0,100,0,55000,55000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Draenei Artificer - On Script - Set Emote State 0");

5
sql/updates/world/4.3.4/2017_12_26_07_world_from_335_was_2017_12_21_00_world.sql Normal file
View File

@@ -0,0 +1,5 @@
UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|33554432 WHERE `entry` IN
(36626,37504,37505,37506, -- Festergut
39863,39864,39944,39945, -- Halion (normal)
40142,40143,40144,40145, -- Halion (twilight)
34797,35447,35448,35449); -- Icehowl

18
sql/updates/world/4.3.4/2017_12_26_08_world_from_335_was_2017_12_21_01_world.sql Normal file
View File

@@ -0,0 +1,18 @@
SET @CGUID:= 16806; -- 1 guid
SET @GGUID:= 1577; -- 2 guids
DELETE FROM `creature` WHERE `guid` = @CGUID;
INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES
(@CGUID, 16031, 329, 0, 0, 1, 1, 0, 0, 4044.78, -3333.68, 117.26, 4.153883, 7200, 0, 0, 4120, 0, 0, 0, 0, 0, '', 0);
DELETE FROM `gameobject` WHERE `guid` IN (@GGUID + 0, @GGUID + 1);
INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`) VALUES
(@GGUID + 0, 181071, 329, 2017, 2017, 1, 1, 4044.34, -3334.217, 115.0604, 2.740162, -0, -0, 0.9799242, 0.1993704, 300, 255, 1, '', 0),
(@GGUID + 1, 181072, 329, 2017, 2017, 1, 1, 4039.52, -3331.85, 115.061, 1.169369, -0, -0, 0.5519361, 0.8338864, 300, 255, 1, '', 0);
DELETE FROM `spell_script_names` WHERE `ScriptName` = "spell_ysida_saved_credit";
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(31912, "spell_ysida_saved_credit");
UPDATE `creature_template` SET `npcflag` = `npcflag` & ~2, `AIName` = "" WHERE `entry` = 16031;
DELETE FROM `smart_scripts` WHERE `entryorguid` = 16031;

2
sql/updates/world/4.3.4/2017_12_26_09_world_from_335_was_2017_12_21_02_world.sql Normal file
View File

@@ -0,0 +1,2 @@
--
UPDATE `creature_template` SET `npcflag` = `npcflag` | 2 WHERE `entry` = 16031;

18
sql/updates/world/4.3.4/2017_12_26_10_world_from_335_was_2017_12_22_00_world.sql Normal file
View File

@@ -0,0 +1,18 @@
-- Quest "The Emitter"
DELETE FROM `smart_scripts` WHERE `entryorguid`=1707100 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
(1707100,9,0,0,0,0,100,0,0,0,0,0,9,0,0,0,0,0,0,20,181286,0,0,0,0,0,0,"Technician Zhanaa - On Script - Activate Gameobject"),
(1707100,9,1,0,0,0,100,0,0,0,0,0,12,16550,1,39000,0,0,0,8,0,0,0,-4187.71,-13738.7,75.6549,1.85005,"Technician Zhanaa - On Script - Summon Creature 'Image of Technician Dyvuun'"),
(1707100,9,2,0,0,0,100,0,0,0,0,0,64,2,0,0,0,0,0,7,0,0,0,0,0,0,0,"Technician Zhanaa - On Script - Store Targetlist"),
(1707100,9,3,0,0,0,100,0,1000,1000,0,0,100,2,0,0,0,0,0,19,16550,10,0,0,0,0,0,"Technician Zhanaa - On Script - Send Target 2"),
(1707100,9,4,0,0,0,100,0,1000,1000,0,0,45,0,1,0,0,0,0,19,16550,10,0,0,0,0,0,"Technician Zhanaa - On Script - Set Data 0 1"),
(1707100,9,5,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,19,16550,10,0,0,0,0,0,"Technician Zhanaa - On Script - Set Orientation Closest Creature 'Image of Technician Dyvuun'"),
(1707100,9,6,0,0,0,100,0,2000,2000,0,0,5,70,0,0,0,0,0,1,0,0,0,0,0,0,0,"Technician Zhanaa - On Script - Play Emote 70"),
(1707100,9,7,0,0,0,100,0,19000,19000,0,0,59,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Technician Zhanaa - On Script - Set Run Off"),
(1707100,9,8,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-4186.67,-13736.3,74.4813,0,"Technician Zhanaa - On Script - Move to Position"),
(1707100,9,9,0,0,0,100,0,3000,3000,0,0,17,133,0,0,0,0,0,1,0,0,0,0,0,0,0,"Technician Zhanaa - On Script - Set Emote State 133"),
(1707100,9,11,0,0,0,100,0,16000,16000,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Technician Zhanaa - On Script - Set Orientation Invoker"),
(1707100,9,12,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Technician Zhanaa - On Script - Say Line 0"),
(1707100,9,13,0,0,0,100,0,29000,29000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Technician Zhanaa - On Script - Set Emote State 0"),
(1707100,9,14,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,8,0,0,0,-4184.55,-13733.1,74.1389,0,"Technician Zhanaa - On Script - Move to Position"),
(1707100,9,15,0,0,0,100,0,3000,3000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.91986,"Technician Zhanaa - On Script - Set Orientation");

93
sql/updates/world/4.3.4/2017_12_26_11_world_from_335_was_2017_12_22_01_world.sql Normal file
View File

@@ -0,0 +1,93 @@
-- Aponi Brightmane & Tahu Sagewind
DELETE FROM `creature_text` WHERE `CreatureID` IN (34526,34528);
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
(34526,0,0,"Talk to me, Tahu. Something. Anything! I'm going stir-crazy.",12,0,100,0,0,0,34762,0,"Aponi Brightmane"),
(34526,1,0,"Not much.",12,0,100,0,0,0,34763,0,"Aponi Brightmane"),
(34526,2,0,"Like Mu'sha.",12,0,100,0,0,0,34764,0,"Aponi Brightmane"),
(34526,3,0,"Where are you going with this?",12,0,100,6,0,0,34765,0,"Aponi Brightmane"),
(34526,4,0,"I hear the \"but\" in your voice...",12,0,100,0,0,0,34766,0,"Aponi Brightmane"),
(34526,5,0,"Do you think his teachings are wrong?",12,0,100,6,0,0,34767,0,"Aponi Brightmane"),
(34526,6,0,"So are you going to bring this up to the elder?",12,0,100,0,0,0,34768,0,"Aponi Brightmane"),
(34526,7,0,"I suppose so. It's not silly, though, what you said.",12,0,100,1,0,0,34769,0,"Aponi Brightmane"),
(34526,8,0,"I see that thoughtful frown, Tahu.",12,0,100,0,0,0,34770,0,"Aponi Brightmane"),
(34526,9,0,"But something is on your mind, right?",12,0,100,6,0,0,34771,0,"Aponi Brightmane"),
(34526,10,0,"What about it?",12,0,100,0,0,0,34772,0,"Aponi Brightmane"),
(34526,11,0,"There's a phrase... \"It's always darkest before the dawn.\" The dawn will come, though, Tahu. The sun will rise. The balance will shift back to where it should be.",12,0,100,1,0,0,34773,0,"Aponi Brightmane"),
(34526,12,0,"%s smiles and gestures to the north.",16,0,100,25,0,0,34774,0,"Aponi Brightmane"),
(34526,13,0,"Even on the glacier itself, the sun manages to peek through the gloom. I have hope, Tahu. I think we'll make it through this, no matter how dire it looks.",12,0,100,1,0,0,34775,0,"Aponi Brightmane"),
(34526,14,0,"But I'd still rather be there on the front lines helping it happen rather than trying to placate myself with belief. We can't just sit around and hope it happens.",12,0,100,0,0,0,34776,0,"Aponi Brightmane"),
(34526,15,0,"And through that hope, strengthen our side in the fight?",12,0,100,0,0,0,34777,0,"Aponi Brightmane"),
(34528,0,0,"%s laughs softly.",16,0,100,0,0,0,34745,0,"Tahu Sagewind"),
(34528,1,0,"All right, Aponi. I've enough on my mind to share. Have you ever spoken to the elves of Moonglade?",12,0,100,1,0,0,34746,0,"Tahu Sagewind"),
(34528,2,0,"The elves speak of a moon goddess, did you know? They put great stock in the light given by the moon.",12,0,100,0,0,0,34747,0,"Tahu Sagewind"),
(34528,3,0,"Just like her. The parallels I've heard are interesting. And it's no secret all druids, Shu'halo and elf alike, can call upon Mu'sha's light.",12,0,100,273,0,0,34748,0,"Tahu Sagewind"),
(34528,4,0,"I wonder. Hamuul has guided us well, and I've learned so much from him. The legends say that our people were druids when time began...",12,0,100,1,0,0,34749,0,"Tahu Sagewind"),
(34528,5,0,"...but what Hamuul teaches is what the elves know. The night elves. They put such stock in their moon goddess, as creatures of the night.",12,0,100,0,0,0,34750,0,"Tahu Sagewind"),
(34528,6,0,"No! No, nothing like that. He is an elder for good reason, sister. Mu'sha is one of the Earthmother's eyes, and she watches over us. That isn't sinister.",12,0,100,274,0,0,34751,0,"Tahu Sagewind"),
(34528,7,0,"But we're nothing if not people who strive for balance. Our warriors fight only when there is need. Our hunters take only what the tribes require to live, and use all they can when they do. The shaman stand as guide and mediator to the elemental spirits.",12,0,100,0,0,0,34753,0,"Tahu Sagewind"),
(34528,8,0,"And while we, as druids, are guardians of nature, I wonder if we've overlooked a key aspect of balance in all things.",12,0,100,1,0,0,34754,0,"Tahu Sagewind"),
(34528,9,0,"No, no. No need for him to trouble about a student's idle philosophizing while he entertains a friend.",12,0,100,274,0,0,34755,0,"Tahu Sagewind"),
(34528,10,0,"Well, it isn't exactly a new thought, sister.",12,0,100,6,0,0,34756,0,"Tahu Sagewind"),
(34528,11,0,"Sorry, sister. It's nothing to worry about.",12,0,100,0,0,0,34778,0,"Tahu Sagewind"),
(34528,12,0,"I'm thinking about the front to the north. The one you're so eager to return to.",12,0,100,1,0,0,34779,0,"Tahu Sagewind"),
(34528,13,0,"I know I'm counseling patience, Aponi, but I don't like remaining here any more than you do. Times are bleak, and failing to act only makes me worry that my idle hand may have been the one to turn the tide.",12,0,100,0,0,0,34780,0,"Tahu Sagewind"),
(34528,14,0,"Still... there is balance in all things, even death. I simply hate the concept that such destruction and darkness might be necessary.",12,0,100,1,0,0,34781,0,"Tahu Sagewind"),
(34528,15,0,"I know, sister. I know. We'll return to fighting one day. For now, though, maybe it's best to spread the word to others... give them the hope you have.",12,0,100,1,0,0,34783,0,"Tahu Sagewind"),
(34528,16,0,"That's the idea.",12,0,100,273,0,0,34784,0,"Tahu Sagewind");
UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=34526;
DELETE FROM `smart_scripts` WHERE `entryorguid`=34526 AND `source_type`=0;
DELETE FROM `smart_scripts` WHERE `entryorguid` IN (3452600,3452601) 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
(34526,0,0,0,20,1,100,0,13986,0,0,0,87,3452600,3452601,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Quest 'An Injured Colleague' Finished - Run Random Script"),
(34526,0,1,0,11,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Respawn - Set Event Phase 1"),
(3452600,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Set Event Phase 0"),
(3452600,9,1,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 0"),
(3452600,9,2,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 0 (Tahu Sagewind)"),
(3452600,9,3,0,0,0,100,0,2000,2000,0,0,1,1,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 1 (Tahu Sagewind)"),
(3452600,9,4,0,0,0,100,0,5500,5500,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 1"),
(3452600,9,5,0,0,0,100,0,2000,2000,0,0,1,2,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 2 (Tahu Sagewind)"),
(3452600,9,6,0,0,0,100,0,3000,3000,0,0,86,65630,0,19,34548,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Cross Cast 'Starfall State Visual'"),
(3452600,9,7,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 2"),
(3452600,9,8,0,0,0,100,0,2000,2000,0,0,1,3,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 3 (Tahu Sagewind)"),
(3452600,9,9,0,0,0,100,0,7000,7000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 3"),
(3452600,9,10,0,0,0,100,0,3000,3000,0,0,1,4,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 4 (Tahu Sagewind)"),
(3452600,9,11,0,0,0,100,0,7000,7000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 4"),
(3452600,9,12,0,0,0,100,0,3000,3000,0,0,1,5,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 5 (Tahu Sagewind)"),
(3452600,9,13,0,0,0,100,0,7000,7000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 5"),
(3452600,9,14,0,0,0,100,0,4000,4000,0,0,1,6,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 6 (Tahu Sagewind)"),
(3452600,9,15,0,0,0,100,0,8000,8000,0,0,1,7,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 7 (Tahu Sagewind)"),
(3452600,9,16,0,0,0,100,0,13000,13000,0,0,1,8,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 8 (Tahu Sagewind)"),
(3452600,9,17,0,0,0,100,0,2500,2500,0,0,28,0,0,0,0,0,0,19,34548,0,0,0,0,0,0,"Aponi Brightmane - On Script - Remove All Auras"),
(3452600,9,18,0,0,0,100,0,500,500,0,0,86,65632,0,19,34548,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Cross Cast 'Eclipse Visual'"),
(3452600,9,19,0,0,0,100,0,3000,3000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 6"),
(3452600,9,20,0,0,0,100,0,4000,4000,0,0,1,9,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 9 (Tahu Sagewind)"),
(3452600,9,21,0,0,0,100,0,5500,5500,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 7"),
(3452600,9,22,0,0,0,100,0,4000,4000,0,0,1,10,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 10 (Tahu Sagewind)"),
(3452600,9,23,0,0,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Set Event Phase 1"),
(3452601,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Set Event Phase 0"),
(3452601,9,1,0,0,0,100,0,3000,3000,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 8"),
(3452601,9,2,0,0,0,100,0,3000,3000,0,0,1,11,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 11 (Tahu Sagewind)"),
(3452601,9,3,0,0,0,100,0,3500,3500,0,0,1,9,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 9"),
(3452601,9,4,0,0,0,100,0,3500,3500,0,0,1,12,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 12 (Tahu Sagewind)"),
(3452601,9,5,0,0,0,100,0,5000,5000,0,0,1,10,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 10"),
(3452601,9,6,0,0,0,100,0,2000,2000,0,0,1,13,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 13 (Tahu Sagewind)"),
(3452601,9,7,0,0,0,100,0,11000,11000,0,0,1,14,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 14 (Tahu Sagewind)"),
(3452601,9,8,0,0,0,100,0,7000,7000,0,0,1,11,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 11"),
(3452601,9,9,0,0,0,100,0,4000,4000,0,0,86,65631,0,19,34548,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Cross Cast 'Sunny'"),
(3452601,9,10,0,0,0,100,0,5000,5000,0,0,1,12,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 12"),
(3452601,9,11,0,0,0,100,0,2000,2000,0,0,1,13,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 13"),
(3452601,9,12,0,0,0,100,0,8000,8000,0,0,1,14,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 14"),
(3452601,9,13,0,0,0,100,0,8500,8500,0,0,1,15,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 15 (Tahu Sagewind)"),
(3452601,9,14,0,0,0,100,0,8000,8000,0,0,1,15,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 15"),
(3452601,9,15,0,0,0,100,0,4000,4000,0,0,1,16,0,0,0,0,0,19,34528,0,0,0,0,0,0,"Aponi Brightmane - On Script - Say Line 16 (Tahu Sagewind)"),
(3452601,9,16,0,0,0,100,0,0,0,0,0,28,0,0,0,0,0,0,19,34548,0,0,0,0,0,0,"Aponi Brightmane - On Script - Remove All Auras"),
(3452601,9,17,0,0,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aponi Brightmane - On Script - Set Event Phase 1");
-- Add missing spawns
SET @GUID1 := 16806;
SET @GUID2 := 17553;
DELETE FROM `creature` WHERE `guid` IN (@GUID1, @GUID2);
INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES
(@GUID1,34548,1,0,0,1,1,0,0,-1047.73,-287.61,159.03,5.93684,300,0,0,42,0,0,0,33554432,0,"",0), -- Invisible Spell Target - Tahu
(@GUID2,34528,1,0,0,1,1,0,1,-1045.84,-288.282,159.03,2.8312,300,0,0,3137,2117,0,0,0,0,"",0); -- Tahu Sagewind

6
sql/updates/world/4.3.4/2017_12_26_12_world_from_335_was_2017_12_22_02_world.sql Normal file
View File

@@ -0,0 +1,6 @@
--
SET @CGUID:= 42637; -- 1 guid
DELETE FROM `creature` WHERE `guid` = @CGUID;
INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES
(@CGUID, 16031, 329, 0, 0, 1, 1, 0, 0, 4044.78, -3333.68, 117.26, 4.153883, 7200, 0, 0, 4120, 0, 0, 0, 0, 0, '', 0);

3
sql/updates/world/4.3.4/2017_12_26_13_world_from_335_was_2017_12_24_00_world.sql Normal file
View File

@@ -0,0 +1,3 @@
--
UPDATE `gameobject` SET `spawnMask` = 3 WHERE `id` = 182947;
UPDATE `gameobject` SET `spawnMask` = 2 WHERE `id` = 184222 AND `map` IN (553,554);

2
sql/updates/world/4.3.4/2017_12_26_14_world_from_335_was_2017_12_25_00_world.sql Normal file
View File

@@ -0,0 +1,2 @@
--
UPDATE creature_template SET AIName='' WHERE entry=21909;

19
sql/updates/world/4.3.4/2017_12_26_15_world_from_335_was_2017_12_25_01_world_335.sql Normal file
View File

@@ -0,0 +1,19 @@
/*
--
-- Change weapons of Commander Springvale to the correct pre-cataclysm ones
UPDATE `creature_equip_template` SET `ItemID1`=5191, `ItemID2`=1201 WHERE `CreatureID`=4278 AND `ID`=1;
-- Update Lupine Horror and Slavering Worg MovementType to stand still
UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE `guid` IN (16240, 16238);
-- Add chain aggro to Worgs infront of Wolf Master Nandos
DELETE FROM `creature_formations` WHERE `leaderGUID`=16241;
INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`) VALUES
(16241, 16241, 0, 0, 3),
(16241, 16240, 0, 0, 3),
(16241, 16238, 0, 0, 3),
(16241, 16239, 0, 0, 3);
-- Add random movement to Razorclaw the Butcher
UPDATE `creature` SET `spawndist`=5, `MovementType`=1 WHERE `guid`=16253;
*/