Skip to content

Commit 473e2bd

Browse files
secahtahsecahtah
authored
Merge branch 'TrinityCore:3.3.5' into 3.3.5
2 parents 4927933 + 1d34bb7 commit 473e2bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+984
-555
lines changed

‎cmake/options.cmake

+6-2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ option(TOOLS "Build map/vmap/mmap extraction/assembler tools"
3737
option(USE_SCRIPTPCH "Use precompiled headers when compiling scripts" 1)
3838
option(USE_COREPCH "Use precompiled headers when compiling servers" 1)
3939
option(WITH_DYNAMIC_LINKING "Enable dynamic library linking." 0)
40+
option(WITH_FILESYSTEM_WATCHER "Include filesystem watcher library" 0)
4041
IsDynamicLinkingRequired(WITH_DYNAMIC_LINKING_FORCED)
4142
if(WITH_DYNAMIC_LINKING AND WITH_DYNAMIC_LINKING_FORCED)
4243
set(WITH_DYNAMIC_LINKING_FORCED OFF)
@@ -46,6 +47,9 @@ if(WITH_DYNAMIC_LINKING OR WITH_DYNAMIC_LINKING_FORCED)
4647
else()
4748
set(BUILD_SHARED_LIBS OFF)
4849
endif()
50+
if(WITH_FILESYSTEM_WATCHER OR BUILD_SHARED_LIBS)
51+
set(BUILD_EFSW ON)
52+
endif()
4953
option(WITH_WARNINGS "Show all warnings during compile" 0)
5054
option(WITH_COREDEBUG "Include additional debug-code in core" 0)
5155
option(WITHOUT_METRICS "Disable metrics reporting (i.e. InfluxDB and Grafana)" 0)
@@ -54,8 +58,8 @@ option(COPY_CONF "Copy authserver and worldserver .conf.dist files to the
5458
set(WITH_SOURCE_TREE "hierarchical" CACHE STRING "Build the source tree for IDE's.")
5559
set_property(CACHE WITH_SOURCE_TREE PROPERTY STRINGS no flat hierarchical hierarchical-folders)
5660
option(WITHOUT_GIT "Disable the GIT testing routines" 0)
57-
option(BUILD_TESTING "Build test suite" 0)
61+
option(BUILD_TESTING "Build test suite" 0)
5862

5963
if(UNIX)
60-
option(USE_LD_GOLD "Use GNU gold linker" 0)
64+
option(USE_LD_GOLD "Use GNU gold linker" 0)
6165
endif()

‎dep/CMakeLists.txt

+3
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ if(SERVERS)
2929
add_subdirectory(mysql)
3030
add_subdirectory(readline)
3131
add_subdirectory(gsoap)
32+
endif()
33+
34+
if(SERVERS AND BUILD_EFSW)
3235
add_subdirectory(efsw)
3336
endif()
3437

‎dep/efsw/CMakeLists.txt

+77-81
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,86 @@
1-
if (BUILD_SHARED_LIBS)
2-
set(SRCS
3-
src/efsw/Debug.cpp
4-
src/efsw/DirectorySnapshot.cpp
5-
src/efsw/DirectorySnapshotDiff.cpp
6-
src/efsw/DirWatcherGeneric.cpp
7-
src/efsw/FileInfo.cpp
8-
src/efsw/FileSystem.cpp
9-
src/efsw/FileWatcher.cpp
10-
src/efsw/FileWatcherCWrapper.cpp
11-
src/efsw/FileWatcherGeneric.cpp
12-
src/efsw/FileWatcherImpl.cpp
13-
src/efsw/Log.cpp
14-
src/efsw/Mutex.cpp
15-
src/efsw/String.cpp
16-
src/efsw/System.cpp
17-
src/efsw/Thread.cpp
18-
src/efsw/Watcher.cpp
19-
src/efsw/WatcherGeneric.cpp)
1+
set(SRCS
2+
src/efsw/Debug.cpp
3+
src/efsw/DirectorySnapshot.cpp
4+
src/efsw/DirectorySnapshotDiff.cpp
5+
src/efsw/DirWatcherGeneric.cpp
6+
src/efsw/FileInfo.cpp
7+
src/efsw/FileSystem.cpp
8+
src/efsw/FileWatcher.cpp
9+
src/efsw/FileWatcherCWrapper.cpp
10+
src/efsw/FileWatcherGeneric.cpp
11+
src/efsw/FileWatcherImpl.cpp
12+
src/efsw/Log.cpp
13+
src/efsw/Mutex.cpp
14+
src/efsw/String.cpp
15+
src/efsw/System.cpp
16+
src/efsw/Thread.cpp
17+
src/efsw/Watcher.cpp
18+
src/efsw/WatcherGeneric.cpp)
2019

21-
if (WIN32)
22-
list (APPEND SRCS
23-
src/efsw/platform/win/FileSystemImpl.cpp
24-
src/efsw/platform/win/MutexImpl.cpp
25-
src/efsw/platform/win/SystemImpl.cpp
26-
src/efsw/platform/win/ThreadImpl.cpp)
27-
else ()
28-
list (APPEND SRCS
29-
src/efsw/platform/posix/FileSystemImpl.cpp
30-
src/efsw/platform/posix/MutexImpl.cpp
31-
src/efsw/platform/posix/SystemImpl.cpp
32-
src/efsw/platform/posix/ThreadImpl.cpp)
33-
endif()
20+
if (WIN32)
21+
list (APPEND SRCS
22+
src/efsw/platform/win/FileSystemImpl.cpp
23+
src/efsw/platform/win/MutexImpl.cpp
24+
src/efsw/platform/win/SystemImpl.cpp
25+
src/efsw/platform/win/ThreadImpl.cpp)
26+
else ()
27+
list (APPEND SRCS
28+
src/efsw/platform/posix/FileSystemImpl.cpp
29+
src/efsw/platform/posix/MutexImpl.cpp
30+
src/efsw/platform/posix/SystemImpl.cpp
31+
src/efsw/platform/posix/ThreadImpl.cpp)
32+
endif()
3433

35-
if (APPLE)
36-
list (APPEND SRCS
37-
src/efsw/FileWatcherFSEvents.cpp
38-
src/efsw/FileWatcherKqueue.cpp
39-
src/efsw/WatcherFSEvents.cpp
40-
src/efsw/WatcherKqueue.cpp)
34+
if (APPLE)
35+
list (APPEND SRCS
36+
src/efsw/FileWatcherFSEvents.cpp
37+
src/efsw/FileWatcherKqueue.cpp
38+
src/efsw/WatcherFSEvents.cpp
39+
src/efsw/WatcherKqueue.cpp)
4140

42-
exec_program(uname ARGS -v OUTPUT_VARIABLE OSX_VERSION)
43-
string(REGEX MATCH "[0-9]+" OSX_VERSION ${OSX_VERSION})
44-
if (NOT OSX_VERSION GREATER 9)
45-
set(OPTIONAL_COMPILE_DEFINITIONS "-DEFSW_FSEVENTS_NOT_SUPPORTED")
46-
endif()
47-
set(OPTIONAL_LINK_LIBRARIES "-framework CoreFoundation" "-framework CoreServices")
48-
elseif (WIN32)
49-
list (APPEND SRCS
50-
src/efsw/FileWatcherWin32.cpp
51-
src/efsw/WatcherWin32.cpp)
52-
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
53-
list (APPEND SRCS
54-
src/efsw/FileWatcherInotify.cpp
55-
src/efsw/WatcherInotify.cpp)
56-
if (NOT EXISTS "/usr/include/sys/inotify.h" AND NOT EXISTS "/usr/local/include/sys/inotify.h")
57-
set(OPTIONAL_COMPILE_DEFINITIONS "-DEFSW_INOTIFY_NOSYS")
58-
endif()
59-
elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
60-
list (APPEND SRCS
61-
src/efsw/FileWatcherKqueue.cpp
62-
src/efsw/WatcherKqueue.cpp)
41+
exec_program(uname ARGS -v OUTPUT_VARIABLE OSX_VERSION)
42+
string(REGEX MATCH "[0-9]+" OSX_VERSION ${OSX_VERSION})
43+
if (NOT OSX_VERSION GREATER 9)
44+
set(OPTIONAL_COMPILE_DEFINITIONS "-DEFSW_FSEVENTS_NOT_SUPPORTED")
6345
endif()
46+
set(OPTIONAL_LINK_LIBRARIES "-framework CoreFoundation" "-framework CoreServices")
47+
elseif (WIN32)
48+
list (APPEND SRCS
49+
src/efsw/FileWatcherWin32.cpp
50+
src/efsw/WatcherWin32.cpp)
51+
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
52+
list (APPEND SRCS
53+
src/efsw/FileWatcherInotify.cpp
54+
src/efsw/WatcherInotify.cpp)
55+
if (NOT EXISTS "/usr/include/sys/inotify.h" AND NOT EXISTS "/usr/local/include/sys/inotify.h")
56+
set(OPTIONAL_COMPILE_DEFINITIONS "-DEFSW_INOTIFY_NOSYS")
57+
endif()
58+
elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
59+
list (APPEND SRCS
60+
src/efsw/FileWatcherKqueue.cpp
61+
src/efsw/WatcherKqueue.cpp)
62+
endif()
6463

65-
add_library(efsw STATIC ${SRCS})
64+
add_library(efsw STATIC ${SRCS})
6665

67-
target_include_directories(efsw
68-
PUBLIC
69-
${CMAKE_CURRENT_SOURCE_DIR}/include
70-
PRIVATE
71-
${CMAKE_CURRENT_SOURCE_DIR}/src)
66+
target_include_directories(efsw
67+
PUBLIC
68+
${CMAKE_CURRENT_SOURCE_DIR}/include
69+
PRIVATE
70+
${CMAKE_CURRENT_SOURCE_DIR}/src)
7271

73-
target_compile_definitions(efsw
74-
PRIVATE
75-
${OPTIONAL_COMPILE_DEFINITIONS})
72+
target_compile_definitions(efsw
73+
PRIVATE
74+
${OPTIONAL_COMPILE_DEFINITIONS})
7675

77-
target_link_libraries(efsw
78-
PRIVATE
79-
trinity-dependency-interface
80-
PUBLIC
81-
threads
82-
${OPTIONAL_LINK_LIBRARIES})
76+
target_link_libraries(efsw
77+
PRIVATE
78+
trinity-dependency-interface
79+
PUBLIC
80+
threads
81+
${OPTIONAL_LINK_LIBRARIES})
8382

84-
set_target_properties(efsw
85-
PROPERTIES
86-
FOLDER
87-
"dep")
88-
else ()
89-
add_library(efsw INTERFACE IMPORTED GLOBAL)
90-
endif ()
83+
set_target_properties(efsw
84+
PROPERTIES
85+
FOLDER
86+
"dep")

‎sql/updates/world/3.3.5/2024_06_03_00_world.sql

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
DELETE FROM `spell_proc` WHERE `SpellId` IN (44401);
2+
INSERT INTO `spell_proc` (`SpellId`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`ProcFlags`,`SpellTypeMask`,`SpellPhaseMask`,`HitMask`,`AttributesMask`,`DisableEffectsMask`,`ProcsPerMinute`,`Chance`,`Cooldown`,`Charges`) VALUES
3+
(44401,0x00,3,0x00000000,0x00000000,0x00000000,0x11000,0x5,0x1,0x0,0x8,0x0,0,0,0,1); -- Missile Barrage

‎sql/updates/world/3.3.5/2024_06_20_00_world.sql

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-- Update School of fish coordinates
2+
UPDATE `creature` SET `position_x`=-925.1334228515625, `position_y`=-5133.50732421875, `position_z`=-7.26972579956054687, `orientation`=1.15957343578338623, `spawntimesecs`=120, `VerifiedBuild`=55141 WHERE `guid`=13035 AND `id`=6145;

‎sql/updates/world/3.3.5/2024_06_27_00_world.sql

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
--
2+
DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_ioc_seaforium_blast_credit' AND `spell_id` IN (67813,67814);
3+
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
4+
(67813, 'spell_ioc_seaforium_blast_credit'),
5+
(67814, 'spell_ioc_seaforium_blast_credit');

‎sql/updates/world/3.3.5/2024_06_27_01_world.sql

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
--
2+
DELETE FROM `trinity_string` WHERE `entry` IN (397,398);
3+
INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES
4+
(397, "Characters below level 10 are not eligible for faction change."),
5+
(398, "Death Knights below level 60 are not eligible for faction change.");

‎sql/updates/world/3.3.5/2024_06_27_02_world.sql

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
-- Desolace, Sar'theris Strand GY
2+
DELETE FROM `graveyard_zone` WHERE `ID` = 1422 AND `GhostZone` = 2100;
3+
INSERT INTO `graveyard_zone` (`ID`, `GhostZone`, `Faction`, `Comment`) VALUES
4+
(1422,2100,0,"Desolace, Sar'theris Strand GY");
5+
6+
-- Also delete most likely wrong linked GY
7+
DELETE FROM `graveyard_zone` WHERE `ID`=31 AND `GhostZone`=2100;
8+
9+
-- Ghost Walker Post Spirit Healer Update
10+
UPDATE `creature` SET `position_x`=-1432.9971923828125, `position_y`=1973.572265625, `position_z`=86.70270538330078125, `orientation`=3.246312379837036132, `spawntimesecs`=120, `VerifiedBuild`=55141 WHERE `guid`=40568 AND `id`=6491;

‎sql/updates/world/3.3.5/2024_07_13_00_world.sql

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
-- Add missing furbolg camp area triggers for quest "How Big a Threat?"
2+
SET @QUEST := 984;
3+
DELETE FROM `areatrigger_involvedrelation` WHERE `quest` = @QUEST;
4+
INSERT INTO `areatrigger_involvedrelation` (`id`, `quest`) VALUES
5+
(231, @QUEST),
6+
(232, @QUEST),
7+
(233, @QUEST),
8+
(234, @QUEST),
9+
(235, @QUEST),
10+
(236, @QUEST),
11+
(237, @QUEST),
12+
(238, @QUEST);

‎sql/updates/world/3.3.5/2024_07_13_01_world.sql

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
--
2+
UPDATE `creature_template_locale` SET `Name`="Balai Lok'Wein", `Title`="Tränke, Schriftrollen & Reagenzien", `VerifiedBuild`=0 WHERE `entry`=13476 AND `locale`='deDE';
3+
UPDATE `creature_template_locale` SET `Name`="Balai Lok'Wein", `Title`="Pociones, pergaminos y componentes", `VerifiedBuild`=0 WHERE `entry`=13476 AND `locale`='esES';
4+
UPDATE `creature_template_locale` SET `Name`="Balai Lok'Wein", `Title`="Pociones, pergaminos y componentes", `VerifiedBuild`=0 WHERE `entry`=13476 AND `locale`='esMX';
5+
UPDATE `creature_template_locale` SET `Name`="Balai Lok'Wein", `Title`="Potions, Parchemins & Composants", `VerifiedBuild`=0 WHERE `entry`=13476 AND `locale`='frFR';
6+
UPDATE `creature_template_locale` SET `Name`="발라이 로크웨인", `Title`="물약 및 마법용품 상인", `VerifiedBuild`=0 WHERE `entry`=13476 AND `locale`='koKR';
7+
UPDATE `creature_template_locale` SET `Name`="Бала Лок'Вен", `Title`="Зелья, cвитки и pеагенты", `VerifiedBuild`=0 WHERE `entry`=13476 AND `locale`='ruRU';
8+
UPDATE `creature_template_locale` SET `Name`="巴莱·洛克维", `Title`="药剂、卷轴和材料", `VerifiedBuild`=0 WHERE `entry`=13476 AND `locale`='zhCN';
9+
UPDATE `creature_template_locale` SET `Name`="巴萊·洛克維", `Title`="药剂、卷轴和材料", `VerifiedBuild`=0 WHERE `entry`=13476 AND `locale`='zhTW';

‎sql/updates/world/3.3.5/2024_07_15_00_world.sql

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
-- Forgotten Depths Ambusher
2+
SET @ENTRY := 30204;
3+
-- Update auras
4+
UPDATE `creature_template_addon` SET `auras`='42459 56422' WHERE `entry`=@ENTRY; -- Dual Wield, Nerubian Submerge
5+
-- Update unit flags
6+
UPDATE `creature_template` SET `unit_flags`=512 WHERE `entry`=@ENTRY;
7+
-- Forgotten Depths Ambusher smart ai
8+
UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = @ENTRY;
9+
DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY;
10+
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
11+
(@ENTRY, 0, 0, 1, 54, 0, 100, 1, 0, 0, 0, 0, 28, 56422, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Forgotten Depths Ambusher - On just summoned - Remove 'Nerubian Submerge' aura (No Repeat)"),
12+
(@ENTRY, 0, 1, 2, 61, 0, 100, 1, 0, 0, 0, 0, 11, 56418, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Forgotten Depths Ambusher - On link - Cast spell 'Emerge From Snow' on Self (No Repeat)"),
13+
(@ENTRY, 0, 2, 0, 61, 0, 100, 1, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 40, 0, 0, 0, 0, 0, 0, "Forgotten Depths Ambusher - On link - Attack start on closest player (No Repeat)"),
14+
(@ENTRY, 0, 3, 0, 7, 0, 100, 1, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Forgotten Depths Ambusher - On evade - Despawn instantly (No Repeat)");

‎sql/updates/world/3.3.5/2024_07_15_01_world.sql

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-- Add Franklin the Friendly charm immunnity
2+
UPDATE `creature_template` SET `mechanic_immune_mask`=`mechanic_immune_mask`|1 WHERE `entry`=14529;

‎sql/updates/world/3.3.5/2024_07_22_00_world.sql

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
-- Return to Obadei 9423 / Makuru's Vengeance 9424
2+
3+
-- Add Anchorite Obadei text
4+
DELETE FROM `creature_text` WHERE `CreatureID`=16834;
5+
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
6+
(16834,0,0,"What have you done, Makuru?! These are not our ways!",12,0,100,0,0,0,13991,0,'Anchorite Obadei'),
7+
(16834,1,0,"I understand how you feel Makuru. Sedai was my brother after all. Yet we can't disgrace his memory by going against his very ideals.",12,0,100,0,0,0,13992,0,'Anchorite Obadei');
8+
9+
-- Add Makuru text
10+
DELETE FROM `creature_text` WHERE `CreatureID` = 16833 AND `GroupID` IN (0,1);
11+
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
12+
(16833,0,0,"No! Not... Sedai! The orcs must pay!",12,0,100,0,0,0,13997,0,'Makuru'),
13+
(16833,1,0,"The orcs hate us, Obadei! They've killed many of us before! They deserve death and worse.",12,0,100,0,0,0,13996,0,'Makuru');
14+
15+
-- "Return to Obadei" Script
16+
DELETE FROM `smart_scripts` WHERE `entryorguid`=16834 AND `source_type`=0 AND `id`=0;
17+
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`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
18+
(16834,0,0,0,20,0,100,0,9423,0,0,0,0,1,0,0,0,0,0,0,19,16833,0,0,0,0,0,0,0,"Anchorite Obadei - On Quest 'Return to Obadei' Rewarded - Makuru Say Line 0");
19+
20+
-- "Makurus Vengeance" Script
21+
DELETE FROM `smart_scripts` WHERE `entryorguid`=16833 AND `source_type`=0 AND `id` IN (0,1,2,3);
22+
DELETE FROM `smart_scripts` WHERE `entryorguid`=16834 AND `source_type`=0 AND `id` IN (1,2,3);
23+
DELETE FROM `smart_scripts` WHERE `entryorguid` IN (1683300,1683400) AND `source_type`=9;
24+
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`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
25+
(16833,0,1,0,20,0,100,0,9424,25000,25000,0,0,80,1683300,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Makuru - On Quest 'Makurus Vengeance' Rewarded - Run Script"),
26+
27+
(16834,0,1,2,38,0,100,0,0,1,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Anchorite Obadei - On Data Set - Remove Gossip + Quest Giver npc flag"),
28+
(16834,0,2,0,61,0,100,0,0,0,0,0,0,53,0,16834,0,0,0,0,1,0,0,0,0,0,0,0,0,"Anchorite Obadei - On Link - Start WP"),
29+
(16834,0,3,0,40,0,100,0,2,16834,0,0,0,80,1683400,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Anchorite Obadei - On Waypoint 2 Reached - Run Script"),
30+
31+
(1683300,9,0,0,0,0,100,0,0,0,0,0,0,45,0,1,0,0,0,0,19,16834,0,0,0,0,0,0,0,"Makuru - On Script - Set Data to Anchorite Obadei"),
32+
(1683300,9,1,0,0,0,100,0,5000,5000,0,0,0,66,0,0,0,0,0,0,19,16834,0,0,0,0,0,0,0,"Makuru - On Script - Set Orientation"),
33+
(1683300,9,2,0,0,0,100,0,20000,20000,0,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Makuru - On Script - Set Orientation Home Position"),
34+
35+
(1683400,9,3,0,0,0,100,0,0,0,0,0,0,54,20000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Anchorite Obadei - On Script - Pause Waypoint"),
36+
(1683400,9,4,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,19,16833,0,0,0,0,0,0,0,"Anchorite Obadei - On Script - Set Orientation"),
37+
(1683400,9,5,0,0,0,100,0,1000,1000,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Anchorite Obadei - On Script - Say Line 0"),
38+
(1683400,9,6,0,0,0,100,0,7000,7000,0,0,0,1,1,0,0,0,0,0,19,16833,0,0,0,0,0,0,0,"Anchorite Obadei - On Script - Say Line 1 (Makuru)"),
39+
(1683400,9,7,0,0,0,100,0,4000,4000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Anchorite Obadei - On Script - Say Line 1"),
40+
(1683400,9,8,0,0,0,100,0,10000,10000,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0,4.643,"Anchorite Obadei - On Script - Set Orientation"),
41+
(1683400,9,9,0,0,0,100,0,1000,1000,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Anchorite Obadei - Script Set - Add Gossip + Quest Giver npc flag");
42+
43+
-- Waypoints
44+
DELETE FROM `waypoints` WHERE `entry`=16834;
45+
INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
46+
(16834,1,93.944,4345.056,101.698,"Anchorite Obadei"),
47+
(16834,2,96.005,4344.833,101.767,"Anchorite Obadei"),
48+
(16834,3,93.944,4345.056,101.698,"Anchorite Obadei"),
49+
(16834,4,90.838,4351.730,103.178,"Anchorite Obadei");

0 commit comments

Comments
 (0)