Prevent Scars of Fraternal Strife trinket to start combat

This commit is contained in:
Tercio Jose
2022-08-26 15:19:52 -03:00
parent 64e0f15bbf
commit a889dfcd8d
18 changed files with 105 additions and 22 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
local dversion = 330
local dversion = 331
local major, minor = "DetailsFramework-1.0", dversion
local DF, oldminor = LibStub:NewLibrary (major, minor)
+1 -7
View File
@@ -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
+4 -4
View File
@@ -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 atrs
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
@@ -1,4 +1,4 @@
## Interface: 90205
## Interface: 90207
## Title: Details!: Storage
## Notes: Stores information for Details! Damage Meter
## DefaultState: Enabled
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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")
@@ -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