Skip to content

Commit

Permalink
Merge branch '3.3.5' into npcbots_3.3.5
Browse files Browse the repository at this point in the history 
# Conflicts:
#	src/server/game/Entities/Unit/Unit.h
  • Loading branch information
@trickerer
trickerer committed Oct 25, 2024
2 parents 4f71404 + f93a500 commit dca2df7
Show file tree
Hide file tree
Showing 13 changed files with 2,640 additions and 648 deletions.
1,392 changes: 1,392 additions & 0 deletions data/sql/updates/db_world/2024_10_22_00.sql
View file

Large diffs are not rendered by default.

29 changes: 29 additions & 0 deletions data/sql/updates/db_world/2024_10_24_00.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
-- DB update 2024_10_22_00 -> 2024_10_24_00
-- Update gameobject 'Water Barrel' with sniffed values
-- updated spawns
DELETE FROM `gameobject` WHERE (`id` IN (186234))
AND (`guid` IN (39922, 43047, 43048, 43051, 43055, 43064, 43072, 43077, 66914, 66923, 66927, 78408));
INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES
(39922, 186234, 0, 0, 0, 1, 1, -9374.9619140625, 52.44444656372070312, 60.75905227661132812, 2.792518377304077148, 0, 0, 0.984807014465332031, 0.173652306199073791, 120, 255, 1, "", 46158, NULL),
(43047, 186234, 1, 0, 0, 1, 1, 352.680572509765625, -4740.74658203125, 9.621239662170410156, 3.263772249221801757, 0, 0, -0.99813461303710937, 0.061051756143569946, 120, 255, 1, "", 45942, NULL),
(43048, 186234, 1, 0, 0, 1, 1, 239.62872314453125, -4562.00830078125, 14.27222061157226562, 2.792518377304077148, 0, 0, 0.984807014465332031, 0.173652306199073791, 120, 255, 1, "", 45942, NULL),
(43051, 186234, 530, 0, 0, 1, 1, 9510.8359375, -6811.96533203125, 16.48661231994628906, 0.418878614902496337, 0, 0, 0.207911491394042968, 0.978147625923156738, 120, 255, 1, "", 45942, NULL),
(43055, 186234, 0, 0, 0, 1, 1, 2232.4375, 277.013885498046875, 34.78683853149414062, 3.263772249221801757, 0, 0, -0.99813461303710937, 0.061051756143569946, 120, 255, 1, "", 45942, NULL),
(43064, 186234, 530, 0, 0, 1, 1, -4185.75341796875, -12504.5302734375, 44.36132049560546875, 3.94444584846496582, 0, 0, -0.92050457000732421, 0.3907318115234375, 120, 255, 1, "", 46158, NULL),
(43072, 186234, 0, 0, 0, 1, 1, -5751.90087890625, -483.79339599609375, 396.50201416015625, 2.234017848968505859, 0, 0, 0.898793220520019531, 0.438372820615768432, 120, 255, 1, "", 46158, NULL),
(43077, 186234, 0, 0, 0, 1, 1, -5624.01611328125, -478.673828125, 396.980255126953125, 3.263772249221801757, 0, 0, -0.99813461303710937, 0.061051756143569946, 120, 255, 1, "", 46158, NULL),
(66914, 186234, 530, 0, 0, 1, 1, -4193.51025390625, -12277.8232421875, 0.310070991516113281, 1.256635904312133789, 0, 0, 0.587784767150878906, 0.809017360210418701, 120, 255, 1, "", 45942, NULL),
(66923, 186234, 0, 0, 0, 1, 1, 2254.413330078125, 474.39410400390625, 33.878875732421875, 2.792518377304077148, 0, 0, 0.984807014465332031, 0.173652306199073791, 120, 255, 1, "", 46158, NULL),
(66927, 186234, 0, 0, 0, 1, 1, -9432.3642578125, 60.296875, 56.40962600708007812, 3.263772249221801757, 0, 0, -0.99813461303710937, 0.061051756143569946, 120, 255, 1, "", 46158, NULL),
(78408, 186234, 530, 0, 0, 1, 1, 9235.0615234375, -6770.26318359375, 24.79453277587890625, 2.792518377304077148, 0, 0, 0.984807014465332031, 0.173652306199073791, 120, 255, 1, "", 45942, NULL);

-- remove duplicate spawns
DELETE FROM `gameobject` WHERE (`id` IN (186234))
AND (`guid` IN (240002));
DELETE FROM `gameobject_addon` WHERE (`guid` IN (240002));
DELETE FROM `game_event_gameobject` WHERE (`eventEntry` = 12) AND (`guid` IN (240002));

-- enable all spawns for eventEntry 12
DELETE FROM `game_event_gameobject` WHERE (`eventEntry` = 12)
AND (`guid` IN (SELECT `guid` FROM `gameobject` WHERE `id` IN (186234)));
INSERT INTO `game_event_gameobject` (SELECT 12, `guid` FROM `gameobject` WHERE `id` IN (186234));
43 changes: 43 additions & 0 deletions data/sql/updates/db_world/2024_10_24_01.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
-- DB update 2024_10_24_00 -> 2024_10_24_01
-- Update gameobject 'Water Bucket(s)' with sniffed values
-- updated spawns
DELETE FROM `gameobject` WHERE (`id` IN (186615, 186614))
AND (`guid` IN (43058, 43059, 43060, 43065, 43066, 43074, 43075, 43076, 66915, 66916, 66920, 66924, 66928));
INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES
(43058, 186615, 0, 0, 0, 1, 1, 2234.30908203125, 277.072906494140625, 34.718231201171875, 5.84685373306274414, 0, 0, -0.21643924713134765, 0.976296067237854003, 120, 255, 1, "", 45942, NULL),
(43059, 186614, 0, 0, 0, 1, 1, 2233.026123046875, 279.588531494140625, 34.95489120483398437, 1.797688722610473632, 0, 0, 0.7826080322265625, 0.622514784336090087, 120, 255, 1, "", 45942, NULL),
(43060, 186614, 0, 0, 0, 1, 1, 2232.5, 275.317718505859375, 34.7205810546875, 2.70525527000427246, 0, 0, 0.97629547119140625, 0.216442063450813293, 120, 255, 1, "", 45942, NULL),
(43065, 186615, 530, 0, 0, 1, 1, -4185.22119140625, -12506.474609375, 44.36132049560546875, 5.009094715118408203, 0, 0, -0.59482288360595703, 0.80385679006576538, 120, 255, 1, "", 46158, NULL),
(43066, 186614, 530, 0, 0, 1, 1, -4187.3759765625, -12504.0244140625, 44.36132049560546875, 5.969027042388916015, 0, 0, -0.1564340591430664, 0.987688362598419189, 120, 255, 1, "", 46158, NULL),
(43074, 186615, 0, 0, 0, 1, 1, -5625.37158203125, -477.26605224609375, 396.862213134765625, 2.530723094940185546, 0, 0, 0.953716278076171875, 0.300707906484603881, 120, 255, 1, "", 46158, NULL),
(43075, 186614, 0, 0, 0, 1, 1, -5623.4853515625, -477.085845947265625, 396.980255126953125, 1.134462952613830566, 0, 0, 0.537299156188964843, 0.843391716480255126, 120, 255, 1, "", 46158, NULL),
(43076, 186614, 0, 0, 0, 1, 1, -5622.24609375, -478.1807861328125, 396.980255126953125, 0.296705186367034912, 0, 0, 0.147809028625488281, 0.989015936851501464, 120, 255, 1, "", 46158, NULL),
(66915, 186615, 530, 0, 0, 1, 1, -4192.17724609375, -12279.00390625, -0.03774299845099449, 5.061456203460693359, 0, 0, -0.57357597351074218, 0.819152355194091796, 120, 255, 1, "", 45942, NULL),
(66916, 186614, 530, 0, 0, 1, 1, -4186.720703125, -12506.3583984375, 44.36132049560546875, 4.45059061050415039, 0, 0, -0.79335308074951171, 0.608761727809906005, 120, 255, 1, "", 46158, NULL),
(66920, 186615, 1, 0, 0, 1, 1, 354.798614501953125, -4740.95166015625, 9.784435272216796875, 2.513273954391479492, 0, 0, 0.951056480407714843, 0.309017121791839599, 120, 255, 1, "", 45942, NULL),
(66924, 186615, 0, 0, 0, 1, 1, 2254.22216796875, 476.39410400390625, 33.8637542724609375, 1.448621988296508789, 0, 0, 0.662619590759277343, 0.748956084251403808, 120, 255, 1, "", 46158, NULL),
(66928, 186615, 0, 0, 0, 1, 1, -9432.5419921875, 62.31770706176757812, 56.53895950317382812, 4.310965538024902343, 0, 0, -0.83388519287109375, 0.55193793773651123, 120, 255, 1, "", 46158, NULL);

-- new spawns
DELETE FROM `gameobject` WHERE (`id` IN (186614))
AND (`guid` IN (141, 142, 143, 144, 145, 146, 147, 148));
INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES
(141, 186614, 0, 0, 0, 1, 1, -9433.3798828125, 61.65451431274414062, 56.49617385864257812, 2.321286916732788085, 0, 0, 0.917059898376464843, 0.398749500513076782, 120, 255, 1, "", 46158, NULL),
(142, 186614, 0, 0, 0, 1, 1, -9433.419921875, 62.27604293823242187, 56.48929977416992187, 2.164205789566040039, 0, 0, 0.882946968078613281, 0.469472706317901611, 120, 255, 1, "", 46158, NULL),
(143, 186614, 0, 0, 0, 1, 1, 2255.53125, 476.2725830078125, 33.83548355102539062, 4.310965538024902343, 0, 0, -0.83388519287109375, 0.55193793773651123, 120, 255, 1, "", 46158, NULL),
(144, 186614, 0, 0, 0, 1, 1, 2255.864501953125, 473.28472900390625, 33.88770294189453125, 4.171337604522705078, 0, 0, -0.87035560607910156, 0.492423713207244873, 120, 255, 1, "", 46158, NULL),
(145, 186614, 1, 0, 0, 1, 1, 353.911468505859375, -4739.3349609375, 9.757994651794433593, 2.251473426818847656, 0, 0, 0.902585029602050781, 0.430511653423309326, 120, 255, 1, "", 45942, NULL),
(146, 186614, 1, 0, 0, 1, 1, 354.51214599609375, -4739.88720703125, 9.747790336608886718, 6.056293010711669921, 0, 0, -0.11320304870605468, 0.993571877479553222, 120, 255, 1, "", 45942, NULL),
(147, 186614, 530, 0, 0, 1, 1, -4191.74462890625, -12277.638671875, 0.059397000819444656, 4.625123500823974609, 0, 0, -0.73727703094482421, 0.67559051513671875, 120, 255, 1, "", 45942, NULL),
(148, 186614, 530, 0, 0, 1, 1, -4193.408203125, -12279.6357421875, 0.272792011499404907, 2.757613182067871093, 0, 0, 0.981626510620117187, 0.190812408924102783, 120, 255, 1, "", 45942, NULL);

-- remove duplicate spawns
DELETE FROM `gameobject` WHERE (`id` IN (186615))
AND (`guid` IN (66917, 66926, 66921, 66929));
DELETE FROM `gameobject_addon` WHERE (`guid` IN (66917, 66926, 66921, 66929));
DELETE FROM `game_event_gameobject` WHERE (`eventEntry` = 12) AND (`guid` IN (66917, 66926, 66921, 66929));

-- enable all spawns for eventEntry 12
DELETE FROM `game_event_gameobject` WHERE (`eventEntry` = 12)
AND (`guid` IN (SELECT `guid` FROM `gameobject` WHERE `id` IN (186614, 186615)));
INSERT INTO `game_event_gameobject` (SELECT 12, `guid` FROM `gameobject` WHERE `id` IN (186614, 186615));
46 changes: 46 additions & 0 deletions data/sql/updates/db_world/2024_10_24_02.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
-- DB update 2024_10_24_01 -> 2024_10_24_02
-- Update gameobject 'Fire Effigy' with sniffed values
-- updated spawns
DELETE FROM `gameobject` WHERE (`id` IN (186720))
AND (`guid` IN (43049, 43050, 43056, 43057, 43061, 43062, 43068, 43071, 43073, 43080, 43081, 66913, 66918, 66919, 66922, 66925, 78404, 78405, 78406, 78407));
INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES
(43049, 186720, 1, 0, 0, 1, 1, 286.56463623046875, -4561.451171875, 27.57416343688964843, 2.426007747650146484, 0, 0, 0.936672210693359375, 0.350207358598709106, 120, 255, 1, "", 45942, NULL),
(43050, 186720, 530, 0, 0, 1, 1, 9235.0498046875, -6783.404296875, 25.44256019592285156, 1.570795774459838867, 0, 0, 0.707106590270996093, 0.707106947898864746, 120, 255, 1, "", 45942, NULL),
(43056, 186720, 0, 0, 0, 1, 1, 2240.437255859375, 459.159027099609375, 38.28380584716796875, 0.820303261280059814, 0, 0, 0.398748397827148437, 0.917060375213623046, 120, 255, 1, "", 46158, NULL),
(43057, 186720, 0, 0, 0, 1, 1, 2239.491455078125, 487.861114501953125, 37.34464263916015625, 5.567600727081298828, 0, 0, -0.35020732879638671, 0.936672210693359375, 120, 255, 1, "", 46158, NULL),
(43061, 186720, 0, 0, 0, 1, 1, -9328.25, 56.27777862548828125, 62.25088882446289062, 2.600535154342651367, 0, 0, 0.963629722595214843, 0.26724100112915039, 120, 255, 1, "", 46158, NULL),
(43062, 186720, 0, 0, 0, 1, 1, -9314.1015625, 52.45621871948242187, 76.734344482421875, 2.932138919830322265, 0, 0, 0.994521141052246093, 0.104535527527332305, 120, 255, 1, "", 46158, NULL),
(43068, 186720, 530, 0, 0, 1, 1, -4207.84423828125, -12276.7001953125, 3.820851087570190429, 6.213373661041259765, 0, 0, -0.03489875793457031, 0.999390840530395507, 120, 255, 1, "", 45942, NULL),
(43071, 186720, 530, 0, 0, 1, 1, -4192.38427734375, -12268.05859375, 1.533890008926391601, 4.555310726165771484, 0, 0, -0.76040554046630859, 0.649448513984680175, 120, 255, 1, "", 45942, NULL),
(43073, 186720, 0, 0, 0, 1, 1, -5753.23779296875, -533.6519775390625, 404.02215576171875, 1.151916384696960449, 0, 0, 0.544638633728027343, 0.838670849800109863, 120, 255, 1, "", 46158, NULL),
(43080, 186720, 0, 0, 0, 1, 1, -5761.1650390625, -528.19342041015625, 403.854522705078125, 1.169368624687194824, 0, 0, 0.551936149597167968, 0.833886384963989257, 120, 255, 1, "", 46158, NULL),
(43081, 186720, 0, 0, 0, 1, 1, -5747.51708984375, -527.633544921875, 400.29693603515625, 0.610863447189331054, 0, 0, 0.3007049560546875, 0.953717231750488281, 120, 255, 1, "", 46158, NULL),
(66913, 186720, 530, 0, 0, 1, 1, -4203.6767578125, -12270.6162109375, 3.725678920745849609, 5.672322273254394531, 0, 0, -0.3007049560546875, 0.953717231750488281, 120, 255, 1, "", 45942, NULL),
(66918, 186720, 1, 0, 0, 1, 1, 278.171875, -4568.798828125, 23.63827133178710937, 1.640606880187988281, 0, 0, 0.731352806091308593, 0.6819993257522583, 120, 255, 1, "", 45942, NULL),
(66919, 186720, 1, 0, 0, 1, 1, 292.4097900390625, -4558.64697265625, 28.58396339416503906, 3.281238555908203125, 0, 0, -0.99756336212158203, 0.069766148924827575, 120, 255, 1, "", 45942, NULL),
(66922, 186720, 0, 0, 0, 1, 1, 2235.046875, 472.654510498046875, 37.98011398315429687, 0.104719325900077819, 0, 0, 0.052335739135742187, 0.998629570007324218, 120, 255, 1, "", 46158, NULL),
(66925, 186720, 0, 0, 0, 1, 1, -9313.744140625, 45.86735153198242187, 72.55771636962890625, 4.136432647705078125, 0, 0, -0.87881660461425781, 0.477159708738327026, 120, 255, 1, "", 46158, NULL),
(78404, 186720, 530, 0, 0, 1, 1, 9225.4619140625, -6765.23388671875, 26.05803871154785156, 5.794494152069091796, 0, 0, -0.24192142486572265, 0.970295846462249755, 120, 255, 1, "", 45942, NULL),
(78405, 186720, 530, 0, 0, 1, 1, 9229.306640625, -6780.560546875, 27.05394935607910156, 1.082102894783020019, 0, 0, 0.51503753662109375, 0.857167601585388183, 120, 255, 1, "", 45942, NULL),
(78406, 186720, 530, 0, 0, 1, 1, 9224.697265625, -6771.0048828125, 27.25944709777832031, 0.069811686873435974, 0, 0, 0.034898757934570312, 0.999390840530395507, 120, 255, 1, "", 45942, NULL),
(78407, 186720, 530, 0, 0, 1, 1, 9224.1533203125, -6777.71533203125, 28.38528251647949218, 0.663223206996917724, 0, 0, 0.325567245483398437, 0.945518851280212402, 120, 255, 1, "", 45942, NULL);

-- new spawns
DELETE FROM `gameobject` WHERE (`id` IN (186720))
AND (`guid` IN (306, 307, 308, 309, 310, 311, 312, 313, 314, 315));
INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES
(306, 186720, 0, 0, 0, 1, 1, -5754.20556640625, -527.0972900390625, 402.495208740234375, 1.221729278564453125, 0, 0, 0.573575973510742187, 0.819152355194091796, 120, 255, 1, "", 46158, NULL),
(307, 186720, 0, 0, 0, 1, 1, -5758.470703125, -521.98565673828125, 399.218231201171875, 1.448621988296508789, 0, 0, 0.662619590759277343, 0.748956084251403808, 120, 255, 1, "", 46158, NULL),
(308, 186720, 0, 0, 0, 1, 1, -9313.2646484375, 58.74604034423828125, 75.66614532470703125, 2.827429771423339843, 0, 0, 0.987688064575195312, 0.156436234712600708, 120, 255, 1, "", 46158, NULL),
(309, 186720, 0, 0, 0, 1, 1, -9321.9033203125, 64.38889312744140625, 65.790313720703125, 2.757613182067871093, 0, 0, 0.981626510620117187, 0.190812408924102783, 120, 255, 1, "", 46158, NULL),
(310, 186720, 0, 0, 0, 1, 1, 2230.421875, 464.664947509765625, 40.39760208129882812, 0.401424884796142578, 0, 0, 0.199367523193359375, 0.979924798011779785, 120, 255, 1, "", 46158, NULL),
(311, 186720, 0, 0, 0, 1, 1, 2231.30029296875, 482.6163330078125, 39.66044235229492187, 5.95157480239868164, 0, 0, -0.16504669189453125, 0.986285746097564697, 120, 255, 1, "", 46158, NULL),
(312, 186720, 1, 0, 0, 1, 1, 289.5565185546875, -4568.08935546875, 36.36351776123046875, 2.251473426818847656, 0, 0, 0.902585029602050781, 0.430511653423309326, 120, 255, 1, "", 45942, NULL),
(313, 186720, 1, 0, 0, 1, 1, 296.09600830078125, -4565.25244140625, 36.67078399658203125, 1.343901276588439941, 0, 0, 0.622513771057128906, 0.78260880708694458, 120, 255, 1, "", 45942, NULL),
(314, 186720, 530, 0, 0, 1, 1, -4198.7509765625, -12264.4716796875, 3.053963899612426757, 5.078907966613769531, 0, 0, -0.56640625, 0.824126183986663818, 120, 255, 1, "", 45942, NULL),
(315, 186720, 530, 0, 0, 1, 1, -4203.6708984375, -12283.0791015625, 2.483135938644409179, 0.506144583225250244, 0, 0, 0.250379562377929687, 0.968147754669189453, 120, 255, 1, "", 45942, NULL);

-- enable all spawns for eventEntry 12
DELETE FROM `game_event_gameobject` WHERE (`eventEntry` = 12)
AND (`guid` IN (SELECT `guid` FROM `gameobject` WHERE `id` IN (186720)));
INSERT INTO `game_event_gameobject` (SELECT 12, `guid` FROM `gameobject` WHERE `id` IN (186720));
Loading

0 comments on commit dca2df7

Please sign in to comment.