Skip to content

Commit

Permalink
Merge branch 'master' into Playerbot
Browse files Browse the repository at this point in the history
  • Loading branch information
liyunfan1223 committed Dec 4, 2024
2 parents ba56317 + 47580c0 commit 889b509
Show file tree
Hide file tree
Showing 121 changed files with 4,758 additions and 1,353 deletions.
25 changes: 18 additions & 7 deletions .github/workflows/core_modules_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,29 @@ on:
branches:
- 'master'
pull_request:
types: ['labeled', 'opened', 'synchronize', 'reopened']
types:
- labeled
- opened
- reopened
- synchronize

concurrency:
group: ${{ github.head_ref }} || concat(${{ github.ref }}, ${{ github.workflow }})
cancel-in-progress: true

jobs:
build-modules:
runs-on: ubuntu-latest
name: modules build on latest ubuntu
if: |
github.repository == 'liyunfan1223/azerothcore-wotlk'
strategy:
fail-fast: true
matrix:
include:
- os: ubuntu-24.04
compiler:
CC: clang-18
CXX: clang++-18
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }}-${{ matrix.compiler.CC }}-nopch-modules
if: github.repository == 'liyunfan1223/azerothcore-wotlk'
&& !github.event.pull_request.draft
&& (
github.ref_name == 'master'
Expand All @@ -33,7 +44,7 @@ jobs:
run: bash -x ./apps/ci/ci-install-modules.sh
- uses: ./.github/actions/linux-build
with:
CC: clang-15
CXX: clang++-15
CC: ${{ matrix.compiler.CC }}
CXX: ${{ matrix.compiler.CXX }}
modules: true
pch: false
5 changes: 5 additions & 0 deletions .github/workflows/tools_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ on:
branches:
- 'master'
pull_request:
types:
- labeled
- opened
- reopened
- synchronize

concurrency:
group: ${{ github.head_ref }} || concat(${{ github.ref }}, ${{ github.workflow }})
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@

!.gitkeep

# default build directory if not specified by CMAKE configuration
/out/*

#
#Generic
#
Expand Down Expand Up @@ -65,6 +68,7 @@ nbproject/
.idea
cmake-build-*/*
coverage-report/
.vs

#
# Eclipse
Expand Down
2 changes: 1 addition & 1 deletion apps/startup-scripts/gdb.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set logging on
set logging enabled on
set debug timestamp
run
bt
Expand Down
2 changes: 1 addition & 1 deletion apps/startup-scripts/starter
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ CRASHES_PATH="$7"

if [ $GDB_ENABLED -eq 1 ]; then
echo "set logging file "$CRASHES_PATH"/gdb-$(date +%Y-%m-%d-%H-%M-%S).txt" > "$GDB_FILE"
echo "set logging on" >> "$GDB_FILE"
echo "set logging enabled on" >> "$GDB_FILE"
echo "set debug timestamp" >> "$GDB_FILE"
echo "run -c $3" >> "$GDB_FILE"
echo "bt" >> "$GDB_FILE"
Expand Down
5 changes: 5 additions & 0 deletions data/sql/updates/db_world/2024_11_25_00.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-- DB update 2024_11_24_07 -> 2024_11_25_00
--
DELETE FROM `smart_scripts` WHERE (`entryorguid` = 7725) AND (`source_type` = 0) AND (`id` IN (1));
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
(7725, 0, 1, 0, 0, 0, 100, 512, 2000, 5000, 5000, 8000, 0, 0, 11, 6533, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Grimtotem Raider - In Combat - Cast \'Net\'');
4 changes: 4 additions & 0 deletions data/sql/updates/db_world/2024_11_25_01.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-- DB update 2024_11_25_00 -> 2024_11_25_01
--
-- Adds "Taunt Immunity" to Boss "Hex Lord Malacrass" (Zul'aman)
UPDATE `creature_template` SET `flags_extra` = `flags_extra` | 256 WHERE `entry` = 24239;
4 changes: 4 additions & 0 deletions data/sql/updates/db_world/2024_11_26_00.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-- DB update 2024_11_25_01 -> 2024_11_26_00
--
-- Adds "Disarm" immunity to Creautre (Boss) "Nalorakk" - [Zul'Aman]
UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask` | 4 WHERE `entry` = 23576;
3 changes: 3 additions & 0 deletions data/sql/updates/db_world/2024_11_26_01.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- DB update 2024_11_26_00 -> 2024_11_26_01
DELETE FROM `spell_custom_attr` WHERE `spell_id`=44132;
INSERT INTO `spell_custom_attr` (`spell_id`, `attributes`) VALUES (44132, 4194304);
138 changes: 138 additions & 0 deletions data/sql/updates/db_world/2024_11_26_02.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
-- DB update 2024_11_26_01 -> 2024_11_26_02

-- Remove Wrong Guids

DELETE FROM `creature` WHERE (`id1` = 28611) AND (`guid` IN (129294, 129297, 129298, 129300, 129303));


-- Add Waypoints

DELETE FROM `waypoint_data` WHERE `id` IN (12929200, 12929300, 12929500, 12929600, 12929900, 12930100, 12930200, 12930400, 12930500);
INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
(12930500, 1, 2374.73, -5855.05, 105.204, NULL, 0, 0, 0, 100, 0),
(12930500, 2, 2359.39, -5856.19, 103.536, NULL, 0, 0, 0, 100, 0),
(12930500, 3, 2343.31, -5854.01, 101.126, NULL, 0, 0, 0, 100, 0),
(12930500, 4, 2332.27, -5850.46, 100.934, NULL, 0, 0, 0, 100, 0),
(12930500, 5, 2316.51, -5848.56, 100.935, NULL, 0, 0, 0, 100, 0),
(12930500, 6, 2332.27, -5850.46, 100.934, NULL, 0, 0, 0, 100, 0),
(12930500, 7, 2343.31, -5854.01, 101.126, NULL, 0, 0, 0, 100, 0),
(12930500, 8, 2359.39, -5856.19, 103.536, NULL, 0, 0, 0, 100, 0),
(12930500, 9, 2374.73, -5855.05, 105.204, NULL, 0, 0, 0, 100, 0),
(12930500, 10, 2395.31, -5848.83, 107.756, NULL, 0, 0, 0, 100, 0),
(12930400, 1, 2412.42, -5854.43, 106.352, NULL, 0, 0, 0, 100, 0),
(12930400, 2, 2402.93, -5842.97, 109.672, NULL, 0, 0, 0, 100, 0),
(12930400, 3, 2412.42, -5854.43, 106.352, NULL, 0, 0, 0, 100, 0),
(12930400, 4, 2422.19, -5860.64, 105.745, NULL, 0, 0, 0, 100, 0),
(12930100, 1, 2282.34, -5879.39, 100.511, NULL, 0, 0, 0, 100, 0),
(12930100, 2, 2298.16, -5877.04, 100.659, NULL, 0, 0, 0, 100, 0),
(12930100, 3, 2332.68, -5870.94, 101.275, NULL, 0, 0, 0, 100, 0),
(12930100, 4, 2343.74, -5873.16, 103.259, NULL, 0, 0, 0, 100, 0),
(12930100, 5, 2359.56, -5876.34, 104.555, NULL, 0, 0, 0, 100, 0),
(12930100, 6, 2373.53, -5899.89, 107.302, NULL, 0, 0, 0, 100, 0),
(12930100, 7, 2383.58, -5923.9, 110.248, NULL, 0, 0, 0, 100, 0),
(12930100, 8, 2373.53, -5899.89, 107.302, NULL, 0, 0, 0, 100, 0),
(12930100, 9, 2359.56, -5876.34, 104.555, NULL, 0, 0, 0, 100, 0),
(12930100, 10, 2343.74, -5873.16, 103.259, NULL, 0, 0, 0, 100, 0),
(12930100, 11, 2332.68, -5870.94, 101.275, NULL, 0, 0, 0, 100, 0),
(12930100, 12, 2298.16, -5877.04, 100.659, NULL, 0, 0, 0, 100, 0),
(12930100, 13, 2282.34, -5879.39, 100.511, NULL, 0, 0, 0, 100, 0),
(12930100, 14, 2261.25, -5882.46, 101.871, NULL, 0, 0, 0, 100, 0),
(12929500, 1, 2270.25, -5814.23, 100.935, NULL, 0, 0, 0, 100, 0),
(12929500, 2, 2258.81, -5827.16, 101.01, NULL, 0, 0, 0, 100, 0),
(12929500, 3, 2263.75, -5846.31, 100.946, NULL, 0, 0, 0, 100, 0),
(12929500, 4, 2277.02, -5851.78, 100.956, NULL, 0, 0, 0, 100, 0),
(12929500, 5, 2287.03, -5859.74, 100.932, NULL, 0, 0, 0, 100, 0),
(12929500, 6, 2301.7, -5860.49, 100.934, NULL, 0, 0, 0, 100, 0),
(12929500, 7, 2304.83, -5844.42, 100.934, NULL, 0, 0, 0, 100, 0),
(12929500, 8, 2307.86, -5827.64, 101.103, NULL, 0, 0, 0, 100, 0),
(12929500, 9, 2291.21, -5815.83, 101.052, NULL, 0, 0, 0, 100, 0),
(12929200, 1, 2192.48, -5751.67, 102.118, NULL, 0, 0, 0, 100, 0),
(12929200, 2, 2202.8, -5748.1, 102.467, NULL, 0, 0, 0, 100, 0),
(12929200, 3, 2211.03, -5751.19, 102.489, NULL, 0, 0, 0, 100, 0),
(12929200, 4, 2226.86, -5757.15, 101.971, NULL, 0, 0, 0, 100, 0),
(12929200, 5, 2222.44, -5771.2, 101.682, NULL, 0, 0, 0, 100, 0),
(12929200, 6, 2212.7, -5784.32, 101.645, NULL, 0, 0, 0, 100, 0),
(12929200, 7, 2196.78, -5777.67, 101.373, NULL, 0, 0, 0, 100, 0),
(12929200, 8, 2181.33, -5770.79, 101.357, NULL, 0, 0, 0, 100, 0),
(12929200, 9, 2178.22, -5758.94, 101.309, NULL, 0, 0, 0, 100, 0),
(12929600, 1, 2071.02, -5751.46, 98.8196, NULL, 0, 0, 0, 100, 0),
(12929600, 2, 2068.28, -5740.5, 99.1555, NULL, 0, 0, 0, 100, 0),
(12929600, 3, 2078.86, -5724.54, 101.533, NULL, 0, 0, 0, 100, 0),
(12929600, 4, 2094.46, -5726.09, 100.311, NULL, 0, 0, 0, 100, 0),
(12929600, 5, 2105.5, -5731.14, 100.3, NULL, 0, 0, 0, 100, 0),
(12929600, 6, 2114.52, -5751.33, 99.0498, NULL, 0, 0, 0, 100, 0),
(12929600, 7, 2115.35, -5761.94, 98.3894, NULL, 0, 0, 0, 100, 0),
(12929600, 8, 2116.15, -5772.22, 98.1393, NULL, 0, 0, 0, 100, 0),
(12929600, 9, 2103.76, -5770.65, 98.6399, NULL, 0, 0, 0, 100, 0),
(12929600, 10, 2089.87, -5770.89, 99.1377, NULL, 0, 0, 0, 100, 0),
(12930200, 1, 2135.82, -5800.13, 99.739, NULL, 0, 0, 0, 100, 0),
(12930200, 2, 2143.67, -5816.31, 100.827, NULL, 0, 0, 0, 100, 0),
(12930200, 3, 2143.72, -5829.03, 101.223, NULL, 0, 0, 0, 100, 0),
(12930200, 4, 2142.77, -5854.49, 101.349, NULL, 0, 0, 0, 100, 0),
(12930200, 5, 2161.43, -5866.23, 101.331, NULL, 0, 0, 0, 100, 0),
(12930200, 6, 2181.55, -5871.43, 101.271, NULL, 0, 0, 0, 100, 0),
(12930200, 7, 2161.43, -5866.23, 101.331, NULL, 0, 0, 0, 100, 0),
(12930200, 8, 2142.77, -5854.49, 101.349, NULL, 0, 0, 0, 100, 0),
(12930200, 9, 2143.72, -5829.03, 101.223, NULL, 0, 0, 0, 100, 0),
(12930200, 10, 2143.67, -5816.31, 100.827, NULL, 0, 0, 0, 100, 0),
(12930200, 11, 2135.82, -5800.13, 99.739, NULL, 0, 0, 0, 100, 0),
(12930200, 12, 2129.66, -5787.29, 98.852, NULL, 0, 0, 0, 100, 0),
(12929900, 1, 2146.6, -5758.24, 99.7128, NULL, 0, 0, 0, 100, 0),
(12929900, 2, 2146.64, -5747.25, 99.9351, NULL, 0, 0, 0, 100, 0),
(12929900, 3, 2146.47, -5736.57, 100.398, NULL, 0, 0, 0, 100, 0),
(12929900, 4, 2141.57, -5729.49, 100.39, NULL, 0, 0, 0, 100, 0),
(12929900, 5, 2136.73, -5722.5, 100.563, NULL, 0, 0, 0, 100, 0),
(12929900, 6, 2128.72, -5710.92, 100.776, NULL, 0, 0, 0, 100, 0),
(12929900, 7, 2136.73, -5722.5, 100.563, NULL, 0, 0, 0, 100, 0),
(12929900, 8, 2141.57, -5729.49, 100.39, NULL, 0, 0, 0, 100, 0),
(12929900, 9, 2146.47, -5736.57, 100.398, NULL, 0, 0, 0, 100, 0),
(12929900, 10, 2146.64, -5747.25, 99.9351, NULL, 0, 0, 0, 100, 0),
(12929900, 11, 2146.6, -5758.24, 99.7128, NULL, 0, 0, 0, 100, 0),
(12929900, 12, 2146.88, -5768.92, 99.848, NULL, 0, 0, 0, 100, 0),
(12929300, 1, 2163.01, -5915.32, 100.19, NULL, 0, 0, 0, 100, 0),
(12929300, 2, 2181.89, -5919.04, 100.921, NULL, 0, 0, 0, 100, 0),
(12929300, 3, 2189.84, -5910.22, 100.848, NULL, 0, 0, 0, 100, 0),
(12929300, 4, 2185.54, -5897.07, 100.693, NULL, 0, 0, 0, 100, 0),
(12929300, 5, 2177.43, -5894.1, 101.309, NULL, 0, 0, 0, 100, 0),
(12929300, 6, 2167.9, -5893.54, 101.112, NULL, 0, 0, 0, 100, 0),
(12929300, 7, 2141.5, -5901.44, 102.039, NULL, 0, 0, 0, 100, 0),
(12929300, 8, 2134.57, -5895.35, 102.476, NULL, 0, 0, 0, 100, 0),
(12929300, 9, 2124.09, -5885.86, 102.768, NULL, 0, 0, 0, 100, 0),
(12929300, 10, 2127.24, -5862.9, 101.846, NULL, 0, 0, 0, 100, 0),
(12929300, 11, 2144.77, -5853.55, 101.35, NULL, 0, 0, 0, 100, 0),
(12929300, 12, 2160.56, -5868.36, 101.312, NULL, 0, 0, 0, 100, 0),
(12929300, 13, 2159.3, -5877.75, 101.317, NULL, 0, 0, 0, 100, 0);


-- Update Spawn-Points

UPDATE `creature` SET `position_x` = 2177.7983, `position_y` = -5758.793, `position_z` = 101.29145, `orientation` = 0.51258016 WHERE `guid` = 129292 AND `id1` = 28611;
UPDATE `creature` SET `position_x` = 2158, `position_y` = -5887.69, `position_z` = 101.37, `orientation` = 4.47917 WHERE `guid` = 129293 AND `id1` = 28611;
UPDATE `creature` SET `position_x` = 2291.298, `position_y` = -5815.7197, `position_z` = 101.05994, `orientation` = 2.814103 WHERE `guid` = 129295 AND `id1` = 28611;
UPDATE `creature` SET `position_x` = 2089.395, `position_y` = -5771.01, `position_z` = 99.147934, `orientation` = 2.3090818 WHERE `guid` = 129296 AND `id1` = 28611;
UPDATE `creature` SET `position_x` = 2146.8882, `position_y` = -5768.9214, `position_z` = 99.84805, `orientation` = 1.5770894 WHERE `guid` = 129299 AND `id1` = 28611;
UPDATE `creature` SET `position_x` = 2261.2556, `position_y` = -5882.462, `position_z` = 101.87194, `orientation` = 0.29108763 WHERE `guid` = 129301 AND `id1` = 28611;
UPDATE `creature` SET `position_x` = 2129.6663, `position_y` = -5787.2954, `position_z` = 98.85208, `orientation` = 5.258737 WHERE `guid` = 129302 AND `id1` = 28611;
UPDATE `creature` SET `position_x` = 2422.1914, `position_y` = -5860.641, `position_z` = 105.74505, `orientation` = 2.593869 WHERE `guid` = 129304 AND `id1` = 28611;
UPDATE `creature` SET `position_x` = 2395.3108, `position_y` = -5848.834, `position_z` = 107.756935, `orientation` = 3.5421836 WHERE `guid` = 129305 AND `id1` = 28611;


-- Update Movement Type and Wander Distance

UPDATE `creature` SET `MovementType` = 2 WHERE (`guid` IN (129292, 129293, 129295, 129296, 129299, 129301, 129302, 129304, 129305));
UPDATE `creature` SET `wander_distance` = 0 WHERE (`guid` IN (129292, 129293, 129295, 129296, 129299, 129301, 129302, 129304, 129305));


-- Add Spawn Addon

DELETE FROM `creature_addon` WHERE (`guid` IN (129292, 129293, 129295, 129296, 129299, 129301, 129302, 129304, 129305));
INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
(129292, 12929200, 2404, 0, 1, 0, 0, NULL),
(129293, 12929300, 2404, 0, 1, 0, 0, NULL),
(129295, 12929500, 2404, 0, 1, 0, 0, NULL),
(129296, 12929600, 2404, 0, 1, 0, 0, NULL),
(129299, 12929900, 2404, 0, 1, 0, 0, NULL),
(129301, 12930100, 2404, 0, 1, 0, 0, NULL),
(129302, 12930200, 2404, 0, 1, 0, 0, NULL),
(129304, 12930400, 2404, 0, 1, 0, 0, NULL),
(129305, 12930500, 2404, 0, 1, 0, 0, NULL);
Loading

0 comments on commit 889b509

Please sign in to comment.