fix(Scripts/Northrend): Update Drakkensryd proto-drake vehicle logic#25587
Merged
Rorschach91 merged 2 commits intoazerothcore:masterfrom May 2, 2026
Merged
fix(Scripts/Northrend): Update Drakkensryd proto-drake vehicle logic#25587Rorschach91 merged 2 commits intoazerothcore:masterfrom
Rorschach91 merged 2 commits intoazerothcore:masterfrom
Conversation
- refactor manual accessory reinstall logic - set Hyldnir Harpoon to only enter the passenger position. Avoids issues where a second player can mount the Rider's position - set UNIT_FLAG2_PREVENT_SPELL_CLICK to avoid cogwheel icon on the drake
github-actions
Bot
added
CORE
Contributor
There was a problem hiding this comment.
Pull request overview
Updates the Hyldsmeet Proto-Drake (Drakkensryd quest) vehicle behavior to improve seat/vehicle usability and reduce unintended player interactions.
Changes:
- Refactors proto-drake accessory reinstall logic by tracking whether the accessory is currently installed and respawning it on a timer after removal.
- Prevents spell-click interaction on the proto-drake (removing the cogwheel interaction icon) via
UNIT_FLAG2_PREVENT_SPELL_CLICK. - Applies a SpellMgr correction for 54933 (Hyldnir Harpoon) to force a specific vehicle seat selection via
BasePoints.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
src/server/scripts/Northrend/zone_storm_peaks.cpp |
Adjusts Hyldsmeet proto-drake vehicle AI (seat handling, accessory reinstall gating, prevents spell-click). |
src/server/game/Spells/SpellInfoCorrections.cpp |
Forces Hyldnir Harpoon to use a specific vehicle seat through a spell effect basepoints correction. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| // 54933 Hyldnir Harpoon | ||
| ApplySpellFix({ 54933 }, [](SpellInfo* spellInfo) | ||
| { | ||
| spellInfo->Effects[EFFECT_0].BasePoints = 1; |
There was a problem hiding this comment.
This spell correction sets BasePoints = 1, but it’s not obvious to future readers that this is to force a specific vehicle seat (often seatId = points - 1). Adding a short inline note about the seat mapping/intent would make this fix easier to maintain.
Suggested change
| spellInfo->Effects[EFFECT_0].BasePoints = 1; | |
| spellInfo->Effects[EFFECT_0].BasePoints = 1; // Force vehicle seat 0 (seatId is derived from points, typically points - 1). |
sogladev
force-pushed
the
fix-drakkensryd-3
branch
from
d7fc9d2 to
238e298
Compare
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
13 tasks
Rorschach91
approved these changes
May 2, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes Proposed:
This PR proposes changes to:
Core (units, players, creatures, game systems).
Scripts (bosses, spell scripts, creature scripts).
Database (SAI, creatures, etc).
refactor manual accessory reinstall logic
set Hyldnir Harpoon to only enter the passenger position. Avoids issues where a second player can mount the Rider's position
set UNIT_FLAG2_PREVENT_SPELL_CLICK to avoid cogwheel icon on the drake
TODO: Using the harpoon can overwrite / mount an already occupied player's seat.
AI-assisted Pull Requests
Important
While the use of AI tools when preparing pull requests is not prohibited, contributors must clearly disclose when such tools have been used and specify the model involved.
Contributors are also expected to fully understand the changes they are submitting and must be able to explain and justify those changes when requested by maintainers.
Issues Addressed:
#25387 (comment)
SOURCE:
The changes have been validated through:
Tests Performed:
This PR has been:
.tele storm.add q 12886How to Test the Changes:
Known Issues and TODO List:
How to Test AzerothCore PRs
When a PR is ready to be tested, it will be marked as [WAITING TO BE TESTED].
You can help by testing PRs and writing your feedback here on the PR's page on GitHub. Follow the instructions here:
http://www.azerothcore.org/wiki/How-to-test-a-PR
REMEMBER: when testing a PR that changes something generic (i.e. a part of code that handles more than one specific thing), the tester should not only check that the PR does its job (e.g. fixing spell XXX) but especially check that the PR does not cause any regression (i.e. introducing new bugs).
For example: if a PR fixes spell X by changing a part of code that handles spells X, Y, and Z, we should not only test X, but we should test Y and Z as well.