Skip to content

Commit

Permalink
General fixes and implementations
Browse files Browse the repository at this point in the history
- Fixed a bug for healing done from unit to unit (by rubenvrolijk@github).
- Added Vanish to the list of defensive cooldowns for Rogues (by DylanMeador@github).
- Added Ny'alotha raid information (by jjholleman@github).
- Fixed Eye of Corruption and Grand Delusions.
- Fixed an error while retriving data from the guild (statistics sync).
- Updated the ToC files for bundled plugins.
- Segments Locked featured won't work for Overall Data.
- Fixed an issue on Player Details Window where sometimes Death Strike healing done would blink the Rune Weapon healing done.
- Regular Details Framework updates.
  • Loading branch information
Tercioo committed Mar 2, 2020
1 parent 6c3e6ff commit 3d7f299
Show file tree
Hide file tree
Showing 16 changed files with 72 additions and 53 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ locales/Details-enUS.lua
locales/Details-deDE.lua
Libs/LibTranslit/.pkgmeta
a.lua
functions/pack2.lua
20 changes: 15 additions & 5 deletions boot.lua

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion classes/classe_heal.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1898,6 +1898,7 @@ function atributo_heal:MontaInfoHealingDone()
gump:JI_AtualizaContainerBarras (amt)

local max_ = minhas_curas[1] and minhas_curas[1][2] or 0
local foundSpellDetail = false

for index, tabela in _ipairs (minhas_curas) do

Expand Down Expand Up @@ -1929,8 +1930,9 @@ function atributo_heal:MontaInfoHealingDone()
barra.spellid = self.nome
barra:Show()

if (self.detalhes and self.detalhes == barra.show) then
if (self.detalhes and self.detalhes == barra.show and not foundSpellDetail) then
self:MontaDetalhes (self.detalhes, barra)
foundSpellDetail = true
end
end

Expand Down
67 changes: 35 additions & 32 deletions classes/classe_instancia.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2201,42 +2201,45 @@ function _detalhes:TrocaTabela (instancia, segmento, atributo, sub_atributo, ini
if (_detalhes.instances_segments_locked and not iniciando_instancia) then
for _, instance in ipairs (_detalhes.tabela_instancias) do
if (instance.meu_id ~= instancia.meu_id and instance.ativa and not instance._postponing_switch and not instance._postponing_current) then
if (instance.modo == 2 or instance.modo == 3) then
--> na troca de segmento, conferir se a instancia esta frozen
if (instance.freezed) then
if (not iniciando_instancia) then
instance:UnFreeze()
else
instance.freezed = false
print (instance:GetSegment(), instancia:GetSegment())
if (instance:GetSegment() >= 0 and instancia:GetSegment() ~= -1) then
if (instance.modo == 2 or instance.modo == 3) then
--> na troca de segmento, conferir se a instancia esta frozen
if (instance.freezed) then
if (not iniciando_instancia) then
instance:UnFreeze()
else
instance.freezed = false
end
end
end

instance.segmento = segmento

if (segmento == -1) then --> overall
instance.showing = _detalhes.tabela_overall
elseif (segmento == 0) then --> combate atual
instance.showing = _detalhes.tabela_vigente; --print ("==> Changing the Segment now! - classe_instancia.lua 2148")
else --> alguma tabela do hist�rico
instance.showing = _detalhes.tabela_historico.tabelas [segmento]
end

instance.segmento = segmento

if (not instance.showing) then
if (not iniciando_instancia) then
instance:Freeze()
if (segmento == -1) then --> overall
instance.showing = _detalhes.tabela_overall
elseif (segmento == 0) then --> combate atual
instance.showing = _detalhes.tabela_vigente; --print ("==> Changing the Segment now! - classe_instancia.lua 2148")
else --> alguma tabela do hist�rico
instance.showing = _detalhes.tabela_historico.tabelas [segmento]
end
return
end

instance.v_barras = true
instance.showing [atributo].need_refresh = true

if (not _detalhes.initializing and not iniciando_instancia) then
instance:ResetaGump()
instance:AtualizaGumpPrincipal (true)

if (not instance.showing) then
if (not iniciando_instancia) then
instance:Freeze()
end
return
end

instance.v_barras = true
instance.showing [atributo].need_refresh = true

if (not _detalhes.initializing and not iniciando_instancia) then
instance:ResetaGump()
instance:AtualizaGumpPrincipal (true)
end

_detalhes:SendEvent ("DETAILS_INSTANCE_CHANGESEGMENT", nil, instance, segmento)
end

_detalhes:SendEvent ("DETAILS_INSTANCE_CHANGESEGMENT", nil, instance, segmento)
end
end
end
Expand Down
3 changes: 3 additions & 0 deletions core/control.lua
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,9 @@
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--> internal functions
-- _detalhes.statistics = {container_calls = 0, container_pet_calls = 0, container_unknow_pet = 0, damage_calls = 0, heal_calls = 0, absorbs_calls = 0, energy_calls = 0, pets_summons = 0}
function _detalhes:StartCombat(...)
return _detalhes:EntrarEmCombate (...)
end

-- ~start ~inicio ~novo �ovo
function _detalhes:EntrarEmCombate (...)
Expand Down
5 changes: 3 additions & 2 deletions core/windows.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1243,7 +1243,7 @@
end

--wallpaper
local background = f:CreateTexture (nil, "border")
local background = f:CreateTexture ("$parentBackgroundImage", "border")
background:SetAlpha (0.3)
background:SetPoint ("topleft", f, "topleft", 6, -65)
background:SetPoint ("bottomright", f, "bottomright", -10, 28)
Expand Down Expand Up @@ -1386,7 +1386,7 @@

--received one encounter table
elseif (guildSyncID == "A") then
f.DownloadedAmount = f.DownloadedAmount + 1
f.DownloadedAmount = (f.DownloadedAmount or 0) + 1

--size = 1 byte per characters in the string
f.EstimateSize = length * f.RequestedAmount > f.EstimateSize and length * f.RequestedAmount or f.RequestedAmount
Expand Down Expand Up @@ -1454,6 +1454,7 @@
local instanceId = _detalhes:GetInstanceIdFromEncounterId (encounterId)
if (instanceId) then
local file, L, R, T, B = _detalhes:GetRaidBackground (instanceId)

background:SetTexture (file)
background:SetTexCoord (L, R, T, B)
end
Expand Down
13 changes: 6 additions & 7 deletions functions/raidinfo.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@

do
--> data for Ny'alotha the Waking City (BFA tier 4)

--F:\World of Warcraft\_retail_\BlizzardInterfaceArt\Interface\GLUES\LOADINGSCREENS\Expansion07\Main\LOADINGSCREEN_NzothRAID
local INSTANCE_EJID = 1180
local INSTANCE_MAPID = 2217
local HDIMAGESPATH = "Details\\images\\raid"
local HDIMAGESPATH = [[Details\images\raid]]
local HDFILEPREFIX = "NyalothaRaid"
local LOADINGSCREEN_FILE, LOADINGSCREEN_COORDS = "Expansion07\\Main\\LoadingScreen_Nzothraid", {0, 1, 285/1024, 875/1024}
local LOADINGSCREEN_FILE, LOADINGSCREEN_COORDS = [[Expansion07\Main\LOADINGSCREEN_NzothRAID]], {0, 1, 285/1024, 875/1024}
local EJ_LOREBG = "UI-EJ-LOREBG-Nyalotha"

local PORTRAIT_LIST = {
3256385, --Wrathion - Wrathion, the Black Emperor
3256380, --Maut
Expand Down Expand Up @@ -77,23 +77,22 @@ do
tinsert (BOSSNAMES, bossName)
local encounterTable = {
boss = bossName,
--portrait = "Interface\\EncounterJournal\\" .. PORTRAIT_LIST [i],
portrait = PORTRAIT_LIST [i],
}
tinsert (ENCOUNTERS, encounterTable)
else
break
end
end

_detalhes:InstallEncounter ({
id = INSTANCE_MAPID, --map id
ej_id = INSTANCE_EJID, --encounter journal id
name = InstanceName,
icons = "Interface\\AddOns\\" .. HDIMAGESPATH .. "\\" .. HDFILEPREFIX .. "_BossFaces",
icon = "Interface\\AddOns\\" .. HDIMAGESPATH .. "\\" .. HDFILEPREFIX .. "_Icon256x128",
is_raid = true,
backgroundFile = {file = "Interface\\Glues\\LOADINGSCREENS\\" .. LOADINGSCREEN_FILE, coords = LOADINGSCREEN_COORDS},
backgroundFile = {file = [[Interface\GLUES\LOADINGSCREENS\]] .. LOADINGSCREEN_FILE, coords = LOADINGSCREEN_COORDS},
backgroundEJ = "Interface\\EncounterJournal\\" .. EJ_LOREBG,

encounter_ids = ENCOUNTER_ID_EJ,
Expand Down
2 changes: 1 addition & 1 deletion plugins/Details_DataStorage/Details_DataStorage.toc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Interface: 80205
## Interface: 80300
## Title: Details!: Storage
## Notes: Stores information for Details! Damage Meter
## DefaultState: Enabled
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Interface: 80205
## Interface: 80300
## Title: Details!: Encounter Breakdown (plugin)
## Notes: Show detailed information about a boss encounter. Also provide damage per phase, graphic charts, easy weakauras creation.
## RequiredDeps: Details
Expand Down
Binary file removed plugins/Details_EncounterDetails/images/boss_bg.tga
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion plugins/Details_RaidCheck/Details_RaidCheck.toc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Interface: 80205
## Interface: 80300
## Title: Details!: Raid Check (plugin)
## Notes: Show talents and item level for all members in your group, also shows food and flask state.
## RequiredDeps: Details
Expand Down
2 changes: 1 addition & 1 deletion plugins/Details_Streamer/Details_Streamer.toc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Interface: 80205
## Interface: 80300
## Title: Details!: Streamer (plugin)
## Notes: Show which spells you are casting, viewers can see what are you doing and follow your steps.
## RequiredDeps: Details
Expand Down
2 changes: 1 addition & 1 deletion plugins/Details_TinyThreat/Details_TinyThreat.toc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Interface: 80205
## Interface: 80300
## Title: Details!: Tiny Threat (plugin)
## Notes: Threat meter plugin, show threat for group members in the window. Select it from the Plugin menu in the Orange Cogwheel.
## RequiredDeps: Details
Expand Down
2 changes: 1 addition & 1 deletion plugins/Details_Vanguard/Details_Vanguard.toc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Interface: 80205
## Interface: 80300
## Title: Details!: Vanguard (plugin)
## Notes: Show the health and debuffs for tanks in your group.
## SavedVariablesPerCharacter: _detalhes_databaseVanguard
Expand Down

0 comments on commit 3d7f299

Please sign in to comment.