From 30b671f49a33700864de1e47caf0c5841d1ecbee Mon Sep 17 00:00:00 2001
From: Kevin Lyles <kevinlyles@gmail.com>
Date: Thu, 18 Feb 2010 19:41:15 -0600
Subject: [PATCH] Refactored damage range/speed handling

---
 Regexps.lua        |   41 ++++++++++++++++++++++++++++-------------
 WeightsWatcher.lua |    4 ++++
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/Regexps.lua b/Regexps.lua
index d79d09e..e415943 100644
--- a/Regexps.lua
+++ b/Regexps.lua
@@ -32,26 +32,41 @@ function WeightsWatcher.multipleStats(text)
 end
 
 function WeightsWatcher.damageRange(textL, textR)
-	local speed
-	local stats = WeightsWatcher.newStatTable()
-	local start, _, added, minVal, maxVal, name = string.find(textL, "^(%+?)(%d+) %- (%d+) (%a* ?damage)$")
+	local stats
+	local start, _, minimum, maximum = string.find(textL, "^(%d+) %- (%d+) damage$")
 	if start then
-		if added == "+" then
-			added = "added "
+		stats = WeightsWatcher.newStatTable()
+		stats["minimum weapon damage"] = tonumber(minimum)
+		stats["maximum weapon damage"] = tonumber(maximum)
+	else
+		local start, _, minimum, maximum, school = string.find(textL, "^(%d+) %- (%d+) (%a+) damage$")
+		if start then
+			stats = WeightsWatcher.newStatTable()
+			stats["minimum wand " .. school .. " damage"] = tonumber(minimum)
+			stats["maximum wand " .. school .. " damage"] = tonumber(maximum)
+		else
+			local start, _, minimum, maximum, school = string.find(textL, "^%+(%d+) %- (%d+) (%a+) damage$")
+			if start then
+				stats = WeightsWatcher.newStatTable()
+				stats["minimum added " .. school .. " damage"] = tonumber(minimum)
+				stats["maximum added " .. school .. " damage"] = tonumber(maximum)
+			else
+				local start, _, damage = string.find(textL, "^(%d+) damage$")
+				if start then
+					stats = WeightsWatcher.newStatTable()
+					stats["minimum weapon damage"] = tonumber(damage)
+					stats["maximum weapon damage"] = tonumber(damage)
+				end
+			end
 		end
-		stats["minimum " .. added .. name] = tonumber(minVal)
-		stats["maximum " .. added .. name] = tonumber(maxVal)
 	end
-	if textR then
-		start, _, speed = string.find(textR, "^speed (%d+%.?%d*)$")
+	if stats and textR then
+		local start, _, speed = string.find(textR, "^speed (%d+%.?%d*)$")
 		if start then
 			stats["speed"] = tonumber(speed)
 		end
 	end
-	-- Don't return an empty table
-	for _, _ in pairs (stats) do
-		return stats
-	end
+	return stats
 end
 
 function WeightsWatcher.singleStat(text)
diff --git a/WeightsWatcher.lua b/WeightsWatcher.lua
index 1c84419..c433cdc 100644
--- a/WeightsWatcher.lua
+++ b/WeightsWatcher.lua
@@ -964,6 +964,10 @@ function WeightsWatcher.parseLine(textL, textR, link)
 			return nil, {["slot"] = textL}
 		end
 	end
+	local stats = WeightsWatcher.damageRange(textL, textR)
+	if stats then
+		return stats
+	end
 	for _, regex in ipairs(MultipleStatLines) do
 		local pattern, func = unpack(regex)
 		if string.find(textL, pattern) then
-- 
1.7.9.5