Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sevi committed 2018-05-21 01:44:51 +02:00
2 parents 034badbbfc f8ac80d4b6
commit 2e734211f0
11 files changed
+77 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

sql/updates/world/4.3.4/2018_05_20_00_world_from_335_was_2018_05_15_00_world_335.sql
+7
View File
@@ -0,0 +1,7 @@
/*
--
DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (4485,4486);
INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES
(1,4485,0,"","","Deprecated quest"),
(1,4486,0,"","","Deprecated quest");
*/
sql/updates/world/4.3.4/2018_05_20_01_world_from_335_was_2018_05_15_01_world_335.sql
+8
View File
@@ -0,0 +1,8 @@
/*
--
-- Quest "Tome of Divinity (1641)"
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry`=1641;
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(19,0,1641,0,0,14,0,2998,0,0,0,0,0,"","Quest 'Tome of Divinity (1641)' can only be taken if quest 'Tome of Divinity (2998)' is not taken"),
(19,0,1641,0,0,14,0,3681,0,0,0,0,0,"","Quest 'Tome of Divinity (1641)' can only be taken if quest 'Tome of Divinity (3681)' is not taken");
*/
sql/updates/world/4.3.4/2018_05_20_02_world_from_335_was_2018_05_15_02_world_335.sql
+30
View File
@@ -0,0 +1,30 @@
/*
--
-- Jordan Stilwell
DELETE FROM `creature_text` WHERE `CreatureID`=6181;
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
(6181,0,0,"Let's get to work, $n!",12,0,100,1,0,0,2501,0,"Jordan Stilwell"),
(6181,1,0,"Here you are, $n.",12,0,100,1,0,0,2504,0,"Jordan Stilwell");
UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6181;
DELETE FROM `smart_scripts` WHERE `entryorguid`=6181 AND `source_type`=0;
DELETE FROM `smart_scripts` WHERE `entryorguid` IN (618100,618101) 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
(6181,0,0,0,19,0,100,0,1806,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Quest 'The Test of Righteousness (Part 3)' Taken - Remove Npc Flag Questgiver"),
(6181,0,1,0,19,0,100,0,1806,0,0,0,53,0,6181,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Quest 'The Test of Righteousness (Part 3)' Taken - Start Waypoint"),
(6181,0,2,0,19,0,100,0,1806,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Quest 'The Test of Righteousness (Part 3)' Taken - Say Line 0"),
(6181,0,3,0,40,0,100,0,1,6181,0,0,80,618100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Waypoint 1 Reached - Run Script"),
(6181,0,4,0,40,0,100,0,2,6181,0,0,80,618101,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Waypoint 2 Reached - Run Script"),
(618100,9,0,0,0,0,100,0,0,0,0,0,54,23000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Script - Pause Waypoint"),
(618100,9,1,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.90077,"Jordan Stilwell - On Script - Set Orientation"),
(618100,9,2,0,0,0,100,0,1000,1000,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Script - Set Emote State 233"),
(618100,9,3,0,0,0,100,0,21000,21000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Script - Set Emote State 0"),
(618101,9,0,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.77704,"Jordan Stilwell - On Script - Set Orientation"),
(618101,9,1,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Script - Say Line 1"),
(618101,9,2,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Script - Add Npc Flag Questgiver");
DELETE FROM `waypoints` WHERE `entry`=6181;
INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
(6181,1,-5094.12,-786.116,495.226,""),
(6181,2,-5089.28,-782.95,495.279,"");
*/
sql/updates/world/4.3.4/2018_05_20_03_world_from_335_was_2018_05_15_03_world_335.sql
+9
View File
@@ -0,0 +1,9 @@
/*
--
-- Quintis Jonespyre --> Add Gossip Text
UPDATE `creature_template` SET `gossip_menu_id`=1922 WHERE `entry`=7879;
DELETE FROM `gossip_menu_option` WHERE `MenuID`=1922;
INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextID`, `VerifiedBuild`) VALUES
(1922,0,1,"I'd like to purchase more Tharlendris seeds.",4851,3,128,0,0,0,0,"",0,0);
*/
sql/updates/world/4.3.4/2018_05_20_04_world_from_335_was_2018_05_16_00_world.sql
+2
View File
@@ -0,0 +1,2 @@
--
DELETE FROM `creature` WHERE `id`=20782;