Module:ItemIcon - Revision history

Macyler-Admin at 05:30, 16 August 2024

2024-08-16T05:30:48Z

← Older revision		Revision as of 05:30, 16 August 2024
Line 92:		Line 92:
	local Link = TemplateCall:getArgument('link'):expand() or DefaultLink or ItemName		local Link = TemplateCall:getArgument('link'):expand() or DefaultLink or ItemName

	local Formatted = IconHTML .. (Format.Newline and '<br />' or '') .. (Format.Name and ItemName or '')		local Formatted = IconHTML .. (Format.Newline and '<br />' or '') .. (Format.Name and ((Format.Newline and '' or ' ') .. ItemName) or '')

	if Format.Link and Link then		if Format.Link and Link then

Macyler-Admin at 05:27, 16 August 2024

2024-08-16T05:27:33Z

← Older revision		Revision as of 05:27, 16 August 2024
Line 55:		Line 55:
	local IconHTML, ItemName, DefaultLink = p.AddSpriteInternal(IconName, IconSize, '')		local IconHTML, ItemName, DefaultLink = p.AddSpriteInternal(IconName, IconSize, '')

	local UsedLink = link or ~~DefaulLink~~		local UsedLink = link or DefaultLink

	if UsedLink ~= '' then		if UsedLink and UsedLink ~= '' and UsedLink ~= 'none' then
	if UsedLink:find('//') then -- External Link		if UsedLink:find('//') then -- External Link
	return '[' .. UsedLink .. ' ' .. IconHTML .. ']'		return '[' .. UsedLink .. ' ' .. IconHTML .. ']'

Macyler-Admin at 05:24, 16 August 2024

2024-08-16T05:24:05Z

← Older revision		Revision as of 05:24, 16 August 2024
Line 90:		Line 90:
	local IconHTML, ItemName, DefaultLink = p.AddSpriteInternal(ItemRef, Format.Size, '')		local IconHTML, ItemName, DefaultLink = p.AddSpriteInternal(ItemRef, Format.Size, '')

	local Link = TemplateCall:getArgument('link'):expand()		local Link = TemplateCall:getArgument('link'):expand() or DefaultLink or ItemName
	~~if (not Link~~) or ~~(Link == '') then Link =~~ DefaultLink ~~end~~

	local Formatted = IconHTML .. (Format.Newline and '<br />' or '') .. (Format.Name and ItemName or '')		local Formatted = IconHTML .. (Format.Newline and '<br />' or '') .. (Format.Name and ItemName or '')

Macyler-Admin at 05:22, 16 August 2024

2024-08-16T05:22:50Z

← Older revision		Revision as of 05:22, 16 August 2024
Line 90:		Line 90:
	local IconHTML, ItemName, DefaultLink = p.AddSpriteInternal(ItemRef, Format.Size, '')		local IconHTML, ItemName, DefaultLink = p.AddSpriteInternal(ItemRef, Format.Size, '')

	local Link = TemplateCall:getArgument('link'):expand() or DefaultLink		local Link = TemplateCall:getArgument('link'):expand()
			if (not Link) or (Link == '') then Link = DefaultLink end

	local Formatted = IconHTML .. (Format.Newline and '<br />' or '') .. (Format.Name and ItemName or '')		local Formatted = IconHTML .. (Format.Newline and '<br />' or '') .. (Format.Name and ItemName or '')

Macyler-Admin at 04:59, 16 August 2024

2024-08-16T04:59:16Z

← Older revision		Revision as of 04:59, 16 August 2024
Line 79:		Line 79:

	local ItemRef = TemplateCall:getArgument('item'):expand()		local ItemRef = TemplateCall:getArgument('item'):expand()
	if not ItemRef then ItemRef = TemplateCall.args[1]~~:expand()~~ end		if not ItemRef then ItemRef = TemplateCall.args[1] end
	if not ItemRef then ItemRef = 'none' end		if not ItemRef then ItemRef = 'none' end

	local FormatName = TemplateCall:getArgument('format'):expand()		local FormatName = TemplateCall:getArgument('format'):expand()
	if not FormatName then FormatName = TemplateCall.args[2]~~:expand()~~ end		if not FormatName then FormatName = TemplateCall.args[2] end
	if (not FormatName) or (not FORMATS[FormatName]) then FormatName = 'inline' end		if (not FormatName) or (not FORMATS[FormatName]) then FormatName = 'inline' end

Macyler-Admin at 04:55, 16 August 2024

2024-08-16T04:55:38Z

@@ Line 1: / Line 1: @@
 local p = {} --package
-function p.AddSpriteInternal(icon, size, link, additionalCssText)
+-- returns HTML, name, defaultLink
      local SHEET_ICON_SIZE = 64 -- how large icons are in the spritesheet
      local SHEET_SIZE_X = 2048 -- how wide the spritesheet image is
      local SHEET_SIZE_Y = 23040 -- how tall the spritesheet image is
      local SPAN_CLASS = 'item-icon' -- the class attribute on the image span element
-     local DataTable = mw.loadData('Module:' .. DATA_MODULE)
+     local DataTable = mw.loadData('Module:ItemIconData')
      if not DataTable then DataTable = {} end
-     local LocationFromTable = DataTable.Locations[icon]
+     local DataFromTable = DataTable.Locations[icon]
-     if not LocationFromTable then LocationFromTable = { X = 0, Y = 0 } end
+     if not DataFromTable then DataFromTable = { X = 0, Y = 0, N = 'NONE', L = nil } end
-     local SpriteX = LocationFromTable.X
+     local SpriteX = DataFromTable.X
-     local SpriteY = LocationFromTable.Y
+     local SpriteY = DataFromTable.Y
      local IconScale = size / SHEET_ICON_SIZE
@@ Line 34: / Line 34: @@
      SpriteHTML:cssText(table.concat(StyleItems, ';') .. ';' .. additionalCssText)
-     if link ~= '' then
+     return tostring(SpriteHTML), (DataFromTable.N or 'NONE'), DataFromTable.L
 end
@@ Line 61: / Line 53: @@
      if not LinkDest then LinkDest = '' end
-     return p.AddSpriteInternal(IconName, IconSize, LinkDest, '')
+     local IconHTML, ItemName, DefaultLink = p.AddSpriteInternal(IconName, IconSize, '')
 end
 return p

Macyler-Admin at 07:00, 9 August 2024

2024-08-09T07:00:15Z

← Older revision		Revision as of 07:00, 9 August 2024
Line 2:		Line 2:

	function p.AddSpriteInternal(icon, size, link, additionalCssText)		function p.AddSpriteInternal(icon, size, link, additionalCssText)
	~~local DEFAULT_ICON_SIZE = 32 -- how big icons should be on the page if not specifically sized~~
	local SHEET_ICON_SIZE = 64 -- how large icons are in the spritesheet		local SHEET_ICON_SIZE = 64 -- how large icons are in the spritesheet
	local SHEET_SIZE_X = 2048 -- how wide the spritesheet image is		local SHEET_SIZE_X = 2048 -- how wide the spritesheet image is
Line 51:		Line 50:
	-- link: The page to link to if the icon is clicked		-- link: The page to link to if the icon is clicked
	function p.AddSprite(frame)		function p.AddSprite(frame)
			local DEFAULT_ICON_SIZE = 32 -- how big icons should be on the page if not specifically sized

	local IconName = frame:getArgument('icon'):expand()		local IconName = frame:getArgument('icon'):expand()
	if not IconName then IconName = 'none' end		if not IconName then IconName = 'none' end

Macyler-Admin at 06:58, 9 August 2024

2024-08-09T06:58:25Z

← Older revision		Revision as of 06:58, 9 August 2024
Line 1:		Line 1:
	local p = {} --package		local p = {} --package

	~~-- Allowed Arguments:~~		function p.AddSpriteInternal(icon, size, link, additionalCssText)
	-- icon~~: The name of the icon to show~~, ~~defined in the image index.~~
	~~-- size: The~~ size, ~~in pixels~~, ~~to use for the icon on the page.~~
	~~-- link: The page to link to if the icon is clicked~~
	~~function p.AddSprite(frame~~)
	local DEFAULT_ICON_SIZE = 32 -- how big icons should be on the page if not specifically sized		local DEFAULT_ICON_SIZE = 32 -- how big icons should be on the page if not specifically sized
	local SHEET_ICON_SIZE = 64 -- how large icons are in the spritesheet		local SHEET_ICON_SIZE = 64 -- how large icons are in the spritesheet
Line 16:		Line 12:
	if not DataTable then DataTable = {} end		if not DataTable then DataTable = {} end

	~~local IconName = frame:getArgument('icon'):expand()~~		local LocationFromTable = DataTable.Locations[icon]
	~~if not IconName then IconName = 'none' end~~

	~~local IconSize = tonumber(frame:getArgument('size'):expand())~~
	~~if not IconSize then IconSize = DEFAULT_ICON_SIZE end~~

	~~local LinkDest = frame:getArgument('link'):expand()~~
	~~if not LinkDest then LinkDest = '' end~~

	local LocationFromTable = DataTable.Locations[~~IconName~~]
	if not LocationFromTable then LocationFromTable = { X = 0, Y = 0 } end		if not LocationFromTable then LocationFromTable = { X = 0, Y = 0 } end

Line 31:		Line 18:
	local SpriteY = LocationFromTable.Y		local SpriteY = LocationFromTable.Y

	local IconScale = ~~IconSize~~ / SHEET_ICON_SIZE		local IconScale = size / SHEET_ICON_SIZE
	local ImageXOffset = SpriteX * SHEET_ICON_SIZE * IconScale * -1		local ImageXOffset = SpriteX * SHEET_ICON_SIZE * IconScale * -1
	local ImageYOffset = SpriteY * SHEET_ICON_SIZE * IconScale * -1		local ImageYOffset = SpriteY * SHEET_ICON_SIZE * IconScale * -1
Line 41:		Line 28:

	local StyleItems = {}		local StyleItems = {}
	StyleItems[#StyleItems + 1] = 'height:' .. ~~IconSize~~ .. 'px'		StyleItems[#StyleItems + 1] = 'height:' .. size .. 'px'
	StyleItems[#StyleItems + 1] = 'width:' .. ~~IconSize~~ .. 'px'		StyleItems[#StyleItems + 1] = 'width:' .. size .. 'px'
	StyleItems[#StyleItems + 1] = 'background-size:' .. ScaledSheetSizeX .. 'px ' .. ScaledSheetSizeY .. 'px'		StyleItems[#StyleItems + 1] = 'background-size:' .. ScaledSheetSizeX .. 'px ' .. ScaledSheetSizeY .. 'px'
	StyleItems[#StyleItems + 1] = 'background-position:' .. ImageXOffset .. 'px ' .. ImageYOffset .. 'px'		StyleItems[#StyleItems + 1] = 'background-position:' .. ImageXOffset .. 'px ' .. ImageYOffset .. 'px'

	SpriteHTML:cssText(table.concat(StyleItems, ';'))		SpriteHTML:cssText(table.concat(StyleItems, ';') .. ';' .. additionalCssText)

	if ~~LinkDest~~ ~= '' then		if link ~= '' then
	if ~~LinkDest~~:find('//') then -- External Link		if link:find('//') then -- External Link
	return '[' .. ~~LinkDest~~ .. ' ' .. tostring(SpriteHTML) .. ']'		return '[' .. link .. ' ' .. tostring(SpriteHTML) .. ']'
	else -- Internal Link		else -- Internal Link
	return '[[' .. ~~LinkDest~~ .. '\|' .. tostring(SpriteHTML) .. ']]'		return '[[' .. link .. '\|' .. tostring(SpriteHTML) .. ']]'
	end		end
	else		else
	return tostring(SpriteHTML)		return tostring(SpriteHTML)
	end		end
			end

			-- Allowed Arguments:
			-- icon: The name of the icon to show, defined in the image index.
			-- size: The size, in pixels, to use for the icon on the page.
			-- link: The page to link to if the icon is clicked
			function p.AddSprite(frame)
			local IconName = frame:getArgument('icon'):expand()
			if not IconName then IconName = 'none' end

			local IconSize = tonumber(frame:getArgument('size'):expand())
			if not IconSize then IconSize = DEFAULT_ICON_SIZE end

			local LinkDest = frame:getArgument('link'):expand()
			if not LinkDest then LinkDest = '' end

			return p.AddSpriteInternal(IconName, IconSize, LinkDest, '')
	end		end

	return p		return p

Macyler-Admin: Fixing typo

2022-08-24T04:31:01Z

Fixing typo

← Older revision		Revision as of 04:31, 24 August 2022
Line 43:		Line 43:
	StyleItems[#StyleItems + 1] = 'height:' .. IconSize .. 'px'		StyleItems[#StyleItems + 1] = 'height:' .. IconSize .. 'px'
	StyleItems[#StyleItems + 1] = 'width:' .. IconSize .. 'px'		StyleItems[#StyleItems + 1] = 'width:' .. IconSize .. 'px'
	StyleItems[#StyleItems + 1] = 'background-size:' .. ScaledSheetSizeX .. 'px ' .. ~~ScaledSHeetSizeY~~ .. 'px'		StyleItems[#StyleItems + 1] = 'background-size:' .. ScaledSheetSizeX .. 'px ' .. ScaledSheetSizeY .. 'px'
	StyleItems[#StyleItems + 1] = 'background-position:' .. ImageXOffset .. 'px ' .. ImageYOffset .. 'px'		StyleItems[#StyleItems + 1] = 'background-position:' .. ImageXOffset .. 'px ' .. ImageYOffset .. 'px'

Macyler-Admin: Testing definition of both spritesheet height and width in attempt to fix iOS rendering

2022-08-24T04:30:43Z

Testing definition of both spritesheet height and width in attempt to fix iOS rendering

← Older revision		Revision as of 04:30, 24 August 2022
Line 8:		Line 8:
	local DEFAULT_ICON_SIZE = 32 -- how big icons should be on the page if not specifically sized		local DEFAULT_ICON_SIZE = 32 -- how big icons should be on the page if not specifically sized
	local SHEET_ICON_SIZE = 64 -- how large icons are in the spritesheet		local SHEET_ICON_SIZE = 64 -- how large icons are in the spritesheet
	local ~~SHEET_SIZE~~ = 2048 -- how wide the spritesheet image is		local SHEET_SIZE_X = 2048 -- how wide the spritesheet image is
			local SHEET_SIZE_Y = 23040 -- how tall the spritesheet image is
	local SPAN_CLASS = 'item-icon' -- the class attribute on the image span element		local SPAN_CLASS = 'item-icon' -- the class attribute on the image span element
	local DATA_MODULE = 'ItemIconData' -- the Module page containing the data table		local DATA_MODULE = 'ItemIconData' -- the Module page containing the data table
Line 33:		Line 34:
	local ImageXOffset = SpriteX * SHEET_ICON_SIZE * IconScale * -1		local ImageXOffset = SpriteX * SHEET_ICON_SIZE * IconScale * -1
	local ImageYOffset = SpriteY * SHEET_ICON_SIZE * IconScale * -1		local ImageYOffset = SpriteY * SHEET_ICON_SIZE * IconScale * -1
	local ~~ScaledSheetSize~~ = ~~SHEET_SIZE~~ * IconScale		local ScaledSheetSizeX = SHEET_SIZE_X * IconScale
			local ScaledSheetSizeY = SHEET_SIZE_Y * IconScale

	local SpriteHTML = mw.html.create('span');		local SpriteHTML = mw.html.create('span');
Line 41:		Line 43:
	StyleItems[#StyleItems + 1] = 'height:' .. IconSize .. 'px'		StyleItems[#StyleItems + 1] = 'height:' .. IconSize .. 'px'
	StyleItems[#StyleItems + 1] = 'width:' .. IconSize .. 'px'		StyleItems[#StyleItems + 1] = 'width:' .. IconSize .. 'px'
	StyleItems[#StyleItems + 1] = 'background-size:' .. ~~ScaledSheetSize~~ .. 'px ~~auto~~'		StyleItems[#StyleItems + 1] = 'background-size:' .. ScaledSheetSizeX .. 'px ' .. ScaledSHeetSizeY .. 'px'
	StyleItems[#StyleItems + 1] = 'background-position:' .. ImageXOffset .. 'px ' .. ImageYOffset .. 'px'		StyleItems[#StyleItems + 1] = 'background-position:' .. ImageXOffset .. 'px ' .. ImageYOffset .. 'px'