Merge TrinityCore master to multivendor_master [skip ci]

CMakeLists.txt

@@ -21,6 +21,7 @@ project(TrinityCore)
 cmake_policy(SET CMP0005 NEW)
 cmake_policy(SET CMP0043 NEW) # Ignore COMPILE_DEFINITIONS_<Config> properties
 cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as variables or keywords when unquoted - prevents intepreting if(SOME_STRING_VARIABLE MATCHES "MSVC") as if(SOME_STRING_VARIABLE MATCHES "1")
+cmake_policy(SET CMP0067 NEW) # Honor language standard in try_compile() source-file signature
 cmake_policy(SET CMP0074 NEW) # find_package() uses <PackageName>_ROOT variables
 
 if(POLICY CMP0144)

cmake/macros/ConfigureBaseTargets.cmake

@@ -13,14 +13,11 @@ add_library(trinity-compile-option-interface INTERFACE)
 
 # Use -std=c++11 instead of -std=gnu++11
 set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD 20)
 
 # An interface library to make the target features available to other targets
 add_library(trinity-feature-interface INTERFACE)
 
-target_compile_features(trinity-feature-interface
-  INTERFACE
-    cxx_std_20)
-
 # An interface library to make the warnings level available to other targets
 # This interface taget is set-up through the platform specific script
 add_library(trinity-warning-interface INTERFACE)

sql/updates/world/master/2024_02_29_00_world.sql

@@ -0,0 +1,80 @@
+-- Convert existing data to static flags. There may be some errors in conversion due to dirty unit flag that that's been dumped into the DB which needs manual fixups
+
+-- CREATURE_STATIC_FLAG_CAN_SWIM
+UPDATE `creature_template_difficulty` AS ctd LEFT JOIN `creature_template` AS ct ON ct.`entry` = ctd.`Entry`
+SET ctd.`StaticFlags1`= ctd.`StaticFlags1` | 0x10000000
+WHERE (ct.`unit_flags` & 0x00008000) != 0;
+
+UPDATE `creature_template_difficulty` AS ctd LEFT JOIN `creature_template` AS ct ON ct.`entry` = ctd.`Entry`
+SET ctd.`StaticFlags1`= ctd.`StaticFlags1` &~ 0x00000100
+WHERE (ct.`unit_flags` & 0x00008000) != 0;
+
+-- CREATURE_STATIC_FLAG_CANT_SWIM
+UPDATE `creature_template_difficulty` AS ctd LEFT JOIN `creature_template` AS ct ON ct.`entry` = ctd.`Entry`
+SET ctd.`StaticFlags1`= ctd.`StaticFlags1` | 0x00000100
+WHERE (ct.`unit_flags` & 0x00004000) != 0;
+
+UPDATE `creature_template_difficulty` AS ctd LEFT JOIN `creature_template` AS ct ON ct.`entry` = ctd.`Entry`
+SET ctd.`StaticFlags1`= ctd.`StaticFlags1` &~ 0x10000000
+WHERE (ct.`unit_flags` & 0x00004000) != 0;
+
+-- CREATURE_STATIC_FLAG_AMPHIBIOUS
+UPDATE `creature_template_difficulty` AS ctd 
+LEFT JOIN `creature_template_movement` AS ctm ON ctm.`CreatureId` = ctd.`Entry` 
+LEFT JOIN `creature_template` AS ct ON ct.`entry` = ctd.`Entry` 
+SET ctd.`StaticFlags1`= ctd.`StaticFlags1` | 0x00080000
+WHERE ctm.`Ground`= 1 AND ctm.`Swim`= 1 AND (ct.`unit_flags` & 0x00008000) = 0;
+
+-- CREATURE_STATIC_FLAG_SESSILE
+UPDATE `creature_template_difficulty` AS ctd LEFT JOIN `creature_template_movement` AS ctm ON ctm.`CreatureId` = ctd.`Entry`
+SET ctd.`StaticFlags1`= ctd.`StaticFlags1` | 0x00000100
+WHERE ctm.`Rooted`= 1;
+
+-- CREATURE_STATIC_FLAG_FLOATING
+UPDATE `creature_template_difficulty` AS ctd LEFT JOIN `creature_template_movement` AS ctm ON ctm.`CreatureId` = ctd.`Entry`
+SET ctd.`StaticFlags1`= ctd.`StaticFlags1` | 0x20000000
+WHERE ctm.`Flight`!= 0;
+
+-- CREATURE_STATIC_FLAG_AQUATIC
+UPDATE `creature_template_difficulty` AS ctd LEFT JOIN `creature_template_movement` AS ctm ON ctm.`CreatureId` = ctd.`Entry`
+SET ctd.`StaticFlags1`= ctd.`StaticFlags1` | 0x00040000
+WHERE ctm.`Ground`= 0 AND ctm.`Swim`= 1;
+
+-- CREATURE_STATIC_FLAG_3_CANNOT_TURN
+UPDATE `creature_template_difficulty` AS ctd LEFT JOIN `creature_template` AS ct ON ct.`entry` = ctd.`Entry`
+SET ctd.`StaticFlags3`= ctd.`StaticFlags3` | 0x02000000
+WHERE (ct.`unit_flags2` & 0x00008000) != 0;
+
+-- Remove unit flags that are now handled by static flags
+UPDATE `creature_template` SET `unit_flags`= `unit_flags` &~ (0x00008000 | 0x00004000);
+UPDATE `creature_template` SET `unit_flags2`= `unit_flags2` &~ 0x00008000;
+
+-- Add new movement settings
+ALTER TABLE `creature_template_movement`   
+	ADD COLUMN `HoverInitiallyEnabled` TINYINT UNSIGNED NULL AFTER `CreatureId`;
+
+UPDATE `creature_template_movement` SET `HoverInitiallyEnabled`= 1 WHERE `Ground` = 2;
+
+ALTER TABLE `creature_movement_override`   
+	ADD COLUMN `HoverInitiallyEnabled` TINYINT UNSIGNED NULL AFTER `SpawnId`;
+
+UPDATE `creature_movement_override` SET `HoverInitiallyEnabled`= 1 WHERE `Ground` = 2;
+
+-- Remove deprecated CREATURE_FLAG_EXTRA_NO_MOVE_FLAGS_UPDATE
+UPDATE `creature_template` SET `flags_extra`= `flags_extra` &~ 0x200;
+
+-- Conversion done. Drop old columns
+ALTER TABLE `creature_movement_override`   
+	DROP COLUMN `Ground`, 
+	DROP COLUMN `Swim`, 
+	DROP COLUMN `Flight`, 
+	DROP COLUMN `Rooted`;
+
+ALTER TABLE `creature_template_movement`   
+	DROP COLUMN `Ground`, 
+	DROP COLUMN `Swim`, 
+	DROP COLUMN `Flight`, 
+	DROP COLUMN `Rooted`;
+
+-- Converted a couple script hacks to static flags where they belong
+UPDATE `creature_template_difficulty` SET `StaticFlags1`= `StaticFlags1` | 0x00000100 WHERE `Entry` IN (37081, 38038);

sql/updates/world/master/2024_02_29_01_world.sql

@@ -0,0 +1,9 @@
+-- Remove falsely assigned data
+UPDATE `creature_template_difficulty` SET `StaticFlags1`= `StaticFlags1` &~0x00000100;
+UPDATE `creature_template_difficulty` SET `StaticFlags1`= `StaticFlags1` &~0x10000000;
+UPDATE `creature_template_difficulty` SET `StaticFlags3`= `StaticFlags3` &~0x00000100;
+
+-- Apply the correct data based on previous database data
+UPDATE `creature_template_difficulty` SET `StaticFlags1`= `StaticFlags1` | 0x00000100 WHERE `Entry` IN (1921, 2667, 2673, 2674, 5202, 5674, 6066, 7527, 8035, 9496, 12426, 14081, 14362, 15047, 16111, 16236, 16364, 16897, 17578, 18176, 18372, 18734, 18735, 18736, 18737, 18738, 19399, 19897, 20061, 21071, 21217, 21233, 21322, 22315, 22331, 22336, 22451, 22461, 23076, 23077, 23706, 23771, 23876, 24210, 24372, 24373, 24792, 25284, 25305, 25315, 25534, 26678, 27064, 27166, 27169, 27212, 27430, 27714, 27894, 28156, 28366, 28408, 28823, 29475, 29483, 29613, 29649, 29747, 29790, 30066, 30236, 30391, 30435, 30527, 31103, 31143, 31144, 31146, 31204, 31280, 31461, 31462, 31547, 32347, 32541, 32542, 32543, 32545, 32546, 32547, 32666, 32667, 32795, 32926, 32938, 33174, 33184, 33229, 33243, 33264, 33272, 33352, 33353, 33651, 34047, 34050, 34068, 34071, 34096, 34108, 34110, 34121, 34149, 34362, 34363, 36021, 36024, 36934, 37964, 38278, 38279, 38280, 38281, 38282, 38326, 38461, 38938, 38939, 38953, 42619, 42728, 43044, 43999, 44712, 44798, 44840, 45088, 45213, 47649, 49259, 51684, 51702, 51703, 51705, 51720, 54519, 54523, 54567, 58664, 59200, 59722, 59738, 60197, 83670, 88206, 95049, 96765, 98497, 99160, 99914, 101748, 105316, 110441, 122450, 122773, 122778, 122818, 123745, 123746, 124167, 130907, 135219, 139522, 139645, 142656, 152643, 153198, 153227, 154078, 154086, 154477, 154508, 154605, 154730, 154765, 155303, 155345, 155371, 156828, 160737, 180803, 187463, 193033, 194736, 194737, 195446, 196211, 197204, 197643, 198236, 37081, 38038);
+UPDATE `creature_template_difficulty` SET `StaticFlags1`= `StaticFlags1` | 0x10000000 WHERE `Entry` IN (46, 68, 89, 95, 121, 122, 126, 127, 171, 232, 285, 315, 334, 349, 379, 391, 397, 422, 435, 436, 437, 440, 449, 456, 458, 481, 485, 486, 502, 504, 513, 515, 517, 519, 520, 544, 545, 548, 578, 584, 587, 588, 589, 590, 595, 596, 597, 599, 615, 645, 660, 667, 669, 670, 671, 672, 689, 691, 694, 696, 697, 699, 701, 702, 706, 732, 735, 747, 750, 751, 752, 754, 780, 781, 782, 783, 784, 808, 813, 814, 824, 866, 871, 873, 875, 877, 879, 905, 946, 950, 1016, 1019, 1024, 1025, 1026, 1027, 1028, 1029, 1034, 1035, 1036, 1038, 1051, 1052, 1053, 1054, 1057, 1059, 1060, 1061, 1062, 1082, 1083, 1084, 1087, 1120, 1121, 1122, 1123, 1124, 1150, 1151, 1152, 1157, 1158, 1169, 1177, 1193, 1200, 1211, 1224, 1259, 1260, 1293, 1364, 1380, 1397, 1400, 1410, 1417, 1418, 1423, 1490, 1491, 1495, 1496, 1497, 1498, 1499, 1500, 1506, 1507, 1515, 1518, 1519, 1521, 1532, 1535, 1536, 1537, 1538, 1539, 1540, 1541, 1543, 1544, 1545, 1560, 1561, 1562, 1563, 1564, 1565, 1568, 1569, 1570, 1649, 1652, 1653, 1658, 1661, 1662, 1663, 1664, 1665, 1666, 1667, 1693, 1696, 1706, 1707, 1708, 1711, 1715, 1716, 1720, 1725, 1726, 1727, 1729, 1735, 1736, 1737, 1738, 1739, 1740, 1741, 1742, 1743, 1744, 1745, 1746, 1749, 1756, 1765, 1766, 1767, 1768, 1778, 1781, 1815, 1817, 1826, 1827, 1831, 1832, 1833, 1834, 1835, 1836, 1837, 1838, 1839, 1841, 1843, 1844, 1845, 1846, 1848, 1867, 1883, 1884, 1885, 1891, 1894, 1895, 1907, 1908, 1909, 1910, 1911, 1912, 1913, 1920, 1934, 1935, 1936, 1938, 1957, 1958, 1976, 1978, 1981, 2053, 2054, 2055, 2058, 2060, 2061, 2062, 2063, 2064, 2065, 2066, 2067, 2068, 2089, 2090, 2091, 2102, 2103, 2108, 2113, 2114, 2115, 2116, 2117, 2118, 2119, 2120, 2121, 2122, 2123, 2124, 2126, 2127, 2128, 2129, 2130, 2131, 2132, 2134, 2135, 2136, 2137, 2173, 2174, 2179, 2180, 2181, 2182, 2183, 2184, 2185, 2187, 2188, 2191, 2192, 2201, 2202, 2203, 2204, 2205, 2206, 2207, 2208, 2209, 2210, 2214, 2215, 2216, 2226, 2240, 2241, 2242, 2243, 2244, 2245, 2246, 2247, 2260, 2261, 2264, 2265, 2266, 2267, 2268, 2269, 2270, 2271, 2272, 2304, 2305, 2306, 2307, 2308, 2309, 2310, 2311, 2314, 2315, 2318, 2319, 2320, 2332, 2335, 2336, 2337, 2338, 2339, 2358, 2360, 2368, 2369, 2370, 2371, 2374, 2375, 2376, 2377, 2385, 2387, 2388, 2389, 2390, 2391, 2392, 2394, 2395, 2396, 2397, 2398, 2399, 2400, 2401, 2402, 2403, 2404, 2408, 2410, 2411, 2412, 2413, 2414, 2415, 2418, 2419, 2423, 2427, 2428, 2431, 2437, 2440, 2448, 2449, 2450, 2451, 2458, 2459, 2462, 2476, 2492, 2503, 2505, 2530, 2534, 2535, 2540, 2541, 2545, 2546, 2547, 2549, 2550, 2552, 2553, 2554, 2555, 2556, 2557, 2558, 2575, 2577, 2581, 2582, 2583, 2584, 2585, 2586, 2587, 2588, 2589, 2590, 2591, 2595, 2596, 2597, 2598, 2599, 2600, 2605, 2606, 2607, 2612, 2618, 2619, 2624, 2628, 2635, 2636, 2639, 2640, 2641, 2642, 2643, 2644, 2645, 2646, 2647, 2648, 2649, 2650, 2651, 2652, 2653, 2654, 2698, 2714, 2721, 2733, 2739, 2740, 2742, 2743, 2744, 2748, 2756, 2770, 2775, 2779, 2780, 2781, 2782, 2783, 2799, 2802, 2848, 2914, 2927, 2928, 2929, 2932, 2934, 2989, 2990, 3024, 3044, 3045, 3046, 3047, 3048, 3049, 3083, 3084, 3101, 3110, 3128, 3129, 3183, 3192, 3195, 3196, 3197, 3198, 3199, 3203, 3204, 3205, 3206, 3207, 3231, 3296, 3300, 3374, 3375, 3376, 3377, 3378, 3379, 3380, 3381, 3382, 3383, 3384, 3385, 3386, 3390, 3392, 3393, 3398, 3414, 3454, 3455, 3461, 3467, 3470, 3476, 3502, 3522, 3523, 3528, 3530, 3532, 3547, 3548, 3549, 3550, 3553, 3555, 3577, 3578, 3581, 3636, 3637, 3640, 3641, 3642, 3652, 3653, 3654, 3660, 3664, 3667, 3669, 3670, 3671, 3672, 3673, 3674, 3680, 3691, 3694, 3696, 3698, 3711, 3712, 3713, 3715, 3717, 3721, 3722, 3725, 3727, 3732, 3733, 3734, 3735, 3736, 3737, 3739, 3740, 3742, 3772, 3797, 3799, 3801, 3802, 3803, 3804, 3806, 3807, 3808, 3840, 3845, 3846, 3847, 3849, 3850, 3864, 3865, 3869, 3870, 3872, 3873, 3875, 3877, 3887, 3921, 3922, 3924, 3925, 3926, 3936, 3940, 3941, 3942, 3943, 3944, 3974, 3975, 3981, 3982, 3983, 3987, 4050, 4051, 4052, 4054, 4062, 4064, 4065, 4079, 4142, 4143, 4144, 4202, 4262, 4278, 4280, 4281, 4282, 4283, 4284, 4285, 4286, 4287, 4288, 4289, 4290, 4291, 4292, 4293, 4294, 4295, 4296, 4297, 4298, 4299, 4300, 4301, 4302, 4303, 4306, 4341, 4343, 4344, 4345, 4348, 4359, 4361, 4362, 4363, 4364, 4366, 4368, 4370, 4371, 4374, 4388, 4389, 4390, 4397, 4418, 4421, 4423, 4444, 4457, 4458, 4459, 4460, 4461, 4462, 4463, 4464, 4465, 4466, 4467, 4479, 4480, 4481, 4486, 4488, 4493, 4494, 4505, 4506, 4540, 4542, 4549, 4551, 4552, 4553, 4554, 4555, 4556, 4557, 4558, 4559, 4560, 4561, 4562, 4564, 4565, 4567, 4568, 4569, 4570, 4571, 4572, 4573, 4574, 4575, 4576, 4577, 4578, 4580, 4581, 4582, 4583, 4584, 4585, 4586, 4587, 4588, 4589, 4590, 4591, 4592, 4593, 4594, 4595, 4596, 4597, 4598, 4599, 4600, 4601, 4602, 4603, 4604, 4605, 4607, 4608, 4609, 4611, 4613, 4614, 4615, 4616, 4617, 4619, 4624, 4677, 4679, 4680, 4682, 4684, 4711, 4712, 4713, 4714, 4715, 4716, 4718, 4719, 4731, 4773, 4775, 4787, 4798, 4799, 4802, 4803, 4805, 4807, 4809, 4810, 4811, 4812, 4813, 4814, 4815, 4818, 4819, 4820, 4822, 4823, 4824, 4825, 4827, 4829, 4830, 4831, 4832, 4841, 4844, 4845, 4846, 4847, 4848, 4849, 4850, 4852, 4853, 4854, 4855, 4860, 4861, 4863, 4880, 4887, 4953, 4968, 4977, 4978, 5029, 5034, 5048, 5052, 5053, 5056, 5085, 5086, 5185, 5186, 5190, 5204, 5224, 5225, 5243, 5256, 5259, 5261, 5263, 5267, 5269, 5270, 5271, 5273, 5277, 5280, 5283, 5291, 5331, 5332, 5333, 5334, 5335, 5336, 5337, 5343, 5355, 5401, 5414, 5418, 5431, 5434, 5435, 5543, 5595, 5624, 5629, 5643, 5645, 5646, 5647, 5648, 5649, 5650, 5651, 5653, 5654, 5655, 5656, 5657, 5658, 5659, 5660, 5661, 5662, 5663, 5664, 5665, 5667, 5668, 5669, 5670, 5675, 5677, 5679, 5682, 5683, 5688, 5690, 5693, 5695, 5696, 5698, 5699, 5700, 5701, 5702, 5703, 5704, 5705, 5706, 5707, 5709, 5710, 5711, 5712, 5713, 5714, 5715, 5716, 5717, 5719, 5720, 5721, 5722, 5724, 5725, 5728, 5731, 5732, 5733, 5734, 5744, 5747, 5753, 5754, 5755, 5756, 5757, 5758, 5759, 5761, 5762, 5771, 5775);
+UPDATE `creature_template_difficulty` SET `StaticFlags3`= `StaticFlags3` | 0x00000100 WHERE `Entry` IN (1492, 1493, 1494, 5359, 11475, 13276, 16300, 21213, 27593, 27881, 27894, 28094, 28312, 28319, 28781, 32627, 32629, 32795, 32796, 33059, 33060, 33062, 33063, 33067, 33109, 33114, 33139, 33167, 33264, 34045, 34111, 34132, 34207, 34775, 34776, 34777, 34778, 34793, 34802, 34812, 34819, 34822, 34823, 34824, 34929, 34935, 34944, 35069, 35150, 35163, 35273, 35335, 35336, 35410, 35413, 35415, 35417, 35419, 35421, 35427, 35429, 35431, 35433, 35436, 36355, 36356, 36357, 36358, 36838, 36839, 36868, 37593, 38150, 38224, 39022, 39376, 39389, 39411, 39874, 39877, 40036, 40221, 40431, 40639, 40641, 40646, 40760, 40761, 40764, 40785, 40831, 40987, 41115, 41235, 41256, 41281, 41535, 41562, 41600, 41636, 41639, 41641, 41779, 41780, 41783, 41784, 42087, 42173, 42244, 42248, 42249, 42314, 42388, 42472, 42475, 42673, 43007, 43370, 43373, 43388, 43442, 43804, 43810, 44218, 44519, 44679, 44973, 45462, 46167, 46468, 46470, 47210, 47872, 50047, 50378, 52552, 53535, 55370, 56007, 56008, 56226, 56360, 56509, 56583, 56671, 56931, 57215, 57285, 57422, 57456, 57710, 57741, 57804, 58867, 59015, 59409, 59439, 59456, 59497, 59720, 59883, 59920, 59957, 60139, 60705, 60722, 60780, 60858, 61061, 61547, 61558, 62026, 62167, 62473, 62482, 62483, 62502, 62536, 62670, 62759, 62760, 63603, 65854, 65984, 66102, 66186, 66191, 66197, 66371, 66916, 67328, 67341, 67343, 67392, 67393, 67394, 67411, 67671, 67694, 67712, 67779, 67784, 67792, 67839, 67862, 67863, 69343, 69420, 69421, 69423, 69449, 69450, 69574, 69575, 69576, 69577, 69578, 69592, 69604, 69608, 69759, 69798, 69813, 70283, 70344, 70500, 70577, 70755, 70889, 70894, 71054, 71167, 71287, 71289, 71294, 71331, 71364, 71365, 71366, 71452, 71590, 72194, 72390, 72847, 73034, 73400, 77015, 78902, 78903, 79256, 79390, 79395, 79603, 80323, 80578, 80957, 81627, 84864, 85211, 85820, 89884, 90435, 90554, 90775, 90797, 90804, 91068, 91524, 91819, 92967, 93151, 93758, 94492, 94777, 94779, 94816, 95261, 96159, 96400, 96402, 97057, 97287, 97584, 98484, 101870, 102231, 102518, 103176, 103656, 104314, 106286, 110903, 111404, 111889, 112421, 114569, 114570, 114579, 115747, 116804, 116939, 117054, 117250, 117251, 117446, 118816, 118821, 118827, 118925, 119395, 119489, 119859, 119959, 119986, 120021, 120060, 120102, 120707, 121045, 123103, 123884, 124294, 124408, 124927, 124930, 125103, 126334, 126336, 126341, 126876, 127178, 128299, 128822, 128823, 128824, 128825, 128826, 128827, 128828, 128829, 128830, 128831, 128832, 128833, 128834, 128835, 128839, 128840, 128841, 128859, 128869, 129017, 129783, 129954, 131663, 131693, 131861, 131862, 131900, 131902, 132702, 133046, 133354, 133370, 133405, 133429, 133490, 133612, 133820, 133840, 133845, 133900, 134469, 134765, 134961, 135497, 136016, 136037, 136608, 137050, 137053, 137054, 137235, 137708, 138798, 138977, 139438, 139442, 139443, 139467, 139468, 139471, 139472, 139486, 139529, 139530, 139787, 140525, 140536, 140543, 140571, 140579, 140580, 140717, 140718, 141038, 141045, 141728, 141858, 141860, 141872, 142432, 142750, 142793, 142803, 142824, 143029, 143030, 143059, 143060, 143093, 143170, 143225, 143488, 143567, 143712, 143713, 144181, 146095, 146161, 146162, 146163, 146210, 146211, 146212, 146379, 146898, 146903, 147394, 147450, 147662, 147942, 147970, 148025, 148031, 148037, 148040, 148103, 148497, 148634, 148649, 148654, 148661, 148974, 149212, 149213, 149955, 150344, 150841, 151159, 151331, 151609, 151863, 151893, 152163, 152197, 152513, 152515, 152586, 152658, 152659, 152714, 152766, 152847, 153697, 154639, 154727, 156042, 156890, 157277, 157725, 157898, 158001, 159678, 159732, 160580, 160594, 161953, 162183, 162254, 162809, 162810, 162811, 162855, 163714, 163894, 164718, 164719, 165565, 165576, 165845, 168268, 168497, 168634, 168984, 169158, 169191, 169220, 169263, 169308, 169444, 169555, 169618, 169692, 169843, 169914, 170022, 170065, 170243, 170244, 170328, 170336, 170390, 170392, 170395, 170397, 170399, 171381, 171561, 171585, 171590, 172624, 172799, 172965, 173888, 175535, 176315, 176568, 176569, 177142);

sql/updates/world/master/2024_02_29_02_world.sql

@@ -0,0 +1,9 @@
+-- Can Swim
+UPDATE `creature_template_difficulty` SET `StaticFlags1`= `StaticFlags1` | 0x10000000 WHERE `Entry` IN (40219, 41017, 40309, 40223, 39913, 41002, 41997, 41998);
+-- Amphibious
+UPDATE `creature_template_difficulty` SET `StaticFlags1`= `StaticFlags1` | 0x00080000 WHERE `Entry` IN (40276, 39918, 40987);
+-- Cannot Swim
+UPDATE `creature_template_difficulty` SET `StaticFlags3`= `StaticFlags3` | 0x00000100 WHERE `Entry`= 40987;
+
+-- Add some wander distance to creatures
+UPDATE `creature` SET `wander_distance`= 5, `MovementType`= 1 WHERE `guid` IN (349183, 349406, 349410, 349412, 349413, 349420, 349421, 349427, 349428, 349430, 349431, 349437, 349438, 349448, 349456, 349461, 349514, 349520, 349521, 349535, 349537, 349538, 349562, 349565, 349602, 349609, 349611, 349659, 349660, 349664, 349674, 349676, 349689, 349704, 349721, 349732, 349733, 349745, 349750, 349751, 349768, 349771);