mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 06:47:45 +00:00
Code Activity

add missing zonepositions, use move semantics for framework constructor

Browse source
This commit is contained in:
NotAdam 2019-03-17 13:50:01 +11:00
parent f2a1f3f4b7
commit 6d9ef0e6c3
4 changed files with 607 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

589
sql/schema/inserts.sql
View file

@ -10139,4 +10139,591 @@ SET @last_id_spawngroup = LAST_INSERT_ID(); INSERT INTO `spawnpoint` ( `spawngro
SET @last_id_spawngroup = LAST_INSERT_ID(); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 222.628784, 24.395672, -658.221313, 0, 0 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 283.243195, 22.311359, -796.170898, 0, 0 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 169.315552, 23.784765, -718.427002, 0, 0 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 153.011917, 25.991085, -749.276184, 0, 0 ); INSERT IGNORE INTO `spawngroup` ( `territoryTypeId`, `bNpcTemplateId`, `level`, `maxHp` ) VALUES ( 180, ( SELECT id FROM bnpctemplate WHERE name = 'elitebedesman_757' ) , 49, 2673 ); SET @last_id_spawngroup = LAST_INSERT_ID(); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 222.628784, 24.395672, -658.221313, 0, 0 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 283.243195, 22.311359, -796.170898, 0, 0 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 169.315552, 23.784765, -718.427002, 0, 0 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 153.011917, 25.991085, -749.276184, 0, 0 ); INSERT IGNORE INTO `spawngroup` ( `territoryTypeId`, `bNpcTemplateId`, `level`, `maxHp` ) VALUES ( 180, ( SELECT id FROM bnpctemplate WHERE name = 'elitebedesman_757' ) , 49, 2673 );
SET @last_id_spawngroup = LAST_INSERT_ID(); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 172.444901, 24.988903, -784.642334, 0, 0 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 279.447388, 21.881470, -807.844788, 0, 0 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 158.525894, 22.116327, -698.329224, 0, 0 ); INSERT IGNORE INTO `spawngroup` ( `territoryTypeId`, `bNpcTemplateId`, `level`, `maxHp` ) VALUES ( 180, ( SELECT id FROM bnpctemplate WHERE name = 'elitepriest_758' ) , 49, 2673 ); SET @last_id_spawngroup = LAST_INSERT_ID(); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 172.444901, 24.988903, -784.642334, 0, 0 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 279.447388, 21.881470, -807.844788, 0, 0 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 158.525894, 22.116327, -698.329224, 0, 0 ); INSERT IGNORE INTO `spawngroup` ( `territoryTypeId`, `bNpcTemplateId`, `level`, `maxHp` ) VALUES ( 180, ( SELECT id FROM bnpctemplate WHERE name = 'elitepriest_758' ) , 49, 2673 );
SET @last_id_spawngroup = LAST_INSERT_ID(); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 253.727448, 22.013004, -797.213379, 0, 0 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 155.508408, 21.852791, -697.356995, 0, 0 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 132.211716, 24.414703, -655.873413, 0, 0 ); INSERT IGNORE INTO `spawngroup` ( `territoryTypeId`, `bNpcTemplateId`, `level`, `maxHp` ) VALUES ( 250, ( SELECT id FROM bnpctemplate WHERE name = 'strikingdummy_8016' ) , 1, 10000 ); SET @last_id_spawngroup = LAST_INSERT_ID(); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 253.727448, 22.013004, -797.213379, 0, 0 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 155.508408, 21.852791, -697.356995, 0, 0 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 132.211716, 24.414703, -655.873413, 0, 0 ); INSERT IGNORE INTO `spawngroup` ( `territoryTypeId`, `bNpcTemplateId`, `level`, `maxHp` ) VALUES ( 250, ( SELECT id FROM bnpctemplate WHERE name = 'strikingdummy_8016' ) , 1, 10000 );
SET @last_id_spawngroup = LAST_INSERT_ID(); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 96.160080, 2.359415, -4.634595, 0, 6483953 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 104.112198, 2.334595, -4.719133, 0, 6483956 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 95.987587, 2.359415, -24.583460, 0, 6483949 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 103.990997, 2.360248, -24.776320, 0, 6483952 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 5.759247, 25.616760, -51.532589, 0, 4833611 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 3.004736, 25.616760, -51.484291, 0, 4833609 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, -3.924433, 25.616760, -51.544392, 0, 4833612 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, -5.181253, 25.616760, -41.729118, 0, 4833610 ); SET @last_id_spawngroup = LAST_INSERT_ID(); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 96.160080, 2.359415, -4.634595, 0, 6483953 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 104.112198, 2.334595, -4.719133, 0, 6483956 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 95.987587, 2.359415, -24.583460, 0, 6483949 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 103.990997, 2.360248, -24.776320, 0, 6483952 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 5.759247, 25.616760, -51.532589, 0, 4833611 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, 3.004736, 25.616760, -51.484291, 0, 4833609 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, -3.924433, 25.616760, -51.544392, 0, 4833612 ); INSERT INTO `spawnpoint` ( `spawngroupid`, `x`, `y`, `z`, `r`, `gimmickId` ) VALUES ( @last_id_spawngroup, -5.181253, 25.616760, -41.729118, 0, 4833610 );
INSERT INTO `zonepositions` (`id`, `target_zone_id`, `pos_x`, `pos_y`, `pos_z`, `pos_o`, `radius`) VALUES
(6426420, 341, -83.034309, 20.799601, 84.731194, -0.872665, 2),
(6426421, 341, -787.899719, 20.402380, -786.736694, 0.872665, 2),
(6472443, 341, -91.735023, 19.211380, 76.868660, 0.698132, 2),
(6472444, 341, -780.357117, 19.153521, -795.817993, -0.785398, 2),
(6486045, 341, -90.000000, 19.369860, 77.000000, 0.785398, 2),
(6486053, 341, -780.000000, 19.313829, -793.500000, -0.872665, 2),
(4508781, 341, -45.563839, -3.999999, -121.815697, 0.279253, 2),
(4508782, 341, -52.463890, 4.000000, -88.498520, -0.610865, 2),
(4508783, 341, -71.971611, 6.000000, -73.975594, -0.883486, 2),
(4508784, 341, -89.064163, -4.000001, -138.395203, 0.593412, 2),
(4508785, 341, -105.035400, 12.000000, -73.523247, -0.974592, 2),
(4508786, 341, -49.417358, 0.000000, -49.095791, 0.785398, 2),
(4508787, 341, -86.574272, 7.999998, -43.214970, 1.082104, 2),
(4508788, 341, -100.271301, 10.000000, -19.320890, -1.343904, 2),
(4508789, 341, -154.896698, 12.000000, -53.422211, 1.134464, 2),
(4508790, 341, -146.379501, 15.000000, -10.159580, 0.174533, 2),
(4508791, 341, -142.336502, 15.000000, 10.318060, -1.308474, 2),
(4508792, 341, -132.544601, 15.000000, 32.574211, 1.308997, 2),
(4508793, 341, -89.681824, 11.618000, 32.778912, 1.331686, 2),
(4508794, 341, -28.000000, -20.000000, 4.100000, -0.000000, 2),
(4508795, 341, -0.865813, -16.020000, -28.539671, -0.785398, 2),
(4508796, 341, 78.714111, -16.000000, -29.442640, -0.523599, 2),
(4508797, 341, 63.000000, -20.000000, -14.150000, 0.000000, 2),
(4508798, 341, 59.063648, -24.000000, 25.315100, 1.047197, 2),
(4508799, 341, 26.238340, -24.000000, 48.174099, 1.047197, 2),
(4508800, 341, -4.000001, -24.000000, 65.900002, -0.000000, 2),
(4508801, 341, 81.484222, -26.000000, -76.858932, 0.785398, 2),
(4508802, 341, 107.063698, -14.000000, -21.382250, -0.349066, 2),
(4508803, 341, 118.677399, -18.000000, -48.080952, 1.221731, 2),
(4508804, 341, 148.500000, -26.000000, -18.000000, 0.000000, 2),
(4508805, 341, 142.051407, -28.000000, 0.005974, -1.570451, 2),
(4508806, 341, 134.001404, -28.000000, 36.004551, -1.570451, 2),
(4508807, 341, 126.000000, -36.000000, 58.000000, -0.000000, 2),
(4508808, 341, 89.759102, -36.000000, 77.101471, 0.523599, 2),
(4508809, 341, 169.901398, -44.000000, 27.504660, 1.570451, 2),
(4508810, 341, 166.000000, -40.000000, 47.999760, 1.570451, 2),
(5362502, 341, -582.184326, -3.999999, -749.563782, -1.291544, 2),
(5362503, 341, -615.501526, 4.000000, -756.463928, 0.959931, 2),
(5362504, 341, -630.024414, 6.000000, -775.971619, 0.687311, 2),
(5362505, 341, -565.604797, -4.000001, -793.064087, -0.977384, 2),
(5362506, 341, -630.476685, 12.000000, -809.035400, 0.596204, 2),
(5362507, 341, -654.904175, 0.000000, -753.417419, 0.785398, 2),
(5362508, 341, -660.784973, 7.999998, -790.574280, -0.488692, 2),
(5362509, 341, -684.679077, 10.000000, -804.271301, 0.226892, 2),
(5362510, 341, -650.577820, 12.000000, -858.896729, -0.436333, 2),
(5362511, 341, -693.840393, 15.000000, -850.379517, 1.396263, 2),
(5362512, 341, -714.318115, 15.000000, -846.336487, -0.262322, 2),
(5362513, 341, -736.574219, 15.000000, -836.544617, 0.261799, 2),
(5362514, 341, -736.778870, 11.618000, -793.681824, 0.239110, 2),
(5362515, 341, -708.099976, -20.000000, -732.000000, -1.570796, 2),
(5362516, 341, -675.460327, -16.020000, -704.865784, 0.785398, 2),
(5362517, 341, -674.557373, -16.000000, -625.285889, 1.047198, 2),
(5362518, 341, -689.849976, -20.000000, -641.000000, -1.570796, 2),
(5362519, 341, -729.315125, -24.000000, -644.936279, -0.523599, 2),
(5362520, 341, -752.174072, -24.000000, -677.761719, -0.523599, 2),
(5362521, 341, -769.900024, -24.000000, -708.000000, -1.570796, 2),
(5362522, 341, -627.141113, -26.000000, -622.515686, -0.785398, 2),
(5362523, 341, -682.617676, -14.000000, -596.936279, 1.221730, 2),
(5362524, 341, -655.919128, -18.000000, -585.322571, 0.349066, 2),
(5362525, 341, -686.000000, -26.000000, -555.500000, 1.570796, 2),
(5362526, 341, -704.005981, -28.000000, -561.948608, -0.000345, 2),
(5362527, 341, -740.004578, -28.000000, -569.998596, -0.000345, 2),
(5362528, 341, -762.000000, -36.000000, -578.000000, -1.570796, 2),
(5362529, 341, -781.101501, -36.000000, -614.240906, 1.047197, 2),
(5362530, 341, -731.504578, -44.000000, -534.098572, -0.000345, 2),
(5362531, 341, -751.999817, -40.000000, -538.000000, -0.000345, 2),
(4573499, 341, -6.276616, -8.000000, -128.066406, 0.456648, 2),
(4573636, 341, 121.412300, -32.000000, -77.154907, -0.355168, 2),
(4573640, 341, -105.066002, 8.570148, -50.345261, 1.305369, 2),
(4573647, 341, -4.031663, -23.225870, 12.528770, 0.440844, 2),
(4573656, 341, 142.727798, -36.001362, 54.812340, -1.291368, 2),
(4656726, 341, 21.318190, -11.076670, -191.085999, -0.525983, 2),
(4656730, 341, 159.425797, -30.000050, -33.288040, 1.517797, 2),
(5362858, 341, -575.933594, -8.000000, -710.276611, -1.114149, 2),
(5362859, 341, -626.845093, -32.000000, -582.587708, 1.215628, 2),
(5362861, 341, -653.654724, 8.570148, -809.065979, 0.265428, 2),
(5362863, 341, -716.357117, -23.225510, -707.325073, 1.129952, 2),
(5362865, 341, -758.812378, -36.001362, -561.272217, -0.279428, 2),
(5362867, 341, -512.914001, -11.076670, -682.681824, 1.044813, 2),
(5362869, 341, -670.711975, -30.000050, -544.574219, -0.053000, 2),
(4508811, 341, -35.551319, -3.999999, -115.960602, -0.279253, 2),
(4508812, 341, -64.516434, 4.000000, -91.776009, 0.610865, 2),
(4508813, 341, -84.524330, 6.000000, -73.911072, 0.883486, 2),
(4508814, 341, -85.686089, -4.000000, -126.233902, -0.593412, 2),
(4508815, 341, -126.152100, 12.000000, -81.406563, -0.596204, 2),
(4508816, 341, -44.160191, 0.000000, -60.009800, -0.785398, 2),
(4508817, 341, -74.958252, 8.000000, -46.108650, -1.082104, 2),
(4508818, 341, -111.719803, 10.000000, -21.963980, 1.343904, 2),
(4508819, 341, -142.885300, 12.000000, -56.624130, -1.134464, 2),
(4508820, 341, -152.684601, 15.000000, -20.575899, -0.174533, 2),
(4508821, 341, -152.795502, 15.000000, 17.268070, 1.308474, 2),
(4508822, 341, -122.030403, 15.000000, 25.615841, -1.308997, 2),
(4508823, 341, -68.858261, 11.618000, 24.887930, 0.239110, 2),
(4508824, 341, -27.988440, -20.000000, 13.316250, -0.000000, 2),
(4508825, 341, -13.533370, -16.020000, -29.870750, 0.785398, 2),
(4508826, 341, 67.194427, -16.000000, -33.441761, 0.523599, 2),
(4508827, 341, 71.013023, -20.000000, -4.480289, -0.000000, 2),
(4508828, 341, 71.087311, -24.000000, 22.995291, -1.047197, 2),
(4508829, 341, 38.588402, -24.000000, 50.685612, -1.047197, 2),
(4508830, 341, 4.001664, -24.000000, 75.257133, -0.000000, 2),
(4508831, 341, 93.513580, -26.000000, -76.195053, -0.785398, 2),
(4508832, 341, 103.829002, -14.000000, -30.215120, 0.349066, 2),
(4508833, 341, 124.619698, -18.000000, -58.779469, -1.221731, 2),
(4508834, 341, 140.520798, -26.000000, -27.272129, -0.000000, 2),
(4508835, 341, 130.010605, -28.000000, 4.002161, 1.570451, 2),
(4508836, 341, 124.776497, -28.000000, 43.978149, 1.570451, 2),
(4508837, 341, 134.011505, -36.000000, 67.311531, -0.000000, 2),
(4508838, 341, 89.707153, -33.680000, 61.217461, -0.523599, 2),
(4508839, 341, 179.171402, -44.000000, 19.494190, -1.570451, 2),
(4508840, 341, 187.977707, -40.000000, 46.702259, -0.000000, 2),
(5362712, 341, -588.039429, -3.999999, -739.551270, 1.291544, 2),
(5362713, 341, -612.223999, 4.000000, -768.516418, -0.959931, 2),
(5362714, 341, -630.088928, 6.000000, -788.524414, -0.687311, 2),
(5362715, 341, -577.766113, -4.000000, -789.686096, 0.977384, 2),
(5362716, 341, -622.593384, 12.000000, -830.152100, -0.974592, 2),
(5362717, 341, -643.990173, 0.000000, -748.160217, -0.785398, 2),
(5362718, 341, -657.891418, 8.000000, -778.958313, 0.488692, 2),
(5362719, 341, -682.036011, 10.000000, -815.719788, -0.226892, 2),
(5362720, 341, -647.375916, 12.000000, -846.885315, 0.436332, 2),
(5362721, 341, -683.424072, 15.000000, -856.684570, -1.396263, 2),
(5362722, 341, -721.268127, 15.000000, -856.795471, 0.262323, 2),
(5362723, 341, -729.615784, 15.000000, -826.030396, -0.261799, 2),
(5362724, 341, -728.887878, 11.618000, -772.858276, -1.331686, 2),
(5362725, 341, -717.316223, -20.000000, -731.988525, 1.570796, 2),
(5362726, 341, -674.129272, -16.020000, -717.533386, -0.785398, 2),
(5362727, 341, -670.558228, -16.000000, -636.805481, -1.047198, 2),
(5362728, 341, -699.519714, -20.000000, -632.987000, 1.570796, 2),
(5362729, 341, -726.995300, -24.000000, -632.912720, 0.523599, 2),
(5362730, 341, -754.685608, -24.000000, -665.411621, 0.523599, 2),
(5362731, 341, -779.257080, -24.000000, -699.998413, 1.570796, 2),
(5362732, 341, -627.804871, -26.000000, -610.486511, 0.785398, 2),
(5362733, 341, -673.784912, -14.000000, -600.171021, -1.221730, 2),
(5362734, 341, -645.220520, -18.000000, -579.380310, -0.349066, 2),
(5362735, 341, -676.727905, -26.000000, -563.479187, -1.570796, 2),
(5362736, 341, -708.002197, -28.000000, -573.989380, -0.000345, 2),
(5362737, 341, -747.978088, -28.000000, -579.223511, -0.000345, 2),
(5362738, 341, -771.311523, -36.000000, -569.988525, 1.570796, 2),
(5362739, 341, -765.217529, -33.680000, -614.292786, -1.047197, 2),
(5362740, 341, -723.494202, -44.000000, -524.828613, -0.000345, 2),
(5362741, 341, -750.702271, -40.000000, -516.022278, 1.570796, 2),
(4389297, 341, -1.201022, -11.076660, -192.566803, -0.104265, 2),
(4575567, 341, -1.201022, -11.076660, -192.566803, -0.104265, 2),
(4656744, 341, 31.760811, -10.919540, -215.353897, -0.664720, 2),
(5341062, 341, 2.117471, -11.076660, -195.650604, -0.104265, 2),
(6067004, 341, -512.404785, -11.076660, -705.365173, -1.560290, 2),
(6067010, 341, -512.404785, -11.076700, -705.365173, -1.560290, 2),
(6067011, 341, -492.748688, -11.076660, -675.166687, -0.897283, 2),
(6425449, 340, 247.550293, 55.066280, -114.412102, -1.570451, 2),
(6425471, 340, -589.352600, 55.066280, -455.193115, -0.000000, 2),
(6472421, 340, 237.434402, 53.703800, -116.935997, 1.570451, 2),
(6472422, 340, -587.382080, 53.709671, -466.402710, -0.000000, 2),
(6486042, 340, 239.000000, 53.723721, -114.500000, 1.570796, 2),
(6486043, 340, -589.500000, 53.686298, -465.500000, -0.000000, 2),
(4573435, 340, 38.651691, 65.959061, -113.381104, 0.033108, 2),
(4573443, 340, -87.185501, 31.288960, -54.186581, 0.015329, 2),
(4573451, 340, -13.450120, 39.512871, -40.490162, 0.979598, 2),
(4573456, 340, 102.623901, 6.483140, 86.547073, 1.328404, 2),
(4573473, 340, -63.150330, 5.886682, 107.648201, 0.243516, 2),
(4660260, 340, 95.039886, 33.862801, -21.348499, 1.547979, 2),
(4660263, 340, 5.335551, 2.610901, 188.079803, -0.870592, 2),
(5364262, 340, -590.618896, 65.959061, -665.348328, 1.537689, 2),
(5364264, 340, -649.813416, 31.288960, -791.185486, 1.555468, 2),
(5364266, 340, -663.509827, 39.512871, -717.450073, 0.591199, 2),
(5364268, 340, -790.547119, 6.483140, -601.376099, -0.242392, 2),
(5364270, 340, -811.648193, 5.886682, -767.150330, 1.327280, 2),
(5364272, 340, -682.651489, 33.862801, -608.960083, 0.022817, 2),
(5364274, 340, -892.079773, 2.610901, -698.664429, -0.700204, 2),
(4508905, 340, 137.500702, 46.000000, -78.372757, -1.570451, 2),
(4508906, 340, 74.500000, 51.000000, -95.098320, -0.000000, 2),
(4508907, 340, 121.226303, 58.500000, -173.456100, -0.698132, 2),
(4508908, 340, 43.320240, 54.500000, -75.938789, 1.308997, 2),
(4508909, 340, 71.500000, 34.501808, -23.979990, -0.000000, 2),
(4508910, 340, 130.799393, 23.500000, -3.689235, -1.134464, 2),
(4508911, 340, 112.170303, 9.625000, 56.740681, -0.087266, 2),
(4508912, 340, 85.848534, 8.750000, 69.722527, 0.785398, 2),
(4508913, 340, 120.030403, 8.000000, 91.001717, -1.570451, 2),
(4508914, 340, 77.819702, 7.750000, 98.964989, 1.221731, 2),
(4508915, 340, 52.000000, 5.000000, 138.506195, -0.000000, 2),
(4508916, 340, 68.866379, 25.000000, 26.501680, 1.570451, 2),
(4508917, 340, 33.484001, 34.000000, 15.603780, 1.308997, 2),
(4508918, 340, 37.055130, 19.500000, 47.401741, 1.570451, 2),
(4508919, 340, 16.780310, 9.000000, 85.501640, 1.570451, 2),
(4508920, 340, -87.899460, 7.761172, 102.886803, 0.698132, 2),
(4508921, 340, -36.318291, 10.000000, 79.161430, -0.785398, 2),
(4508922, 340, -26.001350, 21.000000, 48.401730, 1.570451, 2),
(4508923, 340, -78.670067, 21.500000, 50.968700, 1.221731, 2),
(4508924, 340, -13.405700, 33.000000, -2.998306, -1.570451, 2),
(4508925, 340, -58.000000, 30.500000, 3.457494, -0.000000, 2),
(4508926, 340, -32.147449, 41.500000, -32.498329, 1.570451, 2),
(4508927, 340, -70.369568, 32.000000, -39.398319, -1.570451, 2),
(4508928, 340, -40.654240, 47.000000, -61.498329, 1.570451, 2),
(4508929, 340, -9.101346, 46.500000, -76.898247, -1.570451, 2),
(4508930, 340, -25.911039, 56.500000, -111.516701, -0.174533, 2),
(4508931, 340, -107.738602, 31.500000, -38.322269, 1.308997, 2),
(4508932, 340, -129.331100, 27.500000, -120.572304, 0.488692, 2),
(4508933, 340, -104.734398, 34.500000, -148.227203, 0.733038, 2),
(4508934, 340, -50.500000, 56.000000, -143.453903, -0.000000, 2),
(5364176, 340, -625.627319, 46.000000, -566.499329, -0.000345, 2),
(5364177, 340, -608.901672, 51.000000, -629.500000, -1.570796, 2),
(5364178, 340, -530.543884, 58.500000, -582.773682, 0.872665, 2),
(5364179, 340, -628.061218, 54.500000, -660.679688, -0.261799, 2),
(5364180, 340, -680.020020, 34.501808, -632.500000, -1.570796, 2),
(5364181, 340, -700.310791, 23.500000, -573.200623, 0.436332, 2),
(5364182, 340, -760.740723, 9.625000, -591.829712, -1.483530, 2),
(5364183, 340, -773.722473, 8.750000, -618.151489, -0.785398, 2),
(5364184, 340, -795.001709, 8.000000, -583.969604, -0.000345, 2),
(5364185, 340, -802.965027, 7.750000, -626.180298, -0.349066, 2),
(5364186, 340, -842.506226, 5.000000, -652.000000, -1.570796, 2),
(5364187, 340, -730.501709, 25.000000, -635.133606, -0.000345, 2),
(5364188, 340, -719.603821, 34.000000, -670.515991, 0.261799, 2),
(5364189, 340, -751.401672, 19.500000, -666.944885, -0.000345, 2),
(5364190, 340, -789.501587, 9.000000, -687.219727, -0.000345, 2),
(5364191, 340, -806.886780, 7.761172, -791.899475, -0.872665, 2),
(5364192, 340, -783.161377, 10.000000, -740.318298, -0.785398, 2),
(5364193, 340, -752.401672, 21.000000, -730.001282, -0.000345, 2),
(5364194, 340, -754.968689, 21.500000, -782.669983, -0.349066, 2),
(5364195, 340, -701.001709, 33.000000, -717.405701, -0.000345, 2),
(5364196, 340, -707.457520, 30.500000, -762.000000, -1.570796, 2),
(5364197, 340, -671.501587, 41.500000, -736.147522, -0.000345, 2),
(5364198, 340, -664.601685, 32.000000, -774.369629, -0.000345, 2),
(5364199, 340, -642.501587, 47.000000, -744.654175, -0.000345, 2),
(5364200, 340, -627.101685, 46.500000, -713.101318, -0.000345, 2),
(5364201, 340, -592.483276, 56.500000, -729.911011, 1.396263, 2),
(5364202, 340, -665.677673, 31.500000, -811.738586, -0.261799, 2),
(5364203, 340, -583.427673, 27.500000, -833.331116, 1.082104, 2),
(5364204, 340, -555.772827, 34.500000, -808.734375, -0.837758, 2),
(5364205, 340, -560.546082, 56.000000, -754.500000, -1.570796, 2),
(4508875, 340, 126.599998, 46.000000, -78.369202, 1.570451, 2),
(4508876, 340, 78.500000, 51.000000, -86.699997, -0.000000, 2),
(4508877, 340, 106.034103, 58.500000, -158.424500, 0.872664, 2),
(4508878, 340, 52.346809, 54.500000, -77.557709, -1.308997, 2),
(4508879, 340, 71.500000, 34.500000, -13.300000, 0.000000, 2),
(4508880, 340, 123.424500, 23.499990, 15.822050, 0.436332, 2),
(4508881, 340, 115.366997, 9.625000, 64.950531, 0.087267, 2),
(4508882, 340, 94.333809, 8.750000, 72.833809, -0.785398, 2),
(4508883, 340, 111.699997, 8.000000, 95.004517, 1.570451, 2),
(4508884, 340, 86.903954, 7.749992, 98.014664, -1.221731, 2),
(4508885, 340, 52.000000, 5.000000, 148.899994, 0.000000, 2),
(4508886, 340, 77.300003, 25.000000, 22.504459, -1.570451, 2),
(4508887, 340, 40.496819, 34.000000, 9.583588, -1.308997, 2),
(4508888, 340, 44.599998, 19.500000, 43.504280, -1.570451, 2),
(4508889, 340, 25.100000, 9.000000, 81.504318, -1.570451, 2),
(4508890, 340, -81.008331, 7.750000, 111.099403, -0.698132, 2),
(4508891, 340, -39.263100, 10.000000, 87.763100, 0.785398, 2),
(4508892, 340, -17.900000, 21.000000, 44.504520, -1.570451, 2),
(4508893, 340, -69.971931, 21.500000, 49.877861, -1.221731, 2),
(4508894, 340, -21.700001, 33.000000, 1.004351, 1.570451, 2),
(4508895, 340, -58.000000, 30.500000, 14.200000, 0.000000, 2),
(4508896, 340, -24.200001, 41.500000, -36.495579, -1.570451, 2),
(4508897, 340, -78.500000, 32.000000, -35.495930, 1.570451, 2),
(4508898, 340, -32.400002, 47.000000, -65.495537, -1.570451, 2),
(4508899, 340, -17.000000, 46.500000, -72.995583, 1.570451, 2),
(4508900, 340, -31.222700, 56.500000, -118.605499, 0.174533, 2),
(4508901, 340, -97.289482, 31.500000, -35.522430, -1.308997, 2),
(4508902, 340, -111.645103, 27.500000, -104.630501, -1.082104, 2),
(4508903, 340, -95.565247, 34.500000, -144.021698, -0.733038, 2),
(4508904, 340, -50.500000, 56.000000, -132.699997, 0.000000, 2),
(5364207, 340, -625.630798, 46.000000, -577.400024, -0.000345, 2),
(5364208, 340, -617.299988, 51.000000, -625.500000, 1.570796, 2),
(5364209, 340, -545.575500, 58.500000, -597.965881, 0.698132, 2),
(5364210, 340, -626.442322, 54.500000, -651.653198, 0.261799, 2),
(5364211, 340, -690.700012, 34.500000, -632.500000, 1.570796, 2),
(5364212, 340, -719.822083, 23.499990, -580.575500, 1.134464, 2),
(5364213, 340, -768.950623, 9.625000, -588.632996, 1.483529, 2),
(5364214, 340, -776.833801, 8.750000, -609.666199, 0.785398, 2),
(5364215, 340, -799.004517, 8.000000, -592.299988, -0.000345, 2),
(5364216, 340, -802.014587, 7.749992, -617.096130, 0.349066, 2),
(5364217, 340, -852.900024, 5.000000, -652.000000, 1.570796, 2),
(5364218, 340, -726.504517, 25.000000, -626.700012, -0.000345, 2),
(5364219, 340, -713.583618, 34.000000, -663.503174, -0.261799, 2),
(5364220, 340, -747.504272, 19.500000, -659.400024, -0.000345, 2),
(5364221, 340, -785.504272, 9.000000, -678.900024, -0.000345, 2),
(5364222, 340, -815.099426, 7.750000, -785.008423, 0.872665, 2),
(5364223, 340, -791.763123, 10.000000, -743.263123, 0.785398, 2),
(5364224, 340, -748.504517, 21.000000, -721.900024, -0.000345, 2),
(5364225, 340, -753.877930, 21.500000, -773.971924, 0.349066, 2),
(5364226, 340, -705.004272, 33.000000, -725.700012, -0.000345, 2),
(5364227, 340, -718.200012, 30.500000, -762.000000, 1.570796, 2),
(5364228, 340, -667.504395, 41.500000, -728.200012, -0.000345, 2),
(5364229, 340, -668.504089, 32.000000, -782.500000, -0.000345, 2),
(5364230, 340, -638.504517, 47.000000, -736.400024, -0.000345, 2),
(5364231, 340, -631.004395, 46.500000, -721.000000, -0.000345, 2),
(5364232, 340, -585.394470, 56.500000, -735.222717, -1.396263, 2),
(5364233, 340, -668.477478, 31.500000, -801.289490, 0.261800, 2),
(5364234, 340, -599.369507, 27.500000, -815.645081, 0.488692, 2),
(5364235, 340, -559.978271, 34.500000, -799.565186, 0.837758, 2),
(5364236, 340, -571.299988, 56.000000, -754.500000, 1.570796, 2),
(4549235, 340, 10.395360, 2.610901, 204.643005, -0.493734, 2),
(4575566, 340, 6.831019, 2.610898, 198.020203, -0.493734, 2),
(5341063, 340, 8.760915, 2.610901, 201.606903, -0.493734, 2),
(6066289, 340, -909.598389, 2.610901, -692.749023, 1.047197, 2),
(6066290, 340, -903.075378, 2.610900, -696.505127, 1.047197, 2),
(6080119, 340, -909.598389, 2.610900, -692.749023, 1.047198, 2),
(6425800, 339, -164.123199, 31.500000, -48.560421, 1.570451, 2),
(6425806, 339, -655.484680, 31.500000, -868.697876, -0.000000, 2),
(6472423, 339, -147.559402, 29.813499, -50.412251, -1.570451, 2),
(6472426, 339, -653.505127, 29.813820, -851.304626, 0.000000, 2),
(6486032, 339, -148.927200, 30.000000, -48.500000, -1.570451, 2),
(6486040, 339, -655.500000, 29.805830, -853.000000, -0.000000, 2),
(4573387, 339, -5.933023, 48.997021, -113.895798, -0.396200, 2),
(4573396, 339, -103.722702, 32.711620, -86.794724, -0.844870, 2),
(4573404, 339, 90.593086, 42.003971, -98.758362, -0.391649, 2),
(4573408, 339, 11.323760, 6.002163, 12.858340, -1.501634, 2),
(4573416, 339, 147.489105, 24.000000, 39.697220, -0.282057, 2),
(4656718, 339, -56.184849, 10.001680, 38.387039, -1.549551, 2),
(4656721, 339, 84.664108, 18.000719, -14.902570, 0.563254, 2),
(5347562, 339, -590.104187, 48.997021, -709.932983, 1.174597, 2),
(5347565, 339, -617.205322, 32.711620, -807.722717, -0.725926, 2),
(5347567, 339, -605.241577, 42.003971, -613.406921, -1.179148, 2),
(5347569, 339, -716.858276, 6.002163, -692.676270, -0.069162, 2),
(5347571, 339, -743.697205, 24.000000, -556.510925, -1.288739, 2),
(5347573, 339, -742.387024, 10.001680, -760.184875, -0.021245, 2),
(5347575, 339, -689.097412, 18.000719, -619.335876, -1.007542, 2),
(4508941, 339, -65.424881, 39.998051, -107.841797, 1.565305, 2),
(4508942, 339, -134.557098, 36.000000, -90.605423, 0.801251, 2),
(4508943, 339, -91.945137, 31.999969, -64.895714, -0.000000, 2),
(4508944, 339, -85.458023, 18.009279, -12.285390, 1.523620, 2),
(4508945, 339, -135.352600, 19.999990, 20.838390, 1.072166, 2),
(4508946, 339, -40.674141, 14.000000, 0.333257, -0.843812, 2),
(4508947, 339, -39.905159, 24.000000, -49.638691, -0.030711, 2),
(4508948, 339, -16.774460, 35.998581, -95.909409, -1.557586, 2),
(4508949, 339, 35.883942, 37.999969, -95.160332, -0.029718, 2),
(4508950, 339, 59.976589, 41.999969, -119.253799, 0.018769, 2),
(4508951, 339, 0.098513, 25.028660, -51.204102, 0.015476, 2),
(4508952, 339, 44.012119, 25.999969, -55.177738, 0.000000, 2),
(4508953, 339, 59.862610, 17.999969, -27.131399, 0.000000, 2),
(4508954, 339, 88.182381, 29.000000, -58.622688, 0.774095, 2),
(4508955, 339, 138.555603, 46.000000, -94.621742, -0.834274, 2),
(4508956, 339, 131.151398, 27.999941, -38.031841, -1.570451, 2),
(4508957, 339, 107.058899, 21.999969, -23.935530, -1.570451, 2),
(4508958, 339, 68.089363, 17.041040, 8.918078, 0.033567, 2),
(4508959, 339, 36.567120, 7.999969, 27.255859, -0.370350, 2),
(4508960, 339, 60.115170, 5.999969, 38.275139, -0.518169, 2),
(4508961, 339, 81.832153, 5.021983, 53.202370, -0.704891, 2),
(4508962, 339, 116.041702, 17.999969, 60.880291, 0.022872, 2),
(4508963, 339, 107.992104, 17.999969, 32.845169, 0.010382, 2),
(4508964, 339, 145.951599, 21.999969, -1.138689, -0.025053, 2),
(4508965, 339, 158.001404, 32.061440, 28.910810, 0.004127, 2),
(4508966, 339, 163.189499, 27.999969, 52.010799, -1.557740, 2),
(4508967, 339, 182.012100, 35.999969, -1.151924, -0.009814, 2),
(4508968, 339, 191.990906, 39.999969, 28.910919, -0.004301, 2),
(4508969, 339, 189.521606, 38.025990, 64.009750, -1.562075, 2),
(4508970, 339, 136.800995, 20.000000, 94.372902, -0.520615, 2),
(5347427, 339, -596.158203, 39.998051, -769.424927, 0.005492, 2),
(5347428, 339, -613.394592, 36.000000, -838.557129, -0.769546, 2),
(5347429, 339, -639.104187, 31.999969, -795.945129, 1.570796, 2),
(5347430, 339, -691.714600, 18.009279, -789.458008, 0.047176, 2),
(5347431, 339, -724.838379, 19.999990, -839.352600, 0.498630, 2),
(5347432, 339, -704.333313, 14.000000, -744.674072, -0.726984, 2),
(5347433, 339, -654.361328, 24.000000, -743.905212, -1.540086, 2),
(5347434, 339, -608.090576, 35.998581, -720.774475, -0.013211, 2),
(5347435, 339, -608.839722, 37.999969, -668.116028, -1.541078, 2),
(5347436, 339, -584.746216, 41.999969, -644.023376, -1.552027, 2),
(5347437, 339, -652.795898, 25.028660, -703.901489, -1.555321, 2),
(5347438, 339, -648.822327, 25.999969, -659.987915, -1.570796, 2),
(5347439, 339, -676.868591, 17.999969, -644.137390, -1.570796, 2),
(5347440, 339, -645.377319, 29.000000, -615.817627, -0.796701, 2),
(5347441, 339, -609.378296, 46.000000, -565.444397, -0.736522, 2),
(5347442, 339, -665.968079, 27.999941, -572.848572, -0.000345, 2),
(5347443, 339, -680.064514, 21.999969, -596.941101, -0.000345, 2),
(5347444, 339, -712.918091, 17.041040, -635.910583, -1.537229, 2),
(5347445, 339, -731.255920, 7.999969, -667.432922, -1.200446, 2),
(5347446, 339, -742.275085, 5.999969, -643.884827, -1.052627, 2),
(5347447, 339, -757.202393, 5.021983, -622.167786, -0.865905, 2),
(5347448, 339, -764.880310, 17.999969, -587.958313, -1.547924, 2),
(5347449, 339, -736.845215, 17.999969, -596.007874, -1.560414, 2),
(5347450, 339, -702.861328, 21.999969, -558.048401, -1.545743, 2),
(5347451, 339, -732.910828, 32.061440, -545.998596, -1.566669, 2),
(5347452, 339, -756.010803, 27.999969, -540.810486, -0.013057, 2),
(5347453, 339, -702.848083, 35.999969, -521.987915, -1.560982, 2),
(5347454, 339, -732.910889, 39.999969, -512.009094, -1.566495, 2),
(5347455, 339, -768.009827, 38.025990, -514.478394, 0.008721, 2),
(5347456, 339, -798.372925, 20.000000, -567.198975, 1.050182, 2),
(4387629, 339, -54.396290, 39.998051, -107.902000, -1.565326, 2),
(4387630, 339, -122.884499, 33.693161, -78.979187, -0.790629, 2),
(4387842, 339, -96.145149, 30.735161, -77.417511, -0.000000, 2),
(4387845, 339, -73.570801, 18.000731, -16.150270, -1.564004, 2),
(4387848, 339, -122.538002, 18.000050, 13.440370, -1.072166, 2),
(4387851, 339, -49.674641, 13.119320, 9.569615, 0.752506, 2),
(4387853, 339, -39.942581, 23.991600, -38.327770, -0.033610, 2),
(4387856, 339, -25.341869, 35.998581, -87.990540, 1.569214, 2),
(4387858, 339, 54.014809, 37.998249, -95.929893, -1.562027, 2),
(4387859, 339, 68.022972, 39.998230, -106.200996, -0.018769, 2),
(4387861, 339, 17.437071, 25.028660, -51.982239, -1.567576, 2),
(4387862, 339, 48.112122, 25.000000, -44.254162, -0.038703, 2),
(4387864, 339, 68.000053, 17.999969, -18.401770, -0.000000, 2),
(4387869, 339, 101.567596, 28.766081, -56.110199, -0.762453, 2),
(4387874, 339, 126.824898, 43.997570, -82.908821, 0.761298, 2),
(4387878, 339, 122.601097, 27.999941, -38.005989, 1.570451, 2),
(4387881, 339, 98.622566, 21.992540, -23.988871, 1.570451, 2),
(4387883, 339, 87.321037, 16.001209, 4.115562, -1.538942, 2),
(4387885, 339, 36.019070, 6.002164, 40.210690, 0.313481, 2),
(4387887, 339, 57.196480, 4.064701, 51.149220, 0.512306, 2),
(4387888, 339, 76.525887, 3.051320, 65.515732, 0.720167, 2),
(4387889, 339, 134.000305, 18.000620, 60.012939, -1.550282, 2),
(4387894, 339, 125.632698, 17.775419, 31.987591, -1.531172, 2),
(4387896, 339, 150.049698, 22.052071, 7.723455, -0.009819, 2),
(4387897, 339, 175.617294, 31.999010, 27.972969, -1.570451, 2),
(4387898, 339, 154.375305, 27.999510, 56.006031, 1.560211, 2),
(4387899, 339, 185.954895, 35.998531, 7.667098, -0.023306, 2),
(4387900, 339, 199.952301, 39.998051, 37.434719, -0.026348, 2),
(4387901, 339, 178.546494, 37.998260, 72.027817, 1.543734, 2),
(4387902, 339, 129.113098, 18.000719, 80.988968, 0.550029, 2),
(5347391, 339, -596.098022, 39.998051, -758.396301, -0.005470, 2),
(5347392, 339, -625.020813, 33.693161, -826.884521, 0.780168, 2),
(5347393, 339, -626.582520, 30.735161, -800.145081, -1.570796, 2),
(5347394, 339, -687.849670, 18.000731, -777.570801, -0.006792, 2),
(5347395, 339, -717.440430, 18.000050, -826.538025, -0.498630, 2),
(5347396, 339, -713.569580, 13.119320, -753.674622, 0.818290, 2),
(5347397, 339, -665.672180, 23.991600, -743.942627, 1.537186, 2),
(5347398, 339, -616.009521, 35.998581, -729.341919, -0.001582, 2),
(5347399, 339, -608.070129, 37.998249, -649.985229, -0.008769, 2),
(5347400, 339, -597.799011, 39.998230, -635.977112, 1.552027, 2),
(5347401, 339, -652.017822, 25.028660, -686.562927, -0.003220, 2),
(5347402, 339, -659.745789, 25.000000, -655.887878, 1.532093, 2),
(5347403, 339, -685.598206, 17.999969, -635.999878, 1.570796, 2),
(5347404, 339, -647.889771, 28.766081, -602.432373, 0.808343, 2),
(5347405, 339, -621.091187, 43.997570, -577.175110, 0.809498, 2),
(5347406, 339, -665.994019, 27.999941, -581.398926, -0.000345, 2),
(5347407, 339, -680.011108, 21.992540, -605.377380, -0.000345, 2),
(5347408, 339, -708.115479, 16.001209, -616.679016, -0.031854, 2),
(5347409, 339, -744.210693, 6.002164, -667.981018, 1.257316, 2),
(5347410, 339, -755.149170, 4.064701, -646.803528, 1.058490, 2),
(5347411, 339, -769.515686, 3.051320, -627.474121, 0.850630, 2),
(5347412, 339, -764.012878, 18.000620, -569.999695, -0.020514, 2),
(5347413, 339, -735.987610, 17.775419, -578.367310, -0.039624, 2),
(5347414, 339, -711.723389, 22.052071, -553.950317, 1.560978, 2),
(5347415, 339, -731.973022, 31.999010, -528.382690, -0.000345, 2),
(5347416, 339, -760.005981, 27.999510, -549.624695, -0.010586, 2),
(5347417, 339, -711.667114, 35.998531, -518.045105, 1.547490, 2),
(5347418, 339, -741.434814, 39.998051, -504.047699, 1.544449, 2),
(5347419, 339, -776.027771, 37.998260, -525.453491, -0.027062, 2),
(5347420, 339, -784.989014, 18.000719, -574.886902, -1.020767, 2),
(4323020, 339, -9.994401, 50.259640, -139.755798, -0.000000, 2),
(4575564, 339, -9.994401, 50.259640, -139.755798, -0.000000, 2),
(4664433, 339, -64.066368, 2.066447, 93.609650, -0.000000, 2),
(5341058, 339, -9.994401, 50.259640, -132.959305, -0.000000, 2),
(6066198, 339, -563.954529, 50.259640, -713.824829, -1.570451, 2),
(6066224, 339, -563.954529, 50.259602, -713.824829, -1.570451, 2),
(6066227, 339, -797.868408, 2.066417, -768.024170, 1.570451, 2),
(6793761, 641, -11.758620, 28.049999, -21.141680, -0.523599, 2),
(6793801, 641, -17.093290, 25.049999, -11.487110, 0.523599, 2),
(6793815, 641, -682.960999, 27.999990, -715.832581, -1.045231, 2),
(6793819, 641, -692.599792, 25.000000, -721.183228, 1.045231, 2),
(6794232, 641, -96.560707, 2.020000, 126.183998, 0.558505, 2),
(6794239, 641, -105.579399, 29.999990, -117.917297, -1.210056, 2),
(6794241, 641, -97.684174, 16.020000, -35.046799, 1.548546, 2),
(6794243, 641, -18.670549, 25.000010, -12.901820, 1.548548, 2),
(6794245, 641, 100.374901, 30.070000, 25.044720, -0.985377, 2),
(6794247, 641, -144.357605, 9.999987, 2.560443, -1.423511, 2),
(6794249, 641, -6.596466, 10.020000, 99.490349, 1.548548, 2),
(6794251, 641, 63.619129, 10.020000, 114.196899, 1.548546, 2),
(6794262, 641, -706.418396, 10.069990, -849.174805, -0.213645, 2),
(6794264, 641, -586.429382, 30.000000, -809.274170, -0.404319, 2),
(6794268, 641, -830.277222, 2.019989, -800.427002, 1.011919, 2),
(6794272, 641, -668.292114, 16.020000, -802.052002, -0.000000, 2),
(6794275, 641, -803.380371, 10.020000, -707.669006, -0.000000, 2),
(6794277, 641, -690.551514, 25.000000, -724.463379, -0.000000, 2),
(6794279, 641, -818.088501, 10.020000, -638.651611, -0.000000, 2),
(6794281, 641, -728.622986, 30.030069, -604.051575, -0.599232, 2),
(6790670, 641, -27.971821, 2.020000, 117.651299, 1.308997, 2),
(6790671, 641, -22.956900, 14.520000, 80.082443, 1.361357, 2),
(6790672, 641, 8.094055, 6.020000, 130.802094, 1.117011, 2),
(6790673, 641, 12.849070, 20.020000, 76.790543, 0.523599, 2),
(6790674, 641, 34.102871, 20.020000, 65.283188, -0.523599, 2),
(6790675, 641, 40.865688, 10.020000, 104.297997, -0.000000, 2),
(6790676, 641, 50.123631, 10.020000, 134.669601, 0.000000, 2),
(6790677, 641, 110.750900, 11.600000, 125.714104, -0.785398, 2),
(6790678, 641, 96.696854, 16.020000, 93.248688, 0.959931, 2),
(6790679, 641, 116.939499, 22.020000, 63.294861, -0.785398, 2),
(6790680, 641, 82.194153, 22.020000, 46.308922, -1.047198, 2),
(6790681, 641, 52.322208, 26.020000, 24.709940, -0.418879, 2),
(6790682, 641, 65.386688, 31.590000, -13.086970, -0.488692, 2),
(6790683, 641, 98.665154, 30.020000, 6.762455, -0.785398, 2),
(6790684, 641, 127.001602, 34.020000, 27.942101, -0.785398, 2),
(6790686, 641, 129.447998, 40.020000, -23.473499, -0.785398, 2),
(6790687, 641, -107.392502, 2.019999, 67.930977, -1.047197, 2),
(6790688, 641, -88.783440, 14.520000, 32.516819, -0.785398, 2),
(6790689, 641, -130.889603, 2.020000, 54.081459, 0.785398, 2),
(6790690, 641, -113.495300, 10.020000, 11.714890, -0.959931, 2),
(6790691, 641, -161.529800, 6.020000, 15.791850, -0.261799, 2),
(6790692, 641, -170.995300, 6.020000, -6.141406, -0.000000, 2),
(6790693, 641, -144.348404, 16.020000, -50.939850, 0.785398, 2),
(6790694, 641, -118.693604, 17.510000, -30.069670, 0.785398, 2),
(6790695, 641, -82.111816, 14.020000, -19.863991, -1.047198, 2),
(6790696, 641, -103.322899, 16.020000, -55.232811, -0.785398, 2),
(6790697, 641, -62.981430, 20.020000, -50.040298, -0.000000, 2),
(6790698, 641, -75.054077, 25.020000, -111.231003, -0.000000, 2),
(6790699, 641, -121.963303, 26.620001, -94.666023, -1.134464, 2),
(6790700, 641, -152.563293, 30.020000, -115.589600, 0.785398, 2),
(6790754, 641, -588.439819, 30.020000, -856.504822, -0.785398, 2),
(6790744, 641, -715.379211, 10.020000, -817.104614, -0.610865, 2),
(6790745, 641, -720.572876, 6.020001, -865.242126, 1.308997, 2),
(6790746, 641, -697.695984, 6.019999, -875.101807, -1.541859, 2),
(6790747, 641, -653.556213, 16.020000, -848.883911, 0.785398, 2),
(6790748, 641, -673.896790, 17.510000, -822.830627, 0.785398, 2),
(6790749, 641, -684.104614, 14.020000, -786.090881, 0.523599, 2),
(6790750, 641, -648.431580, 16.020000, -807.169800, -0.785398, 2),
(6790751, 641, -653.673401, 20.020000, -766.981384, -1.570451, 2),
(6790752, 641, -592.919373, 25.020000, -779.082397, -1.570451, 2),
(6790753, 641, -609.418884, 26.620001, -825.933105, -0.436332, 2),
(6790726, 641, -784.033386, 14.520000, -727.604370, -0.261799, 2),
(6790743, 641, -758.075073, 2.020000, -834.850891, -0.785398, 2),
(6790742, 641, -736.781189, 14.520000, -792.477295, 0.785398, 2),
(6790741, 641, -772.095520, 2.020002, -811.132385, 0.523599, 2),
(6790740, 641, -680.442627, 40.020000, -574.461914, -0.785398, 2),
(6790739, 641, -731.773804, 34.020000, -577.044495, 0.785398, 2),
(6790738, 641, -710.486816, 30.020000, -605.104797, -0.785398, 2),
(6790737, 641, -691.451782, 31.590000, -638.884888, -1.099557, 2),
(6790736, 641, -728.454102, 26.020000, -651.542114, -1.134464, 2),
(6790735, 641, -749.744080, 22.020000, -620.959473, -0.523599, 2),
(6790734, 641, -767.817383, 22.020000, -586.439575, 0.785398, 2),
(6790733, 641, -797.685425, 16.020000, -607.895508, 0.610865, 2),
(6790732, 641, -829.984375, 11.600000, -592.978210, 0.785398, 2),
(6790731, 641, -838.324097, 10.020000, -653.971008, 1.570451, 2),
(6790730, 641, -807.898315, 10.020000, -663.086121, -1.570451, 2),
(6790729, 641, -769.078674, 20.020000, -669.804871, -1.047197, 2),
(6790728, 641, -781.051575, 20.020000, -691.266724, 1.047197, 2),
(6790727, 641, -834.468811, 6.020000, -696.531921, -0.418879, 2),
(6790725, 641, -821.487671, 2.020000, -732.413513, -0.226893, 2),
(6791358, 641, -16.520210, 2.060000, 120.901604, -1.324126, 2),
(6791359, 641, -13.482080, 14.102520, 78.894096, -1.320978, 2),
(6791360, 641, 17.895729, 6.059998, 131.201401, -1.084020, 2),
(6791361, 641, 14.144350, 20.000000, 66.636543, -0.493925, 2),
(6791362, 641, 32.921890, 20.000000, 75.266251, 0.484113, 2),
(6791363, 641, 45.179451, 10.020000, 113.421097, -0.000000, 2),
(6791364, 641, 50.177521, 10.020000, 117.473602, 0.000000, 2),
(6791365, 641, 99.734711, 10.020000, 114.782501, 0.797859, 2),
(6791366, 641, 101.584503, 16.070000, 84.945152, -1.006882, 2),
(6791367, 641, 107.975403, 22.000000, 60.034500, 0.812434, 2),
(6791368, 641, 76.787857, 22.000000, 54.120010, 1.012735, 2),
(6791369, 641, 52.110870, 26.000000, 34.886822, 0.384919, 2),
(6791370, 641, 58.183788, 30.020000, 0.764280, 0.475893, 2),
(6791371, 641, 95.104446, 30.000000, 16.011181, 0.750036, 2),
(6791372, 641, 118.116402, 34.000000, 19.155050, 0.813951, 2),
(6791373, 641, 117.025597, 40.020000, -11.084880, 0.777782, 2),
(6791374, 641, -117.230103, 1.999999, 66.915070, 1.187368, 2),
(6791375, 641, -99.091690, 14.000000, 28.314190, 0.860008, 2),
(6791376, 641, -121.815903, 1.999988, 62.897888, -0.837464, 2),
(6791377, 641, -120.354500, 10.000000, 21.490459, 0.948713, 2),
(6791378, 641, -167.846893, 6.000000, 7.949383, 0.282263, 2),
(6791379, 641, -166.858200, 6.049999, 3.201252, 0.017754, 2),
(6791380, 641, -140.808701, 16.070000, -59.957230, -0.868032, 2),
(6791381, 641, -108.039902, 16.020000, -40.917110, -0.833898, 2),
(6791382, 641, -92.281548, 14.000000, -21.083309, 1.068863, 2),
(6791383, 641, -107.126099, 16.020000, -45.757679, 0.731770, 2),
(6791384, 641, -58.743690, 20.020000, -40.752991, -0.000000, 2),
(6791385, 641, -74.866074, 25.069981, -98.721611, 0.000000, 2),
(6791386, 641, -131.531204, 25.070000, -85.906303, 1.099375, 2),
(6791387, 641, -140.491196, 30.070000, -103.339897, -0.820122, 2),
(6791423, 641, -824.691589, 2.060000, -720.464111, 0.252924, 2),
(6791424, 641, -782.962585, 14.000000, -716.109009, 0.261799, 2),
(6791425, 641, -834.961304, 6.059998, -686.167908, 0.406839, 2),
(6791426, 641, -770.738708, 20.000000, -689.941528, -1.060374, 2),
(6791427, 641, -779.316223, 20.000000, -670.950073, 1.120677, 2),
(6791428, 641, -817.107178, 10.020000, -658.996277, 1.568754, 2),
(6791429, 641, -821.919373, 10.070000, -653.780823, -1.560577, 2),
(6791430, 641, -819.146912, 10.020000, -603.781311, -0.806422, 2),
(6791431, 641, -788.865417, 16.070000, -602.472778, -0.620165, 2),
(6791432, 641, -764.023376, 22.000000, -596.103210, -0.772447, 2),
(6791433, 641, -758.088379, 22.000000, -627.166992, 0.531067, 2),
(6791434, 641, -738.837280, 26.000000, -651.965393, 1.136686, 2),
(6791435, 641, -704.517212, 30.020000, -646.027588, 1.088929, 2),
(6791436, 641, -720.079529, 30.000000, -608.980591, 0.829399, 2),
(6791437, 641, -723.084229, 34.000000, -585.800720, -0.833591, 2),
(6791438, 641, -692.442078, 40.070000, -586.446106, 0.735144, 2),
(6791439, 641, -770.972473, 1.999999, -821.235474, -0.502044, 2),
(6791440, 641, -732.227417, 14.000000, -803.100525, -0.754293, 2),
(6791441, 641, -766.842773, 1.999990, -826.237976, 0.785080, 2),
(6791442, 641, -724.120422, 10.000000, -822.504578, 0.650296, 2),
(6791443, 641, -712.302612, 6.000000, -871.555176, -1.350629, 2),
(6791444, 641, -707.106628, 6.012829, -870.977173, 1.570451, 2),
(6791445, 641, -643.994629, 16.064920, -844.978271, -0.758775, 2),
(6791446, 641, -662.993225, 16.020000, -812.122681, -0.782288, 2),
(6791447, 641, -682.907104, 14.000000, -796.226318, -0.551188, 2),
(6791448, 641, -658.052673, 16.020000, -810.883118, 0.850858, 2),
(6791449, 641, -662.996277, 20.020000, -762.877075, 1.570451, 2),
(6791450, 641, -605.064514, 25.070000, -778.699097, 1.570451, 2),
(6791451, 641, -618.141479, 25.070000, -835.449524, 0.482173, 2),
(6791452, 641, -600.473877, 30.070000, -844.469788, 0.753605, 2),
(6663537, 641, -116.838898, 2.020000, 151.014404, 0.537591, 2),
(6663572, 641, -116.838898, 2.020000, 151.014404, 0.537591, 2),
(7450786, 641, -100.084702, 2.020000, 123.888199, 0.537591, 2),
(6663582, 641, -855.014404, 2.020000, -820.838928, 1.033205, 2),
(6663583, 641, -855.014404, 2.020000, -820.838928, 1.033205, 2);

15
src/scripts/common/aethernet/HousingAethernet.cpp
View file

@ -3,7 +3,8 @@
#include <Framework.h> #include <Framework.h>
#include <Exd/ExdDataGenerated.h> #include <Exd/ExdDataGenerated.h>
#include <Territory/Zone.h> #include <Territory/HousingZone.h>
#include <Manager/PlayerMgr.h>
using namespace Sapphire; using namespace Sapphire;
@ -24,8 +25,9 @@ public:
if( !pExdData ) if( !pExdData )
return; return;
auto housingAethernetIds = pExdData->getHousingAethernetIdList(); auto housingZone = std::dynamic_pointer_cast< HousingZone >( player.getCurrentZone() );
auto terrritoryTypeId = player.getCurrentZone()->getTerritoryTypeId(); if( !housingZone )
return;
// param2 is the index starting from 0 inside housingaethernet.exd, but the ID column starts at 0x001E0000........ wtf // param2 is the index starting from 0 inside housingaethernet.exd, but the ID column starts at 0x001E0000........ wtf
auto pHousingAethernet = pExdData->get< Sapphire::Data::HousingAethernet >( getId() + result.param2 ); auto pHousingAethernet = pExdData->get< Sapphire::Data::HousingAethernet >( getId() + result.param2 );
@ -36,7 +38,12 @@ public:
if( player.getCurrentZone()->getTerritoryTypeId() != pHousingAethernet->territoryType ) if( player.getCurrentZone()->getTerritoryTypeId() != pHousingAethernet->territoryType )
return; return;
player.sendDebug( "got level entry: {0}", pHousingAethernet->level ); // todo: this needs to be done properly and used queued zoning + aethernet animation
// moving a player inside an event will crash the game so we end it hre
player.eventFinish( eventId, 1 );
auto playerMgr = getFramework()->get< Sapphire::World::Manager::PlayerMgr >();
playerMgr->movePlayerToLandDestination( player, pHousingAethernet->level, housingZone->getWardNum() );
} ); } );
} }
}; };

2
src/world/Manager/BaseManager.h
View file

@ -9,7 +9,7 @@ namespace Sapphire::World::Manager
class BaseManager class BaseManager
{ {
public: public:
explicit BaseManager( FrameworkPtr pFw ) : m_pFw( pFw ) {}; explicit BaseManager( FrameworkPtr pFw ) : m_pFw( std::move( pFw ) ) {};
virtual ~BaseManager() = default; virtual ~BaseManager() = default;
FrameworkPtr framework() const FrameworkPtr framework() const

8
src/world/Manager/PlayerMgr.cpp
View file

@ -5,6 +5,7 @@
#include <Manager/TerritoryMgr.h> #include <Manager/TerritoryMgr.h>
#include <Territory/ZonePosition.h> #include <Territory/ZonePosition.h>
#include <Territory/Zone.h>
#include <Manager/HousingMgr.h> #include <Manager/HousingMgr.h>
@ -13,7 +14,7 @@
using namespace Sapphire::World::Manager; using namespace Sapphire::World::Manager;
Sapphire::World::Manager::PlayerMgr::PlayerMgr( Sapphire::FrameworkPtr pFw ) : Sapphire::World::Manager::PlayerMgr::PlayerMgr( Sapphire::FrameworkPtr pFw ) :
BaseManager( pFw ) BaseManager( std::move( pFw ) )
{ {
} }
@ -62,7 +63,12 @@ void Sapphire::World::Manager::PlayerMgr::movePlayerToLandDestination( Sapphire:
} }
if( !destinationZone ) if( !destinationZone )
{
player.sendDebug( "Unable to find applicable territory for Warp#{0}. "
"Check that it exists inside zonepositions table.",
landId );
return; return;
}
player.setPos( terriPos->getTargetPosition() ); player.setPos( terriPos->getTargetPosition() );
player.setRot( terriPos->getTargetRotation() ); player.setRot( terriPos->getTargetRotation() );