Module:RarityHandler: Difference between revisions

← Older edit

@@ Line 1: / Line 1: @@
 local p = {}
--- Clean: trim and strip leading ~
+-- Clean up the rarity string: strip ~, commas, trim
 local function clean(rarity)
-    if not rarity or type(rarity) ~= "string" then return nil end
+	if not rarity or type(rarity) ~= "string" then return nil end
-    rarity = mw.text.trim(rarity)
+	rarity = mw.text.trim(rarity)
-    if rarity:sub(1, 1) == "~" then
+	rarity = rarity:gsub("^~", "") -- remove ~
-        rarity = rarity:sub(2)
+	rarity = rarity:gsub(",", "") -- remove commas
-    end
+	return rarity
-    return rarity
 end
 function p.getSortValue(frame)
-    local rarity = clean(frame.args[1])
+	local raw = frame.args[1]
-    if not rarity then return 999999999 end
+	if not raw or type(raw) ~= "string" then return 999999999 end
-    local lowered = string.lower(rarity)
+	local rarity = clean(raw)
+	if not rarity then return 999999999 end
-    if lowered == "1" or lowered == "always" then
+	local lowered = rarity:lower()
-        return 1
-    elseif lowered == "rare" then
-        return 999999998
-    elseif lowered == "never" then
-        return 0
-    end
-    -- Match "1/number" including decimals
+	if lowered == "1" or lowered == "always" then
-    local chance = lowered:match("^1/(%d+%.?%d*)$")
+		return 1
-    if chance then
+	elseif lowered == "rare" then
-        return tonumber(chance) or 999999999
+		return 999999998
-    end
+	elseif lowered == "never" then
+		return 0
+	end
-    -- fallback
+	-- Match 1/X, return raw number (not string)
-    return 999999999
+	local numStr = lowered:match("^1/(%d+%.?%d*)$")
+	if numStr then
+		local num = tonumber(numStr)
+		if num then return math.floor(num) end
+	end
+	return 999999999
 end
--- For class logic: cleaned string, lowercase
+-- For logic styling
 function p.getCleanValue(frame)
-    local rarity = clean(frame.args[1])
+	local rarity = clean(frame.args[1])
-    if not rarity then return "Unknown" end
+	if not rarity then return "Unknown" end
+	if rarity == "1" then return "Always" end
-    if rarity == "1" then
+	return rarity
-        return "Always"
-    end
-    return rarity
 end
 -- For display
 function p.normalizeDisplay(frame)
-    local original = frame.args[1]
+	local original = frame.args[1]
-    if not original or type(original) ~= "string" then return "Unknown" end
+	if not original or type(original) ~= "string" then return "Unknown" end
+	local trimmed = mw.text.trim(original)
+	local hasTilde = trimmed:sub(1, 1) == "~"
+	local cleaned = hasTilde and trimmed:sub(2) or trimmed
-    local trimmed = mw.text.trim(original)
+	if cleaned == "1" then return "Always" end
-    local hasTilde = trimmed:sub(1, 1) == "~"
-    local cleaned = hasTilde and trimmed:sub(2) or trimmed
-    if cleaned == "1" then
+	local prefix, num = cleaned:match("^(1/)(%d+%.?%d*)$")
-        return "Always"
+	if prefix and num then
-    end
+		local withCommas = mw.language.getContentLanguage():formatNum(tonumber(num))
+		return (hasTilde and "~" or "") .. prefix .. withCommas
+	end
-    return hasTilde and ("~" .. cleaned) or cleaned
+	return hasTilde and "~" .. cleaned or cleaned
 end
 return p