[sql][lua] Add Periqia Requiem Assault

scripts/assaults/Periqia/requiem.lua

@@ -0,0 +1,69 @@
+-----------------------------------
+-- Assault: Requiem
+-- Instance 5602
+-- Objective: Defeat all 18 Undeads
+-----------------------------------
+local ID = zones[xi.zone.PERIQIA]
+-----------------------------------
+
+local content = InstanceAssault:new(
+{
+    zoneID           = xi.zone.PERIQIA,
+    assaultID        = xi.assault.mission.REQUIEM,
+    instanceID       = xi.assault.instance.REQUIEM,
+    assaultArea      = xi.assault.assaultArea.PERIQIA,
+    requiredOrders   = xi.ki.PERIQIA_ASSAULT_ORDERS,
+
+    runeOfReleasePos = { x = -489.999, y = -9.694, z = -328.999, rot = 0 },
+    ancientBoxPos    = { x = -490.000, y = -9.961, z = -326.000, rot = 0 },
+    releasePos       = { x = 5, z = 9    },
+
+    suggestedLevel   = 70,
+    basePoints       = 1000,
+    requiredProgress = 18,
+
+    entranceParams   =
+    {
+        instanceID   = xi.assault.instance.REQUIEM,
+        entryEvent   = { 143, 32, -4, 0, 70, 3, 1 },
+        confirmEvent = { 143, 4 },
+        memberEvent  = { 147, 0 },
+    },
+})
+
+content.mobs =
+{
+    { baseID = ID.mob.REQUIEM_UNDEAD_OFFSET,      offset = 22 },
+}
+
+content.loot =
+{
+    appraisalReward =
+    {
+        {
+            { itemId = xi.item.UNAPPRAISED_GLOVES,  weight = 2500 },
+            { itemId = xi.item.UNAPPRAISED_AXE,     weight = 2500 },
+            { itemId = xi.item.UNAPPRAISED_POLEARM, weight = 2500 },
+            { itemId = xi.item.UNAPPRAISED_BOX,     weight = 2500 },
+        },
+    },
+
+    bonusLoot =
+    {
+        {
+            { itemId = xi.item.REMEDY,              weight = 10000 },
+        },
+
+        {
+            { itemId = xi.item.HI_POTION_P3,        weight = 5000 },
+            { itemId = xi.item.REMEDY,              weight = 5000 },
+        },
+
+        {
+            { itemId = xi.item.HI_POTION_P3,        weight = 1000 },
+            { itemId = xi.item.NONE,                weight = 9000 },
+        },
+    },
+}
+
+return content:register()

scripts/zones/Caedarva_Mire/npcs/_273.lua

@@ -3,24 +3,19 @@
 -- Door: Runic Seal
 -- !pos -353 -3 -20 79
 -----------------------------------
-local ID = zones[xi.zone.CAEDARVA_MIRE]
------------------------------------
 ---@type TNpcEntity
 local entity = {}
 
 entity.onTrigger = function(player, npc)
-    if not xi.instance.onTrigger(player, npc, xi.zone.PERIQIA) then
-        player:messageSpecial(ID.text.NOTHING_HAPPENS)
-    end
+    xi.assault.onRunicTrigger(player, npc, xi.zone.PERIQIA)
 end
 
 entity.onEventUpdate = function(player, csid, option, npc)
     xi.assault.onAssaultUpdate(player, csid, option, npc)
-    xi.instance.onEventUpdate(player, csid, option, npc)
 end
 
 entity.onEventFinish = function(player, csid, option, npc)
-    xi.instance.onEventFinish(player, csid, option, npc)
+    xi.assault.onEventFinish(player, csid, option, npc)
 end
 
 return entity

scripts/zones/Periqia/IDs.lua

@@ -52,36 +52,7 @@ zones[xi.zone.PERIQIA] =
 
     mob =
     {
-        [xi.assault.mission.SEAGULL_GROUNDED] =
-        {
-            MOBS_START =
-            {
-                EXCALIAC = 17006593, 17006594, 17006595, 17006596, 17006597, 17006598, 17006599, 17006600, 17006601,
-                17006602, 17006603, 17006604, 17006605, 17006606, 17006607, 17006608, 17006610, 17006611,
-            },
-        },
-        [xi.assault.mission.REQUIEM] =
-        {
-            MOBS_START =
-            {
-                17006612, 17006613, 17006614, 17006615, 17006616, 17006617, 17006619, 17006620, 17006621,
-                17006623, 17006625, 17006626, 17006627, 17006628, 17006630, 17006631, 17006633, 17006634,
-            },
-        },
-        -- Shades of Vengeance
-        [79] =
-        {
-            K23H1LAMIA1  = 17006754,
-            K23H1LAMIA2  = 17006755,
-            K23H1LAMIA3  = 17006756,
-            K23H1LAMIA4  = 17006757,
-            K23H1LAMIA5  = 17006758,
-            K23H1LAMIA6  = 17006759,
-            K23H1LAMIA7  = 17006760,
-            K23H1LAMIA8  = 17006761,
-            K23H1LAMIA9  = 17006762,
-            K23H1LAMIA10 = 17006763,
-        }
+        REQUIEM_UNDEAD_OFFSET = GetFirstID('Putrid_Immortal_Guard'),
     },
 
     npc =

scripts/zones/Periqia/mobs/Batteilant_Bhoot.lua

@@ -5,6 +5,12 @@
 ---@type TMobEntity
 local entity = {}
 
+entity.onMobSpawn = function(mob)
+    mob:setMobMod(xi.mobMod.NO_LINK, 1)
+    mob:setMaxMP(4000)
+    mob:setHP(4000)
+end
+
 entity.onMobDespawn = function(mob)
     local instance = mob:getInstance()
     if not instance then

scripts/zones/Periqia/mobs/Darkling_Draugar.lua

@@ -5,6 +5,12 @@
 ---@type TMobEntity
 local entity = {}
 
+entity.onMobSpawn = function(mob)
+    mob:setMobMod(xi.mobMod.NO_LINK, 1)
+    mob:setMaxMP(4075)
+    mob:setHP(4075)
+end
+
 entity.onMobDespawn = function(mob)
     local instance = mob:getInstance()
     if not instance then

scripts/zones/Periqia/mobs/Draconic_Draugar.lua

@@ -5,11 +5,23 @@
 ---@type TMobEntity
 local entity = {}
 
-entity.onMobEngage = function(mob, target)
+entity.onMobSpawn = function(mob)
     local instance = mob:getInstance()
-    local mobID = mob:getID()
+    local petId    = mob:getID() + 1
+    local pet      = GetMobByID(petId, instance)
+    mob:setMobMod(xi.mobMod.NO_LINK, 1)
+    mob:setMaxMP(4150)
+    mob:setHP(4150)
+    if pet then
+        mob:setPet(pet)
+    end
+end
 
-    SpawnMob(mobID + 1, instance):updateEnmity(target)
+entity.onMobFight = function(mob, target)
+    local pet = GetMobByID(mob:getID() + 1, mob:getInstance())
+    if pet and pet:getCurrentAction() == xi.action.category.ROAMING then
+        pet:updateEnmity(target)
+    end
 end
 
 entity.onMobDespawn = function(mob)

scripts/zones/Periqia/mobs/Putrid_Immortal_Guard.lua

@@ -5,6 +5,12 @@
 ---@type TMobEntity
 local entity = {}
 
+entity.onMobSpawn = function(mob)
+    mob:setMobMod(xi.mobMod.NO_LINK, 1)
+    mob:setMaxMP(4400)
+    mob:setHP(4400)
+end
+
 entity.onMobDespawn = function(mob)
     local instance = mob:getInstance()
     if not instance then