Skip to content

Commit 041d31a

Browse files
github-actions[bot]github-actions[bot]
committed
Merge AzerothCore 3.3.5 to ElunaAzerothcore [skip ci]
2 parents 83b6bee + 771253f commit 041d31a

6 files changed

Lines changed: 120 additions & 5 deletions

File tree

‎.vscode/settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"deno.path": "deps/deno/bin/deno",
121121
"deno.lint": true,
122122
"C_Cpp.default.compileCommands": "${workspaceFolder}/build/compile_commands.json",
123-
"C_Cpp.default.cppStandard": "c++17",
123+
"C_Cpp.default.cppStandard": "c++20",
124124
"C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
125125
"C_Cpp.default.compilerPath": "/usr/bin/clang",
126126
"cmake.sourceDirectory": ["${workspaceFolder}"],

‎data/sql/updates/db_world/2026_05_18_02.sql‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
-- DB update 2026_05_18_01 -> 2026_05_18_02
2+
3+
-- Add Waypoints.
4+
DELETE FROM `waypoint_data` WHERE (`id` IN (4507400, 4507401, 4507402, 4507600, 4507601, 4507602));
5+
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
6+
(4507400, 1, 2608.3418, 899.7364, 107.58177, NULL, 0, 0, 0, 100, 0),
7+
(4507400, 2, 2624.7976, 947.18243, 110.12946, NULL, 0, 0, 0, 100, 0),
8+
(4507400, 3, 2618.49, 966.5148, 109.42407, NULL, 0, 0, 0, 100, 0),
9+
(4507400, 4, 2619.804, 989.7631, 106.12151, NULL, 0, 0, 0, 100, 0),
10+
(4507400, 5, 2617.1274, 1017.7855, 101.755936, NULL, 0, 0, 0, 100, 0),
11+
(4507401, 1, 2600.6504, 1048.624, 93.496185, NULL, 0, 0, 0, 100, 0),
12+
(4507401, 2, 2589.536, 1059.0297, 89.56834, NULL, 0, 0, 0, 100, 0),
13+
(4507401, 3, 2569.1755, 1054.2401, 87.35494, NULL, 0, 0, 0, 100, 0),
14+
(4507401, 4, 2558.293, 1038.8096, 89.36693, NULL, 0, 0, 0, 100, 0),
15+
(4507401, 5, 2550.0022, 1004.9842, 87.71258, NULL, 0, 0, 0, 100, 0),
16+
(4507401, 6, 2545.9758, 980.9874, 89.43088, NULL, 0, 0, 0, 100, 0),
17+
(4507401, 7, 2549.259, 960.1463, 92.66641, NULL, 0, 0, 0, 100, 0),
18+
(4507401, 8, 2551.3828, 938.38605, 94.25331, NULL, 0, 0, 0, 100, 0),
19+
(4507401, 9, 2555.0618, 909.3912, 92.80936, NULL, 0, 0, 0, 100, 0),
20+
(4507401, 10, 2565.865, 900.8129, 97.85348, NULL, 0, 0, 0, 100, 0),
21+
(4507401, 11, 2577.343, 895.7319, 102.08586, NULL, 0, 0, 0, 100, 0),
22+
(4507401, 12, 2598.8699, 891.75824, 105.841194, NULL, 0, 0, 0, 100, 0),
23+
(4507401, 13, 2614.4822, 901.33856, 108.39671, NULL, 0, 0, 0, 100, 0),
24+
(4507401, 14, 2622.1265, 909.65356, 108.724594, NULL, 0, 0, 0, 100, 0),
25+
(4507401, 15, 2633.543, 917.7471, 109.40559, NULL, 0, 0, 0, 100, 0),
26+
(4507401, 16, 2648.4504, 921.5999, 110.50832, NULL, 0, 0, 0, 100, 0),
27+
(4507401, 17, 2669.6716, 924.7839, 110.8462, NULL, 0, 0, 0, 100, 0),
28+
(4507401, 18, 2687.3997, 942.2614, 110.87393, NULL, 0, 0, 0, 100, 0),
29+
(4507401, 19, 2698.3833, 959.3796, 111.991165, NULL, 0, 0, 0, 100, 0),
30+
(4507401, 20, 2705.1965, 978.1737, 111.370476, NULL, 0, 0, 0, 100, 0),
31+
(4507401, 21, 2712.3142, 997.7814, 110.820724, NULL, 0, 0, 0, 100, 0),
32+
(4507401, 22, 2717.2004, 1014.1006, 110.820496, NULL, 0, 0, 0, 100, 0),
33+
(4507402, 1, 2706.9329, 977.25806, 111.23275, NULL, 0, 0, 0, 100, 0),
34+
(4507402, 2, 2696.8916, 944.3594, 110.88748, NULL, 0, 0, 0, 100, 0),
35+
(4507402, 3, 2679.1008, 927.04517, 111.034805, NULL, 0, 0, 0, 100, 0),
36+
(4507402, 4, 2648.8196, 917.92676, 110.56027, NULL, 0, 0, 0, 100, 0),
37+
(4507402, 5, 2631.4575, 916.3612, 109.18283, NULL, 0, 0, 0, 100, 0),
38+
(4507600, 1, 2844.3105, 829.37134, 112.57675, NULL, 0, 0, 0, 100, 0),
39+
(4507600, 2, 2861.2617, 805.0632, 116.396515, NULL, 0, 0, 0, 100, 0),
40+
(4507600, 3, 2852.5176, 784.60895, 117.27478, NULL, 0, 0, 0, 100, 0),
41+
(4507600, 4, 2844.9448, 765.1437, 119.3994, NULL, 0, 0, 0, 100, 0),
42+
(4507600, 5, 2830.7195, 763.0901, 119.19966, NULL, 0, 0, 0, 100, 0),
43+
(4507600, 6, 2809.9922, 773.8125, 116.56846, NULL, 0, 0, 0, 100, 0),
44+
(4507600, 7, 2795.9836, 789.4371, 115.29823, NULL, 0, 0, 0, 100, 0),
45+
(4507600, 8, 2781.8372, 817.4358, 112.59648, NULL, 0, 0, 0, 100, 0),
46+
(4507600, 9, 2760.0073, 830.5569, 111.73909, NULL, 0, 0, 0, 100, 0),
47+
(4507600, 10, 2740.4302, 826.26196, 111.78604, NULL, 0, 0, 0, 100, 0),
48+
(4507600, 11, 2719.261, 812.56165, 111.116455, NULL, 0, 0, 0, 100, 0),
49+
(4507600, 12, 2699.4387, 806.42993, 109.6118, NULL, 0, 0, 0, 100, 0),
50+
(4507600, 13, 2674.912, 816.07574, 108.37607, NULL, 0, 0, 0, 100, 0),
51+
(4507600, 14, 2662.5635, 843.7483, 108.82987, NULL, 0, 0, 0, 100, 0),
52+
(4507600, 15, 2652.8994, 873.9334, 110.85059, NULL, 0, 0, 0, 100, 0),
53+
(4507601, 1, 2611.389, 918.8913, 107.5012, NULL, 0, 0, 0, 100, 0),
54+
(4507601, 2, 2651.7568, 941.5128, 112.666985, NULL, 0, 0, 0, 100, 0),
55+
(4507601, 3, 2683.6868, 929.8602, 110.953384, NULL, 0, 0, 0, 100, 0),
56+
(4507601, 4, 2703.5422, 895.4319, 110.38937, NULL, 0, 0, 0, 100, 0),
57+
(4507601, 5, 2708.535, 870.12305, 111.949066, NULL, 0, 0, 0, 100, 0),
58+
(4507601, 6, 2750.9553, 884.45825, 113.50687, NULL, 0, 0, 0, 100, 0),
59+
(4507601, 7, 2757.431, 861.4463, 113.363815, NULL, 0, 0, 0, 100, 0),
60+
(4507602, 1, 2787.389, 849.2288, 111.83943, NULL, 0, 0, 0, 100, 0),
61+
(4507602, 2, 2817.4443, 843.9208, 111.845505, NULL, 0, 0, 0, 100, 0);
62+
63+
-- Set Move Type Random in Radius e Wander Distance to 25 for the two old Last Souls.
64+
UPDATE `creature` SET `wander_distance` = 25, `MovementType` = 1 WHERE (`id1` = 1531) AND (`guid` IN (44863, 44864));
65+
66+
-- Set Extra Flag Don't Override SAI Entry.
67+
UPDATE `creature_template` SET `flags_extra` = `flags_extra` |134217728 WHERE (`entry` = 1531);
68+
69+
-- Add two new Spawn Points.
70+
DELETE FROM `creature` WHERE (`id1` = 1531) AND (`guid` IN (45074, 45076));
71+
INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `Comment`, `VerifiedBuild`) VALUES
72+
(45074, 1531, 0, 0, 0, 0, 0, 1, 1, 0, 2631.46, 916.361, 109.183, 4.7822, 300, 0, 0, 120, 0, 0, 0, 0, 0, '', 'Has Personal Guid Sai', 0),
73+
(45076, 1531, 0, 0, 0, 0, 0, 1, 1, 0, 2817.44, 843.921, 111.846, 5.7721, 300, 0, 0, 120, 0, 0, 0, 0, 0, '', 'Has Personal Guid Sai', 0);
74+
75+
-- Set Guid for the two new Lost Souls.
76+
DELETE FROM `smart_scripts` WHERE (`source_type` = 0) AND (`entryorguid` IN (-45074, -45076));
77+
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
78+
(-45074, 0, 1, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 4507400, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - On Respawn - Start Path 4507400'),
79+
(-45074, 0, 2, 0, 109, 0, 100, 0, 0, 4507400, 0, 0, 0, 0, 80, 153100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - On Path 4507400 Finished - Run Script'),
80+
(-45074, 0, 3, 0, 109, 0, 100, 0, 0, 4507401, 0, 0, 0, 0, 80, 153101, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - On Path 4507401 Finished - Run Script'),
81+
(-45074, 0, 4, 0, 109, 0, 100, 0, 0, 4507402, 0, 0, 0, 0, 80, 153102, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - On Path 4507402 Finished - Run Script'),
82+
(-45076, 0, 1, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 4507600, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - On Respawn - Start Path 4507600'),
83+
(-45076, 0, 2, 0, 109, 0, 100, 0, 0, 4507600, 0, 0, 0, 0, 80, 153103, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - On Path 4507600 Finished - Run Script'),
84+
(-45076, 0, 3, 0, 109, 0, 100, 0, 0, 4507601, 0, 0, 0, 0, 80, 153104, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - On Path 4507601 Finished - Run Script'),
85+
(-45076, 0, 4, 0, 109, 0, 100, 0, 0, 4507602, 0, 0, 0, 0, 232, 4507600, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - On Path 4507602 Finished - Start Path 4507600');
86+
87+
-- Set Action Lists.
88+
DELETE FROM `smart_scripts` WHERE (`source_type` = 9) AND (`entryorguid` IN (153100, 153101, 153102, 153103, 153104));
89+
INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
90+
(153100, 9, 0, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 0, 89, 25, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - Actionlist - Start Random Movement'),
91+
(153100, 9, 1, 0, 0, 0, 100, 0, 60000, 60000, 0, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - Actionlist - Stop Random Movement'),
92+
(153100, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 4507401, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - Actionlist - Start Path 4507401'),
93+
(153101, 9, 0, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 0, 89, 25, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - Actionlist - Start Random Movement'),
94+
(153101, 9, 1, 0, 0, 0, 100, 0, 60000, 60000, 0, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - Actionlist - Stop Random Movement'),
95+
(153101, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 4507402, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - Actionlist - Start Path 4507402'),
96+
(153102, 9, 0, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 0, 89, 25, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - Actionlist - Start Random Movement'),
97+
(153102, 9, 1, 0, 0, 0, 100, 0, 60000, 60000, 0, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - Actionlist - Stop Random Movement'),
98+
(153102, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 4507400, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - Actionlist - Start Path 4507400'),
99+
(153103, 9, 0, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 0, 89, 25, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - Actionlist - Start Random Movement'),
100+
(153103, 9, 1, 0, 0, 0, 100, 0, 60000, 60000, 0, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - Actionlist - Stop Random Movement'),
101+
(153103, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 4507601, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - Actionlist - Start Path 4507601'),
102+
(153104, 9, 0, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 0, 89, 25, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - Actionlist - Start Random Movement'),
103+
(153104, 9, 1, 0, 0, 0, 100, 0, 60000, 60000, 0, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - Actionlist - Stop Random Movement'),
104+
(153104, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 4507602, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lost Soul - Actionlist - Start Path 4507602');

‎src/cmake/compiler/msvc/settings.cmake‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ target_compile_options(acore-compile-option-interface
3636
INTERFACE
3737
/utf-8)
3838

39+
target_compile_options(acore-compile-option-interface
40+
INTERFACE
41+
/Zc:preprocessor)
42+
message(STATUS "MSVC: Enabled standard conforming preprocessor")
43+
3944
if(PLATFORM EQUAL 64)
4045
# This definition is necessary to work around a bug with Intellisense described
4146
# here: http://tinyurl.com/2cb428. Syntax highlighting is important for proper

‎src/server/game/Chat/Chat.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -895,6 +895,11 @@ std::string CliHandler::GetAcoreString(uint32 entry) const
895895
return sObjectMgr->GetAcoreStringForDBCLocale(entry);
896896
}
897897

898+
std::string const* CliHandler::GetModuleString(std::string module, uint32 id) const
899+
{
900+
return sObjectMgr->GetModuleString(module, id, LocaleConstant(sObjectMgr->GetDBCLocaleIndex()));
901+
}
902+
898903
void CliHandler::SendSysMessage(std::string_view str, bool /*escapeCharacters*/)
899904
{
900905
m_print(m_callbackArg, str);

‎src/server/game/Chat/Chat.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ class AC_GAME_API ChatHandler
156156
return Acore::StringFormat(GetAcoreString(entry), std::forward<Args>(args)...);
157157
}
158158

159-
std::string const* GetModuleString(std::string module, uint32 id) const;
159+
virtual std::string const* GetModuleString(std::string module, uint32 id) const;
160160

161161
template<typename... Args>
162162
void PSendModuleSysMessage(std::string module, uint32 id, Args&&... args)
@@ -260,6 +260,7 @@ class AC_GAME_API CliHandler : public ChatHandler
260260

261261
// overwrite functions
262262
std::string GetAcoreString(uint32 entry) const override;
263+
std::string const* GetModuleString(std::string module, uint32 id) const override;
263264
void SendSysMessage(std::string_view, bool escapeCharacters) override;
264265
bool ParseCommands(std::string_view str) override;
265266
std::string GetNameLink() const override;

‎src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,7 +1190,7 @@ class npc_arthas : public CreatureScript
11901190
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
11911191
me->CastSpell(target, SPELL_ARTHAS_EXORCISM, false);
11921192

1193-
combatEvents.Repeat(7300ms);
1193+
combatEvents.Repeat(7s, 14s);
11941194
break;
11951195
case EVENT_COMBAT_HEALTH_CHECK:
11961196
if (HealthBelowPct(40))
@@ -1247,8 +1247,8 @@ void npc_arthas::npc_arthasAI::JustEngagedWith(Unit* /*who*/)
12471247
DoCast(me, SPELL_ARTHAS_AURA);
12481248

12491249
// Fight
1250-
combatEvents.ScheduleEvent(EVENT_COMBAT_EXORCISM, 2s);
1251-
combatEvents.ScheduleEvent(EVENT_COMBAT_HEALTH_CHECK, 2s);
1250+
combatEvents.RescheduleEvent(EVENT_COMBAT_EXORCISM, 7s, 14s);
1251+
combatEvents.RescheduleEvent(EVENT_COMBAT_HEALTH_CHECK, 2s);
12521252
}
12531253

12541254
void npc_arthas::npc_arthasAI::ReorderInstance(uint32 data)

0 commit comments

Comments
 (0)