From a19270349a1b150dc9a1f8857e125a46584522c1 Mon Sep 17 00:00:00 2001 From: Kevin Lyles Date: Tue, 9 Feb 2010 13:20:29 -0600 Subject: [PATCH] Combined several patterns (much less strict) --- Regexps.lua | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/Regexps.lua b/Regexps.lua index dd13e17..8d6cc6e 100644 --- a/Regexps.lua +++ b/Regexps.lua @@ -193,12 +193,9 @@ MultipleStatLines = { } SingleStatLines = { - {"^([+-]?%d+) (armor)$", WeightsWatcher.statNumFirst}, - {"^([+-]?%d+) (agility)$", WeightsWatcher.statNumFirst}, - {"^([+-]?%d+) (intellect)$", WeightsWatcher.statNumFirst}, - {"^([+-]?%d+) (spirit)$", WeightsWatcher.statNumFirst}, - {"^([+-]?%d+) (stamina)$", WeightsWatcher.statNumFirst}, - {"^([+-]?%d+) (strength)$", WeightsWatcher.statNumFirst}, + {"^([+-]?%d+) ([^b]%a+)$", WeightsWatcher.statNumFirst}, + + {"^%((%d+%.?%d*) damage per second%)$", function(text, pattern) return WeightsWatcher.singleStatValueOnly(text, pattern, "dps") @@ -208,10 +205,8 @@ SingleStatLines = { function(text, pattern) return WeightsWatcher.singleStatValueOnly(text, pattern, "mp5") end}, - {"^([+-]?%d+) (%a+ %a+ rating)$", WeightsWatcher.statNumFirst}, - {"^([+-]?%d+) (%a+ rating)$", WeightsWatcher.statNumFirst}, - {"^([+-]?%d+) (spell power)$", WeightsWatcher.statNumFirst}, - {"^([+-]?%d+) (attack power)$", WeightsWatcher.statNumFirst}, + {"^([+-]?%d+) (%a[%a ]+ rating)$", WeightsWatcher.statNumFirst}, + {"^([+-]?%d+) (%a+ power)$", WeightsWatcher.statNumFirst}, {"^([+-]?%d+) (%a+ resistance)$", WeightsWatcher.statNumFirst}, {"^([+-]?%d+) (all resistances)$", WeightsWatcher.statNumFirst}, {"^([+-]?%d+) resist all$", -- 1.7.9.5