Module:GameSkills: Difference between revisions

← Older edit Newer edit →

@@ Line 729: / Line 729: @@
 -- formatAreaSize: human readable area sizing for QuickStats.
-local function formatAreaSize(area)
+-- Shows: "<Area Size> (<number>)" e.g. "Medium (4)"
+local function formatAreaSize(area, maxLevel, level)
 	if type(area) ~= "table" then
 		return nil
 	end
-	local raw = area["Area Size"]
+	-- Helper: pull a number from scalar/unit/valuepair-ish things.
-	if raw == nil then
+	local function extractNumber(v)
+		if v == nil then return nil end
+		-- Unit block {Value, Unit}
+		if type(v) == "table" and v.Value ~= nil then
+			local n = toNum(v.Value)
+			return n
+		end
+		-- ValuePair {Base, Per Level} -> prefer Base at current level if series exists
+		if type(v) == "table" and (v.Base ~= nil or v["Per Level"] ~= nil) then
+			local s = seriesFromValuePair(v, maxLevel or 1)
+			if type(s) == "table" and #s > 0 then
+				local idx = clamp(level or 1, 1, #s)
+				local txt = s[idx]
+				if txt and txt ~= "—" then
+					-- try parse numeric from string (e.g. "4 tiles" -> 4)
+					local num = tonumber((mw.ustring.gsub(tostring(txt), "[^0-9%.%-]", "")))
+					return num
+				end
+			end
+			return nil
+		end
+		-- Plain scalar
+		if type(v) == "number" then return v end
+		if type(v) == "string" then
+			local num = tonumber((mw.ustring.gsub(mw.text.trim(v), "[^0-9%.%-]", "")))
+			return num
+		end
 		return nil
 	end
-	local name, num
+	-- 1) Read Area Size label/name
+	local rawSize = area["Area Size"]
+	if rawSize == nil then
+		return nil
+	end
-	if type(raw) == "table" then
+	local sizeName = nil
-		name = raw.Name or raw.ID or raw.Value
+	if type(rawSize) == "table" then
-		num  = raw.Value
+		sizeName = rawSize.Name or rawSize.ID or rawSize.Value
-		if raw.Name or raw.ID then
+	elseif type(rawSize) == "string" then
-			name = raw.Name or raw.ID
+		sizeName = rawSize
+	elseif type(rawSize) == "number" then
+		-- uncommon; treat as numeric-only label
+		sizeName = tostring(rawSize)
+	end
+	sizeName = sizeName and mw.text.trim(tostring(sizeName)) or nil
+	if not sizeName or sizeName == "" or isNoneLike(sizeName) then
+		return nil
+	end
+	-- 2) Find the numeric “exact number” to append
+	-- Prefer the explicit Area Distance block, then fall back to other known numeric keys.
+	local num = nil
+	local dist = area["Area Distance"]
+	if type(dist) == "table" then
+		-- Prefer Effective Distance if present and non-zero, else Base
+		num = extractNumber(dist["Effective Distance"]) or extractNumber(dist.Effective) or extractNumber(dist["Effective"])
+		if not num or num == 0 then
+			num = extractNumber(dist.Base) or extractNumber(dist["Base"])
 		end
-	elseif type(raw) == "string" then
-		name = raw
-	elseif type(raw) == "number" then
-		num = raw
 	end
-	if num == nil then
+	if not num or num == 0 then
-		num = toNum(area["Area Value"]) or toNum(area["Area Size Value"]) or toNum(area["Area Number"]) or toNum(area["Area Radius"])
+		num =
+			extractNumber(area["Area Value"]) or
+			extractNumber(area["Area Size Value"]) or
+			extractNumber(area["Area Number"]) or
+			extractNumber(area["Area Radius"])
 	end
-	if name ~= nil then
+	-- 3) Render
-		local s = mw.text.trim(tostring(name))
+	-- If size already contains parentheses, assume it already includes the numeric.
-		if s == "" or isNoneLike(s) then
+	if mw.ustring.find(sizeName, "%(") then
-			return nil
+		return mw.text.nowiki(sizeName)
-		end
-		if mw.ustring.find(s, "%(") then
-			return mw.text.nowiki(s)
-		end
-		if num ~= nil and num ~= 0 then
-			return mw.text.nowiki(string.format("%s (%s)", s, fmtNum(num)))
-		end
-		return mw.text.nowiki(s)
 	end
-	if num ~= nil and num ~= 0 then
+	if num and num ~= 0 then
-		return mw.text.nowiki(string.format("(%s)", fmtNum(num)))
+		return mw.text.nowiki(string.format("%s (%s)", sizeName, fmtNum(num)))
 	end
-	return nil
+	return mw.text.nowiki(sizeName)
 end
@@ Line 1,230: / Line 1,277: @@
 	-- Area
-	local areaVal = formatAreaSize(mech.Area)
+local areaVal = formatAreaSize(mech.Area, maxLevel, level)
 	-- Timings