Merge branch 'main' of https://github.com/MathIsFun0/Cryptid

Author: MathIsFun0

lib/misc.lua

@@ -183,17 +183,44 @@ end
 
 -- simple plural s function for localisation
 function cry_pls(str, vars)
-	if string.sub(str, 1, 1) == "p" or string.sub(str, 1, 1) == "s" or string.sub(str, 1, 1) == "y" then
-		num = vars[tonumber(string.sub(str, 2, -1))]
-		if num then
-			if math.abs(to_big(num) - 1) > to_big(0.001) then
-				return string.sub(str, 1, 1) == "y" and "ies" or "s"
+	local inside = str:match("<(.-)>") -- finds args
+	local _table = {}
+	if inside then
+		for v in inside:gmatch("[^,]+") do -- adds args to array
+			table.insert(_table, v)
+		end
+	end
+	local num = vars[tonumber(string.match(str, ">(%d+)"))] -- gets the number outside angle brackets, and its corresponding variable
+	local plural = _table[1] -- default
+	local checks = { [1] = "=" }
+	if #_table > 1 then
+		for i = 2, #_table do
+			local isnum = tonumber(_table[i])
+			if isnum then
+				checks[isnum] = ">" .. (_table[i + 1] or "")
+				i = i + 1
+			elseif i == 2 then
+				checks[1] = "=" .. _table[i]
 			else
-				return string.sub(str, 1, 1) == "y" and "y" or ""
+				print("Unexpected string: " .. _table[i])
+			end
+		end
+	end
+	local function fch(str, c)
+		return string.sub(str, 1, 1) == c -- gets first char and returns boolean
+	end
+	for k, v in pairs(checks) do
+		if fch(v, "=") then
+			if math.abs(to_big(num) - k) < to_big(0.001) then
+				return string.sub(v, 2, -1)
+			end
+		elseif fch(v, ">") then
+			if to_big(num) >= to_big(k - 0.001) then
+				return string.sub(v, 2, -1)
 			end
 		end
 	end
-	return false -- idk it doesn't really matter
+	return plural
 end
 
 -- generate a random edition (e.g. Antimatter Deck)