From b03c2a1b0afff016b40c510e2143c4e1d0b6fa20 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Mon, 6 May 2024 23:26:46 -0400 Subject: [PATCH 1/4] Shift-proof Qulun Dome --- scripts/zones/Qulun_Dome/IDs.lua | 3 +-- scripts/zones/Qulun_Dome/mobs/Diamond_Quadav.lua | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/zones/Qulun_Dome/IDs.lua b/scripts/zones/Qulun_Dome/IDs.lua index 4d05dfa088a..8a73b8c6466 100644 --- a/scripts/zones/Qulun_Dome/IDs.lua +++ b/scripts/zones/Qulun_Dome/IDs.lua @@ -29,8 +29,7 @@ zones[xi.zone.QULUN_DOME] = }, mob = { - DIAMOND_QUADAV = 17383442, - AFFABLE_ADAMANTKING_OFFSET = 17383444, + DIAMOND_QUADAV = GetFirstID('Diamond_Quadav'), -- Also used for An Affable Adamantking? offset }, npc = { diff --git a/scripts/zones/Qulun_Dome/mobs/Diamond_Quadav.lua b/scripts/zones/Qulun_Dome/mobs/Diamond_Quadav.lua index 56ed0e52445..a3ddff2a2fd 100644 --- a/scripts/zones/Qulun_Dome/mobs/Diamond_Quadav.lua +++ b/scripts/zones/Qulun_Dome/mobs/Diamond_Quadav.lua @@ -11,7 +11,7 @@ local entity = {} entity.onMobInitialize = function(mob) -- the quest version of this NM doesn't drop gil - if mob:getID() >= ID.mob.AFFABLE_ADAMANTKING_OFFSET then + if mob:getID() >= ID.mob.DIAMOND_QUADAV + 2 then mob:setMobMod(xi.mobMod.GIL_MAX, -1) end end From f67986f7bcb35ac4133f21ac372c9bbb3e16b1ca Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Mon, 6 May 2024 23:27:09 -0400 Subject: [PATCH 2/4] Shift-proof Qufim Island --- scripts/zones/Qufim_Island/IDs.lua | 18 +++--------------- .../zones/Qufim_Island/mobs/Dancing_Weapon.lua | 10 +++++++++- .../zones/Qufim_Island/mobs/Giant_Ascetic.lua | 7 ++++++- .../zones/Qufim_Island/mobs/Giant_Hunter.lua | 7 ++++++- .../zones/Qufim_Island/mobs/Giant_Ranger.lua | 7 ++++++- .../zones/Qufim_Island/mobs/Giant_Trapper.lua | 7 ++++++- 6 files changed, 36 insertions(+), 20 deletions(-) diff --git a/scripts/zones/Qufim_Island/IDs.lua b/scripts/zones/Qufim_Island/IDs.lua index 2f029c485aa..52ee72950ef 100644 --- a/scripts/zones/Qufim_Island/IDs.lua +++ b/scripts/zones/Qufim_Island/IDs.lua @@ -49,21 +49,9 @@ zones[xi.zone.QUFIM_ISLAND] = mob = { - SLIPPERY_SUCKER_PH = - { - [17293376] = 17293389, - [17293377] = 17293389, - [17293378] = 17293389, - [17293380] = 17293389, - }, - TRICKSTER_KINETIX_PH = - { - [17293533] = 17293537, -- -138.180 -20.928 228.793 - [17293534] = 17293537, -- -157.659 -25.501 235.862 - [17293535] = 17293537, -- -152.269 -20 243 - [17293536] = 17293537, -- -137.651 -23.507 231.528 - }, - OPHIOTAURUS = GetFirstID('Ophiotaurus'), + SLIPPERY_SUCKER = GetFirstID('Slippery_Sucker'), + TRICKSTER_KINETIX = GetFirstID('Trickster_Kinetix'), + OPHIOTAURUS = GetFirstID('Ophiotaurus'), }, npc = diff --git a/scripts/zones/Qufim_Island/mobs/Dancing_Weapon.lua b/scripts/zones/Qufim_Island/mobs/Dancing_Weapon.lua index c8d3a20b2a5..f787cf71c81 100644 --- a/scripts/zones/Qufim_Island/mobs/Dancing_Weapon.lua +++ b/scripts/zones/Qufim_Island/mobs/Dancing_Weapon.lua @@ -7,11 +7,19 @@ local ID = zones[xi.zone.QUFIM_ISLAND] ----------------------------------- local entity = {} +local tricksterPHTable = +{ + [ID.mob.TRICKSTER_KINETIX - 4] = ID.mob.TRICKSTER_KINETIX, -- -138.180 -20.928 228.793 + [ID.mob.TRICKSTER_KINETIX - 3] = ID.mob.TRICKSTER_KINETIX, -- -157.659 -25.501 235.862 + [ID.mob.TRICKSTER_KINETIX - 2] = ID.mob.TRICKSTER_KINETIX, -- -152.269 -20 243 + [ID.mob.TRICKSTER_KINETIX - 1] = ID.mob.TRICKSTER_KINETIX, -- -137.651 -23.507 231.528 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.TRICKSTER_KINETIX_PH, 5, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, tricksterPHTable, 5, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Qufim_Island/mobs/Giant_Ascetic.lua b/scripts/zones/Qufim_Island/mobs/Giant_Ascetic.lua index 4d84acfae24..ffb82931fbd 100644 --- a/scripts/zones/Qufim_Island/mobs/Giant_Ascetic.lua +++ b/scripts/zones/Qufim_Island/mobs/Giant_Ascetic.lua @@ -7,13 +7,18 @@ local ID = zones[xi.zone.QUFIM_ISLAND] ----------------------------------- local entity = {} +local slipperyPHTable = +{ + [ID.mob.SLIPPERY_SUCKER - 12] = ID.mob.SLIPPERY_SUCKER, -- ascet +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 44, 1, xi.regime.type.FIELDS) xi.regime.checkRegime(player, mob, 45, 2, xi.regime.type.FIELDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.SLIPPERY_SUCKER_PH, 10, 600) -- 10 minutes + xi.mob.phOnDespawn(mob, slipperyPHTable, 10, 600) -- 10 minutes end return entity diff --git a/scripts/zones/Qufim_Island/mobs/Giant_Hunter.lua b/scripts/zones/Qufim_Island/mobs/Giant_Hunter.lua index 1acc8478f90..0c303892024 100644 --- a/scripts/zones/Qufim_Island/mobs/Giant_Hunter.lua +++ b/scripts/zones/Qufim_Island/mobs/Giant_Hunter.lua @@ -7,13 +7,18 @@ local ID = zones[xi.zone.QUFIM_ISLAND] ----------------------------------- local entity = {} +local slipperyPHTable = +{ + [ID.mob.SLIPPERY_SUCKER - 9] = ID.mob.SLIPPERY_SUCKER, -- hunter +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 44, 1, xi.regime.type.FIELDS) xi.regime.checkRegime(player, mob, 45, 2, xi.regime.type.FIELDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.SLIPPERY_SUCKER_PH, 10, 600) -- 10 minutes + xi.mob.phOnDespawn(mob, slipperyPHTable, 10, 600) -- 10 minutes end return entity diff --git a/scripts/zones/Qufim_Island/mobs/Giant_Ranger.lua b/scripts/zones/Qufim_Island/mobs/Giant_Ranger.lua index 569729c5a02..5ef4b80e6bd 100644 --- a/scripts/zones/Qufim_Island/mobs/Giant_Ranger.lua +++ b/scripts/zones/Qufim_Island/mobs/Giant_Ranger.lua @@ -7,13 +7,18 @@ local ID = zones[xi.zone.QUFIM_ISLAND] ----------------------------------- local entity = {} +local slipperyPHTable = +{ + [ID.mob.SLIPPERY_SUCKER - 13] = ID.mob.SLIPPERY_SUCKER, -- range +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 44, 1, xi.regime.type.FIELDS) xi.regime.checkRegime(player, mob, 45, 2, xi.regime.type.FIELDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.SLIPPERY_SUCKER_PH, 10, 600) -- 10 minutes + xi.mob.phOnDespawn(mob, slipperyPHTable, 10, 600) -- 10 minutes end return entity diff --git a/scripts/zones/Qufim_Island/mobs/Giant_Trapper.lua b/scripts/zones/Qufim_Island/mobs/Giant_Trapper.lua index 3c3b683c8d4..1b8c6d0d280 100644 --- a/scripts/zones/Qufim_Island/mobs/Giant_Trapper.lua +++ b/scripts/zones/Qufim_Island/mobs/Giant_Trapper.lua @@ -7,13 +7,18 @@ local ID = zones[xi.zone.QUFIM_ISLAND] ----------------------------------- local entity = {} +local slipperyPHTable = +{ + [ID.mob.SLIPPERY_SUCKER - 11] = ID.mob.SLIPPERY_SUCKER, -- trapper +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 44, 1, xi.regime.type.FIELDS) xi.regime.checkRegime(player, mob, 45, 2, xi.regime.type.FIELDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.SLIPPERY_SUCKER_PH, 10, 600) -- 10 minutes + xi.mob.phOnDespawn(mob, slipperyPHTable, 10, 600) -- 10 minutes end return entity From 678a3da073184011651c78510c02ea34c95ac60f Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Mon, 6 May 2024 23:27:18 -0400 Subject: [PATCH 3/4] Shift-proof QuBia Arena --- scripts/zones/QuBia_Arena/IDs.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/zones/QuBia_Arena/IDs.lua b/scripts/zones/QuBia_Arena/IDs.lua index 57752c8b6d7..abf92c352eb 100644 --- a/scripts/zones/QuBia_Arena/IDs.lua +++ b/scripts/zones/QuBia_Arena/IDs.lua @@ -52,7 +52,7 @@ zones[xi.zone.QUBIA_ARENA] = }, mob = { - HEIR_TO_THE_LIGHT_OFFSET = 17621014, + HEIR_TO_THE_LIGHT_OFFSET = GetFirstID('Warlord_Rojgnoj'), ATORI_TUTORI = GetFirstID('Atori-Tutori_qm') }, npc = From 06a2774980346426b804e014db0851ea62cb8ebd Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Mon, 6 May 2024 23:26:57 -0400 Subject: [PATCH 4/4] Shift-proof Quicksand Caves --- scripts/zones/Quicksand_Caves/IDs.lua | 95 +++++-------------- .../Quicksand_Caves/mobs/Antican_Aedilis.lua | 7 +- .../Quicksand_Caves/mobs/Antican_Hastatus.lua | 9 +- .../Quicksand_Caves/mobs/Antican_Princeps.lua | 23 ++++- .../Quicksand_Caves/mobs/Antican_Signifer.lua | 23 ++++- .../Quicksand_Caves/mobs/Antican_Triarius.lua | 14 ++- .../Quicksand_Caves/mobs/Helm_Beetle.lua | 7 +- .../mobs/Sabotender_Bailaor.lua | 8 +- .../Quicksand_Caves/mobs/Sand_Lizard.lua | 8 +- .../mobs/Spelunking_Sabotender.lua | 8 +- 10 files changed, 117 insertions(+), 85 deletions(-) diff --git a/scripts/zones/Quicksand_Caves/IDs.lua b/scripts/zones/Quicksand_Caves/IDs.lua index 7bbed7ecc46..06abee0c3c4 100644 --- a/scripts/zones/Quicksand_Caves/IDs.lua +++ b/scripts/zones/Quicksand_Caves/IDs.lua @@ -42,74 +42,27 @@ zones[xi.zone.QUICKSAND_CAVES] = }, mob = { - SAGITTARIUS_X_XIII_PH = - { - [17629296] = 17629301, -- 641 -16.786 -774 - }, - NUSSKNACKER_PH = - { - [17629396] = 17629403, -- 189 2 4 - [17629397] = 17629403, -- 200 2 -4 - }, - CENTURIO_X_I_PH = - { - [17629237] = 17629238, -- 773.581 1.576 -568.904 - }, - ANTICAN_MAGISTER_PH = - { - -- Antican Magister is a lottery of various Antica at (C-6). - -- https://www.bg-wiki.com/ffxi/Antican_Magister - - -- Antican Hastatus - [17629409] = GetFirstID('Antican_Magister'), - -- Antican Princeps - [17629410] = GetFirstID('Antican_Magister'), - -- Antican Signifier - [17629411] = GetFirstID('Antican_Magister'), - }, - ANTICAN_PRAEFECTUS_PH = - { - [17629280] = 17629281, -- -90.01 -0.567 -29.424 - }, - ANTICAN_PROCONSUL_PH = - { - [17629420] = 17629421, -- 89.575 -0.299 -196.206 - }, - DIAMOND_DAIG_PH = - { - [17629439] = 17629430, -- -95.632 -0.5 -214.732 - }, - ANTICAN_TRIBUNUS_PH = - { - [17629501] = 17629483, -- -575.455 -0.401 -433.802 - }, - TRIARIUS_X_XV_PH = - { - [17629533] = 17629524, -- -786.730 -0.5 -343.963 - }, - HASTATUS_XI_XII_PH = - { - [17629557] = 17629561, -- -343.859 -0.411 751.608 - }, - SABOTENDER_BAILARIN_PH = - { - [17629261] = 17629264, -- 604 -5.5 -680 - [17629262] = 17629264, -- 600 -5.5 -673 - }, - SABOTENDER_BAILARINA_PH = - { - [17629582] = 17629587, -- -458 0 780 - [17629586] = 17629587, -- -522 1 779 - }, - VALOR = 17629185, - HONOR = 17629186, - CENTURIO_IV_VII = 17629187, - TRIARIUS_IV_XIV = 17629188, - PRINCEPS_IV_XLV = 17629189, - MIMIC = 17629190, - ANCIENT_VESSEL = 17629642, - TRIBUNUS_VII_I = 17629643, - GIRTABLULU = 17629645, + SAGITTARIUS_X_XIII = GetFirstID('Sagittarius_X-XIII'), + NUSSKNACKER = GetFirstID('Nussknacker'), + CENTURIO_X_I = GetFirstID('Centurio_X-I'), + ANTICAN_MAGISTER = GetFirstID('Antican_Magister'), + ANTICAN_PRAEFECTUS = GetFirstID('Antican_Praefectus'), + ANTICAN_PROCONSUL = GetFirstID('Antican_Proconsul'), + DIAMOND_DAIG = GetFirstID('Diamond_Daig'), + ANTICAN_TRIBUNUS = GetFirstID('Antican_Tribunus'), + TRIARIUS_X_XV = GetFirstID('Triarius_X-XV'), + HASTATUS_XI_XII = GetFirstID('Hastatus_XI-XII'), + SABOTENDER_BAILARIN = GetFirstID('Sabotender_Bailarin'), + SABOTENDER_BAILARINA = GetFirstID('Sabotender_Bailarina'), + VALOR = GetFirstID('Valor'), + HONOR = GetFirstID('Honor'), + CENTURIO_IV_VII = GetFirstID('Centurio_IV-VII'), + TRIARIUS_IV_XIV = GetFirstID('Triarius_IV-XIV'), + PRINCEPS_IV_XLV = GetFirstID('Princeps_IV-XLV'), + MIMIC = GetFirstID('Mimic'), + ANCIENT_VESSEL = GetFirstID('Ancient_Vessel'), + TRIBUNUS_VII_I = GetFirstID('Tribunus_VII-I'), + GIRTABLULU = GetFirstID('Girtablulu'), }, npc = { @@ -121,10 +74,10 @@ zones[xi.zone.QUICKSAND_CAVES] = [4] = { 814.000, -14.000, -761.000 }, }, - ORNATE_DOOR_OFFSET = 17629694, - CHAINS_THAT_BIND_US_QM = 17629747, + ORNATE_DOOR_OFFSET = GetFirstID('_5s0'), + CHAINS_THAT_BIND_US_QM = GetFirstID('qm6'), TREASURE_COFFER = GetFirstID('Treasure_Coffer'), - ANTICAN_TAG_QM = 17629770, + ANTICAN_TAG_QM = GetFirstID('qm25'), }, } diff --git a/scripts/zones/Quicksand_Caves/mobs/Antican_Aedilis.lua b/scripts/zones/Quicksand_Caves/mobs/Antican_Aedilis.lua index c5a14ed3a0d..cfa85edaa1e 100644 --- a/scripts/zones/Quicksand_Caves/mobs/Antican_Aedilis.lua +++ b/scripts/zones/Quicksand_Caves/mobs/Antican_Aedilis.lua @@ -7,6 +7,11 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ----------------------------------- local entity = {} +local tribunusPHTable = +{ + [ID.mob.ANTICAN_TRIBUNUS + 18] = ID.mob.ANTICAN_TRIBUNUS, -- -575.455 -0.401 -433.802 TODO: Audit PH +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 812, 2, xi.regime.type.GROUNDS) xi.regime.checkRegime(player, mob, 813, 2, xi.regime.type.GROUNDS) @@ -19,7 +24,7 @@ entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.ANTICAN_TRIBUNUS_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, tribunusPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Quicksand_Caves/mobs/Antican_Hastatus.lua b/scripts/zones/Quicksand_Caves/mobs/Antican_Hastatus.lua index 519553e1c04..d72337ba275 100644 --- a/scripts/zones/Quicksand_Caves/mobs/Antican_Hastatus.lua +++ b/scripts/zones/Quicksand_Caves/mobs/Antican_Hastatus.lua @@ -7,6 +7,13 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ----------------------------------- local entity = {} +local magisterPHTable = +{ + -- Antican Magister is a lottery of various Antica at (C-6). + -- https://www.bg-wiki.com/ffxi/Antican_Magister + [ID.mob.ANTICAN_MAGISTER - 3] = ID.mob.ANTICAN_MAGISTER, +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 812, 2, xi.regime.type.GROUNDS) xi.regime.checkRegime(player, mob, 813, 2, xi.regime.type.GROUNDS) @@ -19,7 +26,7 @@ entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.ANTICAN_MAGISTER_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, magisterPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Quicksand_Caves/mobs/Antican_Princeps.lua b/scripts/zones/Quicksand_Caves/mobs/Antican_Princeps.lua index 61b4e1709fd..43fa0c87429 100644 --- a/scripts/zones/Quicksand_Caves/mobs/Antican_Princeps.lua +++ b/scripts/zones/Quicksand_Caves/mobs/Antican_Princeps.lua @@ -7,6 +7,23 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ----------------------------------- local entity = {} +local sagittariusPHTable = +{ + [ID.mob.SAGITTARIUS_X_XIII - 5] = ID.mob.SAGITTARIUS_X_XIII, -- 641 -16.786 -774 +} + +local magisterPHTable = +{ + -- Antican Magister is a lottery of various Antica at (C-6). + -- https://www.bg-wiki.com/ffxi/Antican_Magister + [ID.mob.ANTICAN_MAGISTER - 2] = ID.mob.ANTICAN_MAGISTER, +} + +local praefectusPHTable = +{ + [ID.mob.ANTICAN_PRAEFECTUS - 1] = ID.mob.ANTICAN_PRAEFECTUS, -- -90.01 -0.567 -29.424 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 812, 2, xi.regime.type.GROUNDS) xi.regime.checkRegime(player, mob, 813, 2, xi.regime.type.GROUNDS) @@ -19,9 +36,9 @@ entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.SAGITTARIUS_X_XIII_PH, 10, 14400) -- 4 hours - xi.mob.phOnDespawn(mob, ID.mob.ANTICAN_PRAEFECTUS_PH, 10, 3600) -- 1 hour - xi.mob.phOnDespawn(mob, ID.mob.ANTICAN_MAGISTER_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, sagittariusPHTable, 10, 14400) -- 4 hours + xi.mob.phOnDespawn(mob, praefectusPHTable, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, magisterPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Quicksand_Caves/mobs/Antican_Signifer.lua b/scripts/zones/Quicksand_Caves/mobs/Antican_Signifer.lua index bed5d996763..f75d3c5ba5e 100644 --- a/scripts/zones/Quicksand_Caves/mobs/Antican_Signifer.lua +++ b/scripts/zones/Quicksand_Caves/mobs/Antican_Signifer.lua @@ -7,6 +7,23 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ----------------------------------- local entity = {} +local centurioPHTable = +{ + [ID.mob.CENTURIO_X_I - 1] = ID.mob.CENTURIO_X_I, -- 773.581 1.576 -568.904 +} + +local magisterPHTable = +{ + -- Antican Magister is a lottery of various Antica at (C-6). + -- https://www.bg-wiki.com/ffxi/Antican_Magister + [ID.mob.ANTICAN_MAGISTER - 1] = ID.mob.ANTICAN_MAGISTER, +} + +local proconsulPHTable = +{ + [ID.mob.ANTICAN_PROCONSUL - 1] = ID.mob.ANTICAN_PROCONSUL, -- 89.575 -0.299 -196.206 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 812, 2, xi.regime.type.GROUNDS) xi.regime.checkRegime(player, mob, 813, 2, xi.regime.type.GROUNDS) @@ -19,9 +36,9 @@ entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.CENTURIO_X_I_PH, 10, 9000) -- 2.5 hours - xi.mob.phOnDespawn(mob, ID.mob.ANTICAN_MAGISTER_PH, 10, 3600) -- 1 hour - xi.mob.phOnDespawn(mob, ID.mob.ANTICAN_PROCONSUL_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, centurioPHTable, 10, 9000) -- 2.5 hours + xi.mob.phOnDespawn(mob, magisterPHTable, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, proconsulPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Quicksand_Caves/mobs/Antican_Triarius.lua b/scripts/zones/Quicksand_Caves/mobs/Antican_Triarius.lua index 1c3f9cfa308..30721283491 100644 --- a/scripts/zones/Quicksand_Caves/mobs/Antican_Triarius.lua +++ b/scripts/zones/Quicksand_Caves/mobs/Antican_Triarius.lua @@ -7,6 +7,16 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ----------------------------------- local entity = {} +local triariusPHTable = +{ + [ID.mob.TRIARIUS_X_XV + 9] = ID.mob.TRIARIUS_X_XV, -- -786.730 -0.5 -343.963 +} + +local hastatusPHTable = +{ + [ID.mob.HASTATUS_XI_XII - 4] = ID.mob.HASTATUS_XI_XII, -- -343.859 -0.411 751.608 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 812, 2, xi.regime.type.GROUNDS) xi.regime.checkRegime(player, mob, 813, 2, xi.regime.type.GROUNDS) @@ -19,8 +29,8 @@ entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.TRIARIUS_X_XV_PH, 10, 7200) -- 2 hours - xi.mob.phOnDespawn(mob, ID.mob.HASTATUS_XI_XII_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, triariusPHTable, 10, 7200) -- 2 hours + xi.mob.phOnDespawn(mob, hastatusPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Quicksand_Caves/mobs/Helm_Beetle.lua b/scripts/zones/Quicksand_Caves/mobs/Helm_Beetle.lua index 09932cc7d65..82470910334 100644 --- a/scripts/zones/Quicksand_Caves/mobs/Helm_Beetle.lua +++ b/scripts/zones/Quicksand_Caves/mobs/Helm_Beetle.lua @@ -7,12 +7,17 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ----------------------------------- local entity = {} +local diamondPHTable = +{ + [ID.mob.DIAMOND_DAIG + 9] = ID.mob.DIAMOND_DAIG, -- -95.632 -0.5 -214.732 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 813, 1, xi.regime.type.GROUNDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.DIAMOND_DAIG_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, diamondPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Quicksand_Caves/mobs/Sabotender_Bailaor.lua b/scripts/zones/Quicksand_Caves/mobs/Sabotender_Bailaor.lua index d2df3193c8e..b2e1fb3665d 100644 --- a/scripts/zones/Quicksand_Caves/mobs/Sabotender_Bailaor.lua +++ b/scripts/zones/Quicksand_Caves/mobs/Sabotender_Bailaor.lua @@ -6,12 +6,18 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ----------------------------------- local entity = {} +local bailarinPHTable = +{ + [ID.mob.SABOTENDER_BAILARIN - 3] = ID.mob.SABOTENDER_BAILARIN, -- 604 -5.5 -680 + [ID.mob.SABOTENDER_BAILARIN - 2] = ID.mob.SABOTENDER_BAILARIN, -- 600 -5.5 -673 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 816, 1, xi.regime.type.GROUNDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.SABOTENDER_BAILARIN_PH, 100, 9000) -- 2.5 hours + xi.mob.phOnDespawn(mob, bailarinPHTable, 100, 9000) -- 2.5 hours end return entity diff --git a/scripts/zones/Quicksand_Caves/mobs/Sand_Lizard.lua b/scripts/zones/Quicksand_Caves/mobs/Sand_Lizard.lua index 98deca26142..76352da4cf6 100644 --- a/scripts/zones/Quicksand_Caves/mobs/Sand_Lizard.lua +++ b/scripts/zones/Quicksand_Caves/mobs/Sand_Lizard.lua @@ -7,12 +7,18 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ----------------------------------- local entity = {} +local nussknackerPHTable = +{ + [ID.mob.NUSSKNACKER - 7] = ID.mob.NUSSKNACKER, -- 189 2 4 + [ID.mob.NUSSKNACKER - 6] = ID.mob.NUSSKNACKER, -- 200 2 -4 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 817, 1, xi.regime.type.GROUNDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.NUSSKNACKER_PH, 5, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, nussknackerPHTable, 5, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Quicksand_Caves/mobs/Spelunking_Sabotender.lua b/scripts/zones/Quicksand_Caves/mobs/Spelunking_Sabotender.lua index fd73a60b98d..3872d400cb1 100644 --- a/scripts/zones/Quicksand_Caves/mobs/Spelunking_Sabotender.lua +++ b/scripts/zones/Quicksand_Caves/mobs/Spelunking_Sabotender.lua @@ -6,12 +6,18 @@ local ID = zones[xi.zone.QUICKSAND_CAVES] ----------------------------------- local entity = {} +local bailarinaPHTable = +{ + [ID.mob.SABOTENDER_BAILARINA - 5] = ID.mob.SABOTENDER_BAILARINA, -- -458 0 780 + [ID.mob.SABOTENDER_BAILARINA - 1] = ID.mob.SABOTENDER_BAILARINA, -- -522 1 779 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 816, 1, xi.regime.type.GROUNDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.SABOTENDER_BAILARINA_PH, 10, 9000) -- 2.5 hours + xi.mob.phOnDespawn(mob, bailarinaPHTable, 10, 9000) -- 2.5 hours end return entity