More fixes and development

Tercioo · Jan 16, 2021 · d93fa52 · d93fa52
1 parent 09601d7
commit d93fa52
Show file tree

Hide file tree

Showing 15 changed files with 440 additions and 142 deletions.
diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua
@@ -1,6 +1,6 @@
 
 
-local dversion = 228
+local dversion = 229
 
 local major, minor = "DetailsFramework-1.0", dversion
 local DF, oldminor = LibStub:NewLibrary (major, minor)
@@ -4238,3 +4238,5 @@ end
 		_G.setfenv(func, newEnvironment)
 	end
 
+
+-----------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/Libs/DF/spells.lua b/Libs/DF/spells.lua
@@ -974,8 +974,6 @@ DF.PotionIDs = {
 --	[] = true, --
 
 	[307165] = true, --Spiritual Anti-Venom
-
-
 }
 
 DF.FeastIDs = {

diff --git a/Libs/DF/timebar.lua b/Libs/DF/timebar.lua
@@ -197,23 +197,27 @@ function TimeBarMetaFunctions:SetDirection(direction)
     self.direction = direction
 end
 
+function TimeBarMetaFunctions:HasTimer()
+    return self.statusBar.hasTimer
+end
+
 function TimeBarMetaFunctions:StopTimer()
     if (self.statusBar.hasTimer) then
+        self.statusBar.hasTimer = nil
         local kill = self:RunHooksForWidget("OnTimerEnd", self.statusBar, self)
         if (kill) then
             return
         end
+    end
 
-        local statusBar = self.statusBar
-        statusBar:SetScript("OnUpdate", nil)
+    local statusBar = self.statusBar
+    statusBar:SetScript("OnUpdate", nil)
 
-        statusBar:SetMinMaxValues(0, 100)
-        statusBar:SetValue(100)
-        statusBar.rightText:SetText("")
+    statusBar:SetMinMaxValues(0, 100)
+    statusBar:SetValue(100)
+    statusBar.rightText:SetText("")
 
-        statusBar.spark:Hide()
-        statusBar.hasTimer = nil
-    end
+    statusBar.spark:Hide()
 end
 
 local OnUpdateFunc = function(self, deltaTime)
@@ -249,6 +253,12 @@ local OnUpdateFunc = function(self, deltaTime)
 end
 
 function TimeBarMetaFunctions:SetTimer(currentTime, startTime, endTime)
+
+    if (not currentTime or currentTime == 0) then
+        self:StopTimer()
+        return
+    end
+
     if (startTime and endTime) then
         if (self.statusBar.hasTimer and currentTime == self.statusBar.timeLeft1) then
             --it is the same timer called again
@@ -266,6 +276,7 @@ function TimeBarMetaFunctions:SetTimer(currentTime, startTime, endTime)
         self.statusBar.timeLeft2 = currentTime
     end
 
+    --print("min|max values:", self.statusBar.starTime, self.statusBar.endTime)
     self.statusBar:SetMinMaxValues(self.statusBar.starTime, self.statusBar.endTime)
 
     if (self.direction == "right") then
-Original file line number
+Diff line change
@@ Expand Up / @@ -974,8 +974,6 @@ DF.PotionIDs = { @@
     --	[] = true, --
     	[307165] = true, --Spiritual Anti-Venom
     }
     DF.FeastIDs = {
@@ Expand Down @@