From 6358bf29f6be517852b02f23c98dba3bfbff9046 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Fri, 10 May 2024 01:18:58 -0400 Subject: [PATCH 1/7] Shift-proof Gustav Tunnel --- scripts/zones/Gustav_Tunnel/IDs.lua | 51 ++++--------------- scripts/zones/Gustav_Tunnel/mobs/Antares.lua | 9 +++- .../zones/Gustav_Tunnel/mobs/Doom_Warlock.lua | 10 +++- scripts/zones/Gustav_Tunnel/mobs/Erlik.lua | 8 ++- .../Gustav_Tunnel/mobs/Goblin_Mercenary.lua | 10 +++- .../Gustav_Tunnel/mobs/Goblin_Reaper.lua | 9 +++- .../Gustav_Tunnel/mobs/Typhoon_Wyvern.lua | 11 +++- 7 files changed, 60 insertions(+), 48 deletions(-) diff --git a/scripts/zones/Gustav_Tunnel/IDs.lua b/scripts/zones/Gustav_Tunnel/IDs.lua index ef3a9ec0def..85afe5023ec 100644 --- a/scripts/zones/Gustav_Tunnel/IDs.lua +++ b/scripts/zones/Gustav_Tunnel/IDs.lua @@ -33,48 +33,15 @@ zones[xi.zone.GUSTAV_TUNNEL] = }, mob = { - GOBLINSAVIOR_HERONOX_PH = - { - [17645592] = 17645609, -- 153.000 -10.000 -53.000 - [17645605] = 17645609, -- 152.325 -10.702 -77.007 - [17645604] = 17645609, -- 165.558 -10.647 -68.537 - }, - WYVERNPOACHER_DRACHLOX_PH = - { - [17645633] = 17645640, -- -100.000 1.000 -44.000 - [17645634] = 17645640, -- -101.000 1.000 -29.000 - [17645644] = 17645640, -- -165.598 0.218 -21.966 - [17645643] = 17645640, -- -150.673 -0.067 -20.914 - }, - BAOBHAN_SITH_PH = - { - [17645717] = 17645719, -- 171.000 9.194 55.000 - [17645718] = 17645719, -- 187.000 9.000 105.000 - }, - TAXIM_PH = - { - [17645731] = 17645742, -- -172.941 -1.220 55.577 - [17645738] = 17645742, -- -137.334 -0.108 48.105 - [17645744] = 17645742, -- -125.000 0.635 59.000 - [17645739] = 17645742, -- -118.000 -0.515 79.000 - }, - UNGUR_PH = - { - [17645764] = 17645755, -- -242.000 -0.577 120.000 - [17645792] = 17645755, -- -88.000 0.735 190.000 - [17645784] = 17645755, -- -123.856 0.239 223.303 - [17645758] = 17645755, -- -277.000 -10.000 -34.000 - [17645754] = 17645755, -- -316.000 -9.000 3.000 - }, - AMIKIRI_PH = - { - [17645763] = 17645774, -- -245.000 -0.045 146.000 - [17645768] = 17645774, -- -228.872 -0.264 144.689 - [17645772] = 17645774, -- -209.552 -0.257 161.728 - }, - BUNE = 17645578, - GIGAPLASM = 17645794, - BARONIAL_BAT = 17645809, + GOBLINSAVIOR_HERONOX = GetFirstID('Goblinsavior_Heronox'), + WYVERNPOACHER_DRACHLOX = GetFirstID('Wyvernpoacher_Drachlox'), + BAOBHAN_SITH = GetFirstID('Baobhan_Sith'), + TAXIM = GetFirstID('Taxim'), + UNGUR = GetFirstID('Ungur'), + AMIKIRI = GetFirstID('Amikiri'), + BUNE = GetFirstID('Bune'), + GIGAPLASM = GetFirstID('Gigaplasm'), + BARONIAL_BAT = GetFirstID('Baronial_Bat'), }, npc = { diff --git a/scripts/zones/Gustav_Tunnel/mobs/Antares.lua b/scripts/zones/Gustav_Tunnel/mobs/Antares.lua index f6fb142243d..ed18e649d29 100644 --- a/scripts/zones/Gustav_Tunnel/mobs/Antares.lua +++ b/scripts/zones/Gustav_Tunnel/mobs/Antares.lua @@ -7,12 +7,19 @@ local ID = zones[xi.zone.GUSTAV_TUNNEL] ----------------------------------- local entity = {} +local amikiriPHTable = +{ + [ID.mob.AMIKIRI - 11] = ID.mob.AMIKIRI, -- -245.000 -0.045 146.000 + [ID.mob.AMIKIRI - 6] = ID.mob.AMIKIRI, -- -228.872 -0.264 144.689 + [ID.mob.AMIKIRI - 2] = ID.mob.AMIKIRI, -- -209.552 -0.257 161.728 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 768, 2, xi.regime.type.GROUNDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.AMIKIRI_PH, 5, math.random(25200, 32400)) -- 7 to 9 hours + xi.mob.phOnDespawn(mob, amikiriPHTable, 5, math.random(25200, 32400)) -- 7 to 9 hours end return entity diff --git a/scripts/zones/Gustav_Tunnel/mobs/Doom_Warlock.lua b/scripts/zones/Gustav_Tunnel/mobs/Doom_Warlock.lua index da2305239a6..2fd26338714 100644 --- a/scripts/zones/Gustav_Tunnel/mobs/Doom_Warlock.lua +++ b/scripts/zones/Gustav_Tunnel/mobs/Doom_Warlock.lua @@ -7,6 +7,14 @@ local ID = zones[xi.zone.GUSTAV_TUNNEL] ----------------------------------- local entity = {} +local taximPHTable = +{ + [ID.mob.TAXIM - 11] = ID.mob.TAXIM, -- -172.941 -1.220 55.577 + [ID.mob.TAXIM - 4] = ID.mob.TAXIM, -- -137.334 -0.108 48.105 + [ID.mob.TAXIM - 3] = ID.mob.TAXIM, -- -118.000 -0.515 79.000 + [ID.mob.TAXIM + 2] = ID.mob.TAXIM, -- -125.000 0.635 59.000 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 765, 2, xi.regime.type.GROUNDS) xi.regime.checkRegime(player, mob, 766, 1, xi.regime.type.GROUNDS) @@ -14,7 +22,7 @@ entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.TAXIM_PH, 5, 7200) -- 2 hours + xi.mob.phOnDespawn(mob, taximPHTable, 5, 7200) -- 2 hours end return entity diff --git a/scripts/zones/Gustav_Tunnel/mobs/Erlik.lua b/scripts/zones/Gustav_Tunnel/mobs/Erlik.lua index 3de156472fc..28e7428d2a2 100644 --- a/scripts/zones/Gustav_Tunnel/mobs/Erlik.lua +++ b/scripts/zones/Gustav_Tunnel/mobs/Erlik.lua @@ -7,12 +7,18 @@ local ID = zones[xi.zone.GUSTAV_TUNNEL] ----------------------------------- local entity = {} +local baobhanPHTable = +{ + [ID.mob.BAOBHAN_SITH - 2] = ID.mob.BAOBHAN_SITH, -- 171.000 9.194 55.000 + [ID.mob.BAOBHAN_SITH - 1] = ID.mob.BAOBHAN_SITH, -- 187.000 9.000 105.000 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 767, 2, xi.regime.type.GROUNDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.BAOBHAN_SITH_PH, 5, math.random(14400, 28800)) -- 4 to 8 hours + xi.mob.phOnDespawn(mob, baobhanPHTable, 5, math.random(14400, 28800)) -- 4 to 8 hours end return entity diff --git a/scripts/zones/Gustav_Tunnel/mobs/Goblin_Mercenary.lua b/scripts/zones/Gustav_Tunnel/mobs/Goblin_Mercenary.lua index e2f9e4470dc..0226f23bec9 100644 --- a/scripts/zones/Gustav_Tunnel/mobs/Goblin_Mercenary.lua +++ b/scripts/zones/Gustav_Tunnel/mobs/Goblin_Mercenary.lua @@ -7,13 +7,21 @@ local ID = zones[xi.zone.GUSTAV_TUNNEL] ----------------------------------- local entity = {} +local wyvernpoacherPHTable = +{ + [ID.mob.WYVERNPOACHER_DRACHLOX - 7] = ID.mob.WYVERNPOACHER_DRACHLOX, -- -100.000 1.000 -44.000 + [ID.mob.WYVERNPOACHER_DRACHLOX - 6] = ID.mob.WYVERNPOACHER_DRACHLOX, -- -101.000 1.000 -29.000 + [ID.mob.WYVERNPOACHER_DRACHLOX + 4] = ID.mob.WYVERNPOACHER_DRACHLOX, -- -165.598 0.218 -21.966 + [ID.mob.WYVERNPOACHER_DRACHLOX + 3] = ID.mob.WYVERNPOACHER_DRACHLOX, -- -150.673 -0.067 -20.914 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 764, 3, xi.regime.type.GROUNDS) xi.regime.checkRegime(player, mob, 765, 3, xi.regime.type.GROUNDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.WYVERNPOACHER_DRACHLOX_PH, 5, math.random(7200, 28800)) -- 2 to 8 hours + xi.mob.phOnDespawn(mob, wyvernpoacherPHTable, 5, math.random(7200, 28800)) -- 2 to 8 hours end return entity diff --git a/scripts/zones/Gustav_Tunnel/mobs/Goblin_Reaper.lua b/scripts/zones/Gustav_Tunnel/mobs/Goblin_Reaper.lua index 9dd3ab4c688..a53b1c5e4db 100644 --- a/scripts/zones/Gustav_Tunnel/mobs/Goblin_Reaper.lua +++ b/scripts/zones/Gustav_Tunnel/mobs/Goblin_Reaper.lua @@ -7,13 +7,20 @@ local ID = zones[xi.zone.GUSTAV_TUNNEL] ----------------------------------- local entity = {} +local goblinsaviorPHTable = +{ + [ID.mob.GOBLINSAVIOR_HERONOX - 17] = ID.mob.GOBLINSAVIOR_HERONOX, -- 153.000 -10.000 -53.000 + [ID.mob.GOBLINSAVIOR_HERONOX - 4] = ID.mob.GOBLINSAVIOR_HERONOX, -- 152.325 -10.702 -77.007 + [ID.mob.GOBLINSAVIOR_HERONOX - 5] = ID.mob.GOBLINSAVIOR_HERONOX, -- 165.558 -10.647 -68.537 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 764, 3, xi.regime.type.GROUNDS) xi.regime.checkRegime(player, mob, 765, 3, xi.regime.type.GROUNDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.GOBLINSAVIOR_HERONOX_PH, 5, math.random(10800, 18000)) -- 3 to 5 hours + xi.mob.phOnDespawn(mob, goblinsaviorPHTable, 5, math.random(10800, 18000)) -- 3 to 5 hours end return entity diff --git a/scripts/zones/Gustav_Tunnel/mobs/Typhoon_Wyvern.lua b/scripts/zones/Gustav_Tunnel/mobs/Typhoon_Wyvern.lua index 6744be67f43..c1186ad3c83 100644 --- a/scripts/zones/Gustav_Tunnel/mobs/Typhoon_Wyvern.lua +++ b/scripts/zones/Gustav_Tunnel/mobs/Typhoon_Wyvern.lua @@ -7,12 +7,21 @@ local ID = zones[xi.zone.GUSTAV_TUNNEL] ----------------------------------- local entity = {} +local ungurPHTable = +{ + [ID.mob.UNGUR + 37] = ID.mob.UNGUR, -- -88.000 0.735 190.000 + [ID.mob.UNGUR + 29] = ID.mob.UNGUR, -- -123.856 0.239 223.303 + [ID.mob.UNGUR + 9] = ID.mob.UNGUR, -- -242.000 -0.577 120.000 + [ID.mob.UNGUR + 3] = ID.mob.UNGUR, -- -277.000 -10.000 -34.000 + [ID.mob.UNGUR - 1] = ID.mob.UNGUR, -- -316.000 -9.000 3.000 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 769, 2, xi.regime.type.GROUNDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.UNGUR_PH, 5, 7200) -- 2 hours + xi.mob.phOnDespawn(mob, ungurPHTable, 5, 7200) -- 2 hours end return entity From c45377bb79d77672b3c46a9f0a4f36c45bdfec22 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Fri, 10 May 2024 01:19:05 -0400 Subject: [PATCH 2/7] Shift-proof Gusgen --- scripts/zones/Gusgen_Mines/IDs.lua | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/zones/Gusgen_Mines/IDs.lua b/scripts/zones/Gusgen_Mines/IDs.lua index a726f240496..31b7b7dc032 100644 --- a/scripts/zones/Gusgen_Mines/IDs.lua +++ b/scripts/zones/Gusgen_Mines/IDs.lua @@ -45,17 +45,17 @@ zones[xi.zone.GUSGEN_MINES] = }, mob = { - BLIND_MOBY = 17580038, - WANDERING_GHOST = 17580337, - PUDDING_OFFSET = 17580338, - APPARATUS_ELEMENTAL = 17580340, - AROMA_FLY = 17580341, - ASPHYXIATED_AMSEL = 17580044, - BURNED_BERGMANN = 17580042, - CRUSHED_KRAUSE = 17580040, - PULVERIZED_PFEFFER = 17580041, - SMOTHERED_SCHMIDT = 17580039, - WOUNDED_WURFEL = 17580043, + BLIND_MOBY = GetFirstID('Blind_Moby'), + WANDERING_GHOST = GetFirstID('Wandering_Ghost'), + PUDDING_OFFSET = GetFirstID('Pudding'), + AROMA_FLY = GetFirstID('Aroma_Fly'), + ASPHYXIATED_AMSEL = GetFirstID('Asphyxiated_Amsel'), + BURNED_BERGMANN = GetFirstID('Burned_Bergmann'), + CRUSHED_KRAUSE = GetFirstID('Crushed_Krause'), + PULVERIZED_PFEFFER = GetFirstID('Pulverized_Pfeffer'), + SMOTHERED_SCHMIDT = GetFirstID('Smothered_Schmidt'), + WOUNDED_WURFEL = GetFirstID('Wounded_Wurfel'), + APPARATUS_ELEMENTAL = GetTableOfIDs('Earth_Elemental')[3], -- Last elemental in the list }, npc = { From a7264a42055b87f7b2eb07585f9965e3ead94b1b Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Fri, 10 May 2024 01:19:16 -0400 Subject: [PATCH 3/7] Shift-proof Grauberg [s] --- scripts/zones/Grauberg_[S]/IDs.lua | 21 +++---------------- scripts/zones/Grauberg_[S]/mobs/Ajattara.lua | 9 +++++++- .../Grauberg_[S]/mobs/Grauberg_Hippogryph.lua | 14 ++++++++++++- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/scripts/zones/Grauberg_[S]/IDs.lua b/scripts/zones/Grauberg_[S]/IDs.lua index 6af4b2b505c..235997aba20 100644 --- a/scripts/zones/Grauberg_[S]/IDs.lua +++ b/scripts/zones/Grauberg_[S]/IDs.lua @@ -30,24 +30,9 @@ zones[xi.zone.GRAUBERG_S] = }, mob = { - KOTAN_KOR_KAMUY_PH = - { - [17141958] = 17141962, - [17141959] = 17141962, - [17141960] = 17141962, - [17141963] = 17141962, - [17141964] = 17141962, - [17141965] = 17141962, - [17141966] = 17141962, - [17141967] = 17141962, - }, - SCITALIS_PH = - { - [17141977] = 17141979, - [17141978] = 17141979, - [17141981] = 17141979, - }, - MIGRATORY_HIPPOGRYPH = 17142108, + KOTAN_KOR_KAMUY = GetFirstID('Kotan-kor_Kamuy'), + SCITALIS = GetFirstID('Scitalis'), + MIGRATORY_HIPPOGRYPH = GetFirstID('Migratory_Hippogryph'), }, npc = { diff --git a/scripts/zones/Grauberg_[S]/mobs/Ajattara.lua b/scripts/zones/Grauberg_[S]/mobs/Ajattara.lua index f81582cfc3c..ef2d1dd8618 100644 --- a/scripts/zones/Grauberg_[S]/mobs/Ajattara.lua +++ b/scripts/zones/Grauberg_[S]/mobs/Ajattara.lua @@ -7,11 +7,18 @@ local ID = zones[xi.zone.GRAUBERG_S] ----------------------------------- local entity = {} +local scitalisPHTable = +{ + [ID.mob.SCITALIS - 2] = ID.mob.SCITALIS, + [ID.mob.SCITALIS - 1] = ID.mob.SCITALIS, + [ID.mob.SCITALIS + 2] = ID.mob.SCITALIS, +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.SCITALIS_PH, 5, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, scitalisPHTable, 5, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Grauberg_[S]/mobs/Grauberg_Hippogryph.lua b/scripts/zones/Grauberg_[S]/mobs/Grauberg_Hippogryph.lua index be8e52c1fd4..f13057a7b61 100644 --- a/scripts/zones/Grauberg_[S]/mobs/Grauberg_Hippogryph.lua +++ b/scripts/zones/Grauberg_[S]/mobs/Grauberg_Hippogryph.lua @@ -7,11 +7,23 @@ local ID = zones[xi.zone.GRAUBERG_S] ----------------------------------- local entity = {} +local kotanPHTable = +{ + [ID.mob.KOTAN_KOR_KAMUY - 4] = ID.mob.KOTAN_KOR_KAMUY, + [ID.mob.KOTAN_KOR_KAMUY - 3] = ID.mob.KOTAN_KOR_KAMUY, + [ID.mob.KOTAN_KOR_KAMUY - 2] = ID.mob.KOTAN_KOR_KAMUY, + [ID.mob.KOTAN_KOR_KAMUY + 1] = ID.mob.KOTAN_KOR_KAMUY, + [ID.mob.KOTAN_KOR_KAMUY + 2] = ID.mob.KOTAN_KOR_KAMUY, + [ID.mob.KOTAN_KOR_KAMUY + 3] = ID.mob.KOTAN_KOR_KAMUY, + [ID.mob.KOTAN_KOR_KAMUY + 4] = ID.mob.KOTAN_KOR_KAMUY, + [ID.mob.KOTAN_KOR_KAMUY + 5] = ID.mob.KOTAN_KOR_KAMUY, +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.KOTAN_KOR_KAMUY_PH, 5, 10800) -- 3 hours + xi.mob.phOnDespawn(mob, kotanPHTable, 5, 10800) -- 3 hours end return entity From 2a85cc2c6f9487fb055ef136397ebf5f24de0290 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Fri, 10 May 2024 01:19:21 -0400 Subject: [PATCH 4/7] Shift-proof Grand Palace --- scripts/zones/Grand_Palace_of_HuXzoi/IDs.lua | 29 ++++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/scripts/zones/Grand_Palace_of_HuXzoi/IDs.lua b/scripts/zones/Grand_Palace_of_HuXzoi/IDs.lua index 56e31977618..5e756cea7e9 100644 --- a/scripts/zones/Grand_Palace_of_HuXzoi/IDs.lua +++ b/scripts/zones/Grand_Palace_of_HuXzoi/IDs.lua @@ -35,27 +35,20 @@ zones[xi.zone.GRAND_PALACE_OF_HUXZOI] = }, mob = { - JAILER_OF_TEMPERANCE_PH = - { - 16916489, -- -420 -1 757 - 16916508, -- -43 -1 460 - 16916525, -- -260 -1.5 43 - 16916541, -- -580 -1.5 43 - 16916560, -- -797 -1.5 460 - }, - IXGHRAH = 16916813, - JAILER_OF_TEMPERANCE = 16916814, - IXAERN_MNK = 16916815, + JAILER_OF_TEMPERANCE_PH = GetTableOfIDs('Eozdei_Still', 5), -- Get the first 5 in the zone + IXGHRAH = GetFirstID('Ixghrah'), + JAILER_OF_TEMPERANCE = GetFirstID('Jailer_of_Temperance'), + IXAERN_MNK = GetFirstID('Ixaern_MNK'), }, npc = { - QM_IXAERN_MNK = 16916819, - QUASILUMIN_OFFSET = 16916898, - ESCORT_1_DOOR_OFFSET = 16916868, - ESCORT_2_DOOR_OFFSET = 16916871, - ESCORT_3_DOOR_OFFSET = 16916876, - ESCORT_4_DOOR_OFFSET = 16916881, - CERMET_ALCOVE_OFFSET = 16916928, + QM_IXAERN_MNK = GetFirstID('qm_ixaern_mnk'), + QUASILUMIN_OFFSET = GetFirstID('Quasilumin'), + ESCORT_1_DOOR_OFFSET = GetFirstID('_0y6'), + ESCORT_2_DOOR_OFFSET = GetFirstID('_iyn'), + ESCORT_3_DOOR_OFFSET = GetFirstID('_iyk'), + ESCORT_4_DOOR_OFFSET = GetFirstID('_iyd'), + CERMET_ALCOVE_OFFSET = GetFirstID('Cermet_Alcove'), }, } From 94ba8a25c8fb5f859c484bebbd3853b7bc12cdf4 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Fri, 10 May 2024 01:19:30 -0400 Subject: [PATCH 5/7] Shift-proof Giddeus --- scripts/zones/Giddeus/IDs.lua | 22 ++++--------------- .../zones/Giddeus/mobs/Yagudo_Mendicant.lua | 7 +++++- .../zones/Giddeus/mobs/Yagudo_Persecutor.lua | 12 +++++++++- scripts/zones/Giddeus/mobs/Yagudo_Piper.lua | 7 +++++- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/scripts/zones/Giddeus/IDs.lua b/scripts/zones/Giddeus/IDs.lua index 834230c268c..28f3272f29f 100644 --- a/scripts/zones/Giddeus/IDs.lua +++ b/scripts/zones/Giddeus/IDs.lua @@ -29,24 +29,10 @@ zones[xi.zone.GIDDEUS] = }, mob = { - HOO_MJUU_THE_TORRENT_PH = - { - [17371513] = 17371515, -- -39.073 0.597 -115.279 - }, - JUU_DUZU_THE_WHIRLWIND_PH = - { - [17371298] = 17371300, -- 116.667 -3.442 -261.079 - [17371533] = 17371300, -- 85.728 -0.071 -248.141 - [17371291] = 17371300, -- 99.902 -2.725 -213.337 - [17371525] = 17371300, -- 81.263 0.498 -208.812 - [17371529] = 17371300, -- 72.302 0.642 -202.985 - [17371519] = 17371300, -- 20.353 -3.647 -169.309 - }, - VUU_PUQU_THE_BEGUILER_PH = - { - [17371577] = 17371578, -- -23.973 0.459 -399.155 - }, - VAA_HUJA_THE_ERUDITE = 17371579, + HOO_MJUU_THE_TORRENT = GetFirstID('Hoo_Mjuu_the_Torrent'), + JUU_DUZU_THE_WHIRLWIND = GetFirstID('Juu_Duzu_the_Whirlwind'), + VUU_PUQU_THE_BEGUILER = GetFirstID('Vuu_Puqu_the_Beguiler'), + VAA_HUJA_THE_ERUDITE = GetFirstID('Vaa_Huja_the_Erudite'), }, npc = { diff --git a/scripts/zones/Giddeus/mobs/Yagudo_Mendicant.lua b/scripts/zones/Giddeus/mobs/Yagudo_Mendicant.lua index f029b1409a7..9b38e9e55e1 100644 --- a/scripts/zones/Giddeus/mobs/Yagudo_Mendicant.lua +++ b/scripts/zones/Giddeus/mobs/Yagudo_Mendicant.lua @@ -6,11 +6,16 @@ local ID = zones[xi.zone.GIDDEUS] ----------------------------------- local entity = {} +local hooMjuuPHTable = +{ + [ID.mob.HOO_MJUU_THE_TORRENT - 2] = ID.mob.HOO_MJUU_THE_TORRENT, -- -39.073 0.597 -115.279 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.HOO_MJUU_THE_TORRENT_PH, 12, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, hooMjuuPHTable, 12, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Giddeus/mobs/Yagudo_Persecutor.lua b/scripts/zones/Giddeus/mobs/Yagudo_Persecutor.lua index f564c0dd42e..1d5fb585bac 100644 --- a/scripts/zones/Giddeus/mobs/Yagudo_Persecutor.lua +++ b/scripts/zones/Giddeus/mobs/Yagudo_Persecutor.lua @@ -6,11 +6,21 @@ local ID = zones[xi.zone.GIDDEUS] ----------------------------------- local entity = {} +local juuDuzuPHTable = +{ + [ID.mob.JUU_DUZU_THE_WHIRLWIND + 233] = ID.mob.JUU_DUZU_THE_WHIRLWIND, -- 85.728 -0.071 -248.141 + [ID.mob.JUU_DUZU_THE_WHIRLWIND + 229] = ID.mob.JUU_DUZU_THE_WHIRLWIND, -- 72.302 0.642 -202.985 + [ID.mob.JUU_DUZU_THE_WHIRLWIND + 219] = ID.mob.JUU_DUZU_THE_WHIRLWIND, -- 20.353 -3.647 -169.309 + [ID.mob.JUU_DUZU_THE_WHIRLWIND + 225] = ID.mob.JUU_DUZU_THE_WHIRLWIND, -- 81.263 0.498 -208.812 + [ID.mob.JUU_DUZU_THE_WHIRLWIND - 9] = ID.mob.JUU_DUZU_THE_WHIRLWIND, -- 99.902 -2.725 -213.337 + [ID.mob.JUU_DUZU_THE_WHIRLWIND - 2] = ID.mob.JUU_DUZU_THE_WHIRLWIND, -- 116.667 -3.442 -261.079 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.JUU_DUZU_THE_WHIRLWIND_PH, 5, 3600) -- 1 to 2 hours + xi.mob.phOnDespawn(mob, juuDuzuPHTable, 5, 3600) -- 1 to 2 hours end return entity diff --git a/scripts/zones/Giddeus/mobs/Yagudo_Piper.lua b/scripts/zones/Giddeus/mobs/Yagudo_Piper.lua index c932ede7614..771ade046fa 100644 --- a/scripts/zones/Giddeus/mobs/Yagudo_Piper.lua +++ b/scripts/zones/Giddeus/mobs/Yagudo_Piper.lua @@ -7,11 +7,16 @@ local ID = zones[xi.zone.GIDDEUS] ----------------------------------- local entity = {} +local vuuPuquPHTable = +{ + [ID.mob.VUU_PUQU_THE_BEGUILER - 1] = ID.mob.VUU_PUQU_THE_BEGUILER, -- -23.973 0.459 -399.155 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.VUU_PUQU_THE_BEGUILER_PH, 15, 900) -- 15 minutes + xi.mob.phOnDespawn(mob, vuuPuquPHTable, 15, 900) -- 15 minutes end return entity From 6d30a40d7ffc28f41688c8a4017452619dcb4884 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Fri, 10 May 2024 01:19:44 -0400 Subject: [PATCH 6/7] Shift-proof Ghelsba Outpost --- scripts/zones/Ghelsba_Outpost/IDs.lua | 14 ++------------ .../zones/Ghelsba_Outpost/mobs/Orcish_Grunt.lua | 7 ++++++- .../Ghelsba_Outpost/mobs/Orcish_Neckchopper.lua | 9 ++++++++- .../Ghelsba_Outpost/mobs/Orcish_Stonechucker.lua | 9 ++++++++- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/scripts/zones/Ghelsba_Outpost/IDs.lua b/scripts/zones/Ghelsba_Outpost/IDs.lua index 5329f932542..08603d4255d 100644 --- a/scripts/zones/Ghelsba_Outpost/IDs.lua +++ b/scripts/zones/Ghelsba_Outpost/IDs.lua @@ -37,18 +37,8 @@ zones[xi.zone.GHELSBA_OUTPOST] = }, mob = { - THOUSANDARM_DESHGLESH_PH = - { - [17350825] = 17350826, -- 123.357 -0.102 332.706 - [17350818] = 17350826, -- 94.576 -1.274 333.168 - [17350819] = 17350826, -- 98.658 -0.319 328.269 - [17350820] = 17350826, -- 96.763 -0.047 319.781 - [17350821] = 17350826, -- 85.215 -0.739 344.257 - [17350817] = 17350826, -- 80.000 -0.249 328.000 - [17350806] = 17350826, -- 75.988 -0.084 382.437 - [17350824] = 17350826, -- 82.000 -0.500 366.000 - }, - CARRION_DRAGON = 17350941, + THOUSANDARM_DESHGLESH = GetFirstID('Thousandarm_Deshglesh'), + CARRION_DRAGON = GetFirstID('Carrion_Dragon'), }, npc = { diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Orcish_Grunt.lua b/scripts/zones/Ghelsba_Outpost/mobs/Orcish_Grunt.lua index ec54c67315b..a0bfa13cbca 100644 --- a/scripts/zones/Ghelsba_Outpost/mobs/Orcish_Grunt.lua +++ b/scripts/zones/Ghelsba_Outpost/mobs/Orcish_Grunt.lua @@ -7,11 +7,16 @@ local ID = zones[xi.zone.GHELSBA_OUTPOST] ----------------------------------- local entity = {} +local thousandarmPHTable = +{ + [ID.mob.THOUSANDARM_DESHGLESH - 7] = ID.mob.THOUSANDARM_DESHGLESH, -- 98.658 -0.319 328.269 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.THOUSANDARM_DESHGLESH_PH, 5, 3600) -- 1 hour minimum + xi.mob.phOnDespawn(mob, thousandarmPHTable, 5, 3600) -- 1 hour minimum end return entity diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Orcish_Neckchopper.lua b/scripts/zones/Ghelsba_Outpost/mobs/Orcish_Neckchopper.lua index 999ffdcbf70..bee01055476 100644 --- a/scripts/zones/Ghelsba_Outpost/mobs/Orcish_Neckchopper.lua +++ b/scripts/zones/Ghelsba_Outpost/mobs/Orcish_Neckchopper.lua @@ -7,11 +7,18 @@ local ID = zones[xi.zone.GHELSBA_OUTPOST] ----------------------------------- local entity = {} +local thousandarmPHTable = +{ + [ID.mob.THOUSANDARM_DESHGLESH - 8] = ID.mob.THOUSANDARM_DESHGLESH, -- 94.576 -1.274 333.168 + [ID.mob.THOUSANDARM_DESHGLESH - 5] = ID.mob.THOUSANDARM_DESHGLESH, -- 85.215 -0.739 344.257 + [ID.mob.THOUSANDARM_DESHGLESH - 1] = ID.mob.THOUSANDARM_DESHGLESH, -- 123.357 -0.102 332.706 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.THOUSANDARM_DESHGLESH_PH, 5, 3600) -- 1 hour minimum + xi.mob.phOnDespawn(mob, thousandarmPHTable, 5, 3600) -- 1 hour minimum end return entity diff --git a/scripts/zones/Ghelsba_Outpost/mobs/Orcish_Stonechucker.lua b/scripts/zones/Ghelsba_Outpost/mobs/Orcish_Stonechucker.lua index 4ada983fa15..a6044391cbe 100644 --- a/scripts/zones/Ghelsba_Outpost/mobs/Orcish_Stonechucker.lua +++ b/scripts/zones/Ghelsba_Outpost/mobs/Orcish_Stonechucker.lua @@ -7,11 +7,18 @@ local ID = zones[xi.zone.GHELSBA_OUTPOST] ----------------------------------- local entity = {} +local thousandarmPHTable = +{ + [ID.mob.THOUSANDARM_DESHGLESH - 9] = ID.mob.THOUSANDARM_DESHGLESH, -- 80.000 -0.249 328.000 + [ID.mob.THOUSANDARM_DESHGLESH - 6] = ID.mob.THOUSANDARM_DESHGLESH, -- 96.763 -0.047 319.781 + [ID.mob.THOUSANDARM_DESHGLESH - 2] = ID.mob.THOUSANDARM_DESHGLESH, -- 82.000 -0.500 366.000 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.THOUSANDARM_DESHGLESH_PH, 5, 3600) -- 1 hour minimum + xi.mob.phOnDespawn(mob, thousandarmPHTable, 5, 3600) -- 1 hour minimum end return entity From 89b8a7b4f2a6a70e6940c1b54a6ddd98d9d4d261 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Fri, 10 May 2024 01:19:54 -0400 Subject: [PATCH 7/7] Shift-proof Garlaige Citadel --- scripts/zones/Garlaige_Citadel/IDs.lua | 25 +++++++------------ .../zones/Garlaige_Citadel/mobs/Explosure.lua | 7 +++++- .../Garlaige_Citadel/mobs/Fallen_Mage.lua | 7 +++++- .../Garlaige_Citadel/mobs/Fallen_Major.lua | 7 +++++- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/scripts/zones/Garlaige_Citadel/IDs.lua b/scripts/zones/Garlaige_Citadel/IDs.lua index add8474d9f8..def26dbedfa 100644 --- a/scripts/zones/Garlaige_Citadel/IDs.lua +++ b/scripts/zones/Garlaige_Citadel/IDs.lua @@ -52,22 +52,15 @@ zones[xi.zone.GARLAIGE_CITADEL] = }, mob = { - HAZMAT_PH = - { - [17596515] = 17596520, - }, - HOVERING_HOTPOT_PH = - { - [17596623] = 17596628, -- 182.157 -0.012 29.941 - [17596625] = 17596628, -- 188.229 -0.018 20.151 - }, - OLD_TWO_WINGS = 17596506, - SKEWER_SAM = 17596507, - CHANDELIER = 17596533, - GUARDIAN_STATUE = 17596643, - SERKET = 17596720, - MIMIC = 17596728, - APPARATUS_ELEMENTAL = 17596729, + HAZMAT = GetFirstID('Hazmat'), + HOVERING_HOTPOT = GetFirstID('Hovering_Hotpot'), + OLD_TWO_WINGS = GetFirstID('Old_Two-Wings'), + SKEWER_SAM = GetFirstID('Skewer_Sam'), + CHANDELIER = GetFirstID('Chandelier'), + GUARDIAN_STATUE = GetFirstID('Guardian_Statue'), + SERKET = GetFirstID('Serket'), + MIMIC = GetFirstID('Mimic'), + APPARATUS_ELEMENTAL = GetFirstID('Light_Elemental'), }, npc = { diff --git a/scripts/zones/Garlaige_Citadel/mobs/Explosure.lua b/scripts/zones/Garlaige_Citadel/mobs/Explosure.lua index 2b1c09111d4..ab11c4ea18c 100644 --- a/scripts/zones/Garlaige_Citadel/mobs/Explosure.lua +++ b/scripts/zones/Garlaige_Citadel/mobs/Explosure.lua @@ -7,12 +7,17 @@ local ID = zones[xi.zone.GARLAIGE_CITADEL] ----------------------------------- local entity = {} +local hazmatPHTable = +{ + [ID.mob.HAZMAT - 5] = ID.mob.HAZMAT, +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 706, 2, xi.regime.type.GROUNDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.HAZMAT_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, hazmatPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Garlaige_Citadel/mobs/Fallen_Mage.lua b/scripts/zones/Garlaige_Citadel/mobs/Fallen_Mage.lua index 395f54a5170..e613ae0b2de 100644 --- a/scripts/zones/Garlaige_Citadel/mobs/Fallen_Mage.lua +++ b/scripts/zones/Garlaige_Citadel/mobs/Fallen_Mage.lua @@ -7,12 +7,17 @@ local ID = zones[xi.zone.GARLAIGE_CITADEL] ----------------------------------- local entity = {} +local hotpotPHTable = +{ + [ID.mob.HOVERING_HOTPOT - 3] = ID.mob.HOVERING_HOTPOT, -- 188.229 -0.018 20.151 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 703, 2, xi.regime.type.FIELDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.HOVERING_HOTPOT_PH, 20, math.random(1800, 3600)) -- 30 to 60 minutes + xi.mob.phOnDespawn(mob, hotpotPHTable, 20, math.random(1800, 3600)) -- 30 to 60 minutes end return entity diff --git a/scripts/zones/Garlaige_Citadel/mobs/Fallen_Major.lua b/scripts/zones/Garlaige_Citadel/mobs/Fallen_Major.lua index 13024ae6cc2..93a5219bb6a 100644 --- a/scripts/zones/Garlaige_Citadel/mobs/Fallen_Major.lua +++ b/scripts/zones/Garlaige_Citadel/mobs/Fallen_Major.lua @@ -7,12 +7,17 @@ local ID = zones[xi.zone.GARLAIGE_CITADEL] ----------------------------------- local entity = {} +local hotpotPHTable = +{ + [ID.mob.HOVERING_HOTPOT - 5] = ID.mob.HOVERING_HOTPOT, -- 182.157 -0.012 29.941 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 703, 2, xi.regime.type.FIELDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.HOVERING_HOTPOT_PH, 20, math.random(1800, 3600)) -- 30 to 60 minutes + xi.mob.phOnDespawn(mob, hotpotPHTable, 20, math.random(1800, 3600)) -- 30 to 60 minutes end return entity