fix(Scripts): Correct Zul'Aman Boss DataType & Hostage Order#25212
Open
brighton-chi wants to merge 3 commits intoazerothcore:masterfrom
Open
fix(Scripts): Correct Zul'Aman Boss DataType & Hostage Order#25212brighton-chi wants to merge 3 commits intoazerothcore:masterfrom
brighton-chi wants to merge 3 commits intoazerothcore:masterfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes Zul’Aman boss indexing so boss state lookups match DungeonEncounter.dbc, preventing Akil’zon/Nalorakk completion status from being swapped and keeping hostage/chest pairing consistent with the corrected indices.
Changes:
- Reorders
DataTypessoDATA_AKILZONis0andDATA_NALORAKKis1. - Reorders hostage/chest lookup arrays and hostage info table to align hostage/chest indices with the corrected boss order.
- Updates hostage comments to clarify which boss each hostage corresponds to.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| src/server/scripts/EasternKingdoms/ZulAman/zulaman.h | Updates boss datatype numeric ordering to match expected encounter index order. |
| src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp | Reorders hostage/chest entry arrays intended to map hostages/chests by encounter index. |
| src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp | Reorders HostageInfo entries and improves comments to match the corrected boss order. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
Outdated
Show resolved
Hide resolved
Contributor
Author
|
There is also incorrect ordering in the hostages--CoPilot noted the inconsistency between SHostageInfo and HostageEntry, but it is actually HostageEntry that is correct. I've fixed SHostageInfo--Ashli should be with Halazzi and Kraz with Jan'alai, but their IDs were flipped. |
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:
ZA boss DataType order is incorrect based on DungeonEncounter.dbc (Nalorakk is 0 and Akil'zon is 1, but that should be flipped). This caused .instance getbossstate to indicate Akil'zon was defeated upon Nalorakk's defeat, and Nalorakk was defeated upon Akil'zon's defeat.
Additionally, hostages Ashli and Kraz were swapped so this PR fixes their locations (and the locations of their chests) so that Ashli correctly is with Halazzi and Kraz with Jan'alai.
This PR proposes changes to:
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.
Claude Sonnet 4.6
Issues Addressed:
SOURCE:
The changes have been validated through:
Tests Performed:
This PR has been:
How 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.