From afa7000b612a1d6702bb2be54a632fc4ab5b5731 Mon Sep 17 00:00:00 2001 From: Crow Date: Sun, 14 Jun 2026 00:54:42 -0500 Subject: [PATCH] fix(Scripts/ZulAman): Correct boss DataType and hostage order (#25212) Co-authored-by: sudlud --- .../scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp | 8 ++++---- src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp | 4 ++-- src/server/scripts/EasternKingdoms/ZulAman/zulaman.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index 8eae8a7e7..721d1ba5b 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -38,10 +38,10 @@ struct SHostageInfo static SHostageInfo HostageInfo[] = { - {23790, 186648, { -57.0f, 1343.0f, 40.77f, 3.2f } }, // bear - {23999, 187021, { 400.0f, 1414.0f, 74.36f, 3.3f } }, // eagle - {24001, 186672, { -35.0f, 1134.0f, 18.71f, 1.9f } }, // dragonhawk - {24024, 186667, { 413.0f, 1117.0f, 6.32f, 3.1f } } // lynx + {23999, 187021, { 400.0f, 1414.0f, 74.36f, 3.3f } }, // Harkor (Akil'zon) + {23790, 186648, { -57.0f, 1343.0f, 40.77f, 3.2f } }, // Tanzar (Nalorakk) + {24024, 186667, { -35.0f, 1134.0f, 18.71f, 1.9f } }, // Kraz (Jan'alai) + {24001, 186672, { 413.0f, 1117.0f, 6.32f, 3.1f } } // Ashli (Halazzi) }; Position const HarrisonJonesLoc = {120.687f, 1674.0f, 42.0217f, 1.59044f}; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index 47e6100d1..23f3a5825 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -242,8 +242,8 @@ struct npc_forest_frog : public ScriptedAI #define GOSSIP_HOSTAGE1 "I am glad to help you." -static uint32 HostageEntry[] = {23790, 23999, 24024, 24001}; -static uint32 ChestEntry[] = {186648, 187021, 186667, 186672}; +static uint32 HostageEntry[] = {23999, 23790, 24024, 24001}; +static uint32 ChestEntry[] = {187021, 186648, 186667, 186672}; class npc_zulaman_hostage : public CreatureScript { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h index d131a9905..7d3c1f401 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h @@ -25,8 +25,8 @@ enum DataTypes { - DATA_NALORAKK = 0, - DATA_AKILZON = 1, + DATA_AKILZON = 0, + DATA_NALORAKK = 1, DATA_JANALAI = 2, DATA_HALAZZI = 3, DATA_HEXLORD = 4,