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

Separating DK army and apoc pets

Browse Source
This commit is contained in:
Tercio Jose
2021-08-30 19:43:41 -03:00
parent 70483cd194
commit 668f3e4559
6 changed files with 264 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libs/DF/panel.lua
+25 -6
View File
@@ -1574,7 +1574,7 @@ function DF:IconPick (callback, close_when_select, param1, param2)
DF.IconPickFrame.preview:Hide()
--serach
DF.IconPickFrame.searchLabel = DF:NewLabel (DF.IconPickFrame, nil, "$parentSearchBoxLabel", nil, "search:", font, size, color)
DF.IconPickFrame.searchLabel = DF:NewLabel (DF.IconPickFrame, nil, "$parentSearchBoxLabel", nil, "search:")
DF.IconPickFrame.searchLabel:SetPoint ("topleft", DF.IconPickFrame, "topleft", 12, -36)
DF.IconPickFrame.searchLabel:SetTemplate (DF:GetTemplate ("font", "ORANGE_FONT_TEMPLATE"))
@@ -8128,6 +8128,9 @@ DF.CastFrameFunctions = {
if (self.casting) then
local name, text, texture, startTime = UnitCastingInfo (self.unit)
if (name) then
--[[if not self.spellStartTime then
self:UpdateCastingInfo(self.unit)
end]]--
self.value = GetTime() - self.spellStartTime
end
@@ -8136,6 +8139,9 @@ DF.CastFrameFunctions = {
elseif (self.channeling) then
local name, text, texture, endTime = UnitChannelInfo (self.unit)
if (name) then
--[[if not self.spellEndTime then
self:UpdateChannelInfo(self.unit)
end]]--
self.value = self.spellEndTime - GetTime()
end
@@ -8329,10 +8335,12 @@ DF.CastFrameFunctions = {
if (isChannel) then
self.channeling = true
self:UpdateChannelInfo(unit)
return self.unit == arg1 and "UNIT_SPELLCAST_CHANNEL_START"
elseif (isRegularCast) then
self.casting = true
self:UpdateCastingInfo(unit)
return self.unit == arg1 and "UNIT_SPELLCAST_START"
else
@@ -8346,8 +8354,7 @@ DF.CastFrameFunctions = {
end
end,
UNIT_SPELLCAST_START = function (self, unit)
UpdateCastingInfo = function (self, unit)
local name, text, texture, startTime, endTime, isTradeSkill, castID, notInterruptible, spellID
if IS_WOW_PROJECT_MAINLINE then
name, text, texture, startTime, endTime, isTradeSkill, castID, notInterruptible, spellID = UnitCastingInfo (unit)
@@ -8406,10 +8413,16 @@ DF.CastFrameFunctions = {
--> update the interrupt cast border
self:UpdateInterruptState()
end,
UNIT_SPELLCAST_START = function (self, unit)
self:UpdateCastingInfo(unit)
self:RunHooksForWidget ("OnCastStart", self, self.unit, "UNIT_SPELLCAST_START")
end,
UNIT_SPELLCAST_CHANNEL_START = function (self, unit, ...)
UpdateChannelInfo = function (self, unit, ...)
local name, text, texture, startTime, endTime, isTradeSkill, notInterruptible, spellID
if IS_WOW_PROJECT_MAINLINE then
name, text, texture, startTime, endTime, isTradeSkill, notInterruptible, spellID = UnitChannelInfo (unit)
@@ -8467,6 +8480,12 @@ DF.CastFrameFunctions = {
--> update the interrupt cast border
self:UpdateInterruptState()
end,
UNIT_SPELLCAST_CHANNEL_START = function (self, unit, ...)
self:UpdateChannelInfo(unit, ...)
self:RunHooksForWidget ("OnCastStart", self, self.unit, "UNIT_SPELLCAST_CHANNEL_START")
end,
@@ -8537,7 +8556,7 @@ DF.CastFrameFunctions = {
UNIT_SPELLCAST_FAILED = function (self, unit, ...)
local unitID, castID, spellID = ...
if (self.casting and castID == self.castID and not self.fadeOut) then
if ((self.casting or self.channeling) and castID == self.castID and not self.fadeOut) then
self.casting = nil
self.channeling = nil
self.failed = true
@@ -8558,7 +8577,7 @@ DF.CastFrameFunctions = {
UNIT_SPELLCAST_INTERRUPTED = function (self, unit, ...)
local unitID, castID, spellID = ...
if (self.casting and castID == self.castID and not self.fadeOut) then
if ((self.casting or self.channeling) and castID == self.castID and not self.fadeOut) then
self.casting = nil
self.channeling = nil
self.interrupted = true