Exiles/coa-details
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

changes

Browse Source
This commit is contained in:
Tercio Jose
2021-04-03 18:40:01 -03:00
parent f82f706bfa
commit 10936adf71
25 changed files with 344 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Details.toc
+1
View File
@@ -128,6 +128,7 @@ core\meta.lua
core\network.lua
core\parser.lua
#core\parser_timewalk.lua
functions\loaddata.lua
Libs/DF/DFPixelUtil.lua
+66
View File
@@ -0,0 +1,66 @@
DFPixelUtil = {};
function DFPixelUtil.GetPixelToUIUnitFactor()
local physicalWidth, physicalHeight = GetPhysicalScreenSize();
return 768.0 / physicalHeight;
end
function DFPixelUtil.GetNearestPixelSize(uiUnitSize, layoutScale, minPixels)
if uiUnitSize == 0 and (not minPixels or minPixels == 0) then
return 0;
end
local uiUnitFactor = DFPixelUtil.GetPixelToUIUnitFactor();
local numPixels = Round((uiUnitSize * layoutScale) / uiUnitFactor);
local rawNumPixels = numPixels;
if minPixels then
if uiUnitSize < 0.0 then
if numPixels > -minPixels then
numPixels = -minPixels;
end
else
if numPixels < minPixels then
numPixels = minPixels;
end
end
end
return numPixels * uiUnitFactor / layoutScale;
end
function DFPixelUtil.SetWidth(region, width, minPixels)
region:SetWidth(DFPixelUtil.GetNearestPixelSize(width, region:GetEffectiveScale(), minPixels));
end
function DFPixelUtil.SetHeight(region, height, minPixels)
region:SetHeight(DFPixelUtil.GetNearestPixelSize(height, region:GetEffectiveScale(), minPixels));
end
function DFPixelUtil.SetSize(region, width, height, minWidthPixels, minHeightPixels)
DFPixelUtil.SetWidth(region, width, minWidthPixels);
DFPixelUtil.SetHeight(region, height, minHeightPixels);
end
function DFPixelUtil.SetPoint(region, point, relativeTo, relativePoint, offsetX, offsetY, minOffsetXPixels, minOffsetYPixels)
region:SetPoint(point, relativeTo, relativePoint,
DFPixelUtil.GetNearestPixelSize(offsetX, region:GetEffectiveScale(), minOffsetXPixels),
DFPixelUtil.GetNearestPixelSize(offsetY, region:GetEffectiveScale(), minOffsetYPixels)
);
end
function DFPixelUtil.SetStatusBarValue(statusBar, value)
local width = statusBar:GetWidth();
if width and width > 0.0 then
local min, max = statusBar:GetMinMaxValues();
local percent = ClampedPercentageBetween(value, min, max);
if percent == 0.0 or percent == 1.0 then
statusBar:SetValue(value);
else
local numPixels = DFPixelUtil.GetNearestPixelSize(statusBar:GetWidth() * percent, statusBar:GetEffectiveScale());
local roundedValue = Lerp(min, max, numPixels / width);
statusBar:SetValue(roundedValue);
end
else
statusBar:SetValue(value);
end
end
Libs/DF/cooltip.lua
+2
View File
@@ -22,6 +22,8 @@ local _GetScreenHeight = GetScreenHeight
local _UIParent = UIParent
local _CreateFrame = CreateFrame
local PixelUtil = PixelUtil or DFPixelUtil
local version = 2
function DF:CreateCoolTip()
Libs/DF/fw.lua
+16 -3
View File
@@ -1,6 +1,6 @@
local dversion = 238
local dversion = 241
local major, minor = "DetailsFramework-1.0", dversion
local DF, oldminor = LibStub:NewLibrary (major, minor)
@@ -35,10 +35,11 @@ DF.AuthorInfo = {
Discord = "https://discord.gg/AGSzAZX",
}
local PixelUtil = PixelUtil or DFPixelUtil
if (not PixelUtil) then
--check if is in classic wow, if it is, build a replacement for PixelUtil
--check if is in classic or TBC wow, if it is, build a replacement for PixelUtil
local gameVersion = GetBuildInfo()
if (gameVersion:match("%d") == "1") then
if (gameVersion:match("%d") == "1" or gameVersion:match("%d") == "2") then
PixelUtil = {
SetWidth = function (self, width) self:SetWidth (width) end,
SetHeight = function (self, height) self:SetHeight (height) end,
@@ -48,6 +49,10 @@ if (not PixelUtil) then
end
end
function DF.IsTimewalkWoW()
return DF.IsClassicWow() or DF.IsTBCWow()
end
function DF.IsClassicWow()
local gameVersion = GetBuildInfo()
if (gameVersion:match ("%d") == "1") then
@@ -56,6 +61,14 @@ function DF.IsClassicWow()
return false
end
function DF.IsTBCWow()
local gameVersion = GetBuildInfo()
if (gameVersion:match ("%d") == "2") then
return true
end
return false
end
function DF.UnitGroupRolesAssigned (unitId)
if (UnitGroupRolesAssigned) then
return UnitGroupRolesAssigned (unitId)
Libs/DF/load.xml
+1
View File
@@ -1,5 +1,6 @@
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd">
<Script file ="DFPixelUtil.lua"/>
<Script file="fw.lua"/>
<Script file="addon.lua"/>
<Script file="colors.lua"/>
Libs/DF/panel.lua
+53 -24
View File
@@ -14,6 +14,8 @@ local _type = type --> lua local
local _math_floor = math.floor --> lua local
local loadstring = loadstring --> lua local
local PixelUtil = PixelUtil or DFPixelUtil
local UnitGroupRolesAssigned = DetailsFramework.UnitGroupRolesAssigned
local cleanfunction = function() end
@@ -6004,11 +6006,15 @@ local default_load_conditions_frame_options = {
function DF:CreateLoadFilterParser (callback)
local f = CreateFrame ("frame")
f:RegisterEvent ("PLAYER_ENTERING_WORLD")
f:RegisterEvent ("PLAYER_SPECIALIZATION_CHANGED")
f:RegisterEvent ("PLAYER_TALENT_UPDATE")
if WOW_PROJECT_ID ~= WOW_PROJECT_CLASSIC then
f:RegisterEvent ("PLAYER_SPECIALIZATION_CHANGED")
f:RegisterEvent ("PLAYER_TALENT_UPDATE")
end
f:RegisterEvent ("PLAYER_ROLES_ASSIGNED")
f:RegisterEvent ("ZONE_CHANGED_NEW_AREA")
f:RegisterEvent ("CHALLENGE_MODE_START")
if WOW_PROJECT_ID ~= WOW_PROJECT_CLASSIC then
f:RegisterEvent ("CHALLENGE_MODE_START")
end
f:RegisterEvent ("ENCOUNTER_START")
f:RegisterEvent ("PLAYER_REGEN_ENABLED")
@@ -7189,15 +7195,15 @@ DF.StatusBarFunctions = {
Width = 100,
Height = 20,
}
healthBarMetaFunctions.HealthBarEvents = {
{"PLAYER_ENTERING_WORLD"},
{"UNIT_HEALTH", true},
{"UNIT_MAXHEALTH", true},
--{"UNIT_HEALTH_FREQUENT", true},
{"UNIT_HEAL_PREDICTION", true},
{"UNIT_ABSORB_AMOUNT_CHANGED", true},
{"UNIT_HEAL_ABSORB_AMOUNT_CHANGED", true},
{(WOW_PROJECT_ID ~= WOW_PROJECT_CLASSIC) and "UNIT_HEAL_PREDICTION", true},
{(WOW_PROJECT_ID ~= WOW_PROJECT_CLASSIC) and "UNIT_ABSORB_AMOUNT_CHANGED", true},
{(WOW_PROJECT_ID ~= WOW_PROJECT_CLASSIC) and "UNIT_HEAL_ABSORB_AMOUNT_CHANGED", true},
}
--> setup the castbar to be used by another unit
@@ -7215,22 +7221,28 @@ DF.StatusBarFunctions = {
for _, eventTable in ipairs (self.HealthBarEvents) do
local event = eventTable [1]
local isUnitEvent = eventTable [2]
if (isUnitEvent) then
self:RegisterUnitEvent (event, self.displayedUnit, self.unit)
else
self:RegisterEvent (event)
if event then
if (isUnitEvent) then
self:RegisterUnitEvent (event, self.displayedUnit, self.unit)
else
self:RegisterEvent (event)
end
end
end
--> check for settings and update some events
if (not self.Settings.ShowHealingPrediction) then
self:UnregisterEvent ("UNIT_HEAL_PREDICTION")
self:UnregisterEvent ("UNIT_HEAL_ABSORB_AMOUNT_CHANGED")
if WOW_PROJECT_ID ~= WOW_PROJECT_CLASSIC then
self:UnregisterEvent ("UNIT_HEAL_PREDICTION")
self:UnregisterEvent ("UNIT_HEAL_ABSORB_AMOUNT_CHANGED")
end
self.incomingHealIndicator:Hide()
self.healAbsorbIndicator:Hide()
end
if (not self.Settings.ShowShields) then
self:UnregisterEvent ("UNIT_ABSORB_AMOUNT_CHANGED")
if WOW_PROJECT_ID ~= WOW_PROJECT_CLASSIC then
self:UnregisterEvent ("UNIT_ABSORB_AMOUNT_CHANGED")
end
self.shieldAbsorbIndicator:Hide()
self.shieldAbsorbGlow:Hide()
end
@@ -7247,7 +7259,9 @@ DF.StatusBarFunctions = {
--> remove all registered events
for _, eventTable in ipairs (self.HealthBarEvents) do
local event = eventTable [1]
self:UnregisterEvent (event)
if event then
self:UnregisterEvent (event)
end
end
--> remove scripts
@@ -7319,6 +7333,7 @@ DF.StatusBarFunctions = {
--health and absorbs prediction
healthBarMetaFunctions.UpdateHealPrediction = function (self)
if WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then return end
local currentHealth = self.currentHealth
local currentHealthMax = self.currentHealthMax
local healthPercent = currentHealth / currentHealthMax
@@ -7774,8 +7789,8 @@ DF.CastFrameFunctions = {
{"UNIT_SPELLCAST_CHANNEL_START"},
{"UNIT_SPELLCAST_CHANNEL_UPDATE"},
{"UNIT_SPELLCAST_CHANNEL_STOP"},
{"UNIT_SPELLCAST_INTERRUPTIBLE"},
{"UNIT_SPELLCAST_NOT_INTERRUPTIBLE"},
{(WOW_PROJECT_ID ~= WOW_PROJECT_CLASSIC) and "UNIT_SPELLCAST_INTERRUPTIBLE"},
{(WOW_PROJECT_ID ~= WOW_PROJECT_CLASSIC) and "UNIT_SPELLCAST_NOT_INTERRUPTIBLE"},
{"PLAYER_ENTERING_WORLD"},
{"UNIT_SPELLCAST_START", true},
{"UNIT_SPELLCAST_STOP", true},
@@ -7975,10 +7990,12 @@ DF.CastFrameFunctions = {
local event = eventTable [1]
local isUnitEvent = eventTable [2]
if (isUnitEvent) then
self:RegisterUnitEvent (event, unit)
else
self:RegisterEvent (event)
if event then
if (isUnitEvent) then
self:RegisterUnitEvent (event, unit)
else
self:RegisterEvent (event)
end
end
end
@@ -8007,7 +8024,9 @@ DF.CastFrameFunctions = {
else
for _, eventTable in ipairs (self.CastBarEvents) do
local event = eventTable [1]
self:UnregisterEvent (event)
if event then
self:UnregisterEvent (event)
end
end
--> register main events
@@ -8302,6 +8321,11 @@ DF.CastFrameFunctions = {
UNIT_SPELLCAST_START = function (self, unit)
local name, text, texture, startTime, endTime, isTradeSkill, castID, notInterruptible, spellID = UnitCastingInfo (unit)
if WOW_PROJECT_ID ~= WOW_PROJECT_CLASSIC then
name, text, texture, startTime, endTime, isTradeSkill, castID, notInterruptible, spellID = UnitCastingInfo (unit)
else
name, text, texture, startTime, endTime, isTradeSkill, castID, spellID = UnitCastingInfo (unit)
end
--> is valid?
if (not self:IsValid (unit, name, isTradeSkill, true)) then
@@ -8357,7 +8381,12 @@ DF.CastFrameFunctions = {
end,
UNIT_SPELLCAST_CHANNEL_START = function (self, unit, ...)
local name, text, texture, startTime, endTime, isTradeSkill, notInterruptible, spellID = UnitChannelInfo (unit)
local name, text, texture, startTime, endTime, isTradeSkill, notInterruptible, spellID
if WOW_PROJECT_ID ~= WOW_PROJECT_CLASSIC then
name, text, texture, startTime, endTime, isTradeSkill, notInterruptible, spellID = UnitChannelInfo (unit)
else
name, text, texture, startTime, endTime, isTradeSkill, spellID = UnitChannelInfo (unit)
end
--> is valid?
if (not self:IsValid (unit, name, isTradeSkill, true)) then
@@ -8964,7 +8993,7 @@ end
--> todo: see what 'UnitTargetsVehicleInRaidUI' is, there's a call for this in the CompactUnitFrame.lua but zero documentation
CheckVehiclePossession = function (self)
--> this unit is possessing a vehicle?
local unitPossessVehicle = UnitHasVehicleUI (self.unit)
local unitPossessVehicle = (WOW_PROJECT_ID ~= WOW_PROJECT_CLASSIC) and UnitHasVehicleUI (self.unit) or false
if (unitPossessVehicle) then
if (not self.unitInVehicle) then
if (UnitIsUnit ("player", self.unit)) then
Libs/LibRaidStatus/LibRaidStatus.lua
+29 -5
View File
@@ -49,8 +49,19 @@ LIB_RAID_STATUS_CAN_LOAD = false
end
end
local isTimewalkWoW = function()
local gameVersion = GetBuildInfo()
if (gameVersion:match("%d") == "1" or gameVersion:match("%d") == "2") then
return true
end
end
--return the current specId of the player
function raidStatusLib.GetPlayerSpecId()
if (isTimewalkWoW()) then
return 0
end
local spec = GetSpecialization()
if (spec) then
local specId = GetSpecializationInfo(spec)
@@ -541,8 +552,12 @@ LIB_RAID_STATUS_CAN_LOAD = false
eventFrame:RegisterEvent("PLAYER_ENTERING_WORLD")
eventFrame:RegisterEvent("PLAYER_REGEN_DISABLED")
eventFrame:RegisterEvent("PLAYER_REGEN_ENABLED")
--eventFrame:RegisterEvent("PLAYER_SPECIALIZATION_CHANGED")
eventFrame:RegisterEvent("PLAYER_TALENT_UPDATE")
if (not isTimewalkWoW()) then
eventFrame:RegisterEvent("PLAYER_TALENT_UPDATE")
end
eventFrame:RegisterEvent("PLAYER_DEAD")
eventFrame:RegisterEvent("PLAYER_ALIVE")
eventFrame:RegisterEvent("PLAYER_UNGHOST")
@@ -551,8 +566,6 @@ LIB_RAID_STATUS_CAN_LOAD = false
eventFunctions[event](...)
end)
--------------------------------------------------------------------------------------------------------------------------------
--> ~main ~control
@@ -1098,8 +1111,13 @@ end)
end
--item level
local _, itemLevel = GetAverageItemLevel()
itemLevel = floor(itemLevel)
local itemLevel
if (_G.GetAverageItemLevel) then
local _, _itemLevel = GetAverageItemLevel()
itemLevel = floor(_itemLevel)
else
itemLevel = 0
end
--repair status
local gearDurability = raidStatusLib.gearManager.GetGearDurability()
@@ -1343,6 +1361,12 @@ end
function raidStatusLib.playerInfoManager.GetPlayerFullInfo()
local playerInfo = {}
if (isTimewalkWoW()) then
--indexes: specId, renown, covenant, talent, conduits
--return a placeholder table
return {0, 0, 0, {0, 0, 0, 0, 0, 0, 0}, {0, 0}}
end
--spec
local specId = 0
local selectedSpecialization = GetSpecialization()
classes/class_damage.lua
+1 -1
View File
@@ -3065,7 +3065,7 @@ function atributo_damage:ToolTip_DamageDone (instancia, numero, barra, keydown)
Details:AddTooltipHeaderStatusbar (r, g, b, barAlha)
end
local topAbility = ActorSkillsSortTable [1] and ActorSkillsSortTable [1][2] or 0
local topAbility = ActorSkillsSortTable [1] and ActorSkillsSortTable [1][2] or 0.0001
if (#ActorSkillsSortTable > 0) then
for i = 1, _math_min (tooltip_max_abilities, #ActorSkillsSortTable) do
classes/container_actors.lua
-1
View File
@@ -519,7 +519,6 @@
--> try to find the owner
if (flag and _bit_band (flag, OBJECT_TYPE_PETGUARDIAN) ~= 0) then
--[[statistics]]-- _detalhes.statistics.container_unknow_pet = _detalhes.statistics.container_unknow_pet + 1
local find_nome, find_owner = find_pet_owner (serial, nome, flag, self)
if (find_nome and find_owner) then
core/gears.lua
+2 -2
View File
@@ -14,7 +14,7 @@ local ItemUpgradeInfo = LibStub ("LibItemUpgradeInfo-1.0")
local ItemUpgradeInfo
local LibGroupInSpecT
if (DetailsFramework.IsClassicWow()) then
if (DetailsFramework.IsTimewalkWoW()) then
ItemUpgradeInfo = false
LibGroupInSpecT = false
end
@@ -1960,7 +1960,7 @@ function ilvl_core:CalcItemLevel (unitid, guid, shout)
local spec
local talents = {}
if (not DetailsFramework.IsClassicWow()) then
if (not DetailsFramework.IsTimewalkWoW()) then
spec = GetInspectSpecialization (unitid)
if (spec and spec ~= 0) then
_detalhes.cached_specs [guid] = spec
core/network.lua
+1 -1
View File
@@ -88,7 +88,7 @@
return
end
if (DetailsFramework.IsClassicWow()) then
if (DetailsFramework.IsTimewalkWoW()) then
--average item level doesn't exists
--talent information is very different
return
core/parser.lua
+57 -26
View File
@@ -305,6 +305,9 @@
--> is parser allowed to replace spellIDs?
local is_using_spellId_override = false
--> is this a timewalking exp?
local is_timewalk_exp = DetailsFramework.IsTimewalkWoW()
--> recording data options flags
local _recording_self_buffs = false
@@ -466,16 +469,14 @@
end
function parser:spell_dmg (token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, alvo_flags2, spellid, spellname, spelltype, amount, overkill, school, resisted, blocked, absorbed, critical, glacing, crushing, isoffhand, isreflected)
------------------------------------------------------------------------------------------------
--> early checks and fixes
------------------------------------------------------------------------------------------------
--> early checks and fixes
if (who_serial == "") then
if (who_flags and _bit_band (who_flags, OBJECT_TYPE_PETS) ~= 0) then --> � um pet
--> pets must have a serial
return
end
--who_serial = nil
end
if (not alvo_name) then
@@ -493,19 +494,25 @@
if (damage_spells_to_ignore [spellid]) then
return
end
if (is_timewalk_exp) then
spellid = spellname
else --retail
--REMOVE ON 10.0
if (spellid == SPELLID_KYRIAN_DRUID_DAMAGE) then
local ownerTable = druid_kyrian_bounds[who_name]
if (ownerTable) then
who_serial, who_name, who_flags = unpack(ownerTable)
end
end
end
--check if the target actor isn't in the temp blacklist
--if (ignore_actors [alvo_serial]) then
-- return
--end
if (spellid == SPELLID_KYRIAN_DRUID_DAMAGE) then
local ownerTable = druid_kyrian_bounds[who_name]
if (ownerTable) then
who_serial, who_name, who_flags = unpack(ownerTable)
end
end
------------------------------------------------------------------------------------------------
--> spell reflection
if (who_serial == alvo_serial and not reflection_ignore[spellid]) then --~reflect
@@ -1717,14 +1724,37 @@
function parser:heal_absorb (token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, alvo_flags2, spellid, spellname, spellschool, owner_serial, owner_name, owner_flags, owner_flags2, shieldid, shieldname, shieldtype, amount)
--[[statistics]]-- _detalhes.statistics.absorbs_calls = _detalhes.statistics.absorbs_calls + 1
if (_type(shieldname) == "boolean") then
owner_serial, owner_name, owner_flags, owner_flags2, shieldid, shieldname, shieldtype, amount = spellid, spellname, spellschool, owner_serial, owner_name, owner_flags, owner_flags2, shieldid
if (is_timewalk_exp) then
if (not amount) then
--melee
owner_serial, owner_name, owner_flags, owner_flags2, shieldid, shieldname, shieldtype, amount = spellid, spellname, spellschool, owner_serial, owner_name, owner_flags, owner_flags2, shieldid
end
--normal: is this for melee?
--token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, alvo_flags2, playerGUID, playerName, flag, flag2, AbsorbedSpellId, AbsorbedSpellName, school, absorbedAmount, nil, nil, nil
--new: is this for spells?
--token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, alvo_flags2, spellId?, spellName, "32", playerGUID, playerName, flag, flag2, AbsorbedSpellId, AbsorbedSpellName, school, absorbedAmount
--17 parameters on tbc beta on april 1st, shieldname isn't boolean but the parameters need to be arranged
--owner_serial, owner_name, owner_flags, owner_flags2, shieldid, shieldname, shieldtype, amount = spellid, spellname, spellschool, owner_serial, owner_name, owner_flags, owner_flags2, shieldid
spellid = spellname
shieldid = shieldname
parser:heal (token, time, owner_serial, owner_name, owner_flags, alvo_serial, alvo_name, alvo_flags, alvo_flags2, shieldid, shieldname, shieldtype, amount, 0, 0, nil, true)
return
else
--retail
if (_type(shieldname) == "boolean") then
owner_serial, owner_name, owner_flags, owner_flags2, shieldid, shieldname, shieldtype, amount = spellid, spellname, spellschool, owner_serial, owner_name, owner_flags, owner_flags2, shieldid
end
end
if (ignored_shields [shieldid]) then
return
elseif (shieldid == 110913) then
--dark bargain
local max_health = _UnitHealthMax (owner_name)
@@ -1732,7 +1762,7 @@
return
end
end
--> diminuir o escudo nas tabelas de escudos
local shields_on_target = escudo [alvo_name]
if (shields_on_target) then
@@ -1746,12 +1776,12 @@
end
--> chamar a fun��o de cura pra contar a cura
return parser:heal (token, time, owner_serial, owner_name, owner_flags, alvo_serial, alvo_name, alvo_flags, alvo_flags2, shieldid, shieldname, shieldtype, amount, 0, 0, nil, true)
parser:heal (token, time, owner_serial, owner_name, owner_flags, alvo_serial, alvo_name, alvo_flags, alvo_flags2, shieldid, shieldname, shieldtype, amount, 0, 0, nil, true)
end
function parser:heal (token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, alvo_flags2, spellid, spellname, spelltype, amount, overhealing, absorbed, critical, is_shield)
------------------------------------------------------------------------------------------------
--> early checks and fixes
@@ -1786,6 +1816,10 @@
return
end
if (is_timewalk_exp) then
spellid = spellname
end
--> spirit link toten
if (spellid == SPELLID_SHAMAN_SLT) then
return parser:SLT_healing (token, time, who_serial, who_name, who_flags, alvo_serial, alvo_name, alvo_flags, spellid, spellname, spelltype, amount, overhealing, absorbed, critical, is_shield)
@@ -2431,7 +2465,6 @@ SPELL_HEAL,Player-3209-0A79112C,"Symantec-Azralon",0x511,0x0,Player-3209-065BAED
--> recording debuffs applied by player
elseif (tipo == "DEBUFF") then
--print ("debuff - ", token, spellname)
--Eye of Corruption 8.3 REMOVE ON 9.0
if (spellid == 315161) then
@@ -4200,7 +4233,7 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
function _detalhes:CaptureEnable (capture_type)
capture_type = string.lower (capture_type)
--retail
if (capture_type == "damage") then
token_list ["SPELL_PERIODIC_DAMAGE"] = parser.spell_dmg
token_list ["SPELL_EXTRA_ATTACKS"] = parser.spell_dmg_extra_attacks
@@ -4255,7 +4288,6 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
token_list ["UNIT_DESTROYED"] = parser.dead
end
end
parser.original_functions = {
@@ -4420,7 +4452,6 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
function _detalhes:Check_ZONE_CHANGED_NEW_AREA (...)
local zoneName, zoneType, _, _, _, _, _, zoneMapID = _GetInstanceInfo()
--print (GetInstanceInfo())
_detalhes.zone_type = zoneType
_detalhes.zone_id = zoneMapID
@@ -4984,7 +5015,7 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
function _detalhes.parser_functions:PLAYER_SPECIALIZATION_CHANGED()
--some parts of details! does call this function, check first for past expansions
if (DetailsFramework.IsClassicWow()) then
if (DetailsFramework.IsTimewalkWoW()) then
return
end
@@ -5353,7 +5384,7 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
local funcao = token_list [token]
if (funcao) then
return funcao (nil, token, time, who_serial, who_name, who_flags, target_serial, target_name, target_flags, target_flags2, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12)
funcao (nil, token, time, who_serial, who_name, who_flags, target_serial, target_name, target_flags, target_flags2, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12)
else
return
end
core/parser_timewalk.lua
+3
View File
@@ -0,0 +1,3 @@
local Details = _G.Details
local _
local helloWorld
core/plugins.lua
+2 -1
View File
@@ -3,6 +3,8 @@
local Loc = LibStub ("AceLocale-3.0"):GetLocale ( "Details" )
local _detalhes = _G._detalhes
local PixelUtil = PixelUtil or DFPixelUtil
DETAILSPLUGIN_ALWAYSENABLED = 0x1
--> consts
@@ -13,7 +15,6 @@
local CONST_PLUGINWINDOW_WIDTH = 925
local CONST_PLUGINWINDOW_HEIGHT = 600
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--> details api functions
function _detalhes:GetPlugin (PAN) --plugin absolute name
frames/window_main.lua
+3 -3
View File
@@ -567,7 +567,7 @@ local movement_onupdate = function (self, elapsed)
show_instance_ids()
instance_ids_shown = nil
if (need_show_group_guide and not DetailsFramework.IsClassicWow()) then
if (need_show_group_guide and not DetailsFramework.IsTimewalkWoW()) then
_detalhes.MicroButtonAlert.Text:SetText (Loc ["STRING_WINDOW1ATACH_DESC"])
_detalhes.MicroButtonAlert:SetPoint ("bottom", need_show_group_guide.baseframe, "top", 0, 30)
_detalhes.MicroButtonAlert:SetHeight (320)
@@ -703,7 +703,7 @@ local movement_onupdate = function (self, elapsed)
instancia_alvo:SnapAlert()
_detalhes.snap_alert.playing = true
if (not DetailsFramework.IsClassicWow()) then
if (not DetailsFramework.IsTimewalkWoW()) then
_detalhes.MicroButtonAlert.Text:SetText (string.format (Loc ["STRING_ATACH_DESC"], self.instance.meu_id, instancia_alvo.meu_id))
_detalhes.MicroButtonAlert:SetPoint ("bottom", instancia_alvo.baseframe.cabecalho.modo_selecao.widget, "top", 0, 18)
_detalhes.MicroButtonAlert:SetHeight (200)
@@ -975,7 +975,7 @@ local function move_janela (baseframe, iniciando, instancia, just_updating)
_detalhes.snap_alert.animIn:Stop()
_detalhes.snap_alert.animOut:Play()
if (not DetailsFramework.IsClassicWow()) then
if (not DetailsFramework.IsTimewalkWoW()) then
_detalhes.MicroButtonAlert:Hide()
end
frames/window_playerbreakdown.lua
+6 -1
View File
@@ -3278,8 +3278,13 @@ function gump:CriaJanelaInfo()
--main player - seta no primeiro box
local spellid = data [1].id
local name, _, icon = _GetSpellInfo (spellid)
if (not name) then
--no spell found? - tbc problem
return
end
local petName = data [3]
bar [1]:SetTexture (icon) --bar[1] = spellicon bar[2] = statusbar
bar [1]:SetTexCoord (unpack (IconTexCoord)) --bar[1] = spellicon bar[2] = statusbar
frames/window_report.lua
+12 -10
View File
@@ -354,17 +354,19 @@ local function cria_drop_down (este_gump)
reportChannelsTable [#reportChannelsTable + 1] = {iconsize = iconsize, value = "CHANNEL|"..channels [i+1], label = channels [i]..". "..channels [i+1], onclick = on_click, icon = [[Interface\FriendsFrame\UI-Toast-ToastIcons]], texcoord = {0.3046875, 0.4453125, 0.109375, 0.390625}, iconcolor = {149/255, 112/255, 112/255}}
end
local _, numBNetOnline = BNGetNumFriends()
for i = 1, numBNetOnline do
local accountInfo = C_BattleNet.GetFriendAccountInfo(i)
local gameAccountInfo = accountInfo and accountInfo.gameAccountInfo
if (not DetailsFramework.IsTimewalkWoW()) then
local _, numBNetOnline = BNGetNumFriends()
for i = 1, numBNetOnline do
local accountInfo = C_BattleNet.GetFriendAccountInfo(i)
local gameAccountInfo = accountInfo and accountInfo.gameAccountInfo
if (gameAccountInfo) then
local isOnline = gameAccountInfo.isOnline
if (isOnline) then
local bTag = accountInfo.battleTag
local bTagNoNumber = bTag:gsub("#.*", "")
reportChannelsTable[#reportChannelsTable + 1] = {iconsize = iconsize, value = "REALID|" .. accountInfo.bnetAccountID, label = bTagNoNumber, onclick = on_click, icon = [[Interface\FriendsFrame\Battlenet-Battleneticon]], texcoord = {0.125, 0.875, 0.125, 0.875}, iconcolor = {1, 1, 1}}
if (gameAccountInfo) then
local isOnline = gameAccountInfo.isOnline
if (isOnline) then
local bTag = accountInfo.battleTag
local bTagNoNumber = bTag:gsub("#.*", "")
reportChannelsTable[#reportChannelsTable + 1] = {iconsize = iconsize, value = "REALID|" .. accountInfo.bnetAccountID, label = bTagNoNumber, onclick = on_click, icon = [[Interface\FriendsFrame\Battlenet-Battleneticon]], texcoord = {0.125, 0.875, 0.125, 0.875}, iconcolor = {1, 1, 1}}
end
end
end
end
functions/autorun.lua
+1 -1
View File
@@ -29,7 +29,7 @@ end
--auto run frame to dispatch scrtips for some events that details! doesn't handle
local autoRunCodeEventFrame = _G.CreateFrame("frame")
if (not _G.DetailsFramework.IsClassicWow()) then
if (not _G.DetailsFramework.IsTimewalkWoW()) then
autoRunCodeEventFrame:RegisterEvent("PLAYER_SPECIALIZATION_CHANGED")
end
functions/mythicdungeon.lua
+1 -1
View File
@@ -21,7 +21,7 @@ local DetailsMythicPlusFrame = _G.CreateFrame ("frame", "DetailsMythicPlusFrame"
DetailsMythicPlusFrame.DevelopmentDebug = false
--disabling the mythic+ feature if the user is playing in wow classic
if (not DF.IsClassicWow()) then
if (not DF.IsTimewalkWoW()) then
DetailsMythicPlusFrame:RegisterEvent ("CHALLENGE_MODE_START")
DetailsMythicPlusFrame:RegisterEvent ("CHALLENGE_MODE_COMPLETED")
DetailsMythicPlusFrame:RegisterEvent ("ZONE_CHANGED_NEW_AREA")
functions/profiles.lua
+1 -1
View File
@@ -1475,7 +1475,7 @@ end
function _detalhes:RestoreState_CurrentMythicDungeonRun()
--no need to check for mythic+ if the user is playing on classic wow
if (DetailsFramework.IsClassicWow()) then
if (DetailsFramework.IsTimewalkWoW()) then
return
end
functions/spellcache.lua
+63 -3
View File
@@ -14,10 +14,51 @@ do
local _GetSpellInfo = GetSpellInfo
local _unpack = unpack
--> is this a timewalking exp?
local is_timewalk_exp = DetailsFramework.IsTimewalkWoW()
--> default container
_detalhes.spellcache = {}
local unknowSpell = {Loc ["STRING_UNKNOWSPELL"], _, "Interface\\Icons\\Ability_Druid_Eclipse"} --> localize-me
local AllSpellNames
if (is_timewalk_exp) then
AllSpellNames = {}
local GetSpellInfo = GetSpellInfo
for i = 1, 60000 do
local name, _, icon = GetSpellInfo(i)
if name and icon and icon ~= 136235 and not AllSpellNames[name] then
AllSpellNames[name] = icon
end
end
end
local GetSpellInfoTimewalk = function(spell)
local spellName, _, spellIcon
if (spell == 0) then
spellName = ATTACK or "It's Blizzard Fault!"
spellIcon = [[Interface\ICONS\INV_Sword_04]]
elseif (spell == "!Melee" or spell == 1) then
spellName = ATTACK or "It's Blizzard Fault!"
spellIcon = [[Interface\ICONS\INV_Sword_04]]
elseif (spell == "!Autoshot" or spell == 2) then
spellName = Loc ["STRING_AUTOSHOT"]
spellIcon = [[Interface\ICONS\INV_Weapon_Bow_07]]
else
spellName, _, spellIcon = GetSpellInfo (spell)
end
if (not spellName) then
return spell, _, AllSpellNames [spell] or defaultSpellIcon
end
return spellName, _, AllSpellNames [spell] or spellIcon
end
--> reset spell cache
function _detalhes:ClearSpellCache()
_detalhes.spellcache = _setmetatable ({},
@@ -29,7 +70,12 @@ do
--> should save only icon and name, other values are not used
if (valor) then --> check if spell is valid before
local cache = {_GetSpellInfo (valor)}
local cache
if (is_timewalk_exp) then
cache = {GetSpellInfoTimewalk(valor)}
else
cache = {_GetSpellInfo (valor)}
end
tabela [valor] = cache
return cache
else
@@ -72,6 +118,19 @@ do
[7] = {name = Loc ["STRING_ENVIRONMENTAL_LAVA"], icon = [[Interface\ICONS\Ability_Rhyolith_Volcano]]},
[8] = {name = Loc ["STRING_ENVIRONMENTAL_SLIME"], icon = [[Interface\ICONS\Ability_Creature_Poison_02]]},
}
elseif (DetailsFramework.IsTBCWow()) then
default_user_spells = {
[1] = {name = Loc ["STRING_MELEE"], icon = [[Interface\ICONS\INV_Sword_04]]},
[2] = {name = Loc ["STRING_AUTOSHOT"], icon = [[Interface\ICONS\INV_Weapon_Bow_07]]},
[3] = {name = Loc ["STRING_ENVIRONMENTAL_FALLING"], icon = [[Interface\ICONS\Spell_Magic_FeatherFall]]},
[4] = {name = Loc ["STRING_ENVIRONMENTAL_DROWNING"], icon = [[Interface\ICONS\Ability_Suffocate]]},
[5] = {name = Loc ["STRING_ENVIRONMENTAL_FATIGUE"], icon = [[Interface\ICONS\Spell_Arcane_MindMastery]]},
[6] = {name = Loc ["STRING_ENVIRONMENTAL_FIRE"], icon = [[Interface\ICONS\INV_SummerFest_FireSpirit]]},
[7] = {name = Loc ["STRING_ENVIRONMENTAL_LAVA"], icon = [[Interface\ICONS\Ability_Rhyolith_Volcano]]},
[8] = {name = Loc ["STRING_ENVIRONMENTAL_SLIME"], icon = [[Interface\ICONS\Ability_Creature_Poison_02]]},
}
else
default_user_spells = {
[1] = {name = Loc ["STRING_MELEE"], icon = [[Interface\ICONS\INV_Sword_04]]},
@@ -236,8 +295,9 @@ do
return false
end
--> overwrite for API GetSpellInfo function
_detalhes.getspellinfo = function (spellid) return _unpack (_detalhes.spellcache[spellid]) end
--> overwrite for API GetSpellInfo function
_detalhes.getspellinfo = function (spellid) return _unpack (_detalhes.spellcache[spellid]) end
_detalhes.GetSpellInfo = _detalhes.getspellinfo
--> overwrite SpellInfo if the spell is a DoT, so Details.GetSpellInfo will return the name modified
plugins/Details_EncounterDetails/Details_EncounterDetails.lua
+1 -1
View File
@@ -2168,7 +2168,7 @@ function EncounterDetails:OnEvent (_, event, ...)
if (_G._detalhes and _G._detalhes:InstallOkey()) then
if (DetailsFramework.IsClassicWow()) then
if (DetailsFramework.IsTimewalkWoW()) then
return
end
plugins/Details_RaidCheck/Details_RaidCheck.lua
+1 -1
View File
@@ -948,7 +948,7 @@ end
if (_G._detalhes) then
if (DetailsFramework.IsClassicWow()) then
if (DetailsFramework.IsTimewalkWoW()) then
return
end
plugins/Details_Vanguard/Details_Vanguard.lua
+1 -1
View File
@@ -939,7 +939,7 @@ function Vanguard:OnEvent (_, event, arg1, token, time, who_serial, who_name, wh
if (_G._detalhes) then
if (DetailsFramework.IsClassicWow()) then
if (DetailsFramework.IsTimewalkWoW()) then
return
end
startup.lua
+20 -12
View File
@@ -236,7 +236,7 @@ function Details:StartMeUp() --I'll never stop!
self.listener:RegisterEvent ("UNIT_FACTION")
if (not _G.DetailsFramework.IsClassicWow()) then
if (not _G.DetailsFramework.IsTimewalkWoW()) then
self.listener:RegisterEvent ("PET_BATTLE_OPENING_START")
self.listener:RegisterEvent ("PET_BATTLE_CLOSE")
self.listener:RegisterEvent ("PLAYER_SPECIALIZATION_CHANGED")
@@ -495,7 +495,9 @@ function Details:StartMeUp() --I'll never stop!
Details:Msg("use '/details me' macro to open the player breakdown for you!")
end
Details.cached_specs[UnitGUID("player")] = GetSpecializationInfo(GetSpecialization() or 0)
if (not DetailsFramework.IsTimewalkWoW()) then
Details.cached_specs[UnitGUID("player")] = GetSpecializationInfo(GetSpecialization() or 0)
end
if (not Details.data_wipes_exp["9"]) then
wipe(Details.encounter_spell_pool or {})
@@ -515,17 +517,23 @@ function Details:StartMeUp() --I'll never stop!
_detalhes.tabela_overall = _detalhes.combate:NovaTabela()
end
--wipe overall on torghast - REMOVE ON 10.0
local torghastTracker = CreateFrame("frame")
torghastTracker:RegisterEvent("JAILERS_TOWER_LEVEL_UPDATE")
torghastTracker:SetScript("OnEvent", function(self, event, level, towerType)
if (level == 1) then
if (Details.overall_clear_newtorghast) then
Details.historico:resetar_overall()
Details:Msg ("overall data are now reset.") --localize-me
if (not DetailsFramework.IsTimewalkWoW()) then
--wipe overall on torghast - REMOVE ON 10.0
local torghastTracker = CreateFrame("frame")
torghastTracker:RegisterEvent("JAILERS_TOWER_LEVEL_UPDATE")
torghastTracker:SetScript("OnEvent", function(self, event, level, towerType)
if (level == 1) then
if (Details.overall_clear_newtorghast) then
Details.historico:resetar_overall()
Details:Msg ("overall data are now reset.") --localize-me
end
end
end
end)
end)
end
if (DetailsFramework.IsTimewalkWoW()) then
Details:Msg("TBC Beta Version: 0008")
end
function Details:InstallOkey()
return true