Module:Dice - Revision history

Gpe at 20:08, 19 November 2025

2025-11-19T20:08:33Z

← Older revision		Revision as of 20:08, 19 November 2025
Line 177:		Line 177:
	:attr("data-full-roll", fullRoll)		:attr("data-full-roll", fullRoll)
	:attr("data-quick-roll", quickRoll)		:attr("data-quick-roll", quickRoll)
	:attr("data-type", roll)		:attr("data-type", "roll")
	:attr("data-roll-type", typ)		:attr("data-roll-type", typ)
	:done()		:done()

Gpe at 20:07, 19 November 2025

2025-11-19T20:07:14Z

← Older revision		Revision as of 20:07, 19 November 2025
Line 173:		Line 173:
	:attr('data-type', typ)		:attr('data-type', typ)
	:wikitext(inner)		:wikitext(inner)
	:~~node~~("span")		:tag("span")
	:addClass("metadata")		:addClass("metadata")
	:attr("data-full-roll", fullRoll)		:attr("data-full-roll", fullRoll)

Gpe at 20:04, 19 November 2025

2025-11-19T20:04:46Z

← Older revision		Revision as of 20:04, 19 November 2025
Line 173:		Line 173:
	:attr('data-type', typ)		:attr('data-type', typ)
	:wikitext(inner)		:wikitext(inner)
			:node("span")
			:addClass("metadata")
			:attr("data-full-roll", fullRoll)
			:attr("data-quick-roll", quickRoll)
			:attr("data-type", roll)
			:attr("data-roll-type", typ)
			:done()
	:allDone()		:allDone()
	end		end

	return p		return p

Gpe at 20:47, 4 November 2025

2025-11-04T20:47:19Z

← Older revision		Revision as of 20:47, 4 November 2025
Line 146:		Line 146:
	elseif prefixFlag then		elseif prefixFlag then
	-- pure prefix		-- pure prefix
	~~table.insert(content, frame:preprocess(~~"{{" .. string.upper(prefixFlag) .. "}}"))		local tpl = "{{" .. string.upper(prefixFlag)
			if prefixCount and prefixCount ~= 1 then tpl = tpl .. "\|" .. prefixCount end
			tpl = tpl .. "}}"
			table.insert(content, frame:preprocess(tpl))
	else		else
	-- fallback: unknown token but with qualifiers; keep original token text		-- fallback: unknown token but with qualifiers; keep original token text

Gpe at 20:33, 4 November 2025

2025-11-04T20:33:25Z

← Older revision		Revision as of 20:33, 4 November 2025
Line 22:		Line 22:
	i = i + 1		i = i + 1
	else		else
	local j = s:find("[%+%-%*]", i)		local j = s:find("[%+%-]", i)
	if j then		if j then
	table.insert(parts, trim(s:sub(i, j-1)))		table.insert(parts, trim(s:sub(i, j-1)))

Gpe at 20:33, 4 November 2025

2025-11-04T20:33:00Z

← Older revision		Revision as of 20:33, 4 November 2025
Line 22:		Line 22:
	i = i + 1		i = i + 1
	else		else
	local j = s:find("[%+%-]", i)		local j = s:find("[%+%-%*]", i)
	if j then		if j then
	table.insert(parts, trim(s:sub(i, j-1)))		table.insert(parts, trim(s:sub(i, j-1)))

Gpe: // via Wikitext Extension for VSCode

2025-08-11T23:10:36Z

// via Wikitext Extension for VSCode

← Older revision		Revision as of 23:10, 11 August 2025
Line 40:		Line 40:
	end		end

	-- Parse an individual part into prefix, dice, and ~~qualifiers~~		-- Parse an individual part into prefix, dice, qualifiers, and constant
	local function parsePart(part)		local function parsePart(part)
	local s = trim(part)		local s = trim(part)
	local prefixCount, prefixFlag, diceCount, diceFaces, qualifiers = nil, nil, nil, nil, {}		local prefixCount, prefixFlag, diceCount, diceFaces, qualifiers = nil, nil, nil, nil, {}
			local constValue = nil

	-- Extract qualifiers in [brackets]		-- Extract qualifiers in [brackets]
Line 77:		Line 78:
	diceCount = tonumber(cnt) or 1		diceCount = tonumber(cnt) or 1
	diceFaces = faces		diceFaces = faces
			else
			-- If not dice, check for a bare numeric constant
			local num = s:match("^(%d+)$")
			if num then
			constValue = tonumber(num)
			end
	end		end

	return prefixCount, prefixFlag, diceCount, diceFaces, qualifiers		return prefixCount, prefixFlag, diceCount, diceFaces, qualifiers, constValue
	end		end

Line 96:		Line 103:
	else		else
	-- parse dice, prefix, or constant		-- parse dice, prefix, or constant
	local prefixCount, prefixFlag, diceCount, diceFaces, qualifiers = parsePart(part)		local prefixCount, prefixFlag, diceCount, diceFaces, qualifiers, constValue = parsePart(part)
	-- ~~fallback for~~ plain ~~constants~~
	if not diceCount and not prefixFlag then		-- If it's truly plain (no dice/prefix/qualifiers), keep old behavior
			if not diceCount and not prefixFlag and #qualifiers == 0 and not constValue then
	table.insert(quickParts, part)		table.insert(quickParts, part)
	table.insert(content, part)		table.insert(content, part)
Line 105:		Line 113:
	if diceCount then		if diceCount then
	table.insert(quickParts, diceCount .. "d" .. diceFaces)		table.insert(quickParts, diceCount .. "d" .. diceFaces)
			elseif constValue then
			table.insert(quickParts, tostring(constValue))
	end		end

	-- Prefix template for typed rolls		-- Prefix template for typed rolls (only before dice, as before)
	if prefixFlag and typ ~= "none" and diceCount then		if prefixFlag and typ ~= "none" and diceCount then
	local tpl = "{{" .. string.upper(prefixFlag)		local tpl = "{{" .. string.upper(prefixFlag)
Line 115:		Line 125:
	end		end

	-- Build dice link		-- Build dice link or output constant/pure prefix
	if diceCount then		if diceCount then
	local displayDice = diceCount .. "d" .. diceFaces		local displayDice = diceCount .. "d" .. diceFaces
Line 131:		Line 141:
	string.format("[https://dice.run/#/d/%dd%s %s]", diceCount, diceFaces, linkLabel)		string.format("[https://dice.run/#/d/%dd%s %s]", diceCount, diceFaces, linkLabel)
	)		)
			elseif constValue then
			-- numeric constant (e.g., 4[lethal])
			table.insert(content, tostring(constValue))
	elseif prefixFlag then		elseif prefixFlag then
	-- pure prefix		-- pure prefix
	table.insert(content, frame:preprocess("{{" .. string.upper(prefixFlag) .. "}}"))		table.insert(content, frame:preprocess("{{" .. string.upper(prefixFlag) .. "}}"))
			else
			-- fallback: unknown token but with qualifiers; keep original token text
			table.insert(content, part)
	end		end

Gpe: // via Wikitext Extension for VSCode

2025-06-20T01:02:47Z

// via Wikitext Extension for VSCode

← Older revision		Revision as of 01:02, 20 June 2025
Line 52:		Line 52:
	table.insert(qualifiers, q)		table.insert(qualifiers, q)
	end		end
	~~-- Sort qualifiers alphabetically~~
	table.sort(qualifiers)		table.sort(qualifiers)
	end		end
Line 59:		Line 58:
	local rawPref = s:match("^%(([^)]+)%)")		local rawPref = s:match("^%(([^)]+)%)")
	if rawPref then		if rawPref then
	~~-- Match "<number>*@<flag>" or "<number>@<flag>" or just "@<flag>"~~
	local num, flag = rawPref:match("^(%d+)%s%%s*@(%a+)$")		local num, flag = rawPref:match("^(%d+)%s%%s*@(%a+)$")
	if not num then		if not num then num, flag = rawPref:match("^(%d*)@(%a+)$") end
	num, flag = rawPref:match("^(%d*)@(%a+)$")
	end
	prefixCount = tonumber(num) or 1		prefixCount = tonumber(num) or 1
	prefixFlag = flag		prefixFlag = flag
	s = s:gsub("^%b()", "", 1)		s = s:gsub("^%b()", "", 1)
	else		else
	~~-- Pure prefix without dice~~
	local pure = s:match("^@(%a+)$")		local pure = s:match("^@(%a+)$")
	if pure then		if pure then
Line 96:		Line 91:
	for _, part in ipairs(parts) do		for _, part in ipairs(parts) do
	if part == "+" or part == "-" then		if part == "+" or part == "-" then
			-- operator
	table.insert(quickParts, part)		table.insert(quickParts, part)
	table.insert(content, " " .. part .. " ")		table.insert(content, " " .. part .. " ")
	else		else
			-- parse dice, prefix, or constant
	local prefixCount, prefixFlag, diceCount, diceFaces, qualifiers = parsePart(part)		local prefixCount, prefixFlag, diceCount, diceFaces, qualifiers = parsePart(part)
	-- Build quick-roll sequence (ignore flags)		-- fallback for plain constants
	if diceCount then		if not diceCount and not prefixFlag then
	table.insert(quickParts, diceCount .. "d" .. diceFaces)		table.insert(quickParts, part)
	end		table.insert(content, part)
			else
			-- Build quick-roll sequence (ignore flags)
			if diceCount then
			table.insert(quickParts, diceCount .. "d" .. diceFaces)
			end

	-- Prefix template for ~~non-'none' types~~		-- Prefix template for typed rolls
	if prefixFlag and typ ~= "none" and diceCount then		if prefixFlag and typ ~= "none" and diceCount then
	local tpl = "{{" .. string.upper(prefixFlag)		local tpl = "{{" .. string.upper(prefixFlag)
	if prefixCount and prefixCount ~= 1 then tpl = tpl .. "\|" .. prefixCount end		if prefixCount and prefixCount ~= 1 then tpl = tpl .. "\|" .. prefixCount end
	tpl = tpl .. "}}"		tpl = tpl .. "}}"
	table.insert(content, frame:preprocess(tpl))		table.insert(content, frame:preprocess(tpl))
	end		end

	-- Build dice link		-- Build dice link
	if diceCount then		if diceCount then
	local displayDice = diceCount .. "d" .. diceFaces		local displayDice = diceCount .. "d" .. diceFaces
	local linkLabel = displayDice		local linkLabel = displayDice
	if prefixFlag then		if prefixFlag then
	if typ == "none" and #qualifiers == 0 then		if typ == "none" and #qualifiers == 0 then
	~~-- Merge prefix into label when no type and no qualifiers~~		local prefixLabel = string.upper(prefixFlag)
	local prefixLabel = string.upper(prefixFlag)		if prefixCount and prefixCount > 1 then prefixLabel = prefixCount .. prefixLabel end
	if prefixCount and prefixCount > 1 then		linkLabel = prefixLabel .. "d" .. diceFaces
	prefixLabel = ~~prefixCount~~ .. ~~prefixLabel~~		else
			linkLabel = "d" .. diceFaces
	end		end
	~~linkLabel = prefixLabel .. "d" .. diceFaces~~
	~~else~~
	~~-- For typed rolls, label should only show the face string~~
	~~linkLabel = "d" .. diceFaces~~
	end		end
			table.insert(content,
			string.format("[https://dice.run/#/d/%dd%s %s]", diceCount, diceFaces, linkLabel)
			)
			elseif prefixFlag then
			-- pure prefix
			table.insert(content, frame:preprocess("{{" .. string.upper(prefixFlag) .. "}}"))
	end		end
	~~table.insert(content, string.format("[https://dice.run/#/d/%dd%s %s]", diceCount, diceFaces, linkLabel))~~
	~~elseif prefixFlag then~~
	~~-- Pure prefix outputs template~~
	~~table.insert(content, frame:preprocess("{{" .. string.upper(prefixFlag) .. "}}"))~~
	~~end~~

	-- Qualifier labels		-- Qualifier labels
	for _, q in ipairs(qualifiers) do		for _, q in ipairs(qualifiers) do
	table.insert(content, frame:preprocess(" {{L\|" .. capitalize(typ) .. "\|" .. capitalize(q) .. "}}"))		table.insert(content, frame:preprocess(" {{L\|" .. capitalize(typ) .. "\|" .. capitalize(q) .. "}}"))
			end
	end		end
	end		end
	end		end

	-- ~~Assemble~~ quick-roll and ~~content~~		-- assemble quick-roll and output
	local quickRoll = table.concat(quickParts, " ")		local quickRoll = table.concat(quickParts, " ")
	local inner = table.concat(content)		local inner = table.concat(content)

	~~-- Generate span~~		return html.create('span')
	~~local span =~~ html.create('span')
	:addClass('dice')		:addClass('dice')
	:attr('data-full-roll', fullRoll)		:attr('data-full-roll', fullRoll)
Line 154:		Line 154:
	:attr('data-type', typ)		:attr('data-type', typ)
	:wikitext(inner)		:wikitext(inner)
			:allDone()
	~~return span~~:allDone()
	end		end

	return p		return p

Gpe: // via Wikitext Extension for VSCode

2025-06-20T00:57:42Z

// via Wikitext Extension for VSCode

← Older revision		Revision as of 00:57, 20 June 2025
Line 115:		Line 115:
	-- Build dice link		-- Build dice link
	if diceCount then		if diceCount then
	~~-- Default display includes count~~
	local displayDice = diceCount .. "d" .. diceFaces		local displayDice = diceCount .. "d" .. diceFaces
	local linkLabel = displayDice		local linkLabel = displayDice
	~~-- Override for standalone prefix (no qualifiers)~~		if prefixFlag then
	if ~~prefixFlag and~~ typ == "none" and #qualifiers == 0 then		if typ == "none" and #qualifiers == 0 then
	local prefixLabel = string.upper(prefixFlag)		-- Merge prefix into label when no type and no qualifiers
	if prefixCount and prefixCount > 1 then		local prefixLabel = string.upper(prefixFlag)
	prefixLabel = prefixCount .. prefixLabel		if prefixCount and prefixCount > 1 then
			prefixLabel = prefixCount .. prefixLabel
			end
			linkLabel = prefixLabel .. "d" .. diceFaces
			else
			-- For typed rolls, label should only show the face string
			linkLabel = "d" .. diceFaces
	end		end
	~~-- Use just "d<faces>" for dice when prefixed~~
	~~linkLabel = prefixLabel .. "d" .. diceFaces~~
	end		end
	table.insert(content, string.format("[https://dice.run/#/d/%dd%s %s]", diceCount, diceFaces, linkLabel))		table.insert(content, string.format("[https://dice.run/#/d/%dd%s %s]", diceCount, diceFaces, linkLabel))

Gpe: // via Wikitext Extension for VSCode

2025-06-20T00:31:19Z

// via Wikitext Extension for VSCode

← Older revision		Revision as of 00:31, 20 June 2025
Line 59:		Line 59:
	local rawPref = s:match("^%(([^)]+)%)")		local rawPref = s:match("^%(([^)]+)%)")
	if rawPref then		if rawPref then
	-- ~~Try to match~~ "<number>*@<flag>"		-- Match "<number>*@<flag>" or "<number>@<flag>" or just "@<flag>"
	local num, flag = rawPref:match("^(%d+)%s%%s*@(%a+)$")		local num, flag = rawPref:match("^(%d+)%s%%s*@(%a+)$")
	if not num then		if not num then
	~~-- Try "<number>@<flag>" or just "@<flag>"~~
	num, flag = rawPref:match("^(%d*)@(%a+)$")		num, flag = rawPref:match("^(%d*)@(%a+)$")
	end		end
Line 101:		Line 100:
	else		else
	local prefixCount, prefixFlag, diceCount, diceFaces, qualifiers = parsePart(part)		local prefixCount, prefixFlag, diceCount, diceFaces, qualifiers = parsePart(part)
	-- Build quick-roll (ignore flags)		-- Build quick-roll sequence (ignore flags)
	if diceCount then		if diceCount then
	table.insert(quickParts, diceCount .. "d" .. diceFaces)		table.insert(quickParts, diceCount .. "d" .. diceFaces)
Line 116:		Line 115:
	-- Build dice link		-- Build dice link
	if diceCount then		if diceCount then
	-- ~~Always show~~ count		-- Default display includes count
	local displayDice = diceCount .. "d" .. diceFaces		local displayDice = diceCount .. "d" .. diceFaces
	local linkLabel = displayDice		local linkLabel = displayDice
	-- ~~Embed~~ prefix ~~in label when type='none' and~~ no qualifiers		-- Override for standalone prefix (no qualifiers)
	if prefixFlag and typ == "none" and #qualifiers == 0 then		if prefixFlag and typ == "none" and #qualifiers == 0 then
	local prefixLabel = string.upper(prefixFlag)		local prefixLabel = string.upper(prefixFlag)
Line 125:		Line 124:
	prefixLabel = prefixCount .. prefixLabel		prefixLabel = prefixCount .. prefixLabel
	end		end
	linkLabel = prefixLabel .. ~~displayDice~~		-- Use just "d<faces>" for dice when prefixed
			linkLabel = prefixLabel .. "d" .. diceFaces
	end		end
	table.insert(content, string.format("[https://dice.run/#/d/%dd%s %s]", diceCount, diceFaces, linkLabel))		table.insert(content, string.format("[https://dice.run/#/d/%dd%s %s]", diceCount, diceFaces, linkLabel))
	elseif prefixFlag ~~and not diceCount~~ then		elseif prefixFlag then
	-- Pure prefix outputs template ~~always~~		-- Pure prefix outputs template
	table.insert(content, frame:preprocess("{{" .. string.upper(prefixFlag) .. "}}"))		table.insert(content, frame:preprocess("{{" .. string.upper(prefixFlag) .. "}}"))
	end		end