From 8dff08a77154b6153caade1f8cbd7880518bc69a Mon Sep 17 00:00:00 2001 From: Frankie-hz <105882754+Frankie-hz@users.noreply.github.com> Date: Mon, 13 May 2024 19:27:00 -0400 Subject: [PATCH] Shift-proof Cape Terriggan --- scripts/zones/Cape_Teriggan/IDs.lua | 14 ++++---------- .../zones/Cape_Teriggan/mobs/Greater_Manticore.lua | 10 +++++++++- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/scripts/zones/Cape_Teriggan/IDs.lua b/scripts/zones/Cape_Teriggan/IDs.lua index 678abc2cbd7..fd4528a8c01 100644 --- a/scripts/zones/Cape_Teriggan/IDs.lua +++ b/scripts/zones/Cape_Teriggan/IDs.lua @@ -46,16 +46,10 @@ zones[xi.zone.CAPE_TERIGGAN] = }, mob = { - FROSTMANE_PH = - { - [17240374] = 17240376, -- -283.874 -0.660 485.504 - [17240372] = 17240376, -- -272.224 -0.942 461.321 - [17240373] = 17240376, -- -268.000 -0.558 440.000 - [17240371] = 17240376, -- -262.000 -0.700 442.000 - }, - KREUTZET = 17240413, - AXESARION_THE_WANDERER = 17240414, - STOLAS = 17240424, + FROSTMANE = GetFirstID('Frostmane'), + KREUTZET = GetFirstID('Kreutzet'), + AXESARION_THE_WANDERER = GetFirstID('Axesarion_the_Wanderer'), + STOLAS = GetFirstID('Stolas'), ZMEY_GORYNYCH = GetFirstID('Zmey_Gorynych') }, npc = diff --git a/scripts/zones/Cape_Teriggan/mobs/Greater_Manticore.lua b/scripts/zones/Cape_Teriggan/mobs/Greater_Manticore.lua index fcfe542fbaf..2fe97bd7850 100644 --- a/scripts/zones/Cape_Teriggan/mobs/Greater_Manticore.lua +++ b/scripts/zones/Cape_Teriggan/mobs/Greater_Manticore.lua @@ -7,12 +7,20 @@ local ID = zones[xi.zone.CAPE_TERIGGAN] ----------------------------------- local entity = {} +local frostmanePHTable = +{ + [ID.mob.FROSTMANE - 5] = ID.mob.FROSTMANE, -- -262.000 -0.700 442.000 + [ID.mob.FROSTMANE - 4] = ID.mob.FROSTMANE, -- -272.224 -0.942 461.321 + [ID.mob.FROSTMANE - 3] = ID.mob.FROSTMANE, -- -268.000 -0.558 440.000 + [ID.mob.FROSTMANE - 2] = ID.mob.FROSTMANE, -- -283.874 -0.660 485.504 +} + entity.onMobDeath = function(mob, player, optParams) xi.regime.checkRegime(player, mob, 108, 2, xi.regime.type.FIELDS) end entity.onMobDespawn = function(mob) - xi.mob.phOnDespawn(mob, ID.mob.FROSTMANE_PH, 5, math.random(3600, 21600)) -- 1 to 6 hours + xi.mob.phOnDespawn(mob, frostmanePHTable, 5, math.random(3600, 21600)) -- 1 to 6 hours end return entity