From f12176fccffd267727162626955a07cbb7bfd542 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Mon, 13 May 2024 19:14:18 -0400 Subject: [PATCH 1/4] Shift-proof Dragons Aery --- scripts/zones/Dragons_Aery/IDs.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/zones/Dragons_Aery/IDs.lua b/scripts/zones/Dragons_Aery/IDs.lua index 5c0ca8143e5..faac7a40eae 100644 --- a/scripts/zones/Dragons_Aery/IDs.lua +++ b/scripts/zones/Dragons_Aery/IDs.lua @@ -24,12 +24,12 @@ zones[xi.zone.DRAGONS_AERY] = }, mob = { - FAFNIR = 17408018, - NIDHOGG = 17408019, + FAFNIR = GetFirstID('Fafnir'), + NIDHOGG = GetFirstID('Nidhogg'), }, npc = { - FAFNIR_QM = 17408033, + FAFNIR_QM = GetFirstID('qm0'), }, } From 78d64ef6ca7beb5eb37cb1238c2c4d1aa446ba19 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Mon, 13 May 2024 19:14:42 -0400 Subject: [PATCH 2/4] Shift-proof Den of Rancor --- scripts/zones/Den_of_Rancor/IDs.lua | 48 +++++-------------- scripts/zones/Den_of_Rancor/mobs/Bifrons.lua | 7 ++- .../zones/Den_of_Rancor/mobs/Doom_Toad.lua | 9 +++- .../mobs/Tonberry_Beleaguerer.lua | 7 ++- .../mobs/Tonberry_Imprecator.lua | 8 +++- .../Den_of_Rancor/mobs/Tonberry_Slasher.lua | 12 ++++- .../Den_of_Rancor/mobs/Tonberry_Trailer.lua | 7 ++- 7 files changed, 55 insertions(+), 43 deletions(-) diff --git a/scripts/zones/Den_of_Rancor/IDs.lua b/scripts/zones/Den_of_Rancor/IDs.lua index 5ab0c27e36a..9afe07467db 100644 --- a/scripts/zones/Den_of_Rancor/IDs.lua +++ b/scripts/zones/Den_of_Rancor/IDs.lua @@ -33,46 +33,20 @@ zones[xi.zone.DEN_OF_RANCOR] = }, mob = { - CELESTE_EYED_TOZBERRY_PH = - { - [17432622] = 17432624, - }, - FRIAR_RUSH_PH = - { - [17432638] = 17432640, - }, - CARMINE_TAILED_JANBERRY_PH = - { - [17432661] = 17432659, - [17432662] = 17432659, - }, - TAWNY_FINGERED_MUGBERRY_PH = - { - [17432784] = 17432798, - [17432785] = 17432798, - [17432787] = 17432798, - [17432788] = 17432798, - [17432793] = 17432798, - [17432794] = 17432798, - }, - BISTRE_HEARTED_MALBERRY_PH = - { - [17432822] = 17432845, - }, - OGAMA_PH = - { - [17432972] = 17432974, - [17432978] = 17432974, - [17432979] = 17432974, - }, - MIMIC = 17432583, - HAKUTAKU = 17433005, - MOKUMOKUREN = 17433006, + CELESTE_EYED_TOZBERRY = GetFirstID('Celeste-eyed_Tozberry'), + FRIAR_RUSH = GetFirstID('Friar_Rush'), + CARMINE_TAILED_JANBERRY = GetFirstID('Carmine-tailed_Janberry'), + TAWNY_FINGERED_MUGBERRY = GetFirstID('Tawny-fingered_Mugberry'), + BISTRE_HEARTED_MALBERRY = GetFirstID('Bistre-hearted_Malberry'), + OGAMA = GetFirstID('Ogama'), + MIMIC = GetFirstID('Mimic'), + HAKUTAKU = GetFirstID('Hakutaku'), + MOKUMOKUREN = GetFirstID('Mokumokuren'), }, npc = { - LANTERN_OFFSET = 17433048, - DROP_GATE = 17433052, + LANTERN_OFFSET = GetFirstID('_4g3'), + DROP_GATE = GetFirstID('_4g0'), TREASURE_COFFER = GetFirstID('Treasure_Coffer'), }, } diff --git a/scripts/zones/Den_of_Rancor/mobs/Bifrons.lua b/scripts/zones/Den_of_Rancor/mobs/Bifrons.lua index 8252284c7c4..7a263a5e145 100644 --- a/scripts/zones/Den_of_Rancor/mobs/Bifrons.lua +++ b/scripts/zones/Den_of_Rancor/mobs/Bifrons.lua @@ -7,11 +7,16 @@ local ID = zones[xi.zone.DEN_OF_RANCOR] ----------------------------------- local entity = {} +local friarPHTable = +{ + [ID.mob.FRIAR_RUSH - 2] = ID.mob.FRIAR_RUSH, +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.FRIAR_RUSH_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, friarPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Den_of_Rancor/mobs/Doom_Toad.lua b/scripts/zones/Den_of_Rancor/mobs/Doom_Toad.lua index ff24a76805e..92872bca057 100644 --- a/scripts/zones/Den_of_Rancor/mobs/Doom_Toad.lua +++ b/scripts/zones/Den_of_Rancor/mobs/Doom_Toad.lua @@ -7,12 +7,19 @@ local ID = zones[xi.zone.DEN_OF_RANCOR] ----------------------------------- local entity = {} +local ogamaPHTable = +{ + [ID.mob.OGAMA - 2] = ID.mob.OGAMA, + [ID.mob.OGAMA + 4] = ID.mob.OGAMA, + [ID.mob.OGAMA + 5] = ID.mob.OGAMA, +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 801, 2, xi.regime.type.GROUNDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.OGAMA_PH, 5, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, ogamaPHTable, 5, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Den_of_Rancor/mobs/Tonberry_Beleaguerer.lua b/scripts/zones/Den_of_Rancor/mobs/Tonberry_Beleaguerer.lua index 0a1a3d6fb9b..c0460ecc2be 100644 --- a/scripts/zones/Den_of_Rancor/mobs/Tonberry_Beleaguerer.lua +++ b/scripts/zones/Den_of_Rancor/mobs/Tonberry_Beleaguerer.lua @@ -8,6 +8,11 @@ local ID = zones[xi.zone.DEN_OF_RANCOR] ----------------------------------- local entity = {} +local bistrePHTable = +{ + [ID.mob.BISTRE_HEARTED_MALBERRY - 23] = ID.mob.BISTRE_HEARTED_MALBERRY, +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 798, 1, xi.regime.type.GROUNDS) xi.regime.checkRegime(player, mob, 799, 2, xi.regime.type.GROUNDS) @@ -15,7 +20,7 @@ entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.BISTRE_HEARTED_MALBERRY_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, bistrePHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Den_of_Rancor/mobs/Tonberry_Imprecator.lua b/scripts/zones/Den_of_Rancor/mobs/Tonberry_Imprecator.lua index 4bed7cc41c4..cbbce806392 100644 --- a/scripts/zones/Den_of_Rancor/mobs/Tonberry_Imprecator.lua +++ b/scripts/zones/Den_of_Rancor/mobs/Tonberry_Imprecator.lua @@ -8,6 +8,12 @@ local ID = zones[xi.zone.DEN_OF_RANCOR] ----------------------------------- local entity = {} +local carminePHTable = +{ + [ID.mob.CARMINE_TAILED_JANBERRY + 2] = ID.mob.CARMINE_TAILED_JANBERRY, + [ID.mob.CARMINE_TAILED_JANBERRY + 3] = ID.mob.CARMINE_TAILED_JANBERRY, +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 798, 1, xi.regime.type.GROUNDS) xi.regime.checkRegime(player, mob, 799, 2, xi.regime.type.GROUNDS) @@ -15,7 +21,7 @@ entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.CARMINE_TAILED_JANBERRY_PH, 5, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, carminePHTable, 5, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Den_of_Rancor/mobs/Tonberry_Slasher.lua b/scripts/zones/Den_of_Rancor/mobs/Tonberry_Slasher.lua index 80683d814a2..d13175701f4 100644 --- a/scripts/zones/Den_of_Rancor/mobs/Tonberry_Slasher.lua +++ b/scripts/zones/Den_of_Rancor/mobs/Tonberry_Slasher.lua @@ -8,6 +8,16 @@ local ID = zones[xi.zone.DEN_OF_RANCOR] ----------------------------------- local entity = {} +local tawnyPHTable = +{ + [ID.mob.TAWNY_FINGERED_MUGBERRY - 14] = ID.mob.TAWNY_FINGERED_MUGBERRY, + [ID.mob.TAWNY_FINGERED_MUGBERRY - 13] = ID.mob.TAWNY_FINGERED_MUGBERRY, + [ID.mob.TAWNY_FINGERED_MUGBERRY - 11] = ID.mob.TAWNY_FINGERED_MUGBERRY, + [ID.mob.TAWNY_FINGERED_MUGBERRY - 10] = ID.mob.TAWNY_FINGERED_MUGBERRY, + [ID.mob.TAWNY_FINGERED_MUGBERRY - 5] = ID.mob.TAWNY_FINGERED_MUGBERRY, + [ID.mob.TAWNY_FINGERED_MUGBERRY - 4] = ID.mob.TAWNY_FINGERED_MUGBERRY, +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 798, 1, xi.regime.type.GROUNDS) xi.regime.checkRegime(player, mob, 799, 2, xi.regime.type.GROUNDS) @@ -15,7 +25,7 @@ entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.TAWNY_FINGERED_MUGBERRY_PH, 5, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, tawnyPHTable, 5, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Den_of_Rancor/mobs/Tonberry_Trailer.lua b/scripts/zones/Den_of_Rancor/mobs/Tonberry_Trailer.lua index 3d67d592c9d..134e6eaa9df 100644 --- a/scripts/zones/Den_of_Rancor/mobs/Tonberry_Trailer.lua +++ b/scripts/zones/Den_of_Rancor/mobs/Tonberry_Trailer.lua @@ -8,6 +8,11 @@ local ID = zones[xi.zone.DEN_OF_RANCOR] ----------------------------------- local entity = {} +local celestePHTable = +{ + [ID.mob.CELESTE_EYED_TOZBERRY - 2] = ID.mob.CELESTE_EYED_TOZBERRY, +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 798, 1, xi.regime.type.GROUNDS) xi.regime.checkRegime(player, mob, 799, 2, xi.regime.type.GROUNDS) @@ -15,7 +20,7 @@ entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.CELESTE_EYED_TOZBERRY_PH, 10, 7200) -- 2 hours + xi.mob.phOnDespawn(mob, celestePHTable, 10, 7200) -- 2 hours end return entity From 6c22daec0954170c923c917113a48b8ac02c001a Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Mon, 13 May 2024 19:21:18 -0400 Subject: [PATCH 3/4] Shift-proof Davoi --- scripts/zones/Davoi/IDs.lua | 55 +++++-------------- scripts/zones/Davoi/mobs/Davoi_Mush.lua | 7 ++- .../zones/Davoi/mobs/Orcish_Beastrider.lua | 8 ++- scripts/zones/Davoi/mobs/Orcish_Brawler.lua | 7 ++- .../zones/Davoi/mobs/Orcish_Cursemaker.lua | 9 ++- .../zones/Davoi/mobs/Orcish_Firebelcher.lua | 7 ++- scripts/zones/Davoi/mobs/Orcish_Impaler.lua | 15 ++++- .../zones/Davoi/mobs/Orcish_Nightraider.lua | 8 ++- scripts/zones/Davoi/mobs/War_Lizard.lua | 8 ++- 9 files changed, 75 insertions(+), 49 deletions(-) diff --git a/scripts/zones/Davoi/IDs.lua b/scripts/zones/Davoi/IDs.lua index 02e6c0a056f..7bc890f7096 100644 --- a/scripts/zones/Davoi/IDs.lua +++ b/scripts/zones/Davoi/IDs.lua @@ -41,50 +41,25 @@ zones[xi.zone.DAVOI] = }, mob = { - HAWKEYED_DNATBAT_PH = - { - [17387558] = 17387567, -- 337.116 -1.167 -110.483 - [17387560] = 17387567, -- 336.498 -0.563 -138.502 - [17387563] = 17387567, -- 371.525 0.235 -176.188 - }, - STEELBITER_GUDRUD_PH = - { - [17387578] = 17387585, -- 252.457 3.501 -248.655 - }, - TIGERBANE_BAKDAK_PH = - { - [17387602] = 17387606, -- 158 -0.662 -18 - [17387603] = 17387606, -- 153.880 -0.769 -18.092 - }, - POISONHAND_GNADGAD_PH = - { - [17387634] = 17387644, -- -53.910 -0.583 56.606 - [17387635] = 17387644, -- -62.647 -0.468 24.442 - [17387636] = 17387644, -- -64.578 -0.658 61.273 - [17387637] = 17387644, -- -59.013 -0.590 14.783 - [17387638] = 17387644, -- -50.158 -0.537 22.257 - [17387639] = 17387644, -- -56.626 -0.607 63.285 - [17387640] = 17387644, -- -54.694 -0.545 42.385 - [17387641] = 17387644, -- -60.057 -0.655 29.127 - }, - BLUBBERY_BULGE_PH = - { - [17387919] = 17387920, -- -225.237 2.295 -294.764 - }, - GAVOTVUT = 17387965, - BARAKBOK = 17387966, - BILOPDOP = 17387967, - DELOKNOK = 17387968, - PURPLEFLASH_BRUKDOK = 17387969, - ONE_EYED_GWAJBOJ = 17387970, - THREE_EYED_PROZPUZ = 17387971, - HEMATIC_CYST = 17387972, + HAWKEYED_DNATBAT = GetFirstID('Hawkeyed_Dnatbat'), + STEELBITER_GUDRUD = GetFirstID('Steelbiter_Gudrud'), + TIGERBANE_BAKDAK = GetFirstID('Tigerbane_Bakdak'), + POISONHAND_GNADGAD = GetFirstID('Poisonhand_Gnadgad'), + BLUBBERY_BULGE = GetFirstID('Blubbery_Bulge'), + GAVOTVUT = GetFirstID('Gavotvut'), + BARAKBOK = GetFirstID('Barakbok'), + BILOPDOP = GetFirstID('Bilopdop'), + DELOKNOK = GetFirstID('Deloknok'), + PURPLEFLASH_BRUKDOK = GetFirstID('Purpleflash_Brukdok'), + ONE_EYED_GWAJBOJ = GetFirstID('One-eyed_Gwajboj'), + THREE_EYED_PROZPUZ = GetFirstID('Three-eyed_Prozpuz'), + HEMATIC_CYST = GetFirstID('Hematic_Cyst'), }, npc = { JAR = GetFirstID('Jar'), - HIDE_FLAP_OFFSET = 17388024, - STORAGE_HOLE = 17388026, + HIDE_FLAP_OFFSET = GetFirstID('Hide_Flap_1'), + STORAGE_HOLE = GetFirstID('Storage_Hole'), TREASURE_CHEST = GetFirstID('Treasure_Chest'), }, } diff --git a/scripts/zones/Davoi/mobs/Davoi_Mush.lua b/scripts/zones/Davoi/mobs/Davoi_Mush.lua index 31410a3100a..aac9b4e4c66 100644 --- a/scripts/zones/Davoi/mobs/Davoi_Mush.lua +++ b/scripts/zones/Davoi/mobs/Davoi_Mush.lua @@ -7,11 +7,16 @@ local ID = zones[xi.zone.DAVOI] ----------------------------------- local entity = {} +local blueberryPHTable = +{ + [ID.mob.BLUBBERY_BULGE - 1] = ID.mob.BLUBBERY_BULGE, -- -225.237 2.295 -294.764 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.BLUBBERY_BULGE_PH, 20, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, blueberryPHTable, 20, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Davoi/mobs/Orcish_Beastrider.lua b/scripts/zones/Davoi/mobs/Orcish_Beastrider.lua index 4e584f9ff05..3f3e4802a79 100644 --- a/scripts/zones/Davoi/mobs/Orcish_Beastrider.lua +++ b/scripts/zones/Davoi/mobs/Orcish_Beastrider.lua @@ -7,11 +7,17 @@ local ID = zones[xi.zone.DAVOI] ----------------------------------- local entity = {} +local poisonhandPHTable = +{ + [ID.mob.POISONHAND_GNADGAD - 9] = ID.mob.POISONHAND_GNADGAD, -- -62.647 -0.468 24.442 + [ID.mob.POISONHAND_GNADGAD - 5] = ID.mob.POISONHAND_GNADGAD, -- -56.626 -0.607 63.285 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.POISONHAND_GNADGAD_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, poisonhandPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Davoi/mobs/Orcish_Brawler.lua b/scripts/zones/Davoi/mobs/Orcish_Brawler.lua index 97fd7c8c146..7b5fac47d4d 100644 --- a/scripts/zones/Davoi/mobs/Orcish_Brawler.lua +++ b/scripts/zones/Davoi/mobs/Orcish_Brawler.lua @@ -7,11 +7,16 @@ local ID = zones[xi.zone.DAVOI] ----------------------------------- local entity = {} +local poisonhandPHTable = +{ + [ID.mob.POISONHAND_GNADGAD - 7] = ID.mob.POISONHAND_GNADGAD, -- -59.013 -0.590 14.783 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.POISONHAND_GNADGAD_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, poisonhandPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Davoi/mobs/Orcish_Cursemaker.lua b/scripts/zones/Davoi/mobs/Orcish_Cursemaker.lua index 326020dfc1e..b04de5e07ff 100644 --- a/scripts/zones/Davoi/mobs/Orcish_Cursemaker.lua +++ b/scripts/zones/Davoi/mobs/Orcish_Cursemaker.lua @@ -7,11 +7,18 @@ local ID = zones[xi.zone.DAVOI] ----------------------------------- local entity = {} +local dnatbatPHTable = +{ + [ID.mob.HAWKEYED_DNATBAT - 9] = ID.mob.HAWKEYED_DNATBAT, -- 337.116 -1.167 -110.483 + [ID.mob.HAWKEYED_DNATBAT - 7] = ID.mob.HAWKEYED_DNATBAT, -- 336.498 -0.563 -138.502 + [ID.mob.HAWKEYED_DNATBAT - 4] = ID.mob.HAWKEYED_DNATBAT, -- 371.525 0.235 -176.188 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.HAWKEYED_DNATBAT_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, dnatbatPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Davoi/mobs/Orcish_Firebelcher.lua b/scripts/zones/Davoi/mobs/Orcish_Firebelcher.lua index 93e96b0630d..bf604fb0bb1 100644 --- a/scripts/zones/Davoi/mobs/Orcish_Firebelcher.lua +++ b/scripts/zones/Davoi/mobs/Orcish_Firebelcher.lua @@ -7,11 +7,16 @@ local ID = zones[xi.zone.DAVOI] ----------------------------------- local entity = {} +local poisonhandPHTable = +{ + [ID.mob.POISONHAND_GNADGAD - 3] = ID.mob.POISONHAND_GNADGAD, -- -60.057 -0.655 29.127 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.POISONHAND_GNADGAD_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, poisonhandPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Davoi/mobs/Orcish_Impaler.lua b/scripts/zones/Davoi/mobs/Orcish_Impaler.lua index 0981825683e..cc10e6f1355 100644 --- a/scripts/zones/Davoi/mobs/Orcish_Impaler.lua +++ b/scripts/zones/Davoi/mobs/Orcish_Impaler.lua @@ -7,12 +7,23 @@ local ID = zones[xi.zone.DAVOI] ----------------------------------- local entity = {} +local steelbiterPHTable = +{ + [ID.mob.STEELBITER_GUDRUD - 7] = ID.mob.STEELBITER_GUDRUD, -- 252.457 3.501 -248.655 +} + +local poisonhandPHTable = +{ + [ID.mob.POISONHAND_GNADGAD - 10] = ID.mob.POISONHAND_GNADGAD, -- -53.910 -0.583 56.606 + [ID.mob.POISONHAND_GNADGAD - 6] = ID.mob.POISONHAND_GNADGAD, -- -50.158 -0.537 22.257 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.POISONHAND_GNADGAD_PH, 10, 3600) -- 1 hour - xi.mob.phOnDespawn(mob, ID.mob.STEELBITER_GUDRUD_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, poisonhandPHTable, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, steelbiterPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Davoi/mobs/Orcish_Nightraider.lua b/scripts/zones/Davoi/mobs/Orcish_Nightraider.lua index a0f528a9d79..c5d3d139a4c 100644 --- a/scripts/zones/Davoi/mobs/Orcish_Nightraider.lua +++ b/scripts/zones/Davoi/mobs/Orcish_Nightraider.lua @@ -7,11 +7,17 @@ local ID = zones[xi.zone.DAVOI] ----------------------------------- local entity = {} +local poisonhandPHTable = +{ + [ID.mob.POISONHAND_GNADGAD - 8] = ID.mob.POISONHAND_GNADGAD, -- -64.578 -0.658 61.273 + [ID.mob.POISONHAND_GNADGAD - 4] = ID.mob.POISONHAND_GNADGAD, -- -54.694 -0.545 42.385 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.POISONHAND_GNADGAD_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, poisonhandPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Davoi/mobs/War_Lizard.lua b/scripts/zones/Davoi/mobs/War_Lizard.lua index 9d0913e280f..e5d060b46f5 100644 --- a/scripts/zones/Davoi/mobs/War_Lizard.lua +++ b/scripts/zones/Davoi/mobs/War_Lizard.lua @@ -7,11 +7,17 @@ local ID = zones[xi.zone.DAVOI] ----------------------------------- local entity = {} +local tigerbanePHTable = +{ + [ID.mob.TIGERBANE_BAKDAK - 4] = ID.mob.TIGERBANE_BAKDAK, -- 158 -0.662 -18 + [ID.mob.TIGERBANE_BAKDAK - 3] = ID.mob.TIGERBANE_BAKDAK, -- 153.880 -0.769 -18.092 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.TIGERBANE_BAKDAK_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, tigerbanePHTable, 10, 3600) -- 1 hour end return entity From 24aa8abc9d2cc285308feaca4eb48ad37d911a68 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Mon, 13 May 2024 19:21:28 -0400 Subject: [PATCH 4/4] Shift-proof Dangruf Wadi --- scripts/zones/Dangruf_Wadi/IDs.lua | 15 ++++++--------- scripts/zones/Dangruf_Wadi/mobs/Hoarder_Hare.lua | 7 ++++++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/scripts/zones/Dangruf_Wadi/IDs.lua b/scripts/zones/Dangruf_Wadi/IDs.lua index 954f12dfc50..3db7763c1c0 100644 --- a/scripts/zones/Dangruf_Wadi/IDs.lua +++ b/scripts/zones/Dangruf_Wadi/IDs.lua @@ -46,18 +46,15 @@ zones[xi.zone.DANGRUF_WADI] = }, mob = { - TEPORINGO_PH = - { - [17559583] = 17559584, - }, - GEYSER_LIZARD = 17559558, - CHOCOBOLEECH = 17559869, - APPARATUS_ELEMENTAL = 17559870, + TEPORINGO = GetFirstID('Teporingo'), + GEYSER_LIZARD = GetFirstID('Geyser_Lizard'), + CHOCOBOLEECH = GetFirstID('Chocoboleech'), + APPARATUS_ELEMENTAL = GetFirstID('Fire_Elemental'), }, npc = { - GEYSER_OFFSET = 17559900, - AN_EMPTY_VESSEL_QM = 17559912, + GEYSER_OFFSET = GetFirstID('blank'), + AN_EMPTY_VESSEL_QM = GetFirstID('qm2'), TREASURE_CHEST = GetFirstID('Treasure_Chest'), }, } diff --git a/scripts/zones/Dangruf_Wadi/mobs/Hoarder_Hare.lua b/scripts/zones/Dangruf_Wadi/mobs/Hoarder_Hare.lua index 1920f7c9385..55cd1c8a552 100644 --- a/scripts/zones/Dangruf_Wadi/mobs/Hoarder_Hare.lua +++ b/scripts/zones/Dangruf_Wadi/mobs/Hoarder_Hare.lua @@ -7,11 +7,16 @@ local ID = zones[xi.zone.DANGRUF_WADI] ----------------------------------- local entity = {} +local teporingoPHTable = +{ + [ID.mob.TEPORINGO - 1] = ID.mob.TEPORINGO, +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.TEPORINGO_PH, 20, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, teporingoPHTable, 20, 3600) -- 1 hour end return entity