From 252f719438a236822eef4adfa87b29015588ab64 Mon Sep 17 00:00:00 2001 From: Kevin Lyles Date: Fri, 3 Jan 2014 22:52:21 -0600 Subject: [PATCH] Handle health and mana per 5 seconds even if it's not per 5 seconds --- Locales/enUS/patterns.lua | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/Locales/enUS/patterns.lua b/Locales/enUS/patterns.lua index 25c7944..4fdf185 100644 --- a/Locales/enUS/patterns.lua +++ b/Locales/enUS/patterns.lua @@ -317,21 +317,26 @@ ww_SingleStatLines = { }, {"^([+-]?%d+) (attack power)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "elixir", "enchant", "food", "generic", "socketBonus", "stackingEquipEffect", "useEffect"}}, {"^([+-]?%d+) (spirit)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "elixir", "enchant", "food", "generic", "socketBonus", "stackingEquipEffect", "useEffect"}}, - {"^([+-]?%d+) mana [ep]v?ery? 5 seco?n?d?s?%.?$", + {"^([+-]?%d+) (%a+) [ep]v?ery? (%d+) seco?n?d?s?%.?$", function(text, pattern) - return WeightsWatcher.singleStatValueOnly(text, pattern, "mp5") + local start, _, amount, stat, period = text:find(pattern) + if start then + amount = tonumber(amount) + if period ~= "5" then + amount = amount * 5 / tonumber(period) + end + if stat == "mana" then + return WeightsWatcher.newStatTable({ mp5 = amount }) + elseif stat == "health" then + return WeightsWatcher.newStatTable({ hp5 = amount }) + end + end end, {"cooldownUseEffect", "elixir", "enchant", "equipEffect", "food", "generic", "socketBonus"}, }, {"^([+-]?%d+) (%a+ resistances?)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "elixir", "enchant", "equipEffect", "generic", "useEffect"}}, -- random suffix enchants {"^([+-]?%d+) (%a+ spell damage)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "generic"}}, - {"^([+-]?%d+) health [ep]v?ery? 5 seco?n?d?s?%.?$", - function(text, pattern) - return WeightsWatcher.singleStatValueOnly(text, pattern, "hp5") - end, - {"cooldownUseEffect", "elixir", "equipEffect", "food", "generic"}, - }, {"^minor run speed increase$", function(text, pattern) return WeightsWatcher.newStatTable({["minor run speed"] = 1}) -- 1.7.9.5