From 670f4af1f793ed01e49c724f85b73408e5a13873 Mon Sep 17 00:00:00 2001 From: claywar Date: Sun, 12 May 2024 19:26:09 -0400 Subject: [PATCH] Interaction - Battlefields: Stellar Fulcrum Remove unused bcnm code Remove unused variable --- .../return_to_delkfutts_tower.lua | 42 +++++++++++++++++++ scripts/globals/bcnm.lua | 10 ----- scripts/zones/Stellar_Fulcrum/IDs.lua | 1 + .../bcnms/return_to_delkfutts_tower.lua | 39 ----------------- .../zones/Stellar_Fulcrum/mobs/Kamlanaut.lua | 1 - scripts/zones/Stellar_Fulcrum/npcs/_4z0.lua | 7 +--- scripts/zones/Stellar_Fulcrum/npcs/_4z1.lua | 14 ------- scripts/zones/Stellar_Fulcrum/npcs/_4z2.lua | 14 ------- scripts/zones/Stellar_Fulcrum/npcs/_4z3.lua | 14 ------- 9 files changed, 44 insertions(+), 98 deletions(-) create mode 100644 scripts/battlefields/Stellar_Fulcrum/return_to_delkfutts_tower.lua delete mode 100644 scripts/zones/Stellar_Fulcrum/bcnms/return_to_delkfutts_tower.lua diff --git a/scripts/battlefields/Stellar_Fulcrum/return_to_delkfutts_tower.lua b/scripts/battlefields/Stellar_Fulcrum/return_to_delkfutts_tower.lua new file mode 100644 index 00000000000..60187a6bff0 --- /dev/null +++ b/scripts/battlefields/Stellar_Fulcrum/return_to_delkfutts_tower.lua @@ -0,0 +1,42 @@ +----------------------------------- +-- Area: Stellar Fulcrum +-- Name: ZM8 Return to Delkfutt's Tower +-- !pos -520 -4 17 179 +----------------------------------- +local stellarFulcrumID = zones[xi.zone.STELLAR_FULCRUM] +----------------------------------- + +local content = BattlefieldMission:new({ + zoneId = xi.zone.STELLAR_FULCRUM, + battlefieldId = xi.battlefield.id.RETURN_TO_DELKFUTTS_TOWER, + isMission = true, + maxPlayers = 6, + levelCap = 75, + timeLimit = utils.minutes(30), + index = 0, + entryNpc = '_4z0', + exitNpcs = { '_4z1', '_4z2', '_4z3' }, + missionArea = xi.mission.log_id.ZILART, + mission = xi.mission.id.zilart.RETURN_TO_DELKFUTTS_TOWER, + missionStatusArea = xi.mission.log_id.ZILART, + requiredMissionStatus = 2, + title = xi.title.DESTROYER_OF_ANTIQUITY, +}) + +content.groups = +{ + { + mobIds = + { + { stellarFulcrumID.mob.KAMLANAUT }, + { stellarFulcrumID.mob.KAMLANAUT + 1 }, + { stellarFulcrumID.mob.KAMLANAUT + 2 }, + }, + + allDeath = function(battlefield, mob) + battlefield:setStatus(xi.battlefield.status.WON) + end, + }, +} + +return content:register() diff --git a/scripts/globals/bcnm.lua b/scripts/globals/bcnm.lua index 7559bc7eaaa..6abd0a5a2dc 100644 --- a/scripts/globals/bcnm.lua +++ b/scripts/globals/bcnm.lua @@ -538,7 +538,6 @@ local function checkReqs(player, npc, bfid, registrant) local asaMission = player:getCurrentMission(xi.mission.log_id.ASA) local nationStatus = player:getMissionStatus(player:getNation()) - local zilartStatus = player:getMissionStatus(xi.mission.log_id.ZILART) local promathiaStatus = player:getCharVar('PromathiaStatus') local toauStatus = player:getMissionStatus(xi.mission.log_id.TOAU) @@ -592,11 +591,6 @@ local function checkReqs(player, npc, bfid, registrant) nationStatus == 2 end, - [256] = function() -- ZM8: Return to Delkfutt's Tower - return zilartMission == xi.mission.id.zilart.RETURN_TO_DELKFUTTS_TOWER and - zilartStatus == 2 - end, - [320] = function() -- ZM16: The Celestial Nexus return zilartMission == xi.mission.id.zilart.THE_CELESTIAL_NEXUS end, @@ -1177,10 +1171,6 @@ local function checkSkip(player, bfid) ) end, - [256] = function() -- ZM8: Return to Delkfutt's Tower - return player:hasCompletedMission(xi.mission.log_id.ZILART, xi.mission.id.zilart.RETURN_TO_DELKFUTTS_TOWER) - end, - [320] = function() -- ZM16: The Celestial Nexus return player:hasCompletedMission(xi.mission.log_id.ZILART, xi.mission.id.zilart.THE_CELESTIAL_NEXUS) end, diff --git a/scripts/zones/Stellar_Fulcrum/IDs.lua b/scripts/zones/Stellar_Fulcrum/IDs.lua index df0dc73884e..e8c43c9e1b8 100644 --- a/scripts/zones/Stellar_Fulcrum/IDs.lua +++ b/scripts/zones/Stellar_Fulcrum/IDs.lua @@ -28,6 +28,7 @@ zones[xi.zone.STELLAR_FULCRUM] = }, mob = { + KAMLANAUT = GetFirstID('Kamlanaut'), }, npc = { diff --git a/scripts/zones/Stellar_Fulcrum/bcnms/return_to_delkfutts_tower.lua b/scripts/zones/Stellar_Fulcrum/bcnms/return_to_delkfutts_tower.lua deleted file mode 100644 index 68faa645295..00000000000 --- a/scripts/zones/Stellar_Fulcrum/bcnms/return_to_delkfutts_tower.lua +++ /dev/null @@ -1,39 +0,0 @@ ------------------------------------ --- Area: Stellar Fulcrum --- Name: ZM8 Return to Delkfutt's Tower --- !pos -520 -4 17 179 ------------------------------------ -local battlefieldObject = {} - -battlefieldObject.onBattlefieldTick = function(battlefield, tick) - xi.battlefield.onBattlefieldTick(battlefield, tick) -end - -battlefieldObject.onBattlefieldRegister = function(player, battlefield) -end - -battlefieldObject.onBattlefieldEnter = function(player, battlefield) -end - -battlefieldObject.onBattlefieldLeave = function(player, battlefield, leavecode) - if leavecode == xi.battlefield.leaveCode.WON then -- play end CS. Need time and battle id for record keeping + storage - local _, clearTime, partySize = battlefield:getRecord() - - if player:getCurrentMission(xi.mission.log_id.ZILART) == xi.mission.id.zilart.RETURN_TO_DELKFUTTS_TOWER then - player:setLocalVar('battlefieldWin', battlefield:getID()) - end - - local arg8 = (player:hasCompletedMission(xi.mission.log_id.ZILART, xi.mission.id.zilart.RETURN_TO_DELKFUTTS_TOWER)) and 1 or 0 - player:startEvent(32001, battlefield:getArea(), clearTime, partySize, battlefield:getTimeInside(), 1, battlefield:getLocalVar('[cs]bit'), arg8) - elseif leavecode == xi.battlefield.leaveCode.LOST then - player:startEvent(32002) - end -end - -battlefieldObject.onEventUpdate = function(player, csid, option, npc) -end - -battlefieldObject.onEventFinish = function(player, csid, option, npc) -end - -return battlefieldObject diff --git a/scripts/zones/Stellar_Fulcrum/mobs/Kamlanaut.lua b/scripts/zones/Stellar_Fulcrum/mobs/Kamlanaut.lua index 0a4fea24ee9..3d43c0bc40a 100644 --- a/scripts/zones/Stellar_Fulcrum/mobs/Kamlanaut.lua +++ b/scripts/zones/Stellar_Fulcrum/mobs/Kamlanaut.lua @@ -54,7 +54,6 @@ entity.onMobWeaponSkill = function(target, mob, skill) end entity.onMobDeath = function(mob, player, optParams) - player:addTitle(xi.title.DESTROYER_OF_ANTIQUITY) end return entity diff --git a/scripts/zones/Stellar_Fulcrum/npcs/_4z0.lua b/scripts/zones/Stellar_Fulcrum/npcs/_4z0.lua index 5d8fcf2f4ae..b593264c88b 100644 --- a/scripts/zones/Stellar_Fulcrum/npcs/_4z0.lua +++ b/scripts/zones/Stellar_Fulcrum/npcs/_4z0.lua @@ -5,21 +5,16 @@ ----------------------------------- local entity = {} - entity.onTrade = function(player, npc, trade) - xi.bcnm.onTrade(player, npc, trade) end entity.onTrigger = function(player, npc) - xi.bcnm.onTrigger(player, npc) end -entity.onEventUpdate = function(player, csid, option, extras) - xi.bcnm.onEventUpdate(player, csid, option, extras) +entity.onEventUpdate = function(player, csid, option, npc) end entity.onEventFinish = function(player, csid, option, npc) - xi.bcnm.onEventFinish(player, csid, option, npc) end return entity diff --git a/scripts/zones/Stellar_Fulcrum/npcs/_4z1.lua b/scripts/zones/Stellar_Fulcrum/npcs/_4z1.lua index bffe30065f3..68ed7e41099 100644 --- a/scripts/zones/Stellar_Fulcrum/npcs/_4z1.lua +++ b/scripts/zones/Stellar_Fulcrum/npcs/_4z1.lua @@ -8,26 +8,12 @@ entity.onTrade = function(player, npc, trade) end entity.onTrigger = function(player, npc) - player:startEvent(32003) - return 1 end entity.onEventUpdate = function(player, csid, option, npc) end entity.onEventFinish = function(player, csid, option, npc) - local pZone = player:getZoneID() - - if csid == 32003 and option == 4 then - if player:getCharVar(tostring(pZone) .. '_Fight') == 100 then - player:setCharVar('BCNM_Killed', 0) - player:setCharVar('BCNM_Timer', 0) - end - - player:setCharVar(tostring(pZone) .. '_Runaway', 1) - player:delStatusEffect(xi.effect.BATTLEFIELD) - player:setCharVar(tostring(pZone) .. '_Runaway', 0) - end end return entity diff --git a/scripts/zones/Stellar_Fulcrum/npcs/_4z2.lua b/scripts/zones/Stellar_Fulcrum/npcs/_4z2.lua index bffe30065f3..68ed7e41099 100644 --- a/scripts/zones/Stellar_Fulcrum/npcs/_4z2.lua +++ b/scripts/zones/Stellar_Fulcrum/npcs/_4z2.lua @@ -8,26 +8,12 @@ entity.onTrade = function(player, npc, trade) end entity.onTrigger = function(player, npc) - player:startEvent(32003) - return 1 end entity.onEventUpdate = function(player, csid, option, npc) end entity.onEventFinish = function(player, csid, option, npc) - local pZone = player:getZoneID() - - if csid == 32003 and option == 4 then - if player:getCharVar(tostring(pZone) .. '_Fight') == 100 then - player:setCharVar('BCNM_Killed', 0) - player:setCharVar('BCNM_Timer', 0) - end - - player:setCharVar(tostring(pZone) .. '_Runaway', 1) - player:delStatusEffect(xi.effect.BATTLEFIELD) - player:setCharVar(tostring(pZone) .. '_Runaway', 0) - end end return entity diff --git a/scripts/zones/Stellar_Fulcrum/npcs/_4z3.lua b/scripts/zones/Stellar_Fulcrum/npcs/_4z3.lua index bffe30065f3..68ed7e41099 100644 --- a/scripts/zones/Stellar_Fulcrum/npcs/_4z3.lua +++ b/scripts/zones/Stellar_Fulcrum/npcs/_4z3.lua @@ -8,26 +8,12 @@ entity.onTrade = function(player, npc, trade) end entity.onTrigger = function(player, npc) - player:startEvent(32003) - return 1 end entity.onEventUpdate = function(player, csid, option, npc) end entity.onEventFinish = function(player, csid, option, npc) - local pZone = player:getZoneID() - - if csid == 32003 and option == 4 then - if player:getCharVar(tostring(pZone) .. '_Fight') == 100 then - player:setCharVar('BCNM_Killed', 0) - player:setCharVar('BCNM_Timer', 0) - end - - player:setCharVar(tostring(pZone) .. '_Runaway', 1) - player:delStatusEffect(xi.effect.BATTLEFIELD) - player:setCharVar(tostring(pZone) .. '_Runaway', 0) - end end return entity