From 8287fad6a1fba0083db8635b796bfce77e3bd160 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Tue, 7 May 2024 00:34:05 -0400 Subject: [PATCH 1/6] Shift-proof PsoXja --- scripts/zones/PsoXja/IDs.lua | 15 ++++++--------- scripts/zones/PsoXja/mobs/Diremite.lua | 7 ++++++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/scripts/zones/PsoXja/IDs.lua b/scripts/zones/PsoXja/IDs.lua index dfe791766d9..1723eedaf1b 100644 --- a/scripts/zones/PsoXja/IDs.lua +++ b/scripts/zones/PsoXja/IDs.lua @@ -33,18 +33,15 @@ zones[xi.zone.PSOXJA] = }, mob = { - GYRE_CARLIN_PH = - { - [16814330] = 16814331, - }, - GARGOYLE_OFFSET = 16814081, - NUNYUNUWI = 16814361, - GOLDEN_TONGUED_CULBERRY = 16814432, + GYRE_CARLIN = GetFirstID('Gyre-Carlin'), + GARGOYLE_OFFSET = GetFirstID('Gargoyle'), + NUNYUNUWI = GetFirstID('Nunyunuwi'), + GOLDEN_TONGUED_CULBERRY = GetFirstID('Golden-Tongued_Culberry'), }, npc = { - STONE_DOOR_OFFSET = 16814446, -- _090 in npc_list - TREASURE_CHEST = 16814558, + STONE_DOOR_OFFSET = GetFirstID('_090'), + TREASURE_CHEST = GetFirstID('Treasure_Chest'), }, } diff --git a/scripts/zones/PsoXja/mobs/Diremite.lua b/scripts/zones/PsoXja/mobs/Diremite.lua index 1347b2a3a64..b641db70ada 100644 --- a/scripts/zones/PsoXja/mobs/Diremite.lua +++ b/scripts/zones/PsoXja/mobs/Diremite.lua @@ -6,11 +6,16 @@ local ID = zones[xi.zone.PSOXJA] ----------------------------------- local entity = {} +local gyreCarlinPHTable = +{ + [ID.mob.GYRE_CARLIN - 1] = ID.mob.GYRE_CARLIN, +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.GYRE_CARLIN_PH, 5, 1800) -- 30 minutes. + xi.mob.phOnDespawn(mob, gyreCarlinPHTable, 5, 1800) -- 30 minutes. end return entity From 41af806306c0a08ffae514fb04a29770854bd200 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Tue, 7 May 2024 00:34:17 -0400 Subject: [PATCH 2/6] Shift-proof Port Windurst --- scripts/zones/Port_Windurst/IDs.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/zones/Port_Windurst/IDs.lua b/scripts/zones/Port_Windurst/IDs.lua index 7d39bbcbbf1..bfec42124fc 100644 --- a/scripts/zones/Port_Windurst/IDs.lua +++ b/scripts/zones/Port_Windurst/IDs.lua @@ -80,7 +80,7 @@ zones[xi.zone.PORT_WINDURST] = }, npc = { - EXPLORER_MOOGLE = 17760450, + EXPLORER_MOOGLE = GetFirstID('Explorer_Moogle'), }, } From 8c00c2d559466db624b0a22ea9321c3c1d9e863c Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Tue, 7 May 2024 00:34:50 -0400 Subject: [PATCH 3/6] Shift-proof Phomiuna Aquedcuts --- scripts/zones/Phomiuna_Aqueducts/IDs.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/zones/Phomiuna_Aqueducts/IDs.lua b/scripts/zones/Phomiuna_Aqueducts/IDs.lua index cd3dfb93dcb..9567dd3e4a7 100644 --- a/scripts/zones/Phomiuna_Aqueducts/IDs.lua +++ b/scripts/zones/Phomiuna_Aqueducts/IDs.lua @@ -31,7 +31,7 @@ zones[xi.zone.PHOMIUNA_AQUEDUCTS] = }, npc = { - LADDER_KNOCKING = 16888097, + LADDER_KNOCKING = GetTableOfIDs('Wooden_Ladder')[4], -- 4th Wooden Ladder on the list }, } From 262f971a0dc4675ae980b6312cee2c9f7ace0882 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Tue, 7 May 2024 00:35:04 -0400 Subject: [PATCH 4/6] Shift-proof part of Periqia --- scripts/zones/Periqia/IDs.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/zones/Periqia/IDs.lua b/scripts/zones/Periqia/IDs.lua index 08efc8bdd71..8ab098b3e6b 100644 --- a/scripts/zones/Periqia/IDs.lua +++ b/scripts/zones/Periqia/IDs.lua @@ -86,13 +86,13 @@ zones[xi.zone.PERIQIA] = npc = { - ANCIENT_LOCKBOX = 17006809, - RUNE_OF_RELEASE = 17006810, - _1K6 = 17006846, - _1KX = 17006873, - _1KZ = 17006875, - _JK1 = 17006877, - _JK3 = 17006879, + ANCIENT_LOCKBOX = GetFirstID('Ancient_Lockbox'), + RUNE_OF_RELEASE = GetFirstID('Rune_of_Release'), + _1K6 = GetFirstID('_1k6'), + _1KX = GetFirstID('_1kx'), + _1KZ = GetFirstID('_1kz'), + _JK1 = GetFirstID('_jk1'), + _JK3 = GetFirstID('_jk3'), } } From b2fca8c20b2239ceb3e805b7352a8e6e1d706f02 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Tue, 7 May 2024 00:35:37 -0400 Subject: [PATCH 5/6] Shift-proof Palborough Mines --- scripts/zones/Palborough_Mines/IDs.lua | 21 ++++--------------- .../Palborough_Mines/mobs/Copper_Beetle.lua | 10 ++++++++- .../Palborough_Mines/mobs/Copper_Quadav.lua | 7 ++++++- .../Palborough_Mines/mobs/Old_Quadav.lua | 7 ++++++- .../Palborough_Mines/mobs/Veteran_Quadav.lua | 7 ++++++- 5 files changed, 31 insertions(+), 21 deletions(-) diff --git a/scripts/zones/Palborough_Mines/IDs.lua b/scripts/zones/Palborough_Mines/IDs.lua index 4fe61d81d37..18ade1aa324 100644 --- a/scripts/zones/Palborough_Mines/IDs.lua +++ b/scripts/zones/Palborough_Mines/IDs.lua @@ -30,23 +30,10 @@ zones[xi.zone.PALBOROUGH_MINES] = }, mob = { - BU_GHI_HOWLBLADE_PH = - { - [17363177] = 17363181, -- 170.000 -15.000 179.000 - [17363178] = 17363181, -- 170.000 -16.000 165.000 - [17363179] = 17363181, -- 166.000 -16.000 135.000 - [17363180] = 17363181, -- 167.207 -18.027 159.374 - }, - ZI_GHI_BONEEATER_PH = - { - [17363205] = 17363208, -- 130.386 -32.313 73.967 - }, - BEHYA_HUNDREDWALL_PH = - { - [17363256] = 17363258, - [17363257] = 17363258, - }, - NI_GHU_NESTFENDER = 17363318, + BU_GHI_HOWLBLADE = GetFirstID('BuGhi_Howlblade'), + ZI_GHI_BONEEATER = GetFirstID('ZiGhi_Boneeater'), + BEHYA_HUNDREDWALL = GetFirstID('BeHya_Hundredwall'), + NI_GHU_NESTFENDER = GetFirstID('NiGhu_Nestfender'), }, npc = { diff --git a/scripts/zones/Palborough_Mines/mobs/Copper_Beetle.lua b/scripts/zones/Palborough_Mines/mobs/Copper_Beetle.lua index 2a9dd0804c3..54eb4351f38 100644 --- a/scripts/zones/Palborough_Mines/mobs/Copper_Beetle.lua +++ b/scripts/zones/Palborough_Mines/mobs/Copper_Beetle.lua @@ -7,11 +7,19 @@ local ID = zones[xi.zone.PALBOROUGH_MINES] ----------------------------------- local entity = {} +local buGhiHowlbladePHTable = +{ + [ID.mob.BU_GHI_HOWLBLADE - 4] = ID.mob.BU_GHI_HOWLBLADE, -- 170.000 -15.000 179.000 + [ID.mob.BU_GHI_HOWLBLADE - 3] = ID.mob.BU_GHI_HOWLBLADE, -- 170.000 -16.000 165.000 + [ID.mob.BU_GHI_HOWLBLADE - 2] = ID.mob.BU_GHI_HOWLBLADE, -- 166.000 -16.000 135.000 + [ID.mob.BU_GHI_HOWLBLADE - 1] = ID.mob.BU_GHI_HOWLBLADE, -- 167.207 -18.027 159.374 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.BU_GHI_HOWLBLADE_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, buGhiHowlbladePHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Palborough_Mines/mobs/Copper_Quadav.lua b/scripts/zones/Palborough_Mines/mobs/Copper_Quadav.lua index 51fcb4e82b2..44035de70cb 100644 --- a/scripts/zones/Palborough_Mines/mobs/Copper_Quadav.lua +++ b/scripts/zones/Palborough_Mines/mobs/Copper_Quadav.lua @@ -7,11 +7,16 @@ local ID = zones[xi.zone.PALBOROUGH_MINES] ----------------------------------- local entity = {} +local behyaPHTable = +{ + [ID.mob.BEHYA_HUNDREDWALL - 1] = ID.mob.BEHYA_HUNDREDWALL, +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.BEHYA_HUNDREDWALL_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, behyaPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Palborough_Mines/mobs/Old_Quadav.lua b/scripts/zones/Palborough_Mines/mobs/Old_Quadav.lua index 06e90bd2594..2daaadb93d5 100644 --- a/scripts/zones/Palborough_Mines/mobs/Old_Quadav.lua +++ b/scripts/zones/Palborough_Mines/mobs/Old_Quadav.lua @@ -7,11 +7,16 @@ local ID = zones[xi.zone.PALBOROUGH_MINES] ----------------------------------- local entity = {} +local behyaPHTable = +{ + [ID.mob.BEHYA_HUNDREDWALL - 2] = ID.mob.BEHYA_HUNDREDWALL, +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.BEHYA_HUNDREDWALL_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, behyaPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Palborough_Mines/mobs/Veteran_Quadav.lua b/scripts/zones/Palborough_Mines/mobs/Veteran_Quadav.lua index df6d80c0261..e07e05c8557 100644 --- a/scripts/zones/Palborough_Mines/mobs/Veteran_Quadav.lua +++ b/scripts/zones/Palborough_Mines/mobs/Veteran_Quadav.lua @@ -7,11 +7,16 @@ local ID = zones[xi.zone.PALBOROUGH_MINES] ----------------------------------- local entity = {} +local ziGhiBoneeater = +{ + [ID.mob.ZI_GHI_BONEEATER - 3] = ID.mob.ZI_GHI_BONEEATER, -- 130.386 -32.313 73.967 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.ZI_GHI_BONEEATER_PH, 20, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, ziGhiBoneeater, 20, 3600) -- 1 hour end return entity From ba8fe968de2bc925113e48669dcfebb90d910589 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Tue, 7 May 2024 00:35:27 -0400 Subject: [PATCH 6/6] Shift-proof Pashhow Marshlands and [S] --- scripts/zones/Pashhow_Marshlands/IDs.lua | 23 ++++--------------- .../zones/Pashhow_Marshlands/mobs/Goobbue.lua | 7 +++++- .../Pashhow_Marshlands/mobs/Thread_Leech.lua | 7 +++++- .../mobs/Veteran_Quadav.lua | 8 ++++++- scripts/zones/Pashhow_Marshlands_[S]/IDs.lua | 20 +++------------- .../mobs/Lou_Carcolh.lua | 7 +++++- .../mobs/Virulent_Peiste.lua | 11 ++++++++- 7 files changed, 43 insertions(+), 40 deletions(-) diff --git a/scripts/zones/Pashhow_Marshlands/IDs.lua b/scripts/zones/Pashhow_Marshlands/IDs.lua index 3d233f2eaee..12c96e848bd 100644 --- a/scripts/zones/Pashhow_Marshlands/IDs.lua +++ b/scripts/zones/Pashhow_Marshlands/IDs.lua @@ -49,24 +49,11 @@ zones[xi.zone.PASHHOW_MARSHLANDS] = mob = { - NI_ZHO_BLADEBENDER_PH = - { - [17223740] = 17223797, -- -429.953 24.5 -305.450 - [17223789] = 17223797, -- 11.309 23.904 -337.923 - }, - - JOLLY_GREEN_PH = - { - [17223888] = 17223889, -- 184.993 24.499 -41.790 - }, - - BLOODPOOL_VORAX_PH = - { - [17224014] = 17224019, -- -351.884 24.014 513.531 - }, - - BOWHO_WARMONGER = 17224104, - TOXIC_TAMLYN = GetFirstID('Toxic_Tamlyn'), + NI_ZHO_BLADEBENDER = GetFirstID('NiZho_Bladebender'), + JOLLY_GREEN = GetFirstID('Jolly_Green'), + BLOODPOOL_VORAX = GetFirstID('Bloodpool_Vorax'), + BOWHO_WARMONGER = GetFirstID('BoWho_Warmonger'), + TOXIC_TAMLYN = GetFirstID('Toxic_Tamlyn'), VOIDWALKER = { diff --git a/scripts/zones/Pashhow_Marshlands/mobs/Goobbue.lua b/scripts/zones/Pashhow_Marshlands/mobs/Goobbue.lua index f48e73596d6..ae6422bacea 100644 --- a/scripts/zones/Pashhow_Marshlands/mobs/Goobbue.lua +++ b/scripts/zones/Pashhow_Marshlands/mobs/Goobbue.lua @@ -7,12 +7,17 @@ local ID = zones[xi.zone.PASHHOW_MARSHLANDS] ----------------------------------- local entity = {} +local jollyPHTable = +{ + [ID.mob.JOLLY_GREEN - 1] = ID.mob.JOLLY_GREEN, -- 184.993 24.499 -41.790 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 60, 3, xi.regime.type.FIELDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.JOLLY_GREEN_PH, 5, 1) -- 1 second / no cooldown + xi.mob.phOnDespawn(mob, jollyPHTable, 5, 1) -- 1 second / no cooldown end return entity diff --git a/scripts/zones/Pashhow_Marshlands/mobs/Thread_Leech.lua b/scripts/zones/Pashhow_Marshlands/mobs/Thread_Leech.lua index 3f902f7bc9f..03c9b174a51 100644 --- a/scripts/zones/Pashhow_Marshlands/mobs/Thread_Leech.lua +++ b/scripts/zones/Pashhow_Marshlands/mobs/Thread_Leech.lua @@ -7,13 +7,18 @@ local ID = zones[xi.zone.PASHHOW_MARSHLANDS] ----------------------------------- local entity = {} +local bloodpoolPHTable = +{ + [ID.mob.BLOODPOOL_VORAX - 5] = ID.mob.BLOODPOOL_VORAX, -- -351.884 24.014 513.531 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 22, 1, xi.regime.type.FIELDS) xi.regime.checkRegime(player, mob, 23, 2, xi.regime.type.FIELDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.BLOODPOOL_VORAX_PH, 5, 600) -- 10 minutes + xi.mob.phOnDespawn(mob, bloodpoolPHTable, 5, 600) -- 10 minutes end return entity diff --git a/scripts/zones/Pashhow_Marshlands/mobs/Veteran_Quadav.lua b/scripts/zones/Pashhow_Marshlands/mobs/Veteran_Quadav.lua index b80e0ecfadc..6cc385edf19 100644 --- a/scripts/zones/Pashhow_Marshlands/mobs/Veteran_Quadav.lua +++ b/scripts/zones/Pashhow_Marshlands/mobs/Veteran_Quadav.lua @@ -7,12 +7,18 @@ local ID = zones[xi.zone.PASHHOW_MARSHLANDS] ----------------------------------- local entity = {} +local niZhoPHTable = +{ + [ID.mob.NI_ZHO_BLADEBENDER - 57] = ID.mob.NI_ZHO_BLADEBENDER, -- -429.953 24.5 -305.450 TODO: Audit PH + [ID.mob.NI_ZHO_BLADEBENDER - 8] = ID.mob.NI_ZHO_BLADEBENDER, -- 11.309 23.904 -337.923 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 60, 1, xi.regime.type.FIELDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.NI_ZHO_BLADEBENDER_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, niZhoPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Pashhow_Marshlands_[S]/IDs.lua b/scripts/zones/Pashhow_Marshlands_[S]/IDs.lua index ae52150910c..bf3e690cfd3 100644 --- a/scripts/zones/Pashhow_Marshlands_[S]/IDs.lua +++ b/scripts/zones/Pashhow_Marshlands_[S]/IDs.lua @@ -3,8 +3,6 @@ ----------------------------------- zones = zones or {} -local nommoID = GetFirstID('Nommo') - zones[xi.zone.PASHHOW_MARSHLANDS_S] = { text = @@ -35,21 +33,9 @@ zones[xi.zone.PASHHOW_MARSHLANDS_S] = mob = { - SUGAAR_PH = - { - [17145862] = 17145867, -- -412.599 24.437 -431.639 - [17145863] = 17145867, -- -455.311 24.499 -472.247 - [17145864] = 17145867, -- -446.738 24.499 -443.850 - [17145865] = 17145867, -- -417.691 23.840 -485.922 - [17145866] = 17145867, -- -444.380 24.499 -487.828 - }, - - NOMMO_PH = - { - [nommoID - 5] = nommoID, -- -168.292 24.499 396.933 - }, - - KINEPIKWA = 17146147, + SUGAAR = GetFirstID('Sugaar'), + NOMMO = GetFirstID('Nommo'), + KINEPIKWA = GetFirstID('Kinepikwa'), VOIDWALKER = { diff --git a/scripts/zones/Pashhow_Marshlands_[S]/mobs/Lou_Carcolh.lua b/scripts/zones/Pashhow_Marshlands_[S]/mobs/Lou_Carcolh.lua index b59dcc3cdb3..d548ff6aa30 100644 --- a/scripts/zones/Pashhow_Marshlands_[S]/mobs/Lou_Carcolh.lua +++ b/scripts/zones/Pashhow_Marshlands_[S]/mobs/Lou_Carcolh.lua @@ -7,11 +7,16 @@ local ID = zones[xi.zone.PASHHOW_MARSHLANDS_S] ----------------------------------- local entity = {} +local nommoPHTable = +{ + [ID.mob.NOMMO - 5] = ID.mob.NOMMO, -- -168.292 24.499 396.933 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.NOMMO_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, nommoPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Pashhow_Marshlands_[S]/mobs/Virulent_Peiste.lua b/scripts/zones/Pashhow_Marshlands_[S]/mobs/Virulent_Peiste.lua index a09b57c8764..0ab50f7aac1 100644 --- a/scripts/zones/Pashhow_Marshlands_[S]/mobs/Virulent_Peiste.lua +++ b/scripts/zones/Pashhow_Marshlands_[S]/mobs/Virulent_Peiste.lua @@ -7,11 +7,20 @@ local ID = zones[xi.zone.PASHHOW_MARSHLANDS_S] ----------------------------------- local entity = {} +local sugaarPHTable = +{ + [ID.mob.SUGAAR - 5] = ID.mob.SUGAAR, -- -412.599 24.437 -431.639 + [ID.mob.SUGAAR - 4] = ID.mob.SUGAAR, -- -455.311 24.499 -472.247 + [ID.mob.SUGAAR - 3] = ID.mob.SUGAAR, -- -446.738 24.499 -443.850 + [ID.mob.SUGAAR - 2] = ID.mob.SUGAAR, -- -417.691 23.840 -485.922 + [ID.mob.SUGAAR - 1] = ID.mob.SUGAAR, -- -444.380 24.499 -487.828 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.SUGAAR_PH, 5, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, sugaarPHTable, 5, 3600) -- 1 hour end return entity