Module:Block value: Difference between revisions

← Older edit

@@ Line 1: / Line 1: @@
 local p = {}
-p.value = function( f )
+function p.value( f )
 	local args = f
 	if f == mw.getCurrentFrame() then
@@ Line 6: / Line 7: @@
 	end
 	local block = mw.text.trim( args[1] or '' ):lower()
-	local type = args.type
+	local argType = args.type
-	-- Most of these transforms are unnecessary, but are kept for compatibility with original template
-	-- Strip trailing "s" on everything but these
-	local keepS = {
-		glass = true,
-		steps = true, stairs = true,
-		bars = true,
-		cactus = true,
-		leaves = true,
-		grass = true,
-		potatoes = true,
-		planks = true,
-		seagrass = true
-	}
-	if type~="blast resistance" and not keepS[block:match( '%w+$' )] then
-		block = block:gsub( 's$', '' )
-	end
-	-- Other transforms
+	local values = mw.loadData( 'Module:' .. argType .. ' values' )
-    if type~="blast resistance" then
+	local value = values[block]
-	block = block
-		:gsub( 'wooden', 'wood' )
-		:gsub( 'mossy', 'moss' )
-		:gsub( 'steps', 'stairs' )
-		:gsub( "['%(%)%-%s]+", '' )
-	end
-	local value = mw.loadData( 'Module:' .. type .. ' values' )[block]
 	local category = ''
 	if not value then
-		value = '[[Template:' .. type .. ' values#Missing value|?]]'
+		value = values[block:gsub( 's$', '' )]
-		local title = mw.title.getCurrentTitle()
-		if not args.nocat and title.namespace == 0 and not title.isSubpage then
+		if not value then
-			category = '[[Category:Missing ' .. type:lower() .. ']]'
+			value = '[[Template:' .. argType .. ' values#Missing value|?]]'
+			local title = mw.title.getCurrentTitle()
+			if not args.nocat and title.namespace == 0 and not title.isSubpage then
+				category = '[[Category:Missing ' .. argType:lower() .. ']]'
+			end
 		end
 	end
 	return value .. category
 end
 return p