Skip to content

fix(Scripts): Correct Zul'Aman Boss DataType & Hostage Order#25212

Open
brighton-chi wants to merge 3 commits intoazerothcore:masterfrom
brighton-chi:fix-za-datatypes
Open

fix(Scripts): Correct Zul'Aman Boss DataType & Hostage Order#25212
brighton-chi wants to merge 3 commits intoazerothcore:masterfrom
brighton-chi:fix-za-datatypes

Conversation

@brighton-chi
Copy link
Copy Markdown
Contributor

@brighton-chi brighton-chi commented Mar 25, 2026

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:

  • Core (units, players, creatures, game systems).
  • Scripts (bosses, spell scripts, creature scripts).
  • Database (SAI, creatures, etc).

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.

  • AI tools (e.g. ChatGPT, Claude, or similar) were used entirely or partially in preparing this pull request. Please specify which tools were used, if any.

Claude Sonnet 4.6

Issues Addressed:

  • Closes

SOURCE:

The changes have been validated through:

  • Live research (checked on live servers, e.g Classic WotLK, Retail, etc.)
  • Sniffs (remember to share them with the open source community!)
  • Video evidence, knowledge databases or other public sources (e.g forums, Wowhead, etc.)
  • The changes promoted by this pull request come partially or entirely from another project (cherry-pick). Cherry-picks must be committed using the proper --author tag in order to be accepted, thus crediting the original authors, unless otherwise unable to be found

Tests Performed:

This PR has been:

  • Tested in-game by the author.
  • Tested in-game by other community members/someone else other than the author/has been live on production servers.
  • This pull request requires further testing and may have edge cases to be tested.

How to Test the Changes:

  • This pull request can be tested by following the reproduction steps provided in the linked issue
  • This pull request requires further testing. Provide steps to test your changes. If it requires any specific setup e.g multiple players please specify it as well.
  1. .teleport zulaman
  2. .die on Akil'zon, check .instance getbossstate, make sure Harkor spawns
  3. .die on Nalorakk, check .instance getbossstate, make sure Tanzar spawns
  4. .die on Jan'alai, make sure Kraz spawns
  5. .die on Halazzi, make sure Ashli spawns

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.

Copilot AI review requested due to automatic review settings March 25, 2026 03:13
@github-actions github-actions bot added Script Refers to C++ Scripts for the Core file-cpp Used to trigger the matrix build labels Mar 25, 2026
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 DataTypes so DATA_AKILZON is 0 and DATA_NALORAKK is 1.
  • 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.

@brighton-chi
Copy link
Copy Markdown
Contributor Author

brighton-chi commented Mar 25, 2026

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.

@brighton-chi brighton-chi changed the title fix(Scripts): Correct Zul'Aman Boss DataType Order fix(Scripts): Correct Zul'Aman Boss DataType & Hostage Order Mar 25, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

file-cpp Used to trigger the matrix build Script Refers to C++ Scripts for the Core

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants