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
  • Loading branch information
trickerer committed Feb 21, 2024
2 parents 4ef3ff7 + e311bac commit 6a4899b
Show file tree
Hide file tree
Showing 80 changed files with 2,170 additions and 595 deletions.
2 changes: 1 addition & 1 deletion apps/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ RUN groupadd --gid "$GROUP_ID" "$DOCKER_USER" && \
passwd -d "$DOCKER_USER" && \
chown -R "$DOCKER_USER:$DOCKER_USER" /azerothcore

COPY --chown=$USER_ID:GROUP_ID \
COPY --chown=$USER_ID:$GROUP_ID \
--chmod=755 \
apps/docker/entrypoint.sh /azerothcore/entrypoint.sh

Expand Down
8 changes: 8 additions & 0 deletions data/sql/updates/db_world/2024_02_12_00.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
-- DB update 2024_02_08_02 -> 2024_02_12_00
--
UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 20045;

DELETE FROM `smart_scripts` WHERE `entryorguid` = 20045 AND `source_type` = 0;
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
(20045, 0, 0, 0, 0, 0, 100, 0, 11900, 11900, 19300, 19300, 0, 0, 11, 37135, 128, 0, 0, 0, 0, 17, 0, 2000, 5, 0, 0, 0, 0, 0, 'Nether Scryer - In Combat - Cast \'Domination\''),
(20045, 0, 1, 0, 0, 0, 100, 0, 12400, 14900, 9800, 9800, 0, 0, 11, 37126, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Nether Scryer - In Combat - Cast \'Arcane Blast\'');
6 changes: 6 additions & 0 deletions data/sql/updates/db_world/2024_02_12_01.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
-- DB update 2024_02_12_00 -> 2024_02_12_01
--
DELETE FROM `smart_scripts` WHERE `entryorguid` = 20039 AND `source_type` = 0;
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
(20039, 0, 0, 0, 0, 0, 100, 0, 9700, 12200, 18050, 30950, 0, 0, 11, 37156, 0, 0, 0, 0, 0, 28, 45, 1, 1, 0, 0, 0, 0, 0, 'Phoenix-Hawk - In Combat - Cast Dive'),
(20039, 0, 1, 0, 0, 0, 100, 0, 6450, 9150, 16950, 29050, 0, 0, 11, 37159, 256, 0, 0, 0, 0, 17, 0, 30, 0, 0, 0, 0, 0, 0, 'Phoenix-Hawk - In Combat - Cast Mana Burn');
22 changes: 22 additions & 0 deletions data/sql/updates/db_world/2024_02_12_02.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
-- DB update 2024_02_12_01 -> 2024_02_12_02
-- Update gameobject 201716 'Chemical Wagon' with sniffed values
-- updated spawns
DELETE FROM `gameobject` WHERE (`id` = 201716) AND (`guid` IN (242298, 242308, 242309, 242310, 242311, 242312, 242313, 242314, 242315, 242316, 242317, 242318, 242319));
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
(242298, 201716, 1, 0, 0, 1, 1, 6764.8193359375, -4905.126953125, 774.26409912109375, 0, 0, 0, 0, 1, 120, 255, 1, "", 52237, NULL),
(242308, 201716, 0, 0, 0, 1, 1, -406.282989501953125, 163.5868072509765625, 75.4813995361328125, 0, 0, 0, 0, 1, 120, 255, 1, "", 52237, NULL),
(242309, 201716, 1, 0, 0, 1, 1, -3370.9462890625, -4168.55712890625, 17.80469894409179687, 0, 0, 0, 0, 1, 120, 255, 1, "", 52237, NULL),
(242310, 201716, 0, 0, 0, 1, 1, 88.59375, -2477.99658203125, 124.779296875, 0, 0, 0, 0, 1, 120, 255, 1, "", 52237, NULL),
(242311, 201716, 1, 0, 0, 1, 1, 4862.0009765625, 160.6180572509765625, 52.87637710571289062, 5.462882041931152343, 0, 0, -0.39874839782714843, 0.917060375213623046, 120, 255, 1, "", 52237, NULL),
(242312, 201716, 571, 0, 0, 1, 1, 5638.05029296875, 107.1215286254882812, 154.9245452880859375, 1.082102894783020019, 0, 0, 0.51503753662109375, 0.857167601585388183, 120, 255, 1, "", 52237, NULL),
(242313, 201716, 530, 0, 0, 1, 1, -1808.5086669921875, 4844.5771484375, 1.868746042251586914, 0, 0, 0, 0, 1, 120, 255, 1, "", 52237, NULL),
(242314, 201716, 1, 0, 0, 1, 1, 1264.0572509765625, -4084.614501953125, 25.43340110778808593, 0, 0, 0, 0, 1, 120, 255, 1, "", 52237, NULL),
(242315, 201716, 0, 0, 0, 1, 1, -9454.0830078125, 522.8125, 55.8221435546875, 0, 0, 0, 0, 1, 120, 255, 1, "", 52237, NULL),
(242316, 201716, 0, 0, 0, 1, 1, -50.1909713745117187, 1150.404541015625, 66.00772857666015625, 0, 0, 0, 0, 1, 120, 255, 1, "", 52237, NULL),
(242317, 201716, 571, 0, 0, 1, 1, 5592.7646484375, 68.61284637451171875, 148.5281829833984375, 3.735006093978881835, 0, 0, -0.95630455017089843, 0.292372345924377441, 120, 255, 1, "", 52237, NULL),
(242318, 201716, 571, 0, 0, 1, 1, 5579.16748046875, 179.388885498046875, 149.8949737548828125, 5.811946868896484375, 0, 0, -0.2334451675415039, 0.972369968891143798, 120, 255, 1, "", 52237, NULL),
(242319, 201716, 571, 0, 0, 1, 1, 5576.55126953125, 124.4253463745117187, 150.719146728515625, 5.811946868896484375, 0, 0, -0.2334451675415039, 0.972369968891143798, 120, 255, 1, "", 52237, NULL);

-- enable all spawns for eventEntry 8
DELETE FROM `game_event_gameobject` WHERE (`eventEntry` = 8) AND (`guid` IN (SELECT `guid` FROM `gameobject` WHERE `id` = 201716));
INSERT INTO `game_event_gameobject` (SELECT 8, `guid` FROM `gameobject` WHERE `id` = 201716);
3 changes: 3 additions & 0 deletions data/sql/updates/db_world/2024_02_12_03.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- DB update 2024_02_12_02 -> 2024_02_12_03
--
UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask`|1 WHERE `entry` IN (20033, 20034);
34 changes: 34 additions & 0 deletions data/sql/updates/db_world/2024_02_12_04.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
-- DB update 2024_02_12_03 -> 2024_02_12_04
-- rage winterchill
DELETE FROM `waypoint_data` WHERE `id` = 177670;
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
(177670, 1, 4896.08, -1576.35, 1333.65, 0, 0, 0, 0, 100, 0),
(177670, 2, 4898.68, -1615.02, 1329.48, 0, 0, 0, 0, 100, 0),
(177670, 3, 4907.12, -1667.08, 1321.00, 0, 0, 0, 0, 100, 0),
(177670, 4, 4963.18, -1699.35, 1340.51, 0, 0, 0, 0, 100, 0),
(177670, 5, 4989.16, -1716.67, 1335.74, 0, 0, 0, 0, 100, 0),
(177670, 6, 5026.27, -1736.89, 1323.02, 0, 0, 0, 0, 100, 0),
(177670, 7, 5037.77, -1770.56, 1324.36, 0, 0, 0, 0, 100, 0),
(177670, 8, 5067.23, -1789.95, 1321.17, 0, 0, 0, 0, 100, 0);
-- anetheron
DELETE FROM `waypoint_data` WHERE `id` = 178080;
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
(178080, 1, 4896.08, -1576.35, 1333.65, 0, 0, 0, 0, 100, 0),
(178080, 2, 4898.68, -1615.02, 1329.48, 0, 0, 0, 0, 100, 0),
(178080, 3, 4907.12, -1667.08, 1321.00, 0, 0, 0, 0, 100, 0),
(178080, 4, 4963.18, -1699.35, 1340.51, 0, 0, 0, 0, 100, 0),
(178080, 5, 4989.16, -1716.67, 1335.74, 0, 0, 0, 0, 100, 0),
(178080, 6, 5026.27, -1736.89, 1323.02, 0, 0, 0, 0, 100, 0),
(178080, 7, 5037.77, -1770.56, 1324.36, 0, 0, 0, 0, 100, 0),
(178080, 8, 5067.23, -1789.95, 1321.17, 0, 0, 0, 0, 100, 0);
-- kaz'rogal
DELETE FROM `waypoint_data` WHERE `id` = 178880;
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
(178880, 1, 5492.91, -2404.61, 1462.63, 0, 0, 0, 0, 100, 0),
(178880, 2, 5531.76, -2460.87, 1469.55, 0, 0, 0, 0, 100, 0),
(178880, 3, 5554.58, -2514.66, 1476.12, 0, 0, 0, 0, 100, 0),
(178880, 4, 5554.16, -2567.23, 1479.90, 0, 0, 0, 0, 100, 0),
(178880, 5, 5540.67, -2625.99, 1480.89, 0, 0, 0, 0, 100, 0),
(178880, 6, 5508.16, -2659.2, 1480.15, 0, 0, 0, 0, 100, 0),
(178880, 7, 5489.62, -2704.05, 1482.18, 0, 0, 0, 0, 100, 0),
(178880, 8, 5457.04, -2726.26, 1485.10, 0, 0, 0, 0, 100, 0);
Loading

0 comments on commit 6a4899b

Please sign in to comment.