news, cd data fix display recipe scan

Author: derfloh205

Data/Classes/CooldownData.lua

@@ -120,7 +120,8 @@ function CraftSim.CooldownData:GetCurrentCharges()
     if self.maxCharges > 0 then
         local currentTime = GetServerTime()
         local diffTotal = currentTime - self.startTime
-        return math.floor(diffTotal / self.cooldownPerCharge)
+        local currentCharges = math.floor(diffTotal / self.cooldownPerCharge)
+        return math.min(currentCharges, self.maxCharges)
     end
 
     if self.isDayCooldown or self.maxCharges == 0 then

Data/News.lua

@@ -34,7 +34,8 @@ function CraftSim.NEWS:GET_NEWS(itemMap)
         f.P .. f.g("Cost Details") .. " renamed to " .. f.g("Cost Optimization"),
         f.a .. "- Now shows the lowest expected crafting costs for an item",
         f.a .. "  if you or one of your alts are able to craft it (and its cached)",
-        f.a .. "- Subcrafting costs are considered if you enable it in the module",
+        f.a .. "- Subcrafting costs are considered if",
+        f.a .. "  you enable it in the module",
         f.a .. "- Now has a " .. f.g("Sub Recipe Options") .. " Tab to configure sub crafts",
         f.P .. f.g("Recipe Scan"),
         f.a .. "- Added a Recipe Scan Option to toggle " .. f.bb("sub crafts"),
@@ -43,7 +44,8 @@ function CraftSim.NEWS:GET_NEWS(itemMap)
         f.a .. "- The alt profession list is now more consistently sorted",
         f.P .. f.g("Average Profit"),
         f.a .. "- Removed Explanation and Statistics Button (-> new modules)",
-        f.a .. "- Refactored the profit and stat weight display and added tooltips",
+        f.a .. "- Refactored the profit and stat weight display",
+        f.a .. "and added tooltips",
         f.P .. f.g("Explanations"),
         f.a .. "- New Module moved from Average Profit",
         f.P .. f.g("Statistics"),
@@ -53,7 +55,8 @@ function CraftSim.NEWS:GET_NEWS(itemMap)
         f.p .. f.bb("CraftResults"),
         f.a .. "- Fixed a Typo in the Item Result Log saying 'Profit: :'",
         f.a .. "  instead of 'Saved Reagents:",
-        f.p .. "Fixed a bug leading to an error when moving a frame while crafting",
+        f.p .. "Fixed a bug leading to an error when moving a",
+        f.a .. "frame while crafting",
         f.p .. "Russian Translation Update",
         f.a .. "- Thanks to " .. f.bb("https://github.com/SerGlushko"),
     }

Modules/RecipeScan/Frames.lua

@@ -770,8 +770,9 @@ function CraftSim.RECIPE_SCAN.FRAMES:AddRecipe(row, recipeData)
             local cooldownData = recipeData:GetCooldownDataForRecipeCrafter()
             if cooldownData and cooldownData.isCooldownRecipe and not cooldownData.isDayCooldown then
                 local timeIcon = CreateAtlasMarkup(CraftSim.CONST.CRAFT_QUEUE_STATUS_TEXTURES.COOLDOWN.texture, 13, 13)
+                local currentCharges = cooldownData:GetCurrentCharges()
                 cooldownInfoText = " " .. timeIcon ..
-                    "(" .. cooldownData:GetCurrentCharges() .. "/" .. cooldownData.maxCharges .. ")"
+                    "(" .. currentCharges .. "/" .. cooldownData.maxCharges .. ")"
             end