Skip to content

Commit

Permalink
Update BRP.lua
Browse files Browse the repository at this point in the history 
Removed unnecessary formating changes, now only the priority is changed
  • Loading branch information
@JNSlevin
JNSlevin authored Jun 10, 2023
1 parent 983407c commit 9edea8b
Showing 1 changed file with 69 additions and 57 deletions.
126 changes: 69 additions & 57 deletions src/zones/BRP.lua
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
local WW = WizardsWardrobe
WW.zones[ "BRP" ] = {}
local BRP = WW.zones[ "BRP" ]
WW.zones["BRP"] = {}
local BRP = WW.zones["BRP"]

BRP.name = GetString( WW_BRP_NAME )
BRP.name = GetString(WW_BRP_NAME)
BRP.tag = "BRP"
BRP.icon = "/esoui/art/icons/achievement_blackrose_veteran.dds"
BRP.priority = 13
BRP.id = 1082
BRP.node = 378

BRP.bosses = {
[ 1 ] = {
name = GetString( WW_TRASH ),
[1] = {
name = GetString(WW_TRASH),
},
[ 2 ] = {
name = GetString( WW_BRP_FIRST ),
[2] = {
name = GetString(WW_BRP_FIRST),
},
[ 3 ] = {
name = GetString( WW_BRP_SECOND ),
[3] = {
name = GetString(WW_BRP_SECOND),
},
[ 4 ] = {
name = GetString( WW_BRP_THIRD ),
[4] = {
name = GetString(WW_BRP_THIRD),
},
[ 5 ] = {
name = GetString( WW_BRP_FOURTH ),
[5] = {
name = GetString(WW_BRP_FOURTH),
},
[ 6 ] = {
name = GetString( WW_BRP_FIFTH ),
[6] = {
name = GetString(WW_BRP_FIFTH),
},
}

Expand Down Expand Up @@ -67,38 +67,38 @@ BRP.PORTALID = 114578

function BRP.Init()
BRP.lastArena = 0

BRP.lastPortalSpawn = 0
BRP.currentRound = 0
BRP.currentWave = 0

EVENT_MANAGER:UnregisterForEvent( WW.name, EVENT_BOSSES_CHANGED )
EVENT_MANAGER:RegisterForUpdate( WW.name .. BRP.tag .. "MovementLoop", 2000, BRP.OnMovement )
EVENT_MANAGER:RegisterForEvent( WW.name .. BRP.tag, EVENT_PLAYER_COMBAT_STATE, BRP.OnCombatChange )

EVENT_MANAGER:RegisterForEvent( WW.name .. BRP.tag .. "PortalSpawn", EVENT_COMBAT_EVENT, BRP.OnPortalSpawn )
EVENT_MANAGER:AddFilterForEvent( WW.name .. BRP.tag .. "PortalSpawn", EVENT_COMBAT_EVENT, REGISTER_FILTER_ABILITY_ID, BRP.PORTALID )
EVENT_MANAGER:RegisterForEvent( WW.name .. BRP.tag .. "LastWave", EVENT_DISPLAY_ANNOUNCEMENT, BRP.OnLastWave )
EVENT_MANAGER:UnregisterForEvent(WW.name, EVENT_BOSSES_CHANGED)
EVENT_MANAGER:RegisterForUpdate(WW.name .. BRP.tag .. "MovementLoop", 2000, BRP.OnMovement)
EVENT_MANAGER:RegisterForEvent(WW.name .. BRP.tag, EVENT_PLAYER_COMBAT_STATE, BRP.OnCombatChange)
EVENT_MANAGER:RegisterForEvent(WW.name .. BRP.tag.. "PortalSpawn", EVENT_COMBAT_EVENT, BRP.OnPortalSpawn)
EVENT_MANAGER:AddFilterForEvent(WW.name .. BRP.tag.. "PortalSpawn", EVENT_COMBAT_EVENT, REGISTER_FILTER_ABILITY_ID, BRP.PORTALID)
EVENT_MANAGER:RegisterForEvent(WW.name .. BRP.tag .. "LastWave", EVENT_DISPLAY_ANNOUNCEMENT, BRP.OnLastWave)
end

function BRP.Reset()
EVENT_MANAGER:UnregisterForEvent( WW.name .. BRP.tag, EVENT_PLAYER_COMBAT_STATE )
EVENT_MANAGER:UnregisterForUpdate( WW.name .. BRP.tag .. "MovementLoop" )
EVENT_MANAGER:RegisterForEvent( WW.name, EVENT_BOSSES_CHANGED, WW.OnBossChange )

EVENT_MANAGER:UnregisterForEvent( WW.name .. BRP.tag .. "PortalSpawn" )
EVENT_MANAGER:UnregisterForEvent( WW.name .. BRP.tag .. "LastWave" )
EVENT_MANAGER:UnregisterForEvent(WW.name .. BRP.tag, EVENT_PLAYER_COMBAT_STATE)
EVENT_MANAGER:UnregisterForUpdate(WW.name .. BRP.tag .. "MovementLoop")
EVENT_MANAGER:RegisterForEvent(WW.name, EVENT_BOSSES_CHANGED, WW.OnBossChange)
EVENT_MANAGER:UnregisterForEvent(WW.name .. BRP.tag.. "PortalSpawn")
EVENT_MANAGER:UnregisterForEvent(WW.name .. BRP.tag .. "LastWave")
end

function BRP.OnBossChange( bossName )
WW.conditions.OnBossChange( bossName )
function BRP.OnBossChange(bossName)
WW.conditions.OnBossChange(bossName)
end

function BRP.OnCombatChange( _, inCombat )
function BRP.OnCombatChange(_, inCombat)
if inCombat == true then
EVENT_MANAGER:UnregisterForUpdate( WW.name .. BRP.tag .. "MovementLoop" )
EVENT_MANAGER:UnregisterForUpdate(WW.name .. BRP.tag .. "MovementLoop")
else
EVENT_MANAGER:RegisterForUpdate( WW.name .. BRP.tag .. "MovementLoop", 2000, BRP.OnMovement )
EVENT_MANAGER:RegisterForUpdate(WW.name .. BRP.tag .. "MovementLoop", 2000, BRP.OnMovement)
end
end

Expand All @@ -107,44 +107,56 @@ function BRP.OnMovement()
--d("Arena " .. tostring(arena) .. " / Last arena " .. BRP.lastArena)
if arena == 0 and BRP.lastArena > 0 then
--d("Trash!")
WW.OnBossChange( _, true, "" )
WW.OnBossChange(_, true, "")
end
BRP.lastArena = arena
end

function BRP.GetStageByLocation()
local zone, x, y, z = GetUnitWorldPosition( "player" )

local zone, x, y, z = GetUnitWorldPosition("player")
if x > BRP.LOCATIONS.FIRST.x1 and x < BRP.LOCATIONS.FIRST.x2
and z > BRP.LOCATIONS.FIRST.z1 and z < BRP.LOCATIONS.FIRST.z2 then

return 1

elseif x > BRP.LOCATIONS.SECOND.x1 and x < BRP.LOCATIONS.SECOND.x2
and z > BRP.LOCATIONS.SECOND.z1 and z < BRP.LOCATIONS.SECOND.z2 then

return 2

elseif x > BRP.LOCATIONS.THIRD.x1 and x < BRP.LOCATIONS.THIRD.x2
and z > BRP.LOCATIONS.THIRD.z1 and z < BRP.LOCATIONS.THIRD.z2 then

return 3

elseif x > BRP.LOCATIONS.FORTH.x1 and x < BRP.LOCATIONS.FORTH.x2
and z > BRP.LOCATIONS.FORTH.z1 and z < BRP.LOCATIONS.FORTH.z2 then

return 4

elseif x > BRP.LOCATIONS.FIFTH.x1 and x < BRP.LOCATIONS.FIFTH.x2
and z > BRP.LOCATIONS.FIFTH.z1 and z < BRP.LOCATIONS.FIFTH.z2 then

return 5

else

return 0

end
end

-- Stuff below stolen from BRHelper (with permission)
-- https://www.esoui.com/downloads/info2181-BlackrosePrisonHelper.html
function BRP.OnLastWave( _, title )
if title == GetString( WW_BRP_FINALROUND ) then
function BRP.OnLastWave(_, title)
if title == GetString(WW_BRP_FINALROUND) then
BRP.currentRound = 5
BRP.currentWave = 0
else
local round = string.match( title, "^.+%s(%d)$" )
local round = string.match(title, '^.+%s(%d)$')
if round then
BRP.currentRound = tonumber( round )
BRP.currentRound = tonumber(round)
BRP.currentWave = 0
end
end
Expand All @@ -154,30 +166,30 @@ function BRP.Wave()
local stage = BRP.GetStageByLocation()
local round = BRP.currentRound
local wave = BRP.currentWave

-- STAGE 1
if stage == 1 then
if round == 4 and wave == 3 then WW.OnBossChange( _, true, GetString( WW_BRP_FIRST ) ) end

-- STAGE 2
if round == 4 and wave == 3 then WW.OnBossChange(_, true, GetString(WW_BRP_FIRST)) end
-- STAGE 2
elseif stage == 2 then
if round == 4 and wave == 2 then WW.OnBossChange( _, true, GetString( WW_BRP_SECOND ) ) end

-- STAGE 3
if round == 4 and wave == 2 then WW.OnBossChange(_, true, GetString(WW_BRP_SECOND)) end
-- STAGE 3
elseif stage == 3 then
if round == 4 and wave == 3 then WW.OnBossChange( _, true, GetString( WW_BRP_THIRD ) ) end

-- STAGE 4
if round == 4 and wave == 3 then WW.OnBossChange(_, true, GetString(WW_BRP_THIRD)) end
-- STAGE 4
elseif stage == 4 then
if round == 4 and wave == 3 then WW.OnBossChange( _, true, GetString( WW_BRP_FOURTH ) ) end

-- STAGE 5
if round == 4 and wave == 3 then WW.OnBossChange(_, true, GetString(WW_BRP_FOURTH)) end
-- STAGE 5
elseif stage == 5 then
if round == 4 and wave == 3 then WW.OnBossChange( _, true, GetString( WW_BRP_FIFTH ) ) end
if round == 4 and wave == 3 then WW.OnBossChange(_, true, GetString(WW_BRP_FIFTH)) end
end
end

function BRP.OnPortalSpawn( _, result, _, _, _, _, _, _, _, _, _, _, _, _, _, _, abilityId )
function BRP.OnPortalSpawn(_, result, _, _, _, _, _, _, _, _, _, _, _, _, _, _, abilityId)
if result == ACTION_RESULT_EFFECT_GAINED then
local spawnTime = GetGameTimeMilliseconds()
if spawnTime - BRP.lastPortalSpawn > 2000 then
Expand Down

0 comments on commit 9edea8b

Please sign in to comment.