diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua index e444153a..c138c87b 100644 --- a/Libs/DF/fw.lua +++ b/Libs/DF/fw.lua @@ -1,6 +1,6 @@ -local dversion = 330 +local dversion = 331 local major, minor = "DetailsFramework-1.0", dversion local DF, oldminor = LibStub:NewLibrary (major, minor) diff --git a/Libs/DF/panel.lua b/Libs/DF/panel.lua index 56fe5374..08becb5b 100644 --- a/Libs/DF/panel.lua +++ b/Libs/DF/panel.lua @@ -17,7 +17,6 @@ local loadstring = loadstring --> lua local local IS_WOW_PROJECT_MAINLINE = WOW_PROJECT_ID == WOW_PROJECT_MAINLINE local IS_WOW_PROJECT_NOT_MAINLINE = WOW_PROJECT_ID ~= WOW_PROJECT_MAINLINE local IS_WOW_PROJECT_CLASSIC_ERA = WOW_PROJECT_ID == WOW_PROJECT_CLASSIC -local IS_WOW_PROJECT_CLASSIC_TBC = WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC local UnitCastingInfo = UnitCastingInfo local UnitChannelInfo = UnitChannelInfo @@ -8679,12 +8678,7 @@ DF.CastFrameFunctions = { end, UpdateChannelInfo = function (self, unit, ...) - local name, text, texture, startTime, endTime, isTradeSkill, notInterruptible, spellID - if not IS_WOW_PROJECT_CLASSIC_TBC then - name, text, texture, startTime, endTime, isTradeSkill, notInterruptible, spellID = UnitChannelInfo (unit) - else - name, text, texture, startTime, endTime, isTradeSkill, spellID = UnitChannelInfo (unit) - end + local name, text, texture, startTime, endTime, isTradeSkill, notInterruptible, spellID = UnitChannelInfo (unit) --> is valid? if (not self:IsValid (unit, name, isTradeSkill, true)) then diff --git a/core/parser.lua b/core/parser.lua index e656fc74..0c17a4dc 100755 --- a/core/parser.lua +++ b/core/parser.lua @@ -303,8 +303,6 @@ --> ignore soul link (damage from the warlock on his pet - current to demonology only) local SPELLID_WARLOCK_SOULLINK = 108446 - --> when checking if can start a new combat, ignore the damage from warlock's burning rush - local SPELLID_WARLOCK_BURNINGRUSH = 111400 --> brewmaster monk guard talent local SPELLID_MONK_GUARD = 115295 --> brewmaster monk stagger mechanics @@ -880,7 +878,7 @@ ------------------------------------------------------------------------------------------------ --> check if need start an combat - if (not _in_combat) then + if (not _in_combat) then --~startcombat ~combatstart if ( token ~= "SPELL_PERIODIC_DAMAGE" and ( (who_flags and _bit_band (who_flags, AFFILIATION_GROUP) ~= 0 and _UnitAffectingCombat (who_name) ) @@ -910,7 +908,9 @@ --> entrar em combate se for dot e for do jogador e o ultimo combate ter sido a mais de 10 segundos atr�s if (token == "SPELL_PERIODIC_DAMAGE" and who_name == _detalhes.playername) then --> ignora burning rush se o jogador estiver fora de combate - if (spellid == SPELLID_WARLOCK_BURNINGRUSH) then + --111400 warlock's burning rush + --368637 is buff from trinket "Scars of Fraternal Strife" which make the player bleed even out-of-combat + if (spellid == 111400 or spellid == 368637) then return end --> faz o calculo dos 10 segundos diff --git a/plugins/Details_DataStorage/Details_DataStorage.toc b/plugins/Details_DataStorage/Details_DataStorage.toc index 4a16a16e..871a8c3e 100644 --- a/plugins/Details_DataStorage/Details_DataStorage.toc +++ b/plugins/Details_DataStorage/Details_DataStorage.toc @@ -1,4 +1,4 @@ -## Interface: 90205 +## Interface: 90207 ## Title: Details!: Storage ## Notes: Stores information for Details! Damage Meter ## DefaultState: Enabled diff --git a/plugins/Details_EncounterDetails/Details_EncounterDetails-BCC.toc b/plugins/Details_EncounterDetails/Details_EncounterDetails-BCC.toc new file mode 100644 index 00000000..6fbfcd2a --- /dev/null +++ b/plugins/Details_EncounterDetails/Details_EncounterDetails-BCC.toc @@ -0,0 +1,17 @@ +## Interface: 20504 +## 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 +## OptionalDeps: Ace3 +## SavedVariablesPerCharacter: EncounterDetailsDB + + +#@no-lib-strip@ +embeds.xml +#@end-no-lib-strip@ + +enUS.lua +ptBR.lua +frames.lua + +Details_EncounterDetails.lua \ No newline at end of file diff --git a/plugins/Details_EncounterDetails/Details_EncounterDetails-Wrath.toc b/plugins/Details_EncounterDetails/Details_EncounterDetails-Wrath.toc new file mode 100644 index 00000000..f74b7652 --- /dev/null +++ b/plugins/Details_EncounterDetails/Details_EncounterDetails-Wrath.toc @@ -0,0 +1,17 @@ +## Interface: 30400 +## 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 +## OptionalDeps: Ace3 +## SavedVariablesPerCharacter: EncounterDetailsDB + + +#@no-lib-strip@ +embeds.xml +#@end-no-lib-strip@ + +enUS.lua +ptBR.lua +frames.lua + +Details_EncounterDetails.lua \ No newline at end of file diff --git a/plugins/Details_EncounterDetails/Details_EncounterDetails.toc b/plugins/Details_EncounterDetails/Details_EncounterDetails.toc index a1a00a42..02cbf81d 100644 --- a/plugins/Details_EncounterDetails/Details_EncounterDetails.toc +++ b/plugins/Details_EncounterDetails/Details_EncounterDetails.toc @@ -1,4 +1,4 @@ -## Interface: 90205 +## Interface: 90207 ## 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 diff --git a/plugins/Details_RaidCheck/Details_RaidCheck-BCC.toc b/plugins/Details_RaidCheck/Details_RaidCheck-BCC.toc new file mode 100644 index 00000000..a501dc10 --- /dev/null +++ b/plugins/Details_RaidCheck/Details_RaidCheck-BCC.toc @@ -0,0 +1,10 @@ +## Interface: 20504 +## 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 + +#@no-lib-strip@ +embeds.xml +#@end-no-lib-strip@ + +Details_RaidCheck.lua \ No newline at end of file diff --git a/plugins/Details_RaidCheck/Details_RaidCheck-Wrath.toc b/plugins/Details_RaidCheck/Details_RaidCheck-Wrath.toc new file mode 100644 index 00000000..ae385fa9 --- /dev/null +++ b/plugins/Details_RaidCheck/Details_RaidCheck-Wrath.toc @@ -0,0 +1,10 @@ +## Interface: 30400 +## 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 + +#@no-lib-strip@ +embeds.xml +#@end-no-lib-strip@ + +Details_RaidCheck.lua \ No newline at end of file diff --git a/plugins/Details_RaidCheck/Details_RaidCheck.lua b/plugins/Details_RaidCheck/Details_RaidCheck.lua index 5a44e9fb..56cde3f9 100644 --- a/plugins/Details_RaidCheck/Details_RaidCheck.lua +++ b/plugins/Details_RaidCheck/Details_RaidCheck.lua @@ -1,4 +1,9 @@ +--do not load if this is a classic version of the game +if (DetailsFramework.IsTBCWow() or DetailsFramework.IsWotLKWow()) then + return +end + local UnitAura = UnitAura local UnitBuff = UnitBuff local GetSpellInfo = GetSpellInfo @@ -751,7 +756,7 @@ end else DetailsRaidCheck:HideToolbarIcon (DetailsRaidCheck.ToolbarButton) DetailsRaidCheck.on_raid = false - if (DetailsRaidCheck.UpdateBuffsTick and not DetailsRaidCheck.UpdateBuffsTick:IsCancelled()) then + if (DetailsRaidCheck.UpdateBuffsTick and not DetailsRaidCheck.UpdateBuffsTick._cancelled) then DetailsRaidCheck.UpdateBuffsTick:Cancel() end end @@ -844,7 +849,7 @@ end DetailsRaidCheck:BuffTrackTick() - if (DetailsRaidCheck.UpdateBuffsTick and not DetailsRaidCheck.UpdateBuffsTick:IsCancelled()) then + if (DetailsRaidCheck.UpdateBuffsTick and not DetailsRaidCheck.UpdateBuffsTick._cancelled) then DetailsRaidCheck.UpdateBuffsTick:Cancel() end @@ -859,7 +864,7 @@ end function DetailsRaidCheck:StopTrackBuffs() DetailsRaidCheck.tracking_buffs = false - if (DetailsRaidCheck.UpdateBuffsTick and not DetailsRaidCheck.UpdateBuffsTick:IsCancelled()) then + if (DetailsRaidCheck.UpdateBuffsTick and not DetailsRaidCheck.UpdateBuffsTick._cancelled) then DetailsRaidCheck.UpdateBuffsTick:Cancel() end end diff --git a/plugins/Details_RaidCheck/Details_RaidCheck.toc b/plugins/Details_RaidCheck/Details_RaidCheck.toc index 1c2ee58b..1cc80166 100644 --- a/plugins/Details_RaidCheck/Details_RaidCheck.toc +++ b/plugins/Details_RaidCheck/Details_RaidCheck.toc @@ -1,4 +1,4 @@ -## Interface: 90205 +## Interface: 90207 ## 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 diff --git a/plugins/Details_Streamer/Details_Streamer.lua b/plugins/Details_Streamer/Details_Streamer.lua index b3917527..38a87fe5 100644 --- a/plugins/Details_Streamer/Details_Streamer.lua +++ b/plugins/Details_Streamer/Details_Streamer.lua @@ -1301,7 +1301,7 @@ function listener:UnregisterMyEvents() listener:UnregisterEvent ("UNIT_SPELLCAST_CHANNEL_UPDATE") listener:UnregisterEvent ("UNIT_SPELLCAST_STOP") - if (not (DetailsFramework.IsTBCWow() or DetailsFramework.IsWotLKWow())) then + if (not DetailsFramework.IsTBCWow() and not DetailsFramework.IsWotLKWow()) then listener:UnregisterEvent ("UNIT_SPELLCAST_INTERRUPTIBLE") listener:UnregisterEvent ("UNIT_SPELLCAST_NOT_INTERRUPTIBLE") end diff --git a/plugins/Details_Streamer/Details_Streamer.toc b/plugins/Details_Streamer/Details_Streamer.toc index abe06666..35c31a66 100644 --- a/plugins/Details_Streamer/Details_Streamer.toc +++ b/plugins/Details_Streamer/Details_Streamer.toc @@ -1,4 +1,4 @@ -## Interface: 90205 +## Interface: 90207 ## Title: Details!: Streamer (plugin) ## Notes: Show which spells you are casting, viewers can see what are you doing and follow your steps. ## RequiredDeps: Details diff --git a/plugins/Details_TinyThreat/Details_TinyThreat.toc b/plugins/Details_TinyThreat/Details_TinyThreat.toc index f4c0df01..6b594732 100644 --- a/plugins/Details_TinyThreat/Details_TinyThreat.toc +++ b/plugins/Details_TinyThreat/Details_TinyThreat.toc @@ -1,4 +1,4 @@ -## Interface: 90205 +## Interface: 90207 ## 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 diff --git a/plugins/Details_Vanguard/Details_Vanguard-BCC.toc b/plugins/Details_Vanguard/Details_Vanguard-BCC.toc new file mode 100644 index 00000000..4c14b643 --- /dev/null +++ b/plugins/Details_Vanguard/Details_Vanguard-BCC.toc @@ -0,0 +1,12 @@ +## Interface: 20504 +## Title: Details!: Vanguard (plugin) +## Notes: Show the health and debuffs for tanks in your group. +## SavedVariablesPerCharacter: _detalhes_databaseVanguard +## RequiredDeps: Details +## OptionalDeps: Ace3 + +#@no-lib-strip@ +embeds.xml +#@end-no-lib-strip@ + +Details_Vanguard.lua \ No newline at end of file diff --git a/plugins/Details_Vanguard/Details_Vanguard-Wrath.toc b/plugins/Details_Vanguard/Details_Vanguard-Wrath.toc new file mode 100644 index 00000000..62356206 --- /dev/null +++ b/plugins/Details_Vanguard/Details_Vanguard-Wrath.toc @@ -0,0 +1,12 @@ +## Interface: 30400 +## Title: Details!: Vanguard (plugin) +## Notes: Show the health and debuffs for tanks in your group. +## SavedVariablesPerCharacter: _detalhes_databaseVanguard +## RequiredDeps: Details +## OptionalDeps: Ace3 + +#@no-lib-strip@ +embeds.xml +#@end-no-lib-strip@ + +Details_Vanguard.lua \ No newline at end of file diff --git a/plugins/Details_Vanguard/Details_Vanguard.lua b/plugins/Details_Vanguard/Details_Vanguard.lua index 111bdf94..525fa23a 100644 --- a/plugins/Details_Vanguard/Details_Vanguard.lua +++ b/plugins/Details_Vanguard/Details_Vanguard.lua @@ -1,3 +1,9 @@ + +--do not load if this is a classic version of the game +if (DetailsFramework.IsTBCWow() or DetailsFramework.IsWotLKWow()) then + return +end + local AceLocale = LibStub ("AceLocale-3.0") local Loc = AceLocale:GetLocale ("Details") local SharedMedia = LibStub:GetLibrary ("LibSharedMedia-3.0") diff --git a/plugins/Details_Vanguard/Details_Vanguard.toc b/plugins/Details_Vanguard/Details_Vanguard.toc index 9f767c51..7d3e0507 100644 --- a/plugins/Details_Vanguard/Details_Vanguard.toc +++ b/plugins/Details_Vanguard/Details_Vanguard.toc @@ -1,4 +1,4 @@ -## Interface: 90205 +## Interface: 90207 ## Title: Details!: Vanguard (plugin) ## Notes: Show the health and debuffs for tanks in your group. ## SavedVariablesPerCharacter: _detalhes_databaseVanguard