Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge #10

Merged
merged 41 commits into from
May 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
9c363bd
fix(AQ40/SmartGameObjectAI): remove locked status from scarab coffer …
sogladev May 11, 2024
0e7b1f3
chore(DB): import pending files
github-actions[bot] May 11, 2024
cd63cc0
fix(Conf): align LeaveGroupOnLogout default in core with worldserver.…
sudlud May 11, 2024
c30cafe
fix(DB/spell_target_position): Mara Portal tp location (#18876)
sogladev May 11, 2024
016dcfa
chore(DB): import pending files
github-actions[bot] May 11, 2024
45ad5ac
fix(db/sai) Some contents of the restoration of creature (27210 and 2…
fangshun2004 May 11, 2024
ac203da
fix(Core/Unit): SPELLMOD_RESIST_MISS_CHANCE should decrease miss cha…
sogladev May 11, 2024
9af66df
chore(DB): import pending files
github-actions[bot] May 11, 2024
2c77139
fix(Scripts/Naxxramas): Maexxna more blizzlike web wrap (#18843)
sogladev May 11, 2024
6edf515
chore(DB): import pending files
github-actions[bot] May 11, 2024
d44c899
fix(Scripts/Spell): Fix Void Zone damage calcs for Netherspite, Blaum…
sogladev May 11, 2024
864ea7f
chore(DB): import pending files
github-actions[bot] May 11, 2024
31096df
fix(Scripts/TheEye): correct first phoenix in p5 (#18802)
balleny May 11, 2024
6b5ad72
fix(DB/Creature): Correct spells order for Broken-down Shredder (iss…
xubpwg May 12, 2024
daf7842
fix(DB/asi)Added some small events to the creature "Shen'dralar Ancie…
fangshun2004 May 12, 2024
bf930bb
chore(DB): import pending files
github-actions[bot] May 12, 2024
dd3f4a5
fix(Scripts/Zones/Creature): Infra-Green Bomber (#18752)
Knindzagxg May 12, 2024
c95594e
fix(DB/updates): fix downquery to match up (#18888)
elthehablo May 12, 2024
0f82c8e
fix(Core/Events) Implement Fireworks Spectacular (#18860)
sudlud May 12, 2024
8552d4f
chore(DB): import pending files
github-actions[bot] May 12, 2024
85e9671
fix(Scripts/Naxxramas): Re enable Portal Hub teleport requirement (#…
sogladev May 12, 2024
d709080
fix(Karazhan/Nightbane): no longer killable during flight (#18890)
sogladev May 12, 2024
5668e47
fix(DB/Hyjal): Archimonde aggro range (#18884)
elthehablo May 12, 2024
e4b4686
chore(DB): import pending files
github-actions[bot] May 12, 2024
b42ca49
fix(Karazhan/Nightbane): Rain of Bones cast on one random player/pet,…
sogladev May 13, 2024
3a4d321
fix(DB/gameobject):Remove the Church of the Holy Light with flowers a…
fangshun2004 May 13, 2024
15e46de
chore(DB): import pending files
github-actions[bot] May 13, 2024
7889a99
fix(DB/Hyjal): allow Giant Infernal to use Flame Buffet (#18885)
elthehablo May 14, 2024
8ad1744
chore(DB): import pending files
github-actions[bot] May 14, 2024
6594255
fix(DB/Loot): Near complete loot rework of Vanilla overworld zones (#…
Gultask May 14, 2024
e06f2b2
chore(DB): import pending files
github-actions[bot] May 14, 2024
fd7c8a0
fix(DB/Gameobject): Rebuild all Eastern Kingdoms gathering nodes usin…
Gultask May 14, 2024
ef6db03
chore(DB): import pending files
github-actions[bot] May 14, 2024
e2029c3
fix(Core/BattlegroundAV): spawn generic gameobjects in Alterac Valley…
sudlud May 15, 2024
6874d5e
chore(DB): import pending files
github-actions[bot] May 15, 2024
3b4639a
fix(Scripts/ShadowmoonValley): minor fixes to Enslaved Netherwing Dra…
elthehablo May 17, 2024
dfc9abb
fix(CI): revert ubuntu-22.04 to gcc12 (#18905)
sudlud May 17, 2024
7b23439
feat(CI): add CI for ubuntu-24.04 (#18909)
sudlud May 17, 2024
e1b5866
Merge branch '3.3.5' into npcbots_3.3.5
trickerer May 18, 2024
6fc305b
NPCBots: Fix bots being able to stay in combat when removed via logout
trickerer May 18, 2024
2031358
NPCBots: Always temporatily enable default roles for bots while free …
trickerer May 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .github/workflows/core-build-nopch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,16 @@ jobs:
CXX: clang++-15
- os: ubuntu-22.04
compiler:
CC: gcc-13
CXX: g++-13
CC: gcc-12
CXX: g++-12
- os: ubuntu-24.04
compiler:
CC: clang-18
CXX: clang++-18
- os: ubuntu-24.04
compiler:
CC: gcc-14
CXX: g++-14
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }}-${{ matrix.compiler.CC }}-nopch
if: github.repository == 'trickerer/AzerothCore-wotlk-with-NPCBots'
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/core-build-pch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,16 @@ jobs:
CXX: clang++-15
- os: ubuntu-22.04
compiler:
CC: gcc-13
CXX: g++-13
CC: gcc-12
CXX: g++-12
- os: ubuntu-24.04
compiler:
CC: clang-18
CXX: clang++-18
- os: ubuntu-24.04
compiler:
CC: gcc-14
CXX: g++-14
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }}-${{ matrix.compiler.CC }}-pch
if: github.repository == 'azerothcore/azerothcore-wotlk' && !github.event.pull_request.draft
Expand Down
8 changes: 8 additions & 0 deletions data/sql/updates/db_world/2024_05_11_00.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
-- DB update 2024_05_09_00 -> 2024_05_11_00
--
UPDATE `gameobject_template` SET `AIName` = 'SmartGameObjectAI' WHERE `entry` IN (180690, 180691);

DELETE FROM `smart_scripts` WHERE (`source_type` = 1 AND `entryorguid` IN (180690, 180691));
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
(180690, 1, 0, 0, 70, 0, 100, 0, 2, 0, 0, 0, 0, 0, 106, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Large Scarab Coffer - On Gameobject State Changed - Remove Gameobject Flags Locked'),
(180691, 1, 0, 0, 70, 0, 100, 0, 2, 0, 0, 0, 0, 0, 106, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Scarab Coffer - On Gameobject State Changed - Remove Gameobject Flags Locked');
3 changes: 3 additions & 0 deletions data/sql/updates/db_world/2024_05_11_01.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-- DB update 2024_05_11_00 -> 2024_05_11_01
--
UPDATE `spell_target_position` SET `PositionX`=386.27, `PositionY`=33.4144, `PositionZ`=-130.934, `VerifiedBuild`=52237 WHERE `ID`=21128;
109 changes: 109 additions & 0 deletions data/sql/updates/db_world/2024_05_11_02.sql

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions data/sql/updates/db_world/2024_05_11_03.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
-- DB update 2024_05_11_02 -> 2024_05_11_03
--
-- 28622: Web Wrap stunned dot
DELETE FROM `spell_script_names` WHERE `spell_id` = 28622;
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`)
VALUES(28622, 'spell_web_wrap_damage');

-- 28618: Disable pull effect and periodic trigger event. Keep pacify silence and set duration to 5 seconds
UPDATE `spell_dbc` SET `DurationIndex` = 27, `Effect_1` = 0, `Effect_2` = 0 WHERE `ID` = 28618;
12 changes: 12 additions & 0 deletions data/sql/updates/db_world/2024_05_11_04.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
-- DB update 2024_05_11_03 -> 2024_05_11_04
DELETE FROM `spell_script_names` WHERE `spell_id` = 28865;
INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
(28865,'spell_gen_consumption');

DELETE FROM `creature_template_spell` WHERE `CreatureID` = 16697;

UPDATE `creature_template` SET `ScriptName` = '', `AIName` = 'SmartAI' WHERE `entry` = 16697;
DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 16697);
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
(16697, 0, 0, 0, 60, 0, 100, 0, 0, 0, 2500, 2500, 0, 0, 11, 28865, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Void Zone - On Update - Cast \'Consumption\''),
(16697, 0, 1, 0, 37, 0, 100, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Void Zone - On Initialize - Set Reactstate Passive');
8 changes: 8 additions & 0 deletions data/sql/updates/db_world/2024_05_12_00.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
-- DB update 2024_05_11_04 -> 2024_05_12_00

DELETE FROM `creature_template_spell` WHERE `CreatureID` = 27354;
INSERT INTO `creature_template_spell` (`CreatureID`, `Index`, `Spell`, `VerifiedBuild`) VALUES
(27354, 0, 48548, 53788),
(27354, 1, 48558, 53788),
(27354, 2, 48604, 53788),
(27354, 4, 48610, 53788);
49 changes: 49 additions & 0 deletions data/sql/updates/db_world/2024_05_12_01.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
-- DB update 2024_05_12_00 -> 2024_05_12_01
-- Shen'dralar Ancient smart ai
SET @ENTRY := 14358;
UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = @ENTRY;
DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY;
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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
(@ENTRY, 0, 0, 0, 25, 0, 100, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Shen\'dralar Ancient - On reset - Set event phase to phase 1'),
(@ENTRY, 0, 1, 0, 62, 0, 100, 512, 5723, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Shen\'dralar Ancient - On gossip action 0 from menu 5723 selected - Gossip player: Close gossip'),
(@ENTRY, 0, 2, 3, 20, 1, 100, 0, 7461, 0, 0, 0, 22, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Shen\'dralar Ancient - On player rewarded quest The Madness Within (7461) - Set event phase to phase 2'),
(@ENTRY, 0, 3, 4, 61, 0, 100, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Shen\'dralar Ancient - storedTarget[0] = Rewarded player'),
(@ENTRY, 0, 4, 5, 61, 0, 100, 0, 0, 0, 0, 0, 12, 14364, 3, 300000, 0, 0, 0, 1, 0, 0, 0, 5, 0, 0, 0, 'Shen\'dralar Ancient - Summon creature Shen\'dralar Spirit (14364) at Self\'s position, moved by offset (5, 0, 0, 0) as summon type timed despawn with duration 300 seconds'),
(@ENTRY, 0, 5, 6, 61, 0, 100, 0, 0, 0, 0, 0, 12, 14364, 3, 300000, 0, 0, 0, 1, 0, 0, 0, 3.5, 3.5, 0, 0, 'Shen\'dralar Ancient - Summon creature Shen\'dralar Spirit (14364) at Self\'s position, moved by offset (3.5, 3.5, 0, 0) as summon type timed despawn with duration 300 seconds'),
(@ENTRY, 0, 6, 7, 61, 0, 100, 0, 0, 0, 0, 0, 12, 14364, 3, 300000, 0, 0, 0, 1, 0, 0, 0, 0, 5, 0, 0, 'Shen\'dralar Ancient - Summon creature Shen\'dralar Spirit (14364) at Self\'s position, moved by offset (0, 5, 0, 0) as summon type timed despawn with duration 300 seconds'),
(@ENTRY, 0, 7, 8, 61, 0, 100, 0, 0, 0, 0, 0, 12, 14364, 3, 300000, 0, 0, 0, 1, 0, 0, 0, 3.5, -3.5, 0, 0, 'Shen\'dralar Ancient - Summon creature Shen\'dralar Spirit (14364) at Self\'s position, moved by offset (3.5, -3.5, 0, 0) as summon type timed despawn with duration 300 seconds'),
(@ENTRY, 0, 8, 9, 61, 0, 100, 0, 0, 0, 0, 0, 12, 14364, 3, 300000, 0, 0, 0, 1, 0, 0, 0, -5, 0, 0, 0, 'Shen\'dralar Ancient - Summon creature Shen\'dralar Spirit (14364) at Self\'s position, moved by offset (-5, 0, 0, 0) as summon type timed despawn with duration 300 seconds'),
(@ENTRY, 0, 9, 10, 61, 0, 100, 0, 0, 0, 0, 0, 12, 14364, 3, 300000, 0, 0, 0, 1, 0, 0, 0, -3.5, -3.5, 0, 0, 'Shen\'dralar Ancient - Summon creature Shen\'dralar Spirit (14364) at Self\'s position, moved by offset (-3.5, -3.5, 0, 0) as summon type timed despawn with duration 300 seconds'),
(@ENTRY, 0, 10, 11, 61, 0, 100, 0, 0, 0, 0, 0, 12, 14364, 3, 300000, 0, 0, 0, 1, 0, 0, 0, 0, -5, 0, 0, 'Shen\'dralar Ancient - Summon creature Shen\'dralar Spirit (14364) at Self\'s position, moved by offset (0, -5, 0, 0) as summon type timed despawn with duration 300 seconds'),
(@ENTRY, 0, 11, 12, 61, 0, 100, 0, 0, 0, 0, 0, 12, 14364, 3, 300000, 0, 0, 0, 1, 0, 0, 0, -3.5, 3.5, 0, 0, 'Shen\'dralar Ancient - Summon creature Shen\'dralar Spirit (14364) at Self\'s position, moved by offset (-3.5, 3.5, 0, 0) as summon type timed despawn with duration 300 seconds'),
(@ENTRY, 0, 12, 13, 61, 0, 100, 0, 0, 0, 0, 0, 5, 21, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Shen\'dralar Ancient - Play emote ONESHOT_APPLAUD (21)'),
(@ENTRY, 0, 13, 0, 61, 0, 100, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 11, 14364, 10, 0, 0, 0, 0, 0, 'Shen\'dralar Ancient - Send stored target storedTarget[0] to Creature Shen\'dralar Spirit (14364) in 10 yd'),
(@ENTRY, 0, 14, 15, 20, 2, 100, 0, 7461, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Shen\'dralar Ancient - storedTarget[0] = Rewarded player (phase 2)'),
(@ENTRY, 0, 15, 0, 61, 0, 100, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 11, 14364, 10, 0, 0, 0, 0, 0, 'Shen\'dralar Ancient - Send stored target storedTarget[0] to Creature Shen\'dralar Spirit (14364) in 10 yd (phase 2)'),
(@ENTRY, 0, 16, 0, 35, 0, 100, 512, 14364, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Shen\'dralar Ancient - On summoned creature Shen\'dralar Spirit (14364) despawn - Set event phase to phase 1');

DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 14358 AND `SourceId` = 0;

-- Shen'dralar Spirit smart ai
SET @ENTRY := 14364;
UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = @ENTRY;
DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY;
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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
(@ENTRY, 0, 0, 0, 60, 0, 100, 0, 0, 30000, 20000, 30000, 10, 2, 21, 4, 66, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Shen\'dralar Spirit - Play random emote: ONESHOT_BOW (2), ONESHOT_APPLAUD (21), ONESHOT_CHEER(DNR) (4), ONESHOT_SALUTE (66),'),
(@ENTRY, 0, 1, 0, 60, 0, 100, 512, 15000, 15000, 15000, 15000, 66, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 'Shen\'dralar Spirit Look at storedTarget[0]');

DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 14364 AND `SourceId` = 0;

-- Treasure of the Shen'dralar
-- 179517 (Area: 2557 - Difficulty: 1) CreateObject1
SET @OGUID1:=11921;
DELETE FROM `gameobject` WHERE (`id` = 179517) AND (`guid` IN (@OGUID1));
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`) VALUES
(@OGUID1, 179517, 429, 2557, 2557, 1, 1, 129.4810638427734375, 544.96710205078125, -48.4663200378417968, 1.623155713081359863, 0, 0, 0.725374221801757812, 0.688354730606079101, 7200, 255, 1, '', 52237);

-- Skeletal Remains of Kariel Winthalus
-- 179544 (Area: 2557 - Difficulty: 1) CreateObject1
SET @OGUID2:=44739;
DELETE FROM `gameobject` WHERE (`id` = 179544) AND (`guid` IN (@OGUID2));
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`) VALUES
(@OGUID2, 179544, 429, 2557, 2557, 1, 1, 163.0381622314453125, 530.1822509765625, -48.4669570922851562, 5.026549339294433593, 0, 0, -0.5877847671508789, 0.809017360210418701, 7200, 255, 1, '', 52237);
Loading