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.

Sign up for GitHub

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

[Nyzul] Use GetFirstID() for zone mobs and NPCs #6929

Merged
merged 4 commits into from
Feb 2, 2025
Merged

[Nyzul] Use GetFirstID() for zone mobs and NPCs #6929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55c26d4
Map first Nyzul door and remove the rest door usages
Xaver-DaRed Feb 2, 2025
de2de4a
Use `GetFirstID()` method for instance 58 and 59 mobs
Xaver-DaRed Feb 2, 2025
c6779d7
Use `GetFirstID()` method for instance 51 mobs
Xaver-DaRed Feb 2, 2025
9fb5aeb
Use `GetFirstID()` method for Nyzul npcs
Xaver-DaRed Feb 2, 2025
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
20 changes: 10 additions & 10 deletions scripts/globals/nyzul.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,10 @@ xi.nyzul.handleAppraisalItem = function(player, npc)
local instance = npc:getInstance()
local chars = instance:getChars()

for _, cofferID in ipairs(ID.npc.TREASURE_COFFER) do
for cofferID = ID.npc.TREASURE_COFFER_OFFSET, ID.npc.TREASURE_COFFER_OFFSET + 2 do
if npc:getID() == cofferID and npc:getLocalVar('opened') == 0 then
-- Appraisal Items
local mobOffset = npc:getLocalVar('appraisalItem') - (ID.mob[51].OFFSET_NM - xi.appraisal.origin.NYZUL_BAT_EYE) -- Bat Eye mobId - Appraisal mob value.
local mobOffset = npc:getLocalVar('appraisalItem') - (ID.mob.NM_OFFSET - xi.appraisal.origin.NYZUL_BAT_EYE) -- Bat Eye mobId - Appraisal mob value.

if mobOffset == 166 or mobOffset == 187 then
mobOffset = 108
Expand Down Expand Up @@ -433,7 +433,7 @@ xi.nyzul.tempBoxFinish = function(player, csid, option, npc)
end

xi.nyzul.clearChests = function(instance)
for _, cofferID in ipairs(ID.npc.TREASURE_COFFER) do
for cofferID = ID.npc.TREASURE_COFFER_OFFSET, ID.npc.TREASURE_COFFER_OFFSET + 2 do
local coffer = GetNPCByID(cofferID, instance)

if coffer and coffer:getStatus() ~= xi.status.DISAPPEAR then
Expand All @@ -444,7 +444,7 @@ xi.nyzul.clearChests = function(instance)
end

if xi.settings.main.ENABLE_NYZUL_CASKETS then
for _, casketID in ipairs(ID.npc.TREASURE_CASKET) do
for casketID = ID.npc.TREASURE_CASKET_OFFSET, ID.npc.TREASURE_CASKET_OFFSET + 3 do
local casket = GetNPCByID(casketID, instance)

if casket and casket:getStatus() ~= xi.status.DISAPPEAR then
Expand Down Expand Up @@ -566,7 +566,7 @@ xi.nyzul.eliminateAllKill = function(mob)
end

xi.nyzul.activateRuneOfTransfer = function(instance)
for _, runeID in pairs(ID.npc.RUNE_OF_TRANSFER) do
for runeID = ID.npc.RUNE_OF_TRANSFER_OFFSET, ID.npc.RUNE_OF_TRANSFER_OFFSET + 1 do
if GetNPCByID(runeID, instance):getStatus() == xi.status.NORMAL then
GetNPCByID(runeID, instance):setAnimationSub(1)

Expand Down Expand Up @@ -608,12 +608,12 @@ xi.nyzul.spawnChest = function(mob, player)

-- NM chest spawn.
if
mobID >= ID.mob[51].OFFSET_NM and
mobID <= ID.mob[51].TAISAIJIN
mobID >= ID.mob.NM_OFFSET and
mobID <= ID.mob.TAISAIJIN
then
xi.nyzul.vigilWeaponDrop(player, mob)

for _, cofferID in ipairs(ID.npc.TREASURE_COFFER) do
for cofferID = ID.npc.TREASURE_COFFER_OFFSET, ID.npc.TREASURE_COFFER_OFFSET + 2 do
local coffer = GetNPCByID(cofferID, instance)

if coffer and coffer:getStatus() == xi.status.DISAPPEAR then
Expand All @@ -629,11 +629,11 @@ xi.nyzul.spawnChest = function(mob, player)

-- NM casket spawn.
elseif
mobID < ID.mob[51].ADAMANTOISE and
mobID < ID.mob.BOSS_OFFSET and
xi.settings.main.ENABLE_NYZUL_CASKETS
then
if math.random(1, 100) <= 6 then
for _, casketID in ipairs(ID.npc.TREASURE_CASKET) do
for casketID = ID.npc.TREASURE_CASKET_OFFSET, ID.npc.TREASURE_CASKET_OFFSET + 3 do
local casket = GetNPCByID(casketID, instance)

if casket and casket:getStatus() == xi.status.DISAPPEAR then
Expand Down
94 changes: 47 additions & 47 deletions scripts/globals/nyzul/floor_generation.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1062,63 +1062,63 @@ local layoutSpawnPoints = -- Spawnpoints by layout.
local pTableEnemyLeaders =
{
-- [Floor_Section] = { first_mob_id, last_mob_id },
[ 1] = { ID.mob[51].MOKKE, ID.mob[51].LONG_HORNED_CHARIOT }, -- Regular enemy leaders. Can appear on all floors, except floor-20 multiples.
[ 40] = { ID.mob[51].ADAMANTOISE, ID.mob[51].ADAMANTOISE + 2 }, -- Floors 1 to 40 bosses. Original Land Kings.
[100] = { ID.mob[51].ADAMANTOISE + 3, ID.mob[51].ADAMANTOISE + 5 }, -- Floors 60 to 100 bosses. ToAU Land Kings.
[ 1] = { ID.mob.LEADER_OFFSET, ID.mob.LEADER_OFFSET + 24 }, -- Regular enemy leaders. Can appear on all floors, except floor-20 multiples.
[ 40] = { ID.mob.BOSS_OFFSET, ID.mob.BOSS_OFFSET + 2 }, -- Floors 1 to 40 bosses. Original Land Kings.
[100] = { ID.mob.BOSS_OFFSET + 3, ID.mob.BOSS_OFFSET + 5 }, -- Floors 60 to 100 bosses. ToAU Land Kings.
}

local pTableSpecifiedMobs =
{
-- [Mob family] = { first_mob_id, last_mob_id },
[1] = { ID.mob[51].OFFSET_SPECIFIED, ID.mob[51].OFFSET_SPECIFIED + 4 }, -- Heraldic Imp x5
[2] = { ID.mob[51].OFFSET_SPECIFIED + 5, ID.mob[51].OFFSET_SPECIFIED + 9 }, -- Psycheflayer x5
[3] = { ID.mob[51].OFFSET_SPECIFIED + 10, ID.mob[51].OFFSET_SPECIFIED + 14 }, -- Poroggo Gent x5
[4] = { ID.mob[51].OFFSET_SPECIFIED + 15, ID.mob[51].OFFSET_SPECIFIED + 19 }, -- Ebony Pudding x5
[5] = { ID.mob[51].OFFSET_SPECIFIED + 20, ID.mob[51].OFFSET_SPECIFIED + 21 }, -- Qiqirn_Treasure_Hunter x2
[6] = { ID.mob[51].OFFSET_SPECIFIED + 22, ID.mob[51].OFFSET_SPECIFIED + 24 }, -- Qiqirn_Archaeologist x3
[7] = { ID.mob[51].OFFSET_SPECIFIED + 25, ID.mob[51].OFFSET_SPECIFIED + 29 }, -- Racing_Chariot x5
[1] = { ID.mob.SPECIFIED_OFFSET, ID.mob.SPECIFIED_OFFSET + 4 }, -- Heraldic Imp x5
[2] = { ID.mob.SPECIFIED_OFFSET + 5, ID.mob.SPECIFIED_OFFSET + 9 }, -- Psycheflayer x5
[3] = { ID.mob.SPECIFIED_OFFSET + 10, ID.mob.SPECIFIED_OFFSET + 14 }, -- Poroggo Gent x5
[4] = { ID.mob.SPECIFIED_OFFSET + 15, ID.mob.SPECIFIED_OFFSET + 19 }, -- Ebony Pudding x5
[5] = { ID.mob.SPECIFIED_OFFSET + 20, ID.mob.SPECIFIED_OFFSET + 21 }, -- Qiqirn_Treasure_Hunter x2
[6] = { ID.mob.SPECIFIED_OFFSET + 22, ID.mob.SPECIFIED_OFFSET + 24 }, -- Qiqirn_Archaeologist x3
[7] = { ID.mob.SPECIFIED_OFFSET + 25, ID.mob.SPECIFIED_OFFSET + 29 }, -- Racing_Chariot x5
}

local pTableEvenFloorRandomNMs =
{
-- [Floor_Section] = { first_mob_id, last_mob_id },
[1] = { ID.mob[51].OFFSET_NM, ID.mob[51].OFFSET_NM + 8 }, -- Floors 1 to 20.
[2] = { ID.mob[51].OFFSET_NM + 18, ID.mob[51].OFFSET_NM + 26 }, -- Floors 21 to 40.
[3] = { ID.mob[51].OFFSET_NM + 36, ID.mob[51].OFFSET_NM + 44 }, -- Floors 41 to 60.
[4] = { ID.mob[51].OFFSET_NM + 54, ID.mob[51].OFFSET_NM + 62 }, -- Floors 61 to 80.
[5] = { ID.mob[51].OFFSET_NM + 72, ID.mob[51].OFFSET_NM + 80 }, -- Floors 81 to 100.
[1] = { ID.mob.NM_OFFSET, ID.mob.NM_OFFSET + 8 }, -- Floors 1 to 20.
[2] = { ID.mob.NM_OFFSET + 18, ID.mob.NM_OFFSET + 26 }, -- Floors 21 to 40.
[3] = { ID.mob.NM_OFFSET + 36, ID.mob.NM_OFFSET + 44 }, -- Floors 41 to 60.
[4] = { ID.mob.NM_OFFSET + 54, ID.mob.NM_OFFSET + 62 }, -- Floors 61 to 80.
[5] = { ID.mob.NM_OFFSET + 72, ID.mob.NM_OFFSET + 80 }, -- Floors 81 to 100.
}

local pTableOddFloorRandomNMs =
{
-- [Floor_Section] = { first_mob_id, last_mob_id },
[1] = { ID.mob[51].OFFSET_NM + 9, ID.mob[51].OFFSET_NM + 17 }, -- Floors 1 to 20.
[2] = { ID.mob[51].OFFSET_NM + 27, ID.mob[51].OFFSET_NM + 35 }, -- Floors 21 to 40.
[3] = { ID.mob[51].OFFSET_NM + 45, ID.mob[51].OFFSET_NM + 53 }, -- Floors 41 to 60.
[4] = { ID.mob[51].OFFSET_NM + 63, ID.mob[51].OFFSET_NM + 71 }, -- Floors 61 to 80.
[5] = { ID.mob[51].OFFSET_NM + 81, ID.mob[51].OFFSET_NM + 89 }, -- Floors 81 to 100.
[1] = { ID.mob.NM_OFFSET + 9, ID.mob.NM_OFFSET + 17 }, -- Floors 1 to 20.
[2] = { ID.mob.NM_OFFSET + 27, ID.mob.NM_OFFSET + 35 }, -- Floors 21 to 40.
[3] = { ID.mob.NM_OFFSET + 45, ID.mob.NM_OFFSET + 53 }, -- Floors 41 to 60.
[4] = { ID.mob.NM_OFFSET + 63, ID.mob.NM_OFFSET + 71 }, -- Floors 61 to 80.
[5] = { ID.mob.NM_OFFSET + 81, ID.mob.NM_OFFSET + 89 }, -- Floors 81 to 100.
}

local pTableFloorRandomEntities =
{
-- [Mob family] = { first_mob_id, last_mob_id },
[ 1] = { ID.mob[51].OFFSET_REGULAR, ID.mob[51].OFFSET_REGULAR + 11 }, -- Aquans
[ 2] = { ID.mob[51].OFFSET_REGULAR + 12, ID.mob[51].OFFSET_REGULAR + 23 }, -- Amorphs
[ 3] = { ID.mob[51].OFFSET_REGULAR + 24, ID.mob[51].OFFSET_REGULAR + 35 }, -- Arcana
[ 4] = { ID.mob[51].OFFSET_REGULAR + 36, ID.mob[51].OFFSET_REGULAR + 47 }, -- Undead
[ 5] = { ID.mob[51].OFFSET_REGULAR + 48, ID.mob[51].OFFSET_REGULAR + 59 }, -- Vermin
[ 6] = { ID.mob[51].OFFSET_REGULAR + 60, ID.mob[51].OFFSET_REGULAR + 71 }, -- Demons
[ 7] = { ID.mob[51].OFFSET_REGULAR + 72, ID.mob[51].OFFSET_REGULAR + 83 }, -- Dragons
[ 8] = { ID.mob[51].OFFSET_REGULAR + 84, ID.mob[51].OFFSET_REGULAR + 95 }, -- Birds
[ 9] = { ID.mob[51].OFFSET_REGULAR + 96, ID.mob[51].OFFSET_REGULAR + 107 }, -- Beasts
[10] = { ID.mob[51].OFFSET_REGULAR + 108, ID.mob[51].OFFSET_REGULAR + 119 }, -- Plantoids
[11] = { ID.mob[51].OFFSET_REGULAR + 120, ID.mob[51].OFFSET_REGULAR + 131 }, -- Lizards
[12] = { ID.mob[51].OFFSET_REGULAR + 132, ID.mob[51].OFFSET_REGULAR + 143 }, -- Amorphs 2
[13] = { ID.mob[51].OFFSET_REGULAR + 144, ID.mob[51].OFFSET_REGULAR + 155 }, -- Mixed
[14] = { ID.mob[51].OFFSET_REGULAR + 156, ID.mob[51].OFFSET_REGULAR + 167 }, -- Mixed 2
[15] = { ID.mob[51].OFFSET_REGULAR + 168, ID.mob[51].OFFSET_REGULAR + 179 }, -- Amorphs 3
[16] = { ID.mob[51].OFFSET_REGULAR + 180, ID.mob[51].OFFSET_REGULAR + 191 }, -- Arcana 2
[17] = { ID.mob[51].OFFSET_GEARS, ID.mob[51].OFFSET_GEARS + 5 }, -- Gears
[ 1] = { ID.mob.MOB_OFFSET, ID.mob.MOB_OFFSET + 11 }, -- Aquans
[ 2] = { ID.mob.MOB_OFFSET + 12, ID.mob.MOB_OFFSET + 23 }, -- Amorphs
[ 3] = { ID.mob.MOB_OFFSET + 24, ID.mob.MOB_OFFSET + 35 }, -- Arcana
[ 4] = { ID.mob.MOB_OFFSET + 36, ID.mob.MOB_OFFSET + 47 }, -- Undead
[ 5] = { ID.mob.MOB_OFFSET + 48, ID.mob.MOB_OFFSET + 59 }, -- Vermin
[ 6] = { ID.mob.MOB_OFFSET + 60, ID.mob.MOB_OFFSET + 71 }, -- Demons
[ 7] = { ID.mob.MOB_OFFSET + 72, ID.mob.MOB_OFFSET + 83 }, -- Dragons
[ 8] = { ID.mob.MOB_OFFSET + 84, ID.mob.MOB_OFFSET + 95 }, -- Birds
[ 9] = { ID.mob.MOB_OFFSET + 96, ID.mob.MOB_OFFSET + 107 }, -- Beasts
[10] = { ID.mob.MOB_OFFSET + 108, ID.mob.MOB_OFFSET + 119 }, -- Plantoids
[11] = { ID.mob.MOB_OFFSET + 120, ID.mob.MOB_OFFSET + 131 }, -- Lizards
[12] = { ID.mob.MOB_OFFSET + 132, ID.mob.MOB_OFFSET + 143 }, -- Amorphs 2
[13] = { ID.mob.MOB_OFFSET + 144, ID.mob.MOB_OFFSET + 155 }, -- Mixed
[14] = { ID.mob.MOB_OFFSET + 156, ID.mob.MOB_OFFSET + 167 }, -- Mixed 2
[15] = { ID.mob.MOB_OFFSET + 168, ID.mob.MOB_OFFSET + 179 }, -- Amorphs 3
[16] = { ID.mob.MOB_OFFSET + 180, ID.mob.MOB_OFFSET + 191 }, -- Arcana 2
[17] = { ID.mob.GEAR_OFFSET + 2, ID.mob.GEAR_OFFSET + 7 }, -- Gears
}

-----------------------------------
Expand Down Expand Up @@ -1214,9 +1214,9 @@ xi.nyzul.prepareMobs = function(instance)
floorBoss = math.random(pTableEnemyLeaders[100][1], pTableEnemyLeaders[100][2])
end

GetMobByID(ID.mob[51].ARCHAIC_RAMPART1, instance):setSpawn(-36, 0, -362, 0)
GetMobByID(ID.mob.ARCHAIC_RAMPART_OFFSET, instance):setSpawn(-36, 0, -362, 0)
GetMobByID(floorBoss, instance):setSpawn(-55.000, 1, -380.000, 250)
SpawnMob(ID.mob[51].ARCHAIC_RAMPART1, instance)
SpawnMob(ID.mob.ARCHAIC_RAMPART_OFFSET, instance)
SpawnMob(floorBoss, instance)

-- All other floors except free.
Expand All @@ -1240,8 +1240,8 @@ xi.nyzul.prepareMobs = function(instance)
spawnPointIndex = math.random(1, #dTableSpawnPoint)
spawnPoint = dTableSpawnPoint[spawnPointIndex]

if floorBoss == ID.mob[51].MOKKE + 18 then
floorBoss = ID.mob[51].MOKKE + 17 + (math.random(0, 1) * 2)
if floorBoss == ID.mob.LEADER_OFFSET + 18 then
floorBoss = ID.mob.LEADER_OFFSET + 17 + math.random(0, 1) * 2
end

-- Spawn Mob.
Expand Down Expand Up @@ -1296,8 +1296,8 @@ xi.nyzul.prepareMobs = function(instance)
spawnPoint = dTableSpawnPoint[spawnPointIndex]

-- Spawn Mob.
GetMobByID(ID.mob[51].DAHAK, instance):setSpawn(spawnPoint.x, spawnPoint.y, spawnPoint.z, math.random(0, 255))
SpawnMob(ID.mob[51].DAHAK, instance)
GetMobByID(ID.mob.DAHAK, instance):setSpawn(spawnPoint.x, spawnPoint.y, spawnPoint.z, math.random(0, 255))
SpawnMob(ID.mob.DAHAK, instance)

-- Remove table entry.
table.remove(dTableSpawnPoint, spawnPointIndex)
Expand All @@ -1320,8 +1320,8 @@ xi.nyzul.prepareMobs = function(instance)
spawnPoint = dTableSpawnPoint[spawnPointIndex]

-- Spawn Mob.
GetMobByID(ID.mob[51].ARCHAIC_RAMPART1, instance):setSpawn(spawnPoint.x, spawnPoint.y, spawnPoint.z, math.random(0, 255))
SpawnMob(ID.mob[51].ARCHAIC_RAMPART1, instance)
GetMobByID(ID.mob.ARCHAIC_RAMPART_OFFSET, instance):setSpawn(spawnPoint.x, spawnPoint.y, spawnPoint.z, math.random(0, 255))
SpawnMob(ID.mob.ARCHAIC_RAMPART_OFFSET, instance)

-- Remove table entry.
table.remove(dTableSpawnPoint, spawnPointIndex)
Expand All @@ -1337,8 +1337,8 @@ xi.nyzul.prepareMobs = function(instance)
spawnPoint = dTableSpawnPoint[spawnPointIndex]

-- Spawn Mob.
GetMobByID(ID.mob[51].ARCHAIC_RAMPART2, instance):setSpawn(spawnPoint.x, spawnPoint.y, spawnPoint.z, math.random(0, 255))
SpawnMob(ID.mob[51].ARCHAIC_RAMPART2, instance)
GetMobByID(ID.mob.ARCHAIC_RAMPART_OFFSET + 1, instance):setSpawn(spawnPoint.x, spawnPoint.y, spawnPoint.z, math.random(0, 255))
SpawnMob(ID.mob.ARCHAIC_RAMPART_OFFSET + 1, instance)

-- Remove table entry.
table.remove(dTableSpawnPoint, spawnPointIndex)
Expand Down
103 changes: 40 additions & 63 deletions scripts/zones/Nyzul_Isle/IDs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,78 +131,55 @@ zones[xi.zone.NYZUL_ISLE] =

mob =
{
[51] = -- Nyzul Isle Investigation
{
ARCHAIC_RAMPART1 = 17092629,
ARCHAIC_RAMPART2 = 17092630,
OFFSET_REGULAR = 17092631, -- Greatclaw
DAHAK = 17092823,
OFFSET_NM = 17092824, -- Bat Eye
TAISAIJIN = 17092913,
OFFSET_GEARS = 17092916, -- Gear
MOKKE = 17092944,
LONG_HORNED_CHARIOT = 17092968,
OFFSET_SPECIFIED = 17092969, -- Heraldic Imp
ADAMANTOISE = 17092999,
},
-- Instance ID: 51 - Nyzul Isle Investigation
ARCHAIC_RAMPART_OFFSET = GetFirstID('Archaic_Rampart'),
BOSS_OFFSET = GetFirstID('Adamantoise'),
DAHAK = GetFirstID('Dahak'),
GEAR_OFFSET = GetFirstID('Archaic_Gear'),
LEADER_OFFSET = GetFirstID('Mokke'),
MOB_OFFSET = GetFirstID('Greatclaw'),
NM_OFFSET = GetFirstID('Bat_Eye'),
SPECIFIED_OFFSET = GetFirstID('Heraldic_Imp'),
TAISAIJIN = GetFirstID('Taisaijin'),

-- Path of Darkness
[58] =
{
AMNAF_BLU = 17093132,
AMNAF_PSYCHEFLAYER = 17093133,
IMPERIAL_GEAR1 = 17093134,
IMPERIAL_GEAR2 = 17093135,
IMPERIAL_GEAR3 = 17093136,
IMPERIAL_GEAR4 = 17093137,
NAJA = 17093142,
},
-- Instance ID: 58 - Path of Darkness
AMNAF_BLU = GetFirstID('Amnaf_BLU'),
AMNAF_PSYCHEFLAYER = GetFirstID('Amnaf_Psycheflayer'),
IMPERIAL_GEAR_OFFSET = GetFirstID('Imperial_Gear'),
NAJA_SALAHEEM = GetFirstID('Naja_Salaheem'),

[59] =
{
RAZFAHD = 17093143,
ALEXANDER = 17093144,
RAUBAHN = 17093145,
},
-- Instance ID: 59 - Nashmeiras Plea
ALEXANDER = GetFirstID('Alexander'),
RAUBAHN = GetFirstID('Raubahn'),
RAZFAHD = GetFirstID('Razfahd'),
},

npc =
{
TREASURE_COFFER =
{
17092611, 17092612, 17092614
},

TREASURE_CASKET =
{
17092609, 17092610, 17092613, 17092620
},

RUNE_OF_TRANSFER =
{
17093330, 17093331
},

-- Nyzul Isle Investigation
RUNIC_LAMP_OFFSET = GetFirstID('Runic_Lamp'),
_257 = GetFirstID('_257'),
_259 = GetFirstID('_259'),
RUNE_TRANSFER_START = GetFirstID('Rune_of_Transfer_Start'),
VENDING_BOX = GetFirstID('Vending_Box'),
DOOR_OFFSET = GetFirstID('_253'),
RUNE_OF_TRANSFER_OFFSET = GetFirstID('Rune_of_Transfer'),
RUNE_OF_TRANSFER_ENTRANCE = GetFirstID('Rune_of_Transfer_Start'),
RUNIC_LAMP_OFFSET = GetFirstID('Runic_Lamp'),
TREASURE_CASKET_OFFSET = GetFirstID('Armoury_Crate_Casket'),
TREASURE_COFFER_OFFSET = GetFirstID('Armoury_Crate_Coffer'),
VENDING_BOX = GetFirstID('Vending_Box'),

-- Other instances
WEATHER = 17093424,
QM1 = 17093473,
BLANK1 = 17093474,
BLANK2 = 17093475,
BLANK3 = 17093476,
NASHMEIRA1 = 17093477,
NASHMEIRA2 = 17093478,
RAZFAHD = 17093479,
CSNPC1 = 17093480,
GHATSAD = 17093481,
ALEXANDER = 17093482,
CSNPC2 = 17093483,
WEATHER = GetFirstID('_k5y'), -- Unused?

-- This NPCs aren't even enabled in the sql (pos 0, 0, 0). Leaving them here for now.
-- QM1 = GetFirstID('17093473'),
-- BLANK1 = GetFirstID('17093474'),
-- BLANK2 = GetFirstID('17093475'),
-- BLANK3 = GetFirstID('17093476'),
-- NASHMEIRA1 = GetFirstID('17093477'),
-- NASHMEIRA2 = GetFirstID('17093478'),
-- RAZFAHD = GetFirstID('17093479'),
-- CSNPC1 = GetFirstID('17093480'),
-- GHATSAD = GetFirstID('17093481'),
-- ALEXANDER = GetFirstID('17093482'),
-- CSNPC2 = GetFirstID('17093483'),
}
}

Expand Down
10 changes: 5 additions & 5 deletions scripts/zones/Nyzul_Isle/instances/nashmeiras_plea.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ instanceObject.entryRequirements = function(player)
end

instanceObject.onInstanceCreated = function(instance)
SpawnMob(ID.mob[59].RAUBAHN, instance)
SpawnMob(ID.mob[59].RAZFAHD, instance)
SpawnMob(ID.mob.RAUBAHN, instance)
SpawnMob(ID.mob.RAZFAHD, instance)
end

instanceObject.onInstanceCreatedCallback = function(player, instance)
Expand Down Expand Up @@ -57,14 +57,14 @@ instanceObject.onInstanceProgressUpdate = function(instance, progress)
local chars = instance:getChars()
local entryPos = instance:getEntryPos()

DespawnMob(ID.mob[59].RAUBAHN, instance)
DespawnMob(ID.mob[59].RAZFAHD, instance)
DespawnMob(ID.mob.RAUBAHN, instance)
DespawnMob(ID.mob.RAZFAHD, instance)
for i, v in pairs(chars) do
v:startEvent(203)
v:setPos(entryPos.x, entryPos.y, entryPos.z, entryPos.rot)
end

SpawnMob(ID.mob[59].ALEXANDER, instance)
SpawnMob(ID.mob.ALEXANDER, instance)

elseif progress == 5 then
instance:complete()
Expand Down
4 changes: 2 additions & 2 deletions scripts/zones/Nyzul_Isle/instances/nyzul_isle_investigation.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ local function pickSetPoint(instance)
instance:setStage(xi.nyzul.objective.FREE_FLOOR)
instance:setLocalVar('freeFloor', 1)

GetNPCByID(ID.npc.RUNE_TRANSFER_START, instance):timer(9000,
GetNPCByID(ID.npc.RUNE_OF_TRANSFER_ENTRANCE, instance):timer(9000,
function(m)
local currentInstance = m:getInstance()
currentInstance:setProgress(15)
Expand Down Expand Up @@ -54,7 +54,7 @@ local function pickSetPoint(instance)
local posX = layoutPoint[1] local posY = layoutPoint[2] local posZ = layoutPoint[3]

-- Set Rune of Transfer to Point
for _, npcID in pairs(ID.npc.RUNE_OF_TRANSFER) do
for npcID = ID.npc.RUNE_OF_TRANSFER_OFFSET, ID.npc.RUNE_OF_TRANSFER_OFFSET + 1 do
local runeOfTransfer = GetNPCByID(npcID, instance)

if
Expand Down
Loading