Skip to content

Commit daf895f

Browse files
author
Github Actions
committed
Merge 3.3.5 to 3.3.5-solocraft
2 parents ab9162d + 542e046 commit daf895f

File tree

54 files changed

+1122
-938
lines changed

Some content is hidden

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

54 files changed

+1122
-938
lines changed

‎dep/boost/CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ if(WIN32)
2121
string(SUBSTRING "${MSVC_TOOLSET_VERSION}" 0 ${_BOOST_MSVC_TOOLSET_VERSION_LENGTH} _BOOST_MSVC_TOOLSET_VERSION_MAJOR)
2222
string(SUBSTRING "${MSVC_TOOLSET_VERSION}" ${_BOOST_MSVC_TOOLSET_VERSION_LENGTH} -1 _BOOST_MSVC_TOOLSET_VERSION_MINOR)
2323

24-
set(BOOST_SEARCH_HINTS "${BOOST_ROOT}/lib${PLATFORM}-msvc-${_BOOST_MSVC_TOOLSET_VERSION_MAJOR}.${_BOOST_MSVC_TOOLSET_VERSION_MINOR}/cmake")
24+
while(_BOOST_MSVC_TOOLSET_VERSION_MINOR GREATER_EQUAL 0)
25+
list(APPEND BOOST_SEARCH_HINTS "${BOOST_ROOT}/lib${PLATFORM}-msvc-${_BOOST_MSVC_TOOLSET_VERSION_MAJOR}.${_BOOST_MSVC_TOOLSET_VERSION_MINOR}/cmake")
26+
math(EXPR _BOOST_MSVC_TOOLSET_VERSION_MINOR "${_BOOST_MSVC_TOOLSET_VERSION_MINOR} - 1" OUTPUT_FORMAT DECIMAL)
27+
endwhile()
2528

2629
unset(_BOOST_MSVC_TOOLSET_VERSION_LENGTH)
2730
unset(_BOOST_MSVC_TOOLSET_VERSION_MAJOR)

‎sql/updates/world/3.3.5/2025_12_23_00_world_2023_04_10_00_world_script_waypoints.sql‎

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
--
2+
DROP PROCEDURE IF EXISTS apply_if_exists_2023_04_10_00_world;
3+
4+
DELIMITER ;;
5+
CREATE PROCEDURE apply_if_exists_2023_04_10_00_world() BEGIN
6+
IF EXISTS (SELECT * FROM `information_schema`.`columns` WHERE `table_schema`=SCHEMA() AND `table_name`='script_waypoint') THEN
7+
DELETE FROM `waypoint_data` WHERE `id` & 2;
8+
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `delay`) SELECT ((s.`entry` << 3) | 2), s.`pointid`, s.`location_x`, s.`location_y`, s.`location_z`, s.`waittime` FROM `script_waypoint` s;
9+
10+
DROP TABLE IF EXISTS `script_waypoint`;
11+
END IF;
12+
END;;
13+
14+
DELIMITER ;
15+
CALL apply_if_exists_2023_04_10_00_world();
16+
17+
DROP PROCEDURE IF EXISTS apply_if_exists_2023_04_10_00_world;
18+
19+
-- Rage Winterchill
20+
SET @PATH_ID := 142138;
21+
DELETE FROM `waypoint_data` WHERE `id`=@PATH_ID;
22+
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`) VALUES
23+
(@PATH_ID, 0, 4896.08, -1576.35, 1333.65),
24+
(@PATH_ID, 1, 4898.68, -1615.02, 1329.48),
25+
(@PATH_ID, 2, 4907.12, -1667.08, 1321.00),
26+
(@PATH_ID, 3, 4963.18, -1699.35, 1340.51),
27+
(@PATH_ID, 4, 4989.16, -1716.67, 1335.74),
28+
(@PATH_ID, 5, 5026.27, -1736.89, 1323.02),
29+
(@PATH_ID, 6, 5037.77, -1770.56, 1324.36),
30+
(@PATH_ID, 7, 5067.23, -1789.95, 1321.17);
31+
32+
-- Kazrogal
33+
SET @PATH_ID := 143106;
34+
DELETE FROM `waypoint_data` WHERE `id`=@PATH_ID;
35+
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`) VALUES
36+
(@PATH_ID, 0, 5492.91, -2404.61, 1462.63),
37+
(@PATH_ID, 1, 5531.76, -2460.87, 1469.55),
38+
(@PATH_ID, 2, 5554.58, -2514.66, 1476.12),
39+
(@PATH_ID, 3, 5554.16, -2567.23, 1479.90),
40+
(@PATH_ID, 4, 5540.67, -2625.99, 1480.89),
41+
(@PATH_ID, 5, 5508.16, -2659.20, 1480.15),
42+
(@PATH_ID, 6, 5489.62, -2704.05, 1482.18),
43+
(@PATH_ID, 7, 5457.04, -2726.26, 1485.10);
44+
45+
-- Azgalor
46+
SET @PATH_ID := 142738;
47+
DELETE FROM `waypoint_data` WHERE `id`=@PATH_ID;
48+
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`) VALUES
49+
(@PATH_ID, 0, 5492.91, -2404.61, 1462.63),
50+
(@PATH_ID, 1, 5531.76, -2460.87, 1469.55),
51+
(@PATH_ID, 2, 5554.58, -2514.66, 1476.12),
52+
(@PATH_ID, 3, 5554.16, -2567.23, 1479.90),
53+
(@PATH_ID, 4, 5540.67, -2625.99, 1480.89),
54+
(@PATH_ID, 5, 5508.16, -2659.20, 1480.15),
55+
(@PATH_ID, 6, 5489.62, -2704.05, 1482.18),
56+
(@PATH_ID, 7, 5457.04, -2726.26, 1485.10);
57+
58+
-- Anetheron
59+
SET @PATH_ID := 142466;
60+
DELETE FROM `waypoint_data` WHERE `id`=@PATH_ID;
61+
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`) VALUES
62+
(@PATH_ID, 0, 4896.08, -1576.35, 1333.65),
63+
(@PATH_ID, 1, 4898.68, -1615.02, 1329.48),
64+
(@PATH_ID, 2, 4907.12, -1667.08, 1321.00),
65+
(@PATH_ID, 3, 4963.18, -1699.35, 1340.51),
66+
(@PATH_ID, 4, 4989.16, -1716.67, 1335.74),
67+
(@PATH_ID, 5, 5026.27, -1736.89, 1323.02),
68+
(@PATH_ID, 6, 5037.77, -1770.56, 1324.36),
69+
(@PATH_ID, 7, 5067.23, -1789.95, 1321.17);
70+
71+
-- ------------------------------------------------------------------------------------------------
72+
73+
SET @MOVE_TYPE_RUN := 1;
74+
SET @MOVE_TYPE_WALK := 0;
75+
76+
-- Thrall, old_hillsbrad.cpp
77+
SET @PATHID := 143010;
78+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=@PATHID AND `point` < 8;
79+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_WALK WHERE `id`=@PATHID AND `point` BETWEEN 8 AND 10;
80+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=@PATHID AND `point` BETWEEN 11 AND 29;
81+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_WALK WHERE `id`=@PATHID AND `point` = 30;
82+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=@PATHID AND `point` BETWEEN 31 AND 58;
83+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_WALK WHERE `id`=@PATHID AND `point`=59;
84+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=@PATHID AND `point` BETWEEN 60 AND 63;
85+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_WALK WHERE `id`=@PATHID AND `point` BETWEEN 64 AND 70;
86+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=@PATHID AND `point` BETWEEN 71 AND 80;
87+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_WALK WHERE `id`=@PATHID AND `point` BETWEEN 81 AND 83;
88+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=@PATHID AND `point` BETWEEN 84 AND 90;
89+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_WALK WHERE `id`=@PATHID AND `point` BETWEEN 91 AND 96;
90+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=@PATHID AND `point` >= 97;
91+
92+
-- Magwin, zone_azuremyst_isle.cpp
93+
SET @PATHID := 138498;
94+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_WALK WHERE `id`=@PATHID;
95+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=@PATHID AND `point` >= 28;
96+
97+
-- Brann Bronzebeard, halls_of_stone.cpp
98+
SET @PATHID := 224562;
99+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=@PATHID AND `point` >= 1;
100+
101+
-- Maghar Captive, zone_nagrand.cpp
102+
SET @PATHID := 145682;
103+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=@PATHID AND `point` >= 16;
104+
105+
-- Rin'ji, zone_hinterlands.cpp
106+
SET @PATHID := 62242;
107+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=@PATHID AND `point` >= 17;
108+
109+
-- ------------------------------------------------------------------------------------------------
110+
111+
-- Mograine, chapter5.cpp
112+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=233386;
113+
114+
-- Scarlet Trainee, boss_herod.cpp
115+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=52602;
116+
117+
-- Anetheron, boss_anetheron.cpp
118+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=142466;
119+
120+
-- Azgalor, boss_azgalor.cpp
121+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=142738;
122+
123+
-- Kazrogal, boss_kazrogal.cpp
124+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=143106;
125+
126+
-- Rage Winterchill, boss_rage_winterchill.cpp
127+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=142138;
128+
129+
-- Legoso, zone_bloodmyst_isle.cpp
130+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=143858;
131+
132+
-- Skeletal Gryphon, boss_black_knight.cpp
133+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=283930;
134+
135+
-- Crok Scourgebane, boss_sister_svalna.cpp
136+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=297034;
137+
138+
-- Mimirons Inferno, boss_flame_leviathan.cpp
139+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=266962;
140+
141+
-- Icefang, zone_storm_peaks.cpp
142+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=236818;
143+
144+
-- Taretha, old_hillsbrad.cpp
145+
UPDATE `waypoint_data` SET `move_type`=@MOVE_TYPE_RUN WHERE `id`=151098;

‎sql/updates/world/3.3.5/2025_12_28_00_world.sql‎

Lines changed: 175 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
--
2+
UPDATE `gossip_menu_option` SET `MenuID` = 202 WHERE `MenuID` = 201;
3+
4+
UPDATE `smart_scripts` SET `action_param1` = 0, `action_param3` = 1 WHERE `entryorguid` = 3669 AND `source_type` = 0 AND `id` = 0;
5+
UPDATE `smart_scripts` SET `action_param1` = 1, `action_param3` = 1 WHERE `entryorguid` = 3670 AND `source_type` = 0 AND `id` = 0;
6+
UPDATE `smart_scripts` SET `action_param1` = 2, `action_param3` = 1 WHERE `entryorguid` = 3671 AND `source_type` = 0 AND `id` = 0;
7+
UPDATE `smart_scripts` SET `action_param1` = 3, `action_param3` = 1 WHERE `entryorguid` = 3673 AND `source_type` = 0 AND `id` = 0;
8+
UPDATE `smart_scripts` SET `action_param1` = 4, `action_param3` = 1 WHERE `entryorguid` = 3654 AND `source_type` = 0 AND `id` = 0;
9+
10+
UPDATE `creature_template` SET `unit_flags` = 0 WHERE `entry` = 3678;
11+
12+
UPDATE `creature_template` SET `flags_extra` = `flags_extra` |512 WHERE `entry` IN (3678,3679);
13+
14+
DELETE FROM `creature_text` WHERE `CreatureID` IN (3678,3679);
15+
INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
16+
(3678,0,0,"At last! Naralex can be awakened! Come aid me, brave adventurers!",14,0,100,0,0,0,2101,0,"Disciple of Naralex SAY_ALL_DONE"),
17+
(3678,1,0,"I must make the necessary preparations before the awakening ritual can begin. You must protect me!",12,0,100,1,0,0,1255,0,"Disciple of Naralex SAY_PROGRESS_1"),
18+
(3678,2,0,"These caverns were once a temple of promise for regrowth in the Barrens. Now, they are the halls of nightmares.",12,0,100,1,0,0,1256,0,"Disciple of Naralex SAY_PROGRESS_2"),
19+
(3678,3,0,"Come. We must continue. There is much to be done before we can pull Naralex from his nightmare.",12,0,100,25,0,0,1257,0,"Disciple of Naralex SAY_PROGRESS_3"),
20+
(3678,4,0,"Within this circle of fire I must cast the spell to banish the spirits of the slain Fanglords.",12,0,100,0,0,0,1258,0,"Disciple of Naralex SAY_PROGRESS_4"),
21+
(3678,5,0,"The caverns have been purified. To Naralex's chamber we go!",12,0,100,1,0,0,1259,0,"Disciple of Naralex SAY_PROGRESS_5"),
22+
(3678,6,0,"Beyond this corridor, Naralex lies in fitful sleep. Let us go awaken him before it is too late.",12,0,100,25,0,0,1263,0,"Disciple of Naralex SAY_PROGRESS_6"),
23+
(3678,7,0,"Protect me brave souls as I delve into the Emerald Dream to rescue Naralex and put an end to this corruption!",12,0,100,20,0,0,1264,0,"Disciple of Naralex SAY_PROGRESS_7"),
24+
(3678,8,0,"%s begins to perform the awakening ritual on Naralex.",16,0,100,0,0,0,1265,0,"Disciple of Naralex SAY_PROGRESS_8"),
25+
(3678,9,0,"At last! Naralex awakes from the nightmare.",12,0,100,25,0,0,1267,0,"Disciple of Naralex SAY_PROGRESS_9"),
26+
27+
(3678,10,0,"Attacked! Help get this $n off of me!",12,0,100,0,0,0,1273,0,"Disciple of Naralex SAY_AGGRO"),
28+
(3678,10,1,"Deal with this $n! I need to prepare to awake Naralex!",12,0,100,0,0,0,1274,0,"Disciple of Naralex SAY_AGGRO"),
29+
(3678,10,2,"I can't handle this $n alone! Help!",12,0,100,0,0,0,1275,0,"Disciple of Naralex SAY_AGGRO"),
30+
(3678,10,3,"This $n is a minion from Naralex's nightmare no doubt!",12,0,100,0,0,0,1276,0,"Disciple of Naralex SAY_AGGRO"),
31+
(3678,10,4,"Help!",12,0,100,0,0,0,1277,0,"Disciple of Naralex SAY_AGGRO"),
32+
33+
(3679,0,0,"%s tosses fitfully in troubled sleep.",16,0,100,0,0,0,1268,0,"Naralex EMOTE_AWAKENING_1"),
34+
(3679,1,0,"%s writhes in agony. The Disciple seems to be breaking through.",16,0,100,0,0,0,1269,0,"Naralex EMOTE_AWAKENING_2"),
35+
(3679,2,0,"%s dreams up a horrendous vision. Something stirs beneath the murky waters.",16,0,100,0,0,0,1270,0,"Naralex EMOTE_AWAKENING_3"),
36+
(3679,3,0,"I AM AWAKE, AT LAST!",14,0,100,15,0,5789,1271,0,"Naralex SAY_AWAKENING_4"),
37+
(3679,4,0,"Ah, to be pulled from the dreaded nightmare! I thank you, my loyal Disciple, along with your brave companions.",12,0,100,2,0,0,1272,0,"Naralex SAY_AWAKENING_5"),
38+
(3679,5,0,"We must go and gather with the other Disciples. There is much work to be done before I can make another attempt to restore the Barrens. Farewell, brave souls!",12,0,100,1,0,0,2103,0,"Naralex SAY_AWAKENING_6");
39+
40+
DELETE FROM `creature_summon_groups` WHERE `summonerId` = 3678 AND `summonerType` = 0;
41+
INSERT INTO `creature_summon_groups` (`summonerId`,`summonerType`,`groupId`,`entry`,`position_x`,`position_y`,`position_z`,`orientation`,`summonType`,`summonTime`,`Comment`) VALUES
42+
(3678,0,0,3636,-67.947014,206.72076,-93.50498,1.890911,6,300000,"Disciple of Naralex - Group 0 - Deviate Ravager"),
43+
(3678,0,0,3636,-69.287880,211.94266,-93.44985,4.095106,6,300000,"Disciple of Naralex - Group 0 - Deviate Ravager"),
44+
45+
(3678,0,1,5048,-60.2539,273.098,-92.760864,0.40142572,6,300000,"Disciple of Naralex - Group 1 - Deviate Adder"),
46+
(3678,0,1,5048,-50.1238,274.717,-92.760864,3.03687290,6,300000,"Disciple of Naralex - Group 1 - Deviate Adder"),
47+
(3678,0,1,5048,-57.5453,280.207,-92.760864,5.07890800,6,300000,"Disciple of Naralex - Group 1 - Deviate Adder"),
48+
49+
(3678,0,2,5762,171.395,213.766,-105.507670,5.0440016,6,300000,"Disciple of Naralex - Group 2 - Deviate Moccasin"),
50+
(3678,0,2,5762,171.690,213.234,-105.419660,1.6231562,6,300000,"Disciple of Naralex - Group 2 - Deviate Moccasin"),
51+
(3678,0,2,5762,178.669,262.253,-106.152664,1.3264502,6,300000,"Disciple of Naralex - Group 2 - Deviate Moccasin"),
52+
53+
(3678,0,3,5763,125.646,169.517,-106.152664,0.94247776,6,300000,"Disciple of Naralex - Group 3 - Nightmare Ectoplasm"),
54+
(3678,0,3,5763,155.845,186.688,-107.083664,0.05235988,6,300000,"Disciple of Naralex - Group 3 - Nightmare Ectoplasm"),
55+
(3678,0,3,5763,162.067,218.715,-105.362660,1.98967530,6,300000,"Disciple of Naralex - Group 3 - Nightmare Ectoplasm"),
56+
(3678,0,3,5763,96.7788,283.762,-104.785670,3.82227100,6,300000,"Disciple of Naralex - Group 3 - Nightmare Ectoplasm"),
57+
(3678,0,3,5763,126.322,282.248,-103.797660,0.94247776,6,300000,"Disciple of Naralex - Group 3 - Nightmare Ectoplasm"),
58+
(3678,0,3,5763,164.627,274.123,-107.297660,4.66002900,6,300000,"Disciple of Naralex - Group 3 - Nightmare Ectoplasm"),
59+
(3678,0,3,5763,144.843,278.079,-104.574660,4.43313650,6,300000,"Disciple of Naralex - Group 3 - Nightmare Ectoplasm"),
60+
61+
(3678,0,4,3654,150.943,262.797,-103.90366,3.700098,6,300000,"Disciple of Naralex - Group 4 - Mutanus the Devourer");
62+
63+
DELETE FROM `waypoint_data` WHERE `id` = 29426;
64+
65+
DELETE FROM `waypoint_data` WHERE `id` IN (367800,367801,367802,367803,367804,367900);
66+
INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
67+
(367800,1,-113.91917,142.769,-80.914154,NULL,0,0,0,100,0),
68+
(367800,2,-111.23017,153.39638,-80.598915,NULL,0,0,0,100,0),
69+
(367800,3,-110.97073,165.60736,-79.444725,NULL,0,0,0,100,0),
70+
(367800,4,-109.30049,181.25143,-79.76007,NULL,0,0,0,100,0),
71+
(367800,5,-110.1942,190.9626,-80.42993,NULL,0,0,0,100,0),
72+
(367800,6,-109.58964,199.15425,-81.23881,NULL,0,0,0,100,0),
73+
(367800,7,-110.56909,206.86935,-82.88934,NULL,0,0,0,100,0),
74+
(367800,8,-110.30787,216.23227,-85.9362,NULL,0,0,0,100,0),
75+
(367800,9,-108.06385,227.87166,-89.926414,NULL,0,0,0,100,0),
76+
(367800,10,-104.28827,234.40804,-91.64163,NULL,0,0,0,100,0),
77+
78+
(367801,1,-99.53033,230.78362,-91.13202,NULL,0,0,0,100,0),
79+
(367801,2,-97.78033,229.78362,-90.88202,NULL,0,0,0,100,0),
80+
(367801,3,-95.03033,229.03362,-90.38202,NULL,0,0,0,100,0),
81+
(367801,4,-93.78033,228.78362,-90.38202,NULL,0,0,0,100,0),
82+
(367801,5,-91.78033,228.28362,-90.38202,NULL,0,0,0,100,0),
83+
(367801,6,-90.78033,228.28362,-91.13202,NULL,0,0,0,100,0),
84+
(367801,7,-87.28033,227.78362,-92.38202,NULL,0,0,0,100,0),
85+
(367801,8,-85.272385,227.1592,-93.12241,NULL,0,0,0,100,0),
86+
(367801,9,-81.619774,223.63588,-93.58602,NULL,0,0,0,100,0),
87+
(367801,10,-71.02429,212.48766,-93.52011,NULL,0,0,0,100,0),
88+
(367801,11,-66.8499,209.88943,-93.30499,NULL,0,0,0,100,0),
89+
(367801,12,-61.41215,207.00401,-93.55031,NULL,0,0,0,100,0),
90+
(367801,13,-49.681805,204.15556,-95.96281,NULL,0,0,0,100,0),
91+
(367801,14,-41.188667,204.99422,-96.51606,NULL,0,0,0,100,0),
92+
(367801,15,-35.381386,212.98494,-96.097084,NULL,0,0,0,100,0),
93+
(367801,16,-33.46709,223.27979,-95.68127,NULL,0,0,0,100,0),
94+
(367801,17,-31.874804,231.84636,-94.49322,NULL,0,0,0,100,0),
95+
(367801,18,-33.1077,240.3214,-93.5856,NULL,0,0,0,100,0),
96+
(367801,19,-38.079693,250.99289,-93.11742,NULL,0,0,0,100,0),
97+
(367801,20,-43.072884,259.32315,-92.84188,NULL,0,0,0,100,0),
98+
(367801,21,-54.713943,273.85025,-92.84426,NULL,0,0,0,100,0),
99+
100+
(367802,1,-49.880116,287.8062,-92.24503,NULL,0,0,0,100,0),
101+
(367802,2,-47.99677,295.32455,-90.81826,NULL,0,0,0,100,0),
102+
(367802,3,-38.468487,306.85004,-89.96177,NULL,0,0,0,100,0),
103+
(367802,4,-34.199474,309.35944,-89.57565,NULL,0,0,0,100,0),
104+
(367802,5,-23.514927,310.80438,-88.513176,NULL,0,0,0,100,0),
105+
(367802,6,-9.611309,305.38797,-88.19709,NULL,0,0,0,100,0),
106+
(367802,7,-3.915017,301.293,-86.814804,NULL,0,0,0,100,0),
107+
(367802,8,-0.235204,294.51816,-85.46129,NULL,0,0,0,100,0),
108+
(367802,9,3.204272,288.31448,-85.4905,NULL,0,0,0,100,0),
109+
(367802,10,10.753059,278.38467,-85.8368,NULL,0,0,0,100,0),
110+
(367802,11,16.977774,273.39676,-86.23834,NULL,0,0,0,100,0),
111+
(367802,12,25.977861,264.6067,-86.788,NULL,0,0,0,100,0),
112+
(367802,13,29.228964,257.175,-87.57598,NULL,0,0,0,100,0),
113+
(367802,14,30.13821,248.86757,-87.36985,NULL,0,0,0,100,0),
114+
(367802,15,38.86757,240.09755,-87.588615,NULL,0,0,0,100,0),
115+
(367802,16,43.998184,234.17651,-87.98252,NULL,0,0,0,100,0),
116+
(367802,17,48.403416,229.11066,-88.36456,NULL,0,0,0,100,0),
117+
(367802,18,54.5601,210.85043,-89.80927,NULL,0,0,0,100,0),
118+
119+
(367803,1,67.69076,205.52835,-92.56347,NULL,0,0,0,100,0),
120+
(367803,2,71.46944,206.84753,-93.108925,NULL,0,0,0,100,0),
121+
(367803,3,77.15617,209.72255,-93.07799,NULL,0,0,0,100,0),
122+
(367803,4,80.431854,214.86958,-93.177925,NULL,0,0,0,100,0),
123+
(367803,5,83.29396,220.0915,-93.69437,NULL,0,0,0,100,0),
124+
(367803,6,86.2444,225.64459,-94.54216,NULL,0,0,0,100,0),
125+
(367803,7,89.99905,229.58038,-95.01256,NULL,0,0,0,100,0),
126+
(367803,8,94.13328,232.7041,-95.36724,NULL,0,0,0,100,0),
127+
(367803,9,99.00888,233.9866,-95.57549,NULL,0,0,0,100,0),
128+
(367803,10,104.59536,233.409,-95.82651,NULL,0,0,0,100,0),
129+
(367803,11,109.07845,232.6175,-96.046,NULL,0,0,0,100,0),
130+
(367803,12,112.8708,233.57512,-96.32112,NULL,0,0,0,100,0),
131+
(367803,13,114.51453,235.30222,-96.160706,NULL,0,0,0,100,0),
132+
(367803,14,114.94154,237.7185,-96.02783,NULL,0,0,0,100,0),
133+
134+
(367804,1,119.04473,234.3336,-94.031525,NULL,0,1,0,100,0),
135+
(367804,2,123.39298,232.1507,-93.80932,NULL,0,1,0,100,0),
136+
(367804,3,129.23982,232.90259,-94.39268,NULL,0,1,0,100,0),
137+
(367804,4,133.76927,236.9294,-95.39268,NULL,0,1,0,100,0),
138+
(367804,5,136.03003,244.8155,-95.80936,NULL,0,1,0,100,0),
139+
(367804,6,134.06624,253.92725,-95.1149,NULL,0,1,0,100,0),
140+
(367804,7,123.16401,266.276,-93.587135,NULL,0,1,0,100,0),
141+
(367804,8,113.3055,265.7754,-91.4482,NULL,0,1,0,100,0),
142+
(367804,9,95.87152,250.9106,-87.55935,NULL,0,1,0,100,0),
143+
(367804,10,87.43284,232.42879,-85.761505,NULL,0,1,0,100,0),
144+
(367804,11,83.19081,218.43571,-84.08354,NULL,0,1,0,100,0),
145+
(367804,12,70.24749,206.56226,-85.1376,NULL,0,1,0,100,0),
146+
(367804,13,47.183872,206.66559,-83.493935,NULL,0,1,0,100,0),
147+
(367804,14,34.54772,204.78317,-82.05306,NULL,0,1,0,100,0),
148+
(367804,15,7.085161,202.25589,-77.79443,NULL,0,1,0,100,0),
149+
(367804,16,-42.047256,203.44832,-83.76682,NULL,0,1,0,100,0),
150+
(367804,17,-65.46242,208.19424,-83.76682,NULL,0,1,0,100,0),
151+
(367804,18,-84.21845,225.56584,-83.76682,NULL,0,1,0,100,0),
152+
153+
(367900,1,117.57947,245.2589,-92.93683,NULL,0,1,0,100,0),
154+
(367900,2,122.07437,244.77504,-91.96459,NULL,0,1,0,100,0),
155+
(367900,3,126.5081,244.80745,-91.52022,NULL,0,1,0,100,0),
156+
(367900,4,130.2855,244.1119,-91.49244,NULL,0,1,0,100,0),
157+
(367900,5,131.33621,246.79683,-90.96464,NULL,0,1,0,100,0),
158+
(367900,6,131.5437,250.70665,-90.85357,NULL,0,1,0,100,0),
159+
(367900,7,131.16864,254.23598,-90.909134,NULL,0,1,0,100,0),
160+
(367900,8,129.56184,256.8811,-90.77021,NULL,0,1,0,100,0),
161+
(367900,9,125.7399,260.43616,-90.35347,NULL,0,1,0,100,0),
162+
(367900,10,120.87533,261.45663,-91.15907,NULL,0,1,0,100,0),
163+
(367900,11,116.536,261.01016,-91.46457,NULL,0,1,0,100,0),
164+
(367900,12,107.43984,258.64542,-91.270226,NULL,0,1,0,100,0),
165+
(367900,13,98.73815,250.1042,-90.18684,NULL,0,1,0,100,0),
166+
(367900,14,91.52554,238.34152,-89.32576,NULL,0,1,0,100,0),
167+
(367900,15,88.4579,228.32156,-88.59779,NULL,0,1,0,100,0),
168+
(367900,16,83.84989,220.01965,-86.313835,NULL,0,1,0,100,0),
169+
(367900,17,77.0841,211.77414,-84.73362,NULL,0,1,0,100,0),
170+
(367900,18,67.49621,205.84052,-84.928276,NULL,0,1,0,100,0),
171+
(367900,19,53.191616,205.93796,-84.08481,NULL,0,1,0,100,0),
172+
(367900,20,33.344265,203.22813,-79.139854,NULL,0,1,0,100,0),
173+
(367900,21,5.091723,198.6573,-71.71256,NULL,0,1,0,100,0),
174+
(367900,22,-32.916367,204.26924,-83.12926,NULL,0,1,0,100,0),
175+
(367900,23,-62.042313,206.22604,-83.12926,NULL,0,1,0,100,0);

0 commit comments

Comments
 (0)