diff --git a/scripts/zones/Bostaunieux_Oubliette/IDs.lua b/scripts/zones/Bostaunieux_Oubliette/IDs.lua index 902a00e6eda..24dd1c81503 100644 --- a/scripts/zones/Bostaunieux_Oubliette/IDs.lua +++ b/scripts/zones/Bostaunieux_Oubliette/IDs.lua @@ -38,37 +38,14 @@ zones[xi.zone.BOSTAUNIEUX_OUBLIETTE] = }, mob = { - SEWER_SYRUP_PH = - { - [17461305] = 17461307, -- -19.000 1.000 -173.000 - [17461306] = 17461307, -- -20.000 1.000 -148.000 - }, - SHII_PH = - { - [17461311] = 17461315, -- -59.000 0.941 -149.000 - [17461334] = 17461315, -- -64.000 -0.500 -144.000 - [17461277] = 17461315, -- -65.000 -1.000 -137.000 - [17461309] = 17461315, -- -64.000 0.950 -132.000 - [17461312] = 17461315, -- -53.000 -0.500 -137.000 - [17461308] = 17461315, -- -57.000 0.998 -135.000 - }, - ARIOCH_PH = - { - [17461322] = 17461433, -- -259 0.489 -188 - }, - MANES_PH = - { - [17461469] = 17461471, - [17461470] = 17461471, - [17461476] = 17461471, - [17461477] = 17461471, - }, - DREXERION_THE_CONDEMNED = 17461338, - PHANDURON_THE_CONDEMNED = 17461343, - BLOODSUCKER = 17461478, - BODACH = 17461479, - MANES = 17461471, - SHII = 17461315, + ARIOCH = GetFirstID('Arioch'), + BLOODSUCKER = GetTableOfIDs('Bloodsucker')[42], -- Last bloodsucker in the zone + BODACH = GetFirstID('Bodach'), + DREXERION_THE_CONDEMNED = GetFirstID('Drexerion_the_Condemned'), + MANES = GetFirstID('Manes'), + PHANDURON_THE_CONDEMNED = GetFirstID('Phanduron_the_Condemned'), + SEWER_SYRUP = GetFirstID('Sewer_Syrup'), + SHII = GetFirstID('Shii'), }, npc = { diff --git a/scripts/zones/Bostaunieux_Oubliette/mobs/Garm.lua b/scripts/zones/Bostaunieux_Oubliette/mobs/Garm.lua index 59df6c68ba5..071eb59596e 100644 --- a/scripts/zones/Bostaunieux_Oubliette/mobs/Garm.lua +++ b/scripts/zones/Bostaunieux_Oubliette/mobs/Garm.lua @@ -7,12 +7,22 @@ local ID = zones[xi.zone.BOSTAUNIEUX_OUBLIETTE] ----------------------------------- local entity = {} +local shiiPHTable = +{ + [ID.mob.SHII - 38] = ID.mob.SHII, -- -65.000 -1.000 -137.000 + [ID.mob.SHII - 7] = ID.mob.SHII, -- -57.000 0.998 -135.000 + [ID.mob.SHII - 6] = ID.mob.SHII, -- -64.000 0.950 -132.000 + [ID.mob.SHII - 4] = ID.mob.SHII, -- -59.000 0.941 -149.000 + [ID.mob.SHII - 3] = ID.mob.SHII, -- -53.000 -0.500 -137.000 + [ID.mob.SHII + 19] = ID.mob.SHII, -- -64.000 -0.500 -144.000 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 612, 1, xi.regime.type.GROUNDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.SHII_PH, 5, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, shiiPHTable, 5, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Bostaunieux_Oubliette/mobs/Gespenst.lua b/scripts/zones/Bostaunieux_Oubliette/mobs/Gespenst.lua index 2b3185d8a96..c17f57a466e 100644 --- a/scripts/zones/Bostaunieux_Oubliette/mobs/Gespenst.lua +++ b/scripts/zones/Bostaunieux_Oubliette/mobs/Gespenst.lua @@ -7,11 +7,19 @@ local ID = zones[xi.zone.BOSTAUNIEUX_OUBLIETTE] ----------------------------------- local entity = {} +local manesPHTable = +{ + [ID.mob.MANES - 2] = ID.mob.MANES, + [ID.mob.MANES - 1] = ID.mob.MANES, + [ID.mob.MANES + 5] = ID.mob.MANES, + [ID.mob.MANES + 6] = ID.mob.MANES, +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.MANES_PH, 5, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, manesPHTable, 5, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Bostaunieux_Oubliette/mobs/Mousse.lua b/scripts/zones/Bostaunieux_Oubliette/mobs/Mousse.lua index 6f4689f91ad..577584be631 100644 --- a/scripts/zones/Bostaunieux_Oubliette/mobs/Mousse.lua +++ b/scripts/zones/Bostaunieux_Oubliette/mobs/Mousse.lua @@ -7,11 +7,17 @@ local ID = zones[xi.zone.BOSTAUNIEUX_OUBLIETTE] ----------------------------------- local entity = {} +local sewerSyrupPHTable = +{ + [ID.mob.SEWER_SYRUP - 2] = ID.mob.SEWER_SYRUP, -- -19.000 1.000 -173.000 + [ID.mob.SEWER_SYRUP - 1] = ID.mob.SEWER_SYRUP, -- -20.000 1.000 -148.000 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.SEWER_SYRUP_PH, 10, 7200) -- 2 hour minimum + xi.mob.phOnDespawn(mob, sewerSyrupPHTable, 10, 7200) -- 2 hour minimum end return entity diff --git a/scripts/zones/Bostaunieux_Oubliette/mobs/Werebat.lua b/scripts/zones/Bostaunieux_Oubliette/mobs/Werebat.lua index 99777b8425d..5394ba9ff8e 100644 --- a/scripts/zones/Bostaunieux_Oubliette/mobs/Werebat.lua +++ b/scripts/zones/Bostaunieux_Oubliette/mobs/Werebat.lua @@ -7,12 +7,17 @@ local ID = zones[xi.zone.BOSTAUNIEUX_OUBLIETTE] ----------------------------------- local entity = {} +local ariochPHTable = +{ + [ID.mob.ARIOCH - 11] = ID.mob.ARIOCH, -- -259 0.489 -188 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 611, 2, xi.regime.type.GROUNDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.ARIOCH_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, ariochPHTable, 10, 3600) -- 1 hour end return entity