Skip to content

[lua] Assault Excavation Duty migration #10558

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

Open
Nobutadas wants to merge 1 commit into
base: base
Choose a base branch
from
Open

[lua] Assault Excavation Duty migration #10558

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
73 changes: 73 additions & 0 deletions scripts/assaults/Lebros_Cavern/excavation_duty.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
-----------------------------------
-- Assault: Excavation Duty
-- Instance 6300
-- Objective: Destroy the 5 Brittle Rocks
-----------------------------------
local ID = zones[xi.zone.LEBROS_CAVERN]
-----------------------------------

local content = InstanceAssault:new(
{
zoneID = xi.zone.LEBROS_CAVERN,
assaultID = xi.assault.mission.EXCAVATION_DUTY,
instanceID = xi.assault.instance.EXCAVATION_DUTY,
assaultArea = xi.assault.assaultArea.LEBROS_CAVERN,
requiredOrders = xi.ki.LEBROS_ASSAULT_ORDERS,

runeOfReleasePos = { x = 49.999, y = -40.837, z = 96.999, rot = 0 },
ancientBoxPos = { x = 50.000, y = -40.070, z = 99.999, rot = 0 },
releasePos = { x = 5, z = 10 },

suggestedLevel = 50,
basePoints = 1100,
requiredProgress = 5,

entranceParams =
{
instanceID = xi.assault.instance.EXCAVATION_DUTY,
entryEvent = { 203, 21, -4, 0, 50, 0, 1 },
confirmEvent = { 203, 4 },
memberEvent = { 208, 0 },
},
})

content.mobs =
{
{ baseID = ID.mob.VOLCANIC_BOMB, offset = 26 },
}

content.loot =
{
appraisalReward = -- TODO: More data on loot. Box is 9/20 on current data.
{
{
{ itemId = xi.item.UNAPPRAISED_BOX, weight = 3000 },
{ itemId = xi.item.UNAPPRAISED_EARRING, weight = 7000 },
},
},

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

{
{ itemId = xi.item.REMEDY, weight = 2000 },
{ itemId = xi.item.NONE, weight = 8000 },
},

{
{ itemId = xi.item.HI_POTION_P3, weight = 4000 },
{ itemId = xi.item.NONE, weight = 6000 },
},

{
{ itemId = xi.item.HI_POTION_P3, weight = 2000 },
{ itemId = xi.item.NONE, weight = 8000 },
},
},
}

return content:register()
10 changes: 1 addition & 9 deletions scripts/zones/Lebros_Cavern/IDs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,7 @@ zones[xi.zone.LEBROS_CAVERN] =
mob =
{
WAMOURA_OFFSET = GetTableOfIDs('Ranch_Wamoura'),
[xi.assault.mission.EXCAVATION_DUTY] =
{
MOBS_START =
{
17035265, 17035266, 17035267, 17035268, 17035269, 17035270, 17035271, 17035272, 17035273,
17035274, 17035275, 17035276, 17035277, 17035278, 17035279, 17035280, 17035281,
BRITTLE_ROCK1 = 17035283, BRITTLE_ROCK2 = 17035285, BRITTLE_ROCK3 = 17035287, BRITTLE_ROCK4 = 17035289, BRITTLE_ROCK5 = 17035291,
},
},
VOLCANIC_BOMB = GetFirstID('Volcanic_Bomb'),
[xi.assault.mission.LEBROS_SUPPLIES] =
{
MOBS_START =
Expand Down
60 changes: 0 additions & 60 deletions scripts/zones/Lebros_Cavern/instances/excavation_duty.lua
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions scripts/zones/Lebros_Cavern/npcs/Ancient_Lockbox.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@ local entity = {}
entity.onTrigger = function(player, npc)
local qItem =
{
[xi.assault.mission.EXCAVATION_DUTY] =
{
{
{ itemId = xi.item.UNAPPRAISED_BOX, weight = 300 },
{ itemId = xi.item.UNAPPRAISED_EARRING, weight = 700 },
},
},

[xi.assault.mission.LEBROS_SUPPLIES] =
{
{
Expand All @@ -37,29 +29,6 @@ entity.onTrigger = function(player, npc)

local regItem =
{
[xi.assault.mission.EXCAVATION_DUTY] =
{
{
{ itemId = xi.item.REMEDY, weight = 900 },
{ itemId = 0, weight = 100 },
},

{
{ itemId = xi.item.REMEDY, weight = 200 },
{ itemId = 0, weight = 800 },
},

{
{ itemId = xi.item.HI_POTION_P3, weight = 400 },
{ itemId = 0, weight = 600 },
},

{
{ itemId = xi.item.HI_POTION_P3, weight = 200 },
{ itemId = 0, weight = 800 },
},
},

[xi.assault.mission.LEBROS_SUPPLIES] =
{
{
Expand Down
9 changes: 2 additions & 7 deletions scripts/zones/Mount_Zhayolm/npcs/_1p3.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,19 @@
-- Door: Runic Seal
-- !pos 703 -18 382 61
-----------------------------------
local ID = zones[xi.zone.MOUNT_ZHAYOLM]
-----------------------------------
---@type TNpcEntity
local entity = {}

entity.onTrigger = function(player, npc)
if not xi.instance.onTrigger(player, npc, xi.zone.LEBROS_CAVERN) then
player:messageSpecial(ID.text.NOTHING_HAPPENS)
end
xi.assault.onRunicTrigger(player, npc, xi.zone.LEBROS_CAVERN)
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
Loading