Skip to content

[lua] [sql] [yaml] Implement Assault "Requiem" + Add support for missing Assault Armband KI Msg #11397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xaver-DaRed merged 1 commit into from
Sep 12, 2026
Merged

[lua] [sql] [yaml] Implement Assault "Requiem" + Add support for missing Assault Armband KI Msg #11397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 54 additions & 51 deletions data/zones/periqia/mobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,11 @@ templates:
id: 360
species: bhoot
spell_list_id: 28
skill_list_id: 52
skill_list_id: 121
attributes:
combat:
skill: club
delay: 250
jobs: [blm, blm]
render:
look:
Expand Down Expand Up @@ -209,10 +210,11 @@ templates:
id: 905
species: draugar
spell_list_id: 5
skill_list_id: 89
skill_list_id: 227
attributes:
combat:
skill: sword
delay: 280
jobs: [drk, drk]
render:
look:
Expand Down Expand Up @@ -283,10 +285,11 @@ templates:
Draconic_Draugar:
id: 1097
species: draugar
skill_list_id: 89
skill_list_id: 227
attributes:
combat:
skill: polearm
delay: 300
jobs: [drg, drg]
render:
look:
Expand All @@ -308,7 +311,7 @@ templates:
attributes:
combat:
skill: scythe
delay: 200
delay: 250
render:
look:
type: standard
Expand Down Expand Up @@ -778,7 +781,7 @@ templates:
attributes:
combat:
skill: sword
delay: 270
delay: 250
render:
look:
type: standard
Expand Down Expand Up @@ -949,96 +952,96 @@ spawns:
level: [77, 79]
17006612:
template: Putrid_Immortal_Guard
at: [-434.051, -5.076, -260.724]
level: [77, 78]
at: [-454.915, -4.121, -255.058, 78]
level: [77, 77]
17006613:
template: Putrid_Immortal_Guard
at: [-455.689, -8.171, -265.212, 60]
level: [77, 78]
at: [-450.889, -6.673, -258.272, 3]
level: [77, 77]
17006614:
template: Batteilant_Bhoot
at: [-510.939, -16.193, -178.466, 86]
level: [77, 78]
at: [-499.716, -16.174, -179.635, 65]
level: [75, 77]
17006615:
template: Batteilant_Bhoot
at: [-508.779, -16.297, -175.037, 110]
level: [77, 78]
at: [-499.622, -16.164, -180.989, 50]
level: [75, 77]
17006616:
template: Darkling_Draugar
at: [-509.631, -18.504, -142.899, 5]
level: [77, 78]
at: [-500.338, -15.800, -145.716, 255]
level: [75, 76]
17006617:
template: Draconic_Draugar
at: [-504.532, -15.733, -143.145, 146]
level: [77, 78]
at: [-501.451, -15.801, -145.041, 153]
level: [75, 76]
17006618:
template: Draugars_Wyvern
at: [-504.532, -15.733, -143.145, 146]
level: [77, 78]
at: [-501.451, -15.801, -145.041, 153]
level: [70, 71]
17006619:
template: Darkling_Draugar
at: [-544.832, -16.103, -142.699, 253]
level: [77, 78]
at: [-538.905, -15.775, -146.001, 13]
level: [75, 76]
17006620:
template: Darkling_Draugar
at: [-535.468, -15.760, -142.838, 238]
level: [77, 78]
at: [-538.621, -16.070, -143.620, 24]
level: [75, 76]
17006621:
template: Draconic_Draugar
at: [-531.053, -16.308, -209.619, 254]
level: [77, 78]
at: [-534.770, -15.908, -212.742, 253]
level: [75, 76]
17006622:
template: Draugars_Wyvern
at: [-531.053, -16.308, -209.619, 254]
level: [77, 78]
at: [-534.770, -15.908, -212.742, 253]
level: [70, 71]
17006623:
template: Draconic_Draugar
at: [-536.109, -15.914, -209.807, 181]
level: [77, 78]
at: [-537.336, -15.916, -212.358, 141]
level: [75, 76]
17006624:
template: Draugars_Wyvern
at: [-536.109, -15.914, -209.807, 181]
level: [77, 78]
at: [-537.336, -15.916, -212.358, 141]
level: [70, 71]
17006625:
template: Batteilant_Bhoot
at: [-389.755, -16.314, -340.165, 26]
level: [77, 78]
at: [-376.720, -16.225, -338.743, 97]
level: [75, 77]
17006626:
template: Batteilant_Bhoot
at: [-380.747, -16.141, -339.757, 227]
level: [77, 78]
at: [-388.673, -16.288, -341.172, 238]
level: [75, 77]
17006627:
template: Darkling_Draugar
at: [-421.740, -15.771, -414.019, 85]
level: [77, 78]
at: [-425.841, -16.123, -406.870, 134]
level: [75, 76]
17006628:
template: Draconic_Draugar
at: [-410.189, -18.512, -417.184, 128]
level: [77, 78]
at: [-424.116, -16.120, -410.327, 22]
level: [75, 76]
17006629:
template: Draugars_Wyvern
at: [-410.189, -18.512, -417.184, 128]
level: [77, 78]
at: [-424.116, -16.120, -410.327, 22]
level: [70, 71]
17006630:
template: Darkling_Draugar
at: [-380.327, -15.837, -372.303, 69]
level: [77, 78]
at: [-381.819, -15.802, -373.410, 128]
level: [75, 76]
17006631:
template: Draconic_Draugar
at: [-373.480, -17.073, -377.010, 128]
level: [77, 78]
at: [-381.304, -15.840, -374.144, 131]
level: [75, 76]
17006632:
template: Draugars_Wyvern
at: [-373.480, -17.073, -377.010, 128]
level: [77, 78]
at: [-381.304, -15.840, -374.144, 131]
level: [70, 71]
17006633:
template: Darkling_Draugar
at: [-345.461, -15.811, -330.613, 116]
level: [77, 78]
at: [-340.229, -15.681, -337.999, 62]
level: [75, 76]
17006634:
template: Darkling_Draugar
at: [-348.444, -17.535, -337.023, 129]
level: [77, 78]
at: [-344.746, -15.934, -336.741, 33]
level: [75, 76]
17006635:
template: Cursed_Chigoe
at: [-58.320, -15.850, 571.903, 196]
Expand Down
85 changes: 85 additions & 0 deletions scripts/assaults/Periqia/requiem.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
-----------------------------------
-- Assault: Requiem
-- Instance 5602
-- Objective: Destroy the undead
-----------------------------------
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 = -490.000, y = -9.695, z = -329.000, rot = 0 },
ancientBoxPos = { x = -490.000, y = -9.985, z = -326.000, rot = 0 },
releasePos = { x = 5, z = 9 }, -- "Unlocking Rune of Release (F-9)"

wallNPCs = { ID.npc._JKH, ID.npc._JKI },

suggestedLevel = 70,
basePoints = 1000,
requiredProgress = 18, -- Every undead except the Draugar's Wyvern pets

entranceParams =
{
instanceID = xi.assault.instance.REQUIEM,
entryEvent = { 143, 32, -4, 0, 70, 0, 1 },
confirmEvent = { 143, 4 },
memberEvent = { 147, 0 },
},
})

content.loot =
{
appraisalReward =
{
{
{ itemId = xi.item.UNAPPRAISED_BOX, weight = 4000 },
{ itemId = xi.item.UNAPPRAISED_GLOVES, weight = 2000 },
{ itemId = xi.item.UNAPPRAISED_POLEARM, weight = 2000 },
{ itemId = xi.item.UNAPPRAISED_AXE, weight = 2000 },
},
},

bonusLoot =
{
{
{ itemId = xi.item.HI_POTION_P3, weight = 5000 },
{ itemId = xi.item.NONE, weight = 5000 },
},

{
{ itemId = xi.item.HI_ETHER_TANK, weight = 1000 },
{ itemId = xi.item.NONE, weight = 9000 },
},

{
{ itemId = xi.item.HI_RERAISER, weight = 5000 },
{ itemId = xi.item.NONE, weight = 5000 },
},
},
}

function content:onInstanceCreated(instance)
InstanceAssault.onInstanceCreated(self, instance)

for mobID = ID.mob.PUTRID_IMMORTAL_GUARD, ID.mob.PUTRID_IMMORTAL_GUARD + 22 do

-- Any pets are skipped and spawned by their masters.
if not GetMobByID(mobID, instance):getMaster() then
SpawnMob(mobID, instance)
end
end

GetNPCByID(ID.npc._1KH, instance):setAnimation(xi.animation.CLOSE_DOOR)
GetNPCByID(ID.npc._1KT, instance):setAnimation(xi.animation.CLOSE_DOOR)
GetNPCByID(ID.npc._JK5, instance):setAnimation(xi.animation.CLOSE_DOOR)
GetNPCByID(ID.npc._JK6, instance):setAnimation(xi.animation.CLOSE_DOOR)
GetNPCByID(ID.npc._JK7, instance):setAnimation(xi.animation.CLOSE_DOOR)
end

return content:register()
13 changes: 9 additions & 4 deletions scripts/globals/assault/container.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,15 +236,20 @@ end
xi.assault.onRunicTrigger = function(player, npc, zone)
local chosenAssault
for _, eligibleAssault in ipairs(xi.assault.contentsByZone[zone] or {}) do
if
xi.assault.checkRequirements(player, eligibleAssault) and
player:hasKeyItem(xi.ki.ASSAULT_ARMBAND)
then
if xi.assault.checkRequirements(player, eligibleAssault) then
chosenAssault = eligibleAssault
break
end
end

if
chosenAssault ~= nil and
not player:hasKeyItem(xi.ki.ASSAULT_ARMBAND)
then
player:messageSpecial(zones[player:getZoneID()].text.MISSING_KEY_ITEM, xi.ki.ASSAULT_ARMBAND)
return
end

if chosenAssault == nil then
if not xi.instance.onTrigger(player, npc, zone) then
player:messageSpecial(zones[player:getZoneID()].text.NOTHING_HAPPENS)
Expand Down
2 changes: 1 addition & 1 deletion scripts/globals/instance.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ xi.instance.lookup =
{
{ 5600, { 143, 79, -6, 0, 99, 3, 0 }, { 143, 4 }, { 147, 3 } }, -- Shades of Vengeance (TOAU31)
-- Assault: Seagull Grounded (scripts/assaults/Periqia/seagull_grounded.lua)
-- Assault: Requiem
-- Assault: Requiem (scripts/assaults/Periqia/requiem.lua)
-- Assault: Saving Private Ryaaf
-- Assault: Shooting Down the Baron
-- Assault: Stop the Bloodshed
Expand Down
1 change: 1 addition & 0 deletions scripts/zones/Alzadaal_Undersea_Ruins/IDs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ zones[xi.zone.ALZADAAL_UNDERSEA_RUINS] =
CANNOT_ENTER = 7465, -- You cannot enter at this time. Please wait a while before trying again.
AREA_FULL = 7466, -- This area is fully occupied. You were unable to enter.
MEMBER_NO_REQS = 7470, -- Not all of your party members meet the requirements for this objective. Unable to enter area.
MISSING_KEY_ITEM = 7471, -- You are not in possession of <keyitem>. Unable to enter area.
MEMBER_TOO_FAR = 7474, -- One or more party members are too far away from the entrance. Unable to enter area.
MEMBER_IMBUED_ITEM = 7475, -- One or more party members are carrying imbued items. Unable to enter area.
IMBUED_ITEM = 7476, -- You are carrying imbued items. Unable to enter area.
Expand Down
1 change: 1 addition & 0 deletions scripts/zones/Arrapago_Reef/IDs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ zones[xi.zone.ARRAPAGO_REEF] =
CANNOT_ENTER = 8481, -- You cannot enter at this time. Please wait a while before trying again.
AREA_FULL = 8482, -- This area is fully occupied. You were unable to enter.
MEMBER_NO_REQS = 8486, -- Not all of your party members meet the requirements for this objective. Unable to enter area.
MISSING_KEY_ITEM = 8487, -- You are not in possession of <keyitem>. Unable to enter area.
MEMBER_TOO_FAR = 8490, -- One or more party members are too far away from the entrance. Unable to enter area.
MEDUSA_ENGAGE = 8600, -- Foolish two-legs... Have you forgotten the terrible power of the gorgons you created? It is time you were reminded...
MEDUSA_DEATH = 8601, -- No... I cannot leave my sisters...
Expand Down
1 change: 1 addition & 0 deletions scripts/zones/Bhaflau_Thickets/IDs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ zones[xi.zone.BHAFLAU_THICKETS] =
CANNOT_ENTER = 7605, -- You cannot enter at this time. Please wait a while before trying again.
AREA_FULL = 7606, -- This area is fully occupied. You were unable to enter.
MEMBER_NO_REQS = 7610, -- Not all of your party members meet the requirements for this objective. Unable to enter area.
MISSING_KEY_ITEM = 7611, -- You are not in possession of <keyitem>. Unable to enter area.
MEMBER_TOO_FAR = 7614, -- One or more party members are too far away from the entrance. Unable to enter area.
WELLSPRING = 7674, -- The water in this spring is an unusual color...
SHED_LEAVES = 7683, -- The ground is strewn with shed leaves...
Expand Down
1 change: 1 addition & 0 deletions scripts/zones/Caedarva_Mire/IDs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ zones[xi.zone.CAEDARVA_MIRE] =
CANNOT_ENTER = 7484, -- You cannot enter at this time. Please wait a while before trying again.
AREA_FULL = 7485, -- This area is fully occupied. You were unable to enter.
MEMBER_NO_REQS = 7489, -- Not all of your party members meet the requirements for this objective. Unable to enter area.
MISSING_KEY_ITEM = 7490, -- You are not in possession of <keyitem>. Unable to enter area.
MEMBER_TOO_FAR = 7493, -- One or more party members are too far away from the entrance. Unable to enter area.
JAZARAATS_HEADSTONE = 7553, -- The name Sir Jazaraat is engraved on the headstone...
SOMEONE_SLIPPED = 7600, -- It looks like someone slipped here...
Expand Down
1 change: 1 addition & 0 deletions scripts/zones/Mount_Zhayolm/IDs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ zones[xi.zone.MOUNT_ZHAYOLM] =
CANNOT_ENTER = 7498, -- You cannot enter at this time. Please wait a while before trying again.
AREA_FULL = 7499, -- This area is fully occupied. You were unable to enter.
MEMBER_NO_REQS = 7503, -- Not all of your party members meet the requirements for this objective. Unable to enter area.
MISSING_KEY_ITEM = 7504, -- You are not in possession of <keyitem>. Unable to enter area.
MEMBER_TOO_FAR = 7507, -- One or more party members are too far away from the entrance. Unable to enter area.
DETACHED_PART = 7562, -- There is a detached part here...
SHED_LEAVES = 7577, -- The ground is strewn with shed leaves...
Expand Down
7 changes: 7 additions & 0 deletions scripts/zones/Periqia/IDs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,17 @@ zones[xi.zone.PERIQIA] =
ANCIENT_LOCKBOX = GetFirstID('Ancient_Lockbox'),
RUNE_OF_RELEASE = GetFirstID('Rune_of_Release'),
_1K6 = GetFirstID('_1k6'),
_1KH = GetFirstID('_1kh'),
_1KT = GetFirstID('_1kt'),
_1KX = GetFirstID('_1kx'),
_1KZ = GetFirstID('_1kz'),
_JK1 = GetFirstID('_jk1'),
_JK3 = GetFirstID('_jk3'),
_JK5 = GetFirstID('_jk5'),
_JK6 = GetFirstID('_jk6'),
_JK7 = GetFirstID('_jk7'),
_JKH = GetFirstID('_jkh'),
_JKI = GetFirstID('_jki'),
}
}

Expand Down
Loading
Loading