From 0ee006c108d83eb2d527c22224939a427097fa38 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Fri, 10 May 2024 01:22:45 -0400 Subject: [PATCH 1/8] Shift-proof Full Moon Fountain --- scripts/zones/Full_Moon_Fountain/IDs.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/zones/Full_Moon_Fountain/IDs.lua b/scripts/zones/Full_Moon_Fountain/IDs.lua index 83738ffac4d..e8feffa3560 100644 --- a/scripts/zones/Full_Moon_Fountain/IDs.lua +++ b/scripts/zones/Full_Moon_Fountain/IDs.lua @@ -26,7 +26,7 @@ zones[xi.zone.FULL_MOON_FOUNTAIN] = }, mob = { - MOON_READING_OFFSET = 17473540, + MOON_READING_OFFSET = GetFirstID('Ace_of_Cups'), }, npc = { From 2e8818b5be0c6d23389ec29e61254972fc85bc68 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Fri, 10 May 2024 01:22:58 -0400 Subject: [PATCH 2/8] Shift-proof Fort Karugo Narugo [s] --- scripts/zones/Fort_Karugo-Narugo_[S]/IDs.lua | 23 ++++--------------- .../Fort_Karugo-Narugo_[S]/mobs/Dragonfly.lua | 7 +++++- .../Fort_Karugo-Narugo_[S]/mobs/Rafflesia.lua | 13 ++++++++++- .../mobs/Vorpal_Bunny.lua | 7 +++++- 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/scripts/zones/Fort_Karugo-Narugo_[S]/IDs.lua b/scripts/zones/Fort_Karugo-Narugo_[S]/IDs.lua index c9ac31720e3..38943d7a504 100644 --- a/scripts/zones/Fort_Karugo-Narugo_[S]/IDs.lua +++ b/scripts/zones/Fort_Karugo-Narugo_[S]/IDs.lua @@ -24,25 +24,10 @@ zones[xi.zone.FORT_KARUGO_NARUGO_S] = }, mob = { - RATATOSKR_PH = - { - [17170472] = 17170475, - }, - KIRTIMUKHA_PH = - { - [17170491] = 17170499, - [17170492] = 17170499, - [17170493] = 17170499, - [17170494] = 17170499, - [17170495] = 17170499, - [17170496] = 17170499, - [17170498] = 17170499, - }, - DEMOISELLE_DESOLEE_PH = - { - [17170577] = 17170569, - }, - TIGRESS_STRIKES_WAR_LYNX = 17170645, + RATATOSKR = GetFirstID('Ratatoskr'), + KIRTIMUKHA = GetFirstID('Kirtimukha'), + DEMOISELLE_DESOLEE = GetFirstID('Demoiselle_Desolee'), + TIGRESS_STRIKES_WAR_LYNX = GetFirstID('War_Lynx'), }, npc = { diff --git a/scripts/zones/Fort_Karugo-Narugo_[S]/mobs/Dragonfly.lua b/scripts/zones/Fort_Karugo-Narugo_[S]/mobs/Dragonfly.lua index 78f1d299581..d6d5c97dfb1 100644 --- a/scripts/zones/Fort_Karugo-Narugo_[S]/mobs/Dragonfly.lua +++ b/scripts/zones/Fort_Karugo-Narugo_[S]/mobs/Dragonfly.lua @@ -7,11 +7,16 @@ local ID = zones[xi.zone.FORT_KARUGO_NARUGO_S] ----------------------------------- local entity = {} +local demoisellePHTable = +{ + [ID.mob.DEMOISELLE_DESOLEE + 8] = ID.mob.DEMOISELLE_DESOLEE, +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.DEMOISELLE_DESOLEE_PH, 5, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, demoisellePHTable, 5, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Fort_Karugo-Narugo_[S]/mobs/Rafflesia.lua b/scripts/zones/Fort_Karugo-Narugo_[S]/mobs/Rafflesia.lua index db79d8447c9..d64c7024d8c 100644 --- a/scripts/zones/Fort_Karugo-Narugo_[S]/mobs/Rafflesia.lua +++ b/scripts/zones/Fort_Karugo-Narugo_[S]/mobs/Rafflesia.lua @@ -7,11 +7,22 @@ local ID = zones[xi.zone.FORT_KARUGO_NARUGO_S] ----------------------------------- local entity = {} +local kirtimukhaPHTable = +{ + [ID.mob.KIRTIMUKHA - 8] = ID.mob.KIRTIMUKHA, + [ID.mob.KIRTIMUKHA - 7] = ID.mob.KIRTIMUKHA, + [ID.mob.KIRTIMUKHA - 6] = ID.mob.KIRTIMUKHA, + [ID.mob.KIRTIMUKHA - 5] = ID.mob.KIRTIMUKHA, + [ID.mob.KIRTIMUKHA - 4] = ID.mob.KIRTIMUKHA, + [ID.mob.KIRTIMUKHA - 3] = ID.mob.KIRTIMUKHA, + [ID.mob.KIRTIMUKHA - 1] = ID.mob.KIRTIMUKHA, +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.KIRTIMUKHA_PH, 5, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, kirtimukhaPHTable, 5, 3600) -- 1 hour end return entity diff --git a/scripts/zones/Fort_Karugo-Narugo_[S]/mobs/Vorpal_Bunny.lua b/scripts/zones/Fort_Karugo-Narugo_[S]/mobs/Vorpal_Bunny.lua index 6230e57bb7f..8a4752c1fb1 100644 --- a/scripts/zones/Fort_Karugo-Narugo_[S]/mobs/Vorpal_Bunny.lua +++ b/scripts/zones/Fort_Karugo-Narugo_[S]/mobs/Vorpal_Bunny.lua @@ -7,11 +7,16 @@ local ID = zones[xi.zone.FORT_KARUGO_NARUGO_S] ----------------------------------- local entity = {} +local ratatoskrPHTable = +{ + [ID.mob.RATATOSKR - 3] = ID.mob.RATATOSKR, +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.RATATOSKR_PH, 10, 5400) -- 90 minutes + xi.mob.phOnDespawn(mob, ratatoskrPHTable, 10, 5400) -- 90 minutes end return entity From 569b29c73afff8a517b7e9a01b1c64a1aeb055f4 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Fri, 10 May 2024 01:23:06 -0400 Subject: [PATCH 3/8] Shift-proof Fort Ghelsba --- scripts/zones/Fort_Ghelsba/IDs.lua | 7 ++----- scripts/zones/Fort_Ghelsba/mobs/Orcish_Fodder.lua | 7 ++++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/zones/Fort_Ghelsba/IDs.lua b/scripts/zones/Fort_Ghelsba/IDs.lua index ddb35ddc0bf..7d6334e8113 100644 --- a/scripts/zones/Fort_Ghelsba/IDs.lua +++ b/scripts/zones/Fort_Ghelsba/IDs.lua @@ -22,11 +22,8 @@ zones[xi.zone.FORT_GHELSBA] = }, mob = { - HUNDREDSCAR_HAJWAJ_PH = - { - [17354823] = 17354828, - }, - ORCISH_PANZER = 17354894, + HUNDREDSCAR_HAJWAJ = GetFirstID('Hundredscar_Hajwaj'), + ORCISH_PANZER = GetFirstID('Orcish_Panzer'), }, npc = { diff --git a/scripts/zones/Fort_Ghelsba/mobs/Orcish_Fodder.lua b/scripts/zones/Fort_Ghelsba/mobs/Orcish_Fodder.lua index 74407c34834..312619946aa 100644 --- a/scripts/zones/Fort_Ghelsba/mobs/Orcish_Fodder.lua +++ b/scripts/zones/Fort_Ghelsba/mobs/Orcish_Fodder.lua @@ -7,11 +7,16 @@ local ID = zones[xi.zone.FORT_GHELSBA] ----------------------------------- local entity = {} +local hundredscarPHTable = +{ + [ID.mob.HUNDREDSCAR_HAJWAJ - 5] = ID.mob.HUNDREDSCAR_HAJWAJ, +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.HUNDREDSCAR_HAJWAJ_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, hundredscarPHTable, 10, 3600) -- 1 hour end return entity From 040cfe1a487cfa80da11d1d03bb10ee738d00fc0 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Fri, 10 May 2024 01:23:13 -0400 Subject: [PATCH 4/8] Shift-proof FeiYin --- scripts/zones/FeiYin/IDs.lua | 44 ++++++--------------- scripts/zones/FeiYin/mobs/Clockwork_Pod.lua | 9 ++++- scripts/zones/FeiYin/mobs/Colossus.lua | 7 +++- scripts/zones/FeiYin/mobs/Specter.lua | 28 +++++++++++-- 4 files changed, 50 insertions(+), 38 deletions(-) diff --git a/scripts/zones/FeiYin/IDs.lua b/scripts/zones/FeiYin/IDs.lua index 0fec9ed916f..66416186d57 100644 --- a/scripts/zones/FeiYin/IDs.lua +++ b/scripts/zones/FeiYin/IDs.lua @@ -44,42 +44,22 @@ zones[xi.zone.FEIYIN] = }, mob = { - MIND_HOARDER_PH = - { - [17612856] = 17612859, - [17612857] = 17612859, - [17612858] = 17612859, - }, - GOLIATH_PH = - { - [17613052] = 17613045, - }, - NORTHERN_SHADOW_PH = - { - [17613098] = 17613102, -- -159.000 -16.000 146.000 - }, - EASTERN_SHADOW_PH = - { - [17613107] = 17613109, -- -86.000 -15.000 152.000 - }, - SOUTHERN_SHADOW_PH = - { - [17613117] = 17613120, -- -169.000 -16.000 87.000 - }, - WESTERN_SHADOW_PH = - { - [17613094] = 17613095, -- -204.000 -15.000 118.000 - }, - ALTEDOUR_I_TAVNAZIA = 17612836, - MISER_MURPHY = 17612849, - DABOTZS_GHOST = 17613128, - CAPRICIOUS_CASSIE = 17613129, + MIND_HOARDER = GetFirstID('Mind_Hoarder'), + GOLIATH = GetFirstID('Goliath'), + NORTHERN_SHADOW = GetFirstID('Northern_Shadow'), + EASTERN_SHADOW = GetFirstID('Eastern_Shadow'), + SOUTHERN_SHADOW = GetFirstID('Southern_Shadow'), + WESTERN_SHADOW = GetFirstID('Western_Shadow'), + ALTEDOUR_I_TAVNAZIA = GetFirstID('Altedour_I_Tavnazia'), + MISER_MURPHY = GetFirstID('Miser_Murphy'), + DABOTZS_GHOST = GetFirstID('Dabotzs_Ghost'), + CAPRICIOUS_CASSIE = GetFirstID('Capricious_Cassie'), }, npc = { - AFTERGRLOW_OFFSET = 17613147, + AFTERGRLOW_OFFSET = GetFirstID('Seed_Afterglow'), TREASURE_CHEST = GetFirstID('Treasure_Chest'), - UNDERGROUND_POOL_OFFSET = 17613247, + UNDERGROUND_POOL_OFFSET = GetFirstID('Underground_Pool'), }, } diff --git a/scripts/zones/FeiYin/mobs/Clockwork_Pod.lua b/scripts/zones/FeiYin/mobs/Clockwork_Pod.lua index f9ec1e3132c..7614a4ef096 100644 --- a/scripts/zones/FeiYin/mobs/Clockwork_Pod.lua +++ b/scripts/zones/FeiYin/mobs/Clockwork_Pod.lua @@ -7,11 +7,18 @@ local ID = zones[xi.zone.FEIYIN] ----------------------------------- local entity = {} +local mindHoarderPHTable = +{ + [ID.mob.MIND_HOARDER - 3] = ID.mob.MIND_HOARDER, + [ID.mob.MIND_HOARDER - 2] = ID.mob.MIND_HOARDER, + [ID.mob.MIND_HOARDER - 1] = ID.mob.MIND_HOARDER, +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.MIND_HOARDER_PH, 10, math.random(5400, 32400)) -- 1.5 to 9 hours + xi.mob.phOnDespawn(mob, mindHoarderPHTable, 10, math.random(5400, 32400)) -- 1.5 to 9 hours end return entity diff --git a/scripts/zones/FeiYin/mobs/Colossus.lua b/scripts/zones/FeiYin/mobs/Colossus.lua index 400729696f1..87a8c6fe8e7 100644 --- a/scripts/zones/FeiYin/mobs/Colossus.lua +++ b/scripts/zones/FeiYin/mobs/Colossus.lua @@ -7,12 +7,17 @@ local ID = zones[xi.zone.FEIYIN] ----------------------------------- local entity = {} +local goliathPHTable = +{ + [ID.mob.GOLIATH + 7] = ID.mob.GOLIATH, +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 715, 2, xi.regime.type.GROUNDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.GOLIATH_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, goliathPHTable, 10, 3600) -- 1 hour end return entity diff --git a/scripts/zones/FeiYin/mobs/Specter.lua b/scripts/zones/FeiYin/mobs/Specter.lua index 9ae51998007..c8e2142a98d 100644 --- a/scripts/zones/FeiYin/mobs/Specter.lua +++ b/scripts/zones/FeiYin/mobs/Specter.lua @@ -7,15 +7,35 @@ local ID = zones[xi.zone.FEIYIN] ----------------------------------- local entity = {} +local northernShadowPHTable = +{ + [ID.mob.NORTHERN_SHADOW - 4] = ID.mob.NORTHERN_SHADOW, -- -159.000 -16.000 146.000 +} + +local easternShadowPHTable = +{ + [ID.mob.EASTERN_SHADOW - 2] = ID.mob.EASTERN_SHADOW, -- -159.000 -16.000 146.000 +} + +local westernShadowPHTable = +{ + [ID.mob.WESTERN_SHADOW - 1] = ID.mob.WESTERN_SHADOW, -- -159.000 -16.000 146.000 +} + +local southernShadowPHTable = +{ + [ID.mob.SOUTHERN_SHADOW - 3] = ID.mob.SOUTHERN_SHADOW, -- -159.000 -16.000 146.000 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 712, 1, xi.regime.type.GROUNDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.NORTHERN_SHADOW_PH, 5, 57600) -- 16 hours - xi.mob.phOnDespawn(mob, ID.mob.EASTERN_SHADOW_PH, 5, 36000) -- 10 hours - xi.mob.phOnDespawn(mob, ID.mob.WESTERN_SHADOW_PH, 5, 36000) -- 10 hours - xi.mob.phOnDespawn(mob, ID.mob.SOUTHERN_SHADOW_PH, 5, 57600) -- 16 hours + xi.mob.phOnDespawn(mob, northernShadowPHTable, 5, 57600) -- 16 hours + xi.mob.phOnDespawn(mob, easternShadowPHTable, 5, 36000) -- 10 hours + xi.mob.phOnDespawn(mob, westernShadowPHTable, 5, 36000) -- 10 hours + xi.mob.phOnDespawn(mob, southernShadowPHTable, 5, 57600) -- 16 hours end return entity From d31201ce92e2b3c5026990bba1066bac915b6979 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Fri, 10 May 2024 01:23:23 -0400 Subject: [PATCH 5/8] Shift-proof Empyreal Paradox --- scripts/zones/Empyreal_Paradox/IDs.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/zones/Empyreal_Paradox/IDs.lua b/scripts/zones/Empyreal_Paradox/IDs.lua index a480a51ae25..3233a030edb 100644 --- a/scripts/zones/Empyreal_Paradox/IDs.lua +++ b/scripts/zones/Empyreal_Paradox/IDs.lua @@ -25,7 +25,7 @@ zones[xi.zone.EMPYREAL_PARADOX] = }, mob = { - PROMATHIA_OFFSET = 16924673, + PROMATHIA_OFFSET = GetFirstID('Promathia'), }, npc = { From d937815d904e0db08af74637f83dd6be7046b412 Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Fri, 10 May 2024 01:23:29 -0400 Subject: [PATCH 6/8] Shift-proof Eastern Altepa --- scripts/zones/Eastern_Altepa_Desert/IDs.lua | 21 +++++++------------ .../mobs/Giant_Spider.lua | 7 ++++++- .../mobs/Sand_Beetle.lua | 8 ++++++- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/scripts/zones/Eastern_Altepa_Desert/IDs.lua b/scripts/zones/Eastern_Altepa_Desert/IDs.lua index 655ac95c0f5..7f062bd8d55 100644 --- a/scripts/zones/Eastern_Altepa_Desert/IDs.lua +++ b/scripts/zones/Eastern_Altepa_Desert/IDs.lua @@ -39,20 +39,13 @@ zones[xi.zone.EASTERN_ALTEPA_DESERT] = }, mob = { - DUNE_WIDOW_PH = - { - [17244395] = 17244396, - }, - DONNERGUGI_PH = - { - [17244258] = 17244268, - [17244263] = 17244268, - }, - CENTURIO_XII_I = 17244372, - NANDI = 17244471, - DECURIO_I_III = 17244523, - TSUCHIGUMO_OFFSET = 17244524, - CACTROT_RAPIDO = 17244539, + DUNE_WIDOW = GetFirstID('Dune_Widow'), + DONNERGUGI = GetFirstID('Donnergugi'), + CENTURIO_XII_I = GetFirstID('Centurio_XII-I'), + NANDI = GetFirstID('Nandi'), + DECURIO_I_III = GetFirstID('Decurio_I-III'), + TSUCHIGUMO_OFFSET = GetFirstID('Tsuchigumo'), + CACTROT_RAPIDO = GetFirstID('Cactrot_Rapido'), }, npc = { diff --git a/scripts/zones/Eastern_Altepa_Desert/mobs/Giant_Spider.lua b/scripts/zones/Eastern_Altepa_Desert/mobs/Giant_Spider.lua index 9567bc11aa7..bffeb3cbd36 100644 --- a/scripts/zones/Eastern_Altepa_Desert/mobs/Giant_Spider.lua +++ b/scripts/zones/Eastern_Altepa_Desert/mobs/Giant_Spider.lua @@ -7,12 +7,17 @@ local ID = zones[xi.zone.EASTERN_ALTEPA_DESERT] ----------------------------------- local entity = {} +local duneWidowPHTable = +{ + [ID.mob.DUNE_WIDOW - 1] = ID.mob.DUNE_WIDOW, +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 109, 1, xi.regime.type.FIELDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.DUNE_WIDOW_PH, 10, math.random(3600, 18000)) -- 1 to 5 hours + xi.mob.phOnDespawn(mob, duneWidowPHTable, 10, math.random(3600, 18000)) -- 1 to 5 hours end return entity diff --git a/scripts/zones/Eastern_Altepa_Desert/mobs/Sand_Beetle.lua b/scripts/zones/Eastern_Altepa_Desert/mobs/Sand_Beetle.lua index 90e591476ff..b5a54e67243 100644 --- a/scripts/zones/Eastern_Altepa_Desert/mobs/Sand_Beetle.lua +++ b/scripts/zones/Eastern_Altepa_Desert/mobs/Sand_Beetle.lua @@ -7,12 +7,18 @@ local ID = zones[xi.zone.EASTERN_ALTEPA_DESERT] ----------------------------------- local entity = {} +local donnergugiPHTable = +{ + [ID.mob.DONNERGUGI - 10] = ID.mob.DONNERGUGI, + [ID.mob.DONNERGUGI - 5] = ID.mob.DONNERGUGI, +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 110, 3, xi.regime.type.FIELDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.DONNERGUGI_PH, 10, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, donnergugiPHTable, 10, 3600) -- 1 hour end return entity From ff4bb0567f24d01b640f498765bf8872026535da Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Fri, 10 May 2024 01:23:40 -0400 Subject: [PATCH 7/8] Shift-proof East Sarutabaruta --- scripts/zones/East_Sarutabaruta/IDs.lua | 15 +++------------ scripts/zones/East_Sarutabaruta/mobs/Crawler.lua | 7 ++++++- .../East_Sarutabaruta/mobs/Savanna_Rarab.lua | 10 +++++++++- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/scripts/zones/East_Sarutabaruta/IDs.lua b/scripts/zones/East_Sarutabaruta/IDs.lua index d1431211b62..78fe32e95da 100644 --- a/scripts/zones/East_Sarutabaruta/IDs.lua +++ b/scripts/zones/East_Sarutabaruta/IDs.lua @@ -38,18 +38,9 @@ zones[xi.zone.EAST_SARUTABARUTA] = }, mob = { - SHARP_EARED_ROPIPI_PH = - { - [17252507] = 17252489, -- 363.152 -16.705 -326.213 - [17252506] = 17252489, -- 303.282 -17.642 -415.870 - [17252487] = 17252489, -- 224.258 -17.858 -486.256 - [17252488] = 17252489, -- 227.825 -16.978 -317.467 - }, - SPINY_SPIPI_PH = - { - [17252656] = 17252657 - }, - DUKE_DECAPOD = 17252725, + SHARP_EARED_ROPIPI = GetFirstID('Sharp-Eared_Ropipi'), + SPINY_SPIPI = GetFirstID('Spiny_Spipi'), + DUKE_DECAPOD = GetFirstID('Duke_Decapod'), }, npc = { diff --git a/scripts/zones/East_Sarutabaruta/mobs/Crawler.lua b/scripts/zones/East_Sarutabaruta/mobs/Crawler.lua index 9600d45d35f..f12cdc38e49 100644 --- a/scripts/zones/East_Sarutabaruta/mobs/Crawler.lua +++ b/scripts/zones/East_Sarutabaruta/mobs/Crawler.lua @@ -7,13 +7,18 @@ local ID = zones[xi.zone.EAST_SARUTABARUTA] ----------------------------------- local entity = {} +local spinySpipiPHTable = +{ + [ID.mob.SPINY_SPIPI - 1] = ID.mob.SPINY_SPIPI, +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 92, 2, xi.regime.type.FIELDS) xi.regime.checkRegime(player, mob, 93, 2, xi.regime.type.FIELDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.SPINY_SPIPI_PH, 10, 2700) -- 45 minute minimum + xi.mob.phOnDespawn(mob, spinySpipiPHTable, 10, 2700) -- 45 minute minimum end return entity diff --git a/scripts/zones/East_Sarutabaruta/mobs/Savanna_Rarab.lua b/scripts/zones/East_Sarutabaruta/mobs/Savanna_Rarab.lua index 04755fe673a..7533dc655ce 100644 --- a/scripts/zones/East_Sarutabaruta/mobs/Savanna_Rarab.lua +++ b/scripts/zones/East_Sarutabaruta/mobs/Savanna_Rarab.lua @@ -7,12 +7,20 @@ local ID = zones[xi.zone.EAST_SARUTABARUTA] ----------------------------------- local entity = {} +local ropipiPHTable = +{ + [ID.mob.SHARP_EARED_ROPIPI + 18] = ID.mob.SHARP_EARED_ROPIPI, -- 363.152 -16.705 -326.213 + [ID.mob.SHARP_EARED_ROPIPI + 17] = ID.mob.SHARP_EARED_ROPIPI, -- 303.282 -17.642 -415.870 + [ID.mob.SHARP_EARED_ROPIPI - 2] = ID.mob.SHARP_EARED_ROPIPI, -- 224.258 -17.858 -486.256 + [ID.mob.SHARP_EARED_ROPIPI - 1] = ID.mob.SHARP_EARED_ROPIPI, -- 227.825 -16.978 -317.467 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 91, 1, xi.regime.type.FIELDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.SHARP_EARED_ROPIPI_PH, 20, 300) -- 5 minutes + xi.mob.phOnDespawn(mob, ropipiPHTable, 20, 300) -- 5 minutes end return entity From 8b9645971dff6aa3b149ea0ef7d1439caaeba7cb Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Fri, 10 May 2024 01:24:00 -0400 Subject: [PATCH 8/8] Shift-proof East Ronfaure & [S] --- scripts/zones/East_Ronfaure/IDs.lua | 17 ++--------------- .../zones/East_Ronfaure/mobs/Carrion_Worm.lua | 8 +++++++- scripts/zones/East_Ronfaure/mobs/Pugil.lua | 13 ++++++++++++- scripts/zones/East_Ronfaure_[S]/IDs.lua | 17 +++-------------- .../zones/East_Ronfaure_[S]/mobs/Battrap.lua | 7 ++++++- .../zones/East_Ronfaure_[S]/mobs/Ladybug.lua | 10 +++++++++- 6 files changed, 39 insertions(+), 33 deletions(-) diff --git a/scripts/zones/East_Ronfaure/IDs.lua b/scripts/zones/East_Ronfaure/IDs.lua index b37d424b30d..2ce8970ccc3 100644 --- a/scripts/zones/East_Ronfaure/IDs.lua +++ b/scripts/zones/East_Ronfaure/IDs.lua @@ -56,21 +56,8 @@ zones[xi.zone.EAST_RONFAURE] = mob = { - BIGMOUTH_BILLY_PH = - { - [17191194] = 17191196, -- 453.625 -18.436 -127.048 - [17191195] = 17191196, -- 403.967 -36.822 -16.285 - }, - - SWAMFISK_PH = - { - [17191187] = 17191189, -- 379.120 -27.898 -46.436 - [17191188] = 17191189, -- 417.542 -17.210 -177.883 - [17191287] = 17191291, -- 443.334 -17.000 -303.275 - [17191288] = 17191291, -- 423.000 -16.000 -285.000 - [17191289] = 17191291, -- 461.268 -6.674 -391.342 - [17191290] = 17191291, -- 459.345 -6.686 -363.842 - }, + BIGMOUTH_BILLY = GetFirstID('Bigmouth_Billy'), + SWAMFISK = GetTableOfIDs('Swamfisk'), -- 2 NMs VOIDWALKER = { diff --git a/scripts/zones/East_Ronfaure/mobs/Carrion_Worm.lua b/scripts/zones/East_Ronfaure/mobs/Carrion_Worm.lua index cab4cce6925..3b0d5e77608 100644 --- a/scripts/zones/East_Ronfaure/mobs/Carrion_Worm.lua +++ b/scripts/zones/East_Ronfaure/mobs/Carrion_Worm.lua @@ -7,12 +7,18 @@ local ID = zones[xi.zone.EAST_RONFAURE] ----------------------------------- local entity = {} +local bigmouthPHTable = +{ + [ID.mob.BIGMOUTH_BILLY - 2] = ID.mob.BIGMOUTH_BILLY, -- 453.625 -18.436 -127.048 + [ID.mob.BIGMOUTH_BILLY - 1] = ID.mob.BIGMOUTH_BILLY, -- 403.967 -36.822 -16.285 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 65, 1, xi.regime.type.FIELDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.BIGMOUTH_BILLY_PH, 7, 1300) -- 30 minute minimum + xi.mob.phOnDespawn(mob, bigmouthPHTable, 7, 1300) -- 30 minute minimum end return entity diff --git a/scripts/zones/East_Ronfaure/mobs/Pugil.lua b/scripts/zones/East_Ronfaure/mobs/Pugil.lua index 352dcfc3372..5b5c956a0f0 100644 --- a/scripts/zones/East_Ronfaure/mobs/Pugil.lua +++ b/scripts/zones/East_Ronfaure/mobs/Pugil.lua @@ -7,12 +7,23 @@ local ID = zones[xi.zone.EAST_RONFAURE] ----------------------------------- local entity = {} +local swamfiskPHTable = +{ + [ID.mob.SWAMFISK[1] - 2] = ID.mob.SWAMFISK[1], -- 379.120 -27.898 -46.436 + [ID.mob.SWAMFISK[1] - 1] = ID.mob.SWAMFISK[1], -- 417.542 -17.210 -177.883 + + [ID.mob.SWAMFISK[2] - 4] = ID.mob.SWAMFISK[2], -- 443.334 -17.000 -303.275 + [ID.mob.SWAMFISK[2] - 3] = ID.mob.SWAMFISK[2], -- 423.000 -16.000 -285.000 + [ID.mob.SWAMFISK[2] - 2] = ID.mob.SWAMFISK[2], -- 461.268 -6.674 -391.342 + [ID.mob.SWAMFISK[2] - 1] = ID.mob.SWAMFISK[2], -- 459.345 -6.686 -363.842 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 64, 1, xi.regime.type.FIELDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.SWAMFISK_PH, 7, 3600) -- 1 hour minimum + xi.mob.phOnDespawn(mob, swamfiskPHTable, 7, 3600) -- 1 hour minimum end return entity diff --git a/scripts/zones/East_Ronfaure_[S]/IDs.lua b/scripts/zones/East_Ronfaure_[S]/IDs.lua index 9e1084924c2..3359bdbf98c 100644 --- a/scripts/zones/East_Ronfaure_[S]/IDs.lua +++ b/scripts/zones/East_Ronfaure_[S]/IDs.lua @@ -33,20 +33,9 @@ zones[xi.zone.EAST_RONFAURE_S] = mob = { - GOBLINTRAP_PH = - { - [17109295] = 17109296, -- 156 0 -438 - }, - - SKOGS_FRU_PH = - { - [17109268] = 17109338, - [17109306] = 17109338, - [17109307] = 17109338, - [17109308] = 17109338, - }, - - MYRADROSH = 17109235, + GOBLINTRAP = GetFirstID('Goblintrap'), + SKOGS_FRU = GetFirstID('Skogs_Fru'), + MYRADROSH = GetFirstID('Myradrosh'), VOIDWALKER = { diff --git a/scripts/zones/East_Ronfaure_[S]/mobs/Battrap.lua b/scripts/zones/East_Ronfaure_[S]/mobs/Battrap.lua index 4ce96400246..d4ba515680c 100644 --- a/scripts/zones/East_Ronfaure_[S]/mobs/Battrap.lua +++ b/scripts/zones/East_Ronfaure_[S]/mobs/Battrap.lua @@ -7,11 +7,16 @@ local ID = zones[xi.zone.EAST_RONFAURE_S] ----------------------------------- local entity = {} +local goblintrapPHTable = +{ + [ID.mob.GOBLINTRAP - 1] = ID.mob.GOBLINTRAP, -- 156 0 -438 +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.GOBLINTRAP_PH, 5, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, goblintrapPHTable, 5, 3600) -- 1 hour end return entity diff --git a/scripts/zones/East_Ronfaure_[S]/mobs/Ladybug.lua b/scripts/zones/East_Ronfaure_[S]/mobs/Ladybug.lua index f3eaa7600cc..77ae06f5ab6 100644 --- a/scripts/zones/East_Ronfaure_[S]/mobs/Ladybug.lua +++ b/scripts/zones/East_Ronfaure_[S]/mobs/Ladybug.lua @@ -8,11 +8,19 @@ mixins = { require('scripts/mixins/families/ladybug') } ----------------------------------- local entity = {} +local skogsFruPHTable = +{ + [ID.mob.SKOGS_FRU- 70] = ID.mob.SKOGS_FRU, + [ID.mob.SKOGS_FRU- 32] = ID.mob.SKOGS_FRU, + [ID.mob.SKOGS_FRU- 31] = ID.mob.SKOGS_FRU, + [ID.mob.SKOGS_FRU- 30] = ID.mob.SKOGS_FRU, +} + entity.onMobDeath = function(mob, player, optParams) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.SKOGS_FRU_PH, 5, 3600) -- 1 hour + xi.mob.phOnDespawn(mob, skogsFruPHTable, 5, 3600) -- 1 hour end return entity