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.

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

[lua, sql] Castle Zvahl Baileys and Castle Zvahl Keep NM Audit #7046

Open
wants to merge 2 commits into
base: base
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 0 additions & 17 deletions scripts/zones/Castle_Zvahl_Baileys/Zone.lua
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
-----------------------------------
-- Zone: Castle_Zvahl_Baileys (161)
-----------------------------------
local ID = zones[xi.zone.CASTLE_ZVAHL_BAILEYS]
-----------------------------------
---@type TZone
local zoneObject = {}

Expand All @@ -13,21 +11,6 @@ zoneObject.onInitialize = function(zone)
zone:registerCuboidTriggerArea(3, -34, 17, -10, -30, 18, -5) -- map 4 SE porter
zone:registerCuboidTriggerArea(4, -34, 17, 45, -30, 18, 51) -- map 4 NE porter

UpdateNMSpawnPoint(ID.mob.LIKHO)
GetMobByID(ID.mob.LIKHO):setRespawnTime(math.random(3600, 4200))

UpdateNMSpawnPoint(ID.mob.MARQUIS_ALLOCEN)
GetMobByID(ID.mob.MARQUIS_ALLOCEN):setRespawnTime(math.random(900, 10800))

UpdateNMSpawnPoint(ID.mob.MARQUIS_AMON)
GetMobByID(ID.mob.MARQUIS_AMON):setRespawnTime(math.random(900, 10800))

UpdateNMSpawnPoint(ID.mob.DUKE_HABORYM)
GetMobByID(ID.mob.DUKE_HABORYM):setRespawnTime(math.random(900, 10800))

UpdateNMSpawnPoint(ID.mob.GRAND_DUKE_BATYM)
GetMobByID(ID.mob.GRAND_DUKE_BATYM):setRespawnTime(math.random(900, 10800))

xi.treasure.initZone(zone)
end

Expand Down
15 changes: 14 additions & 1 deletion scripts/zones/Castle_Zvahl_Baileys/mobs/Abyssal_Demon.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,19 @@ local ID = zones[xi.zone.CASTLE_ZVAHL_BAILEYS]
---@type TMobEntity
local entity = {}

local sabnockSpawnPoints =
{
{ x = 70.800, y = -8.000, z = -119.500 },
{ x = 63.285, y = -8.000, z = -102.540 },
{ x = 80.141, y = -8.000, z = -99.397 },
{ x = 96.419, y = -8.000, z = -118.788 },
{ x = 91.070, y = -8.000, z = -138.734 },
{ x = 74.301, y = -8.000, z = -131.159 },
{ x = 84.099, y = -8.000, z = -121.188 },
{ x = 77.088, y = -8.000, z = -113.123 },
{ x = 68.494, y = -8.000, z = -117.972 },
}

local marquisPHTable =
{
[ID.mob.MARQUIS_SABNOCK - 2] = ID.mob.MARQUIS_SABNOCK,
Expand All @@ -17,7 +30,7 @@ entity.onMobDeath = function(mob, player, optParams)
end

entity.onMobDespawn = function(mob)
xi.mob.phOnDespawn(mob, marquisPHTable, 10, 7200) -- 2 hour
xi.mob.phOnDespawn(mob, marquisPHTable, 10, 7200, { spawnPoints = sabnockSpawnPoints }) -- 2 hour
end

return entity
17 changes: 15 additions & 2 deletions scripts/zones/Castle_Zvahl_Baileys/mobs/Doom_Demon.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,20 @@ local ID = zones[xi.zone.CASTLE_ZVAHL_BAILEYS]
---@type TMobEntity
local entity = {}

local marquisPHTable =
local sabnockSpawnPoints =
{
{ x = 70.800, y = -8.000, z = -119.500 },
{ x = 63.285, y = -8.000, z = -102.540 },
{ x = 80.141, y = -8.000, z = -99.397 },
{ x = 96.419, y = -8.000, z = -118.788 },
{ x = 91.070, y = -8.000, z = -138.734 },
{ x = 74.301, y = -8.000, z = -131.159 },
{ x = 84.099, y = -8.000, z = -121.188 },
{ x = 77.088, y = -8.000, z = -113.123 },
{ x = 68.494, y = -8.000, z = -117.972 },
}

local sabnockPHTable =
{
[ID.mob.MARQUIS_SABNOCK + 1] = ID.mob.MARQUIS_SABNOCK,
}
Expand All @@ -17,7 +30,7 @@ entity.onMobDeath = function(mob, player, optParams)
end

entity.onMobDespawn = function(mob)
xi.mob.phOnDespawn(mob, marquisPHTable, 10, 7200) -- 2 hour
xi.mob.phOnDespawn(mob, sabnockPHTable, 10, 7200, { spawnPoints = sabnockSpawnPoints }) -- 2 hour
end

return entity
62 changes: 60 additions & 2 deletions scripts/zones/Castle_Zvahl_Baileys/mobs/Duke_Haborym.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,73 @@
-- Area: Castle Zvahl Baileys (161)
-- NM: Duke Haborym
-----------------------------------
mixins = { require('scripts/mixins/job_special') }
-----------------------------------
---@type TMobEntity
local entity = {}

entity.onMobDeath = function(mob, player, optParams)
local spawnPoints =
{
{ x = -93.769, y = -4.499, z = 34.776 },
{ x = -84.932, y = -4.000, z = 38.000 },
{ x = -96.179, y = -4.000, z = 48.946 },
{ x = -98.741, y = -4.000, z = 47.952 },
{ x = -78.002, y = -4.000, z = 40.362 },
{ x = -86.154, y = -4.000, z = 46.506 },
{ x = -76.079, y = -4.000, z = 39.661 },
{ x = -97.475, y = -4.000, z = 54.316 },
{ x = -89.632, y = -4.000, z = 36.528 },
{ x = -95.447, y = -4.000, z = 47.594 },
{ x = -93.236, y = -4.000, z = 47.716 },
{ x = -80.050, y = -4.000, z = 35.323 },
{ x = -85.429, y = -4.000, z = 55.021 },
{ x = -89.883, y = -4.000, z = 42.737 },
{ x = -100.166, y = -4.000, z = 38.231 },
{ x = -90.196, y = -4.000, z = 57.541 },
{ x = -77.605, y = -4.000, z = 54.588 },
{ x = -84.243, y = -4.000, z = 34.578 },
{ x = -82.795, y = -4.000, z = 37.228 },
{ x = -79.153, y = -4.000, z = 47.920 },
{ x = -89.630, y = -4.000, z = 53.270 },
{ x = -76.847, y = -4.000, z = 41.022 },
{ x = -84.422, y = -4.000, z = 50.222 },
{ x = -76.259, y = -4.000, z = 58.982 },
{ x = -91.231, y = -4.000, z = 54.904 },
{ x = -98.063, y = -4.000, z = 48.223 },
{ x = -88.618, y = -4.000, z = 52.425 },
{ x = -90.120, y = -4.000, z = 38.297 },
{ x = -80.276, y = -4.000, z = 48.213 },
{ x = -90.232, y = -4.000, z = 59.110 },
{ x = -86.178, y = -4.000, z = 60.332 },
{ x = -75.336, y = -4.000, z = 45.551 },
{ x = -94.653, y = -4.000, z = 46.078 },
{ x = -76.062, y = -4.000, z = 48.924 },
{ x = -78.779, y = -4.000, z = 47.111 },
{ x = -89.020, y = -4.000, z = 50.009 },
{ x = -97.799, y = -4.000, z = 55.399 },
{ x = -79.884, y = -4.000, z = 48.083 },
{ x = -84.411, y = -4.000, z = 61.898 },
{ x = -97.740, y = -4.000, z = 47.258 },
{ x = -80.467, y = -4.000, z = 41.014 },
{ x = -85.431, y = -4.000, z = 40.200 },
{ x = -80.630, y = -4.000, z = 41.076 },
{ x = -74.228, y = -4.000, z = 51.451 },
{ x = -79.111, y = -4.000, z = 43.844 },
{ x = -99.137, y = -4.000, z = 48.229 },
{ x = -84.165, y = -4.000, z = 58.622 },
{ x = -74.743, y = -4.000, z = 43.741 },
{ x = -83.653, y = -4.000, z = 48.851 },
{ x = -82.792, y = -4.000, z = 37.386 },
}

entity.onMobInitialize = function(mob)
xi.mob.updateNMSpawnPoint(mob, spawnPoints)
mob:setRespawnTime(math.random(900, 10800))
end

entity.onMobDespawn = function(mob)
-- Set Duke_Haborym's spawnpoint and respawn time (21-24 hours)
UpdateNMSpawnPoint(mob:getID())
xi.mob.updateNMSpawnPoint(mob, spawnPoints)
mob:setRespawnTime(math.random(75600, 86400))
end

Expand Down
60 changes: 58 additions & 2 deletions scripts/zones/Castle_Zvahl_Baileys/mobs/Grand_Duke_Batym.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,68 @@ mixins = { require('scripts/mixins/job_special') }
---@type TMobEntity
local entity = {}

entity.onMobDeath = function(mob, player, optParams)
local spawnPoints =
{
{ x = -78.000, y = -4.000, z = -15.000 },
{ x = -78.599, y = -4.000, z = -12.779 },
{ x = -75.554, y = -4.000, z = -1.731 },
{ x = -89.634, y = -4.000, z = -16.589 },
{ x = -94.442, y = -4.000, z = -12.632 },
{ x = -92.577, y = -4.000, z = -15.753 },
{ x = -77.281, y = -4.000, z = 0.192 },
{ x = -97.803, y = -4.000, z = -18.198 },
{ x = -94.602, y = -4.000, z = -1.419 },
{ x = -77.211, y = -4.000, z = -5.770 },
{ x = -85.634, y = -4.000, z = -0.250 },
{ x = -91.147, y = -4.000, z = 1.775 },
{ x = -89.712, y = -4.000, z = -18.195 },
{ x = -75.448, y = -4.000, z = -2.352 },
{ x = -96.616, y = -4.000, z = -11.441 },
{ x = -75.108, y = -4.000, z = -11.319 },
{ x = -99.765, y = -4.000, z = -16.407 },
{ x = -93.873, y = -4.000, z = -11.325 },
{ x = -91.976, y = -4.000, z = -11.120 },
{ x = -77.095, y = -4.000, z = -13.986 },
{ x = -78.175, y = -4.000, z = 3.555 },
{ x = -79.723, y = -4.000, z = -18.266 },
{ x = -90.053, y = -4.000, z = 6.087 },
{ x = -88.349, y = -4.000, z = 3.165 },
{ x = -77.482, y = -4.000, z = 4.662 },
{ x = -83.591, y = -4.000, z = -19.229 },
{ x = -97.623, y = -4.000, z = 3.297 },
{ x = -84.199, y = -4.000, z = -5.215 },
{ x = -91.006, y = -4.000, z = -1.435 },
{ x = -86.071, y = -4.000, z = -19.344 },
{ x = -84.769, y = -4.000, z = -17.758 },
{ x = -73.396, y = -4.000, z = 3.381 },
{ x = -79.338, y = -4.000, z = -12.368 },
{ x = -96.680, y = -4.000, z = -13.712 },
{ x = -75.614, y = -4.000, z = -1.859 },
{ x = -89.863, y = -4.000, z = 1.327 },
{ x = -94.948, y = -4.000, z = 3.443 },
{ x = -82.133, y = -4.000, z = 1.375 },
{ x = -81.149, y = -4.000, z = -8.920 },
{ x = -94.966, y = -4.000, z = 6.514 },
{ x = -77.628, y = -4.000, z = -16.071 },
{ x = -86.462, y = -4.000, z = 0.844 },
{ x = -85.265, y = -4.000, z = -11.511 },
{ x = -99.690, y = -4.000, z = -0.093 },
{ x = -97.706, y = -4.000, z = -2.414 },
{ x = -79.080, y = -4.000, z = -3.112 },
{ x = -90.451, y = -4.000, z = -4.216 },
{ x = -83.520, y = -4.000, z = 1.644 },
{ x = -79.246, y = -4.000, z = 2.357 },
{ x = -76.682, y = -4.000, z = -1.974 },
}

entity.onMobInitialize = function(mob)
xi.mob.updateNMSpawnPoint(mob, spawnPoints)
mob:setRespawnTime(math.random(900, 10800))
end

entity.onMobDespawn = function(mob)
-- Set Grand_Duke_Batym's spawnpoint and respawn time (21-24 hours)
UpdateNMSpawnPoint(mob:getID())
xi.mob.updateNMSpawnPoint(mob, spawnPoints)
mob:setRespawnTime(math.random(75600, 86400))
end

Expand Down
26 changes: 25 additions & 1 deletion scripts/zones/Castle_Zvahl_Baileys/mobs/Likho.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,36 @@
---@type TMobEntity
local entity = {}

local spawnPoints =
{
{ x = 141.130, y = -24.030, z = 60.870 },
{ x = 135.592, y = -24.008, z = 54.487 },
{ x = 134.865, y = -24.026, z = 63.909 },
{ x = 146.538, y = -24.121, z = 64.656 },
{ x = 145.965, y = -24.031, z = 55.007 },
{ x = 141.460, y = -24.067, z = 58.680 },
}

entity.onMobInitialize = function(mob)
xi.mob.updateNMSpawnPoint(mob, spawnPoints)
mob:setRespawnTime(math.random(3600, 4200))
end

entity.onMobSpawn = function(mob)
mob:addImmunity(xi.immunity.DARK_SLEEP)
mob:addImmunity(xi.immunity.LIGHT_SLEEP)
mob:addImmunity(xi.immunity.TERROR)
mob:addImmunity(xi.immunity.GRAVITY)
mob:addImmunity(xi.immunity.BIND)
mob:addImmunity(xi.immunity.SILENCE)
end

entity.onMobDeath = function(mob, player, optParams)
xi.hunts.checkHunt(mob, player, 351)
end

entity.onMobDespawn = function(mob)
UpdateNMSpawnPoint(mob:getID())
xi.mob.updateNMSpawnPoint(mob, spawnPoints)
mob:setRespawnTime(math.random(3600, 4200)) -- 60 to 70 minutes
end

Expand Down
62 changes: 60 additions & 2 deletions scripts/zones/Castle_Zvahl_Baileys/mobs/Marquis_Allocen.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,73 @@
-- Area: Castle Zvahl Baileys (161)
-- NM: Marquis Allocen
-----------------------------------
mixins = { require('scripts/mixins/job_special') }
-----------------------------------
---@type TMobEntity
local entity = {}

entity.onMobDeath = function(mob, player, optParams)
local spawnPoints =
{
{ x = -44.116, y = -4.496, z = 37.549 },
{ x = -41.898, y = -4.000, z = 56.042 },
{ x = -31.121, y = -4.000, z = 50.880 },
{ x = -43.564, y = -4.000, z = 53.843 },
{ x = -41.605, y = -4.000, z = 55.350 },
{ x = -20.371, y = -4.000, z = 56.349 },
{ x = -26.795, y = -4.000, z = 40.714 },
{ x = -26.174, y = -4.000, z = 41.675 },
{ x = -25.052, y = -4.000, z = 34.312 },
{ x = -32.637, y = -4.000, z = 49.257 },
{ x = -46.856, y = -4.000, z = 37.937 },
{ x = -33.770, y = -4.000, z = 50.779 },
{ x = -29.703, y = -4.000, z = 52.586 },
{ x = -36.502, y = -4.000, z = 46.858 },
{ x = -25.545, y = -4.000, z = 48.679 },
{ x = -25.149, y = -4.000, z = 34.194 },
{ x = -44.981, y = -4.000, z = 55.805 },
{ x = -46.060, y = -4.000, z = 41.147 },
{ x = -35.931, y = -4.000, z = 55.033 },
{ x = -40.179, y = -4.000, z = 37.523 },
{ x = -34.023, y = -4.000, z = 49.767 },
{ x = -36.089, y = -4.000, z = 34.967 },
{ x = -31.021, y = -4.000, z = 44.052 },
{ x = -22.466, y = -4.000, z = 49.179 },
{ x = -24.819, y = -4.000, z = 33.248 },
{ x = -30.175, y = -4.000, z = 37.415 },
{ x = -44.069, y = -4.000, z = 46.024 },
{ x = -37.015, y = -4.000, z = 36.686 },
{ x = -42.931, y = -4.000, z = 50.644 },
{ x = -26.153, y = -4.000, z = 58.288 },
{ x = -38.545, y = -4.000, z = 57.590 },
{ x = -42.550, y = -4.000, z = 45.172 },
{ x = -39.958, y = -4.000, z = 32.519 },
{ x = -45.529, y = -4.000, z = 50.184 },
{ x = -35.975, y = -4.000, z = 49.437 },
{ x = -33.853, y = -4.000, z = 47.095 },
{ x = -32.779, y = -4.000, z = 36.492 },
{ x = -31.144, y = -4.000, z = 34.182 },
{ x = -30.943, y = -4.000, z = 56.809 },
{ x = -41.128, y = -4.000, z = 42.839 },
{ x = -25.411, y = -4.000, z = 52.437 },
{ x = -22.826, y = -4.000, z = 40.630 },
{ x = -27.296, y = -4.000, z = 38.243 },
{ x = -42.611, y = -4.000, z = 36.112 },
{ x = -24.652, y = -4.000, z = 35.945 },
{ x = -44.697, y = -4.000, z = 37.971 },
{ x = -40.524, y = -4.000, z = 35.199 },
{ x = -27.895, y = -4.000, z = 39.197 },
{ x = -25.233, y = -4.000, z = 33.510 },
{ x = -45.587, y = -4.000, z = 44.461 },
}

entity.onMobInitialize = function(mob)
xi.mob.updateNMSpawnPoint(mob, spawnPoints)
mob:setRespawnTime(math.random(900, 10800))
end

entity.onMobDespawn = function(mob)
-- Set Marquis_Allocen's spawnpoint and respawn time (21-24 hours)
UpdateNMSpawnPoint(mob:getID())
xi.mob.updateNMSpawnPoint(mob, spawnPoints)
mob:setRespawnTime(math.random(75600, 86400))
end

Expand Down
Loading