Module:Crafting Upgrades - Revision history

Mave at 21:34, 12 December 2022

2022-12-12T21:34:02Z

← Older revision		Revision as of 21:34, 12 December 2022
Line 350:		Line 350:
	if station == 'By Hand' then		if station == 'By Hand' then
	return ''		return ''
	~~elseif station == 'Furnace' or station == 'Work Bench' or station == 'Sawmill' or station == "Tinkerer's Workshop" or station == 'Dye Vat'~~
	~~or station == 'Ancient Manipulator' or station == 'Lihzahrd Furnace' or station == 'Living Wood' or station == 'Decay Chamber' or station == 'Teapot' or station == 'Campfire' then~~
	~~return l10n('compact_before') .. itemLink(station, {mode = 'image'}) .. l10n('compact_after')~~
	~~elseif station == "Tinkerer's Workshop and Ecto Mist" then~~
	~~return l10n('compact_before') .. itemLink("Tinkerer's Workshop", {mode = 'image'}) .. " & ".. itemLink('Ecto Mist', {mode = 'text'}) .. l10n('compact_after')~~
	else		else
	return l10n('compact_before') .. station .. l10n('compact_after')		return l10n('compact_before') .. station .. l10n('compact_after')
Line 449:		Line 444:
	spirit = 100,		spirit = 100,
	poison = 110,		poison = 110,
			fire = 112,
			frost = 114,
			lightning = 116,

	blockpower = 120,		blockpower = 120,
Line 488:		Line 486:
	'spirit',		'spirit',
	'poison',		'poison',
			'fire',
			'frost',
			'lightning',
	}		}

Line 995:		Line 996:
	spirit = trim(args['spirit'] or ''),		spirit = trim(args['spirit'] or ''),
	poison = trim(args['poison'] or ''),		poison = trim(args['poison'] or ''),
			fire = trim(args['fire'] or ''),
			frost = trim(args['frost'] or ''),
			lightning = trim(args['lightning'] or ''),

	ingredients = mw.ustring.sub(ingredients_string, 2),		ingredients = mw.ustring.sub(ingredients_string, 2),
Line 1,068:		Line 1,072:
	-- no station		-- no station
	-- query, still need contain station field for cate.		-- query, still need contain station field for cate.
	local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, armor, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, backstab, knockback, repairstationlevel, station, stationlevel, args', {		local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, armor, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, fire, frost, lightning, backstab, knockback, repairstationlevel, station, stationlevel, args', {
	where = where,		where = where,
	groupBy = "result, amount, quality, ings",		groupBy = "result, amount, quality, ings",
Line 1,082:		Line 1,086:
	end		end
	-- query		-- query
	local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, armor, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, backstab, knockback, repairstationlevel, station, stationlevel, args', {		local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, armor, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, fire, frost, lightning, backstab, knockback, repairstationlevel, station, stationlevel, args', {
	where = where,		where = where,
	groupBy = "result, amount, quality, ings",		groupBy = "result, amount, quality, ings",
Line 1,113:		Line 1,117:

	-- query:		-- query:
	local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, armor, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, backstab, knockback, repairstationlevel, station, stationlevel, args', {		local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, armor, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, fire, frost, lightning, backstab, knockback, repairstationlevel, station, stationlevel, args', {
	where = where,		where = where,
	groupBy = "result, amount, quality, ings",		groupBy = "result, amount, quality, ings",
Line 1,238:		Line 1,242:
	end		end
	-- query: since we must use group by to eliminate duplicates, so we can not use COUNT() to get row count directly.		-- query: since we must use group by to eliminate duplicates, so we can not use COUNT() to get row count directly.
	local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, armor, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, backstab, knockback, repairstationlevel, station, stationlevel, args', {		local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, armor, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, fire, frost, lightning, backstab, knockback, repairstationlevel, station, stationlevel, args', {
	where = where,		where = where,
	groupBy = "result, amount, quality, ings",		groupBy = "result, amount, quality, ings",

Mave at 21:56, 11 December 2022

2022-12-11T21:56:55Z

← Older revision		Revision as of 21:56, 11 December 2022
Line 439:		Line 439:

	durability = 40,		durability = 40,
			armor = 45,

	slash = 50,		slash = 50,
Line 469:		Line 470:

	'durability',		'durability',
			'armor',
	'blockpower',		'blockpower',
	'movementspeed',		'movementspeed',
Line 975:		Line 977:

	durability = trim(args['durability'] or ''),		durability = trim(args['durability'] or ''),
			armor = trim(args['armor'] or ''),
	blockpower = trim(args['blockpower'] or ''),		blockpower = trim(args['blockpower'] or ''),
	movementspeed = trim(args['movementspeed'] or ''),		movementspeed = trim(args['movementspeed'] or ''),
Line 1,065:		Line 1,068:
	-- no station		-- no station
	-- query, still need contain station field for cate.		-- query, still need contain station field for cate.
	local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, backstab, knockback, repairstationlevel, station, stationlevel, args', {		local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, armor, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, backstab, knockback, repairstationlevel, station, stationlevel, args', {
	where = where,		where = where,
	groupBy = "result, amount, quality, ings",		groupBy = "result, amount, quality, ings",
Line 1,079:		Line 1,082:
	end		end
	-- query		-- query
	local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, backstab, knockback, repairstationlevel, station, stationlevel, args', {		local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, armor, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, backstab, knockback, repairstationlevel, station, stationlevel, args', {
	where = where,		where = where,
	groupBy = "result, amount, quality, ings",		groupBy = "result, amount, quality, ings",
Line 1,110:		Line 1,113:

	-- query:		-- query:
	local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, backstab, knockback, repairstationlevel, station, stationlevel, args', {		local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, armor, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, backstab, knockback, repairstationlevel, station, stationlevel, args', {
	where = where,		where = where,
	groupBy = "result, amount, quality, ings",		groupBy = "result, amount, quality, ings",
Line 1,235:		Line 1,238:
	end		end
	-- query: since we must use group by to eliminate duplicates, so we can not use COUNT() to get row count directly.		-- query: since we must use group by to eliminate duplicates, so we can not use COUNT() to get row count directly.
	local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, backstab, knockback, repairstationlevel, station, stationlevel, args', {		local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, armor, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, backstab, knockback, repairstationlevel, station, stationlevel, args', {
	where = where,		where = where,
	groupBy = "result, amount, quality, ings",		groupBy = "result, amount, quality, ings",

Mave at 10:44, 8 January 2022

2022-01-08T10:44:35Z

← Older revision		Revision as of 10:44, 8 January 2022
Line 369:		Line 369:
	elseif prop == 'movementspeed' then		elseif prop == 'movementspeed' then
	return 'Movement speed'		return 'Movement speed'
			elseif prop == 'parrybonus' then
			return 'Parry bonus'
			elseif prop == 'parryforce' then
			return 'Parry force'
	end		end

Mave at 19:24, 2 January 2022

2022-01-02T19:24:10Z

← Older revision		Revision as of 19:24, 2 January 2022
Line 424:		Line 424:
	end		end

	local tableBodyUpgrades = function(result, showResultId, withStation, needGroup, needCate, needLink, rootpagename, title, expectedrows, template, stationGroup)		local tableBodyUpgrades = function(noResultsText, result, showResultId, withStation, needGroup, needCate, needLink, rootpagename, title, expectedrows, template, stationGroup)
			if next(result) == nil then
			return "''" .. (noResultsText or 'No results') .. "''"
			end

	propertyOrder = {		propertyOrder = {
Line 1,049:		Line 1,052:
	end		end
	local rootpagename = mw.title.getCurrentTitle().rootText		local rootpagename = mw.title.getCurrentTitle().rootText

			local noResultsText = 'No results'
			if args['result'] or '' ~= '' then
			noResultsText = 'This item cannot be upgraded'
			end

	if trim(args['nostation'] or '') ~= '' then		if trim(args['nostation'] or '') ~= '' then
Line 1,059:		Line 1,067:
	limit = 2000,		limit = 2000,
	})		})
	return tableBodyUpgrades(result, showResultId, false, needGroup, needCate, needLink, rootpagename, _title, _expectedrows, getArg('resulttemplate'), false)		return tableBodyUpgrades(noResultsText, result, showResultId, false, needGroup, needCate, needLink, rootpagename, _title, _expectedrows, getArg('resulttemplate'), false)
	else		else
	-- with station		-- with station
Line 1,073:		Line 1,081:
	limit = 2000,		limit = 2000,
	})		})
	return tableBodyUpgrades(result, showResultId, true, needGroup, needCate, needLink, rootpagename, _title, _expectedrows, getArg('resulttemplate'), stationGroup)		return tableBodyUpgrades(noResultsText, result, showResultId, true, needGroup, needCate, needLink, rootpagename, _title, _expectedrows, getArg('resulttemplate'), stationGroup)
	end		end
	end -- p.query		end -- p.query

Mave at 11:18, 2 January 2022

2022-01-02T11:18:36Z

← Older revision		Revision as of 11:18, 2 January 2022
Line 427:		Line 427:

	propertyOrder = {		propertyOrder = {
	quality = 1,		quality = 10,
	station = 2,		station = 20,
	stationlevel = 3,		stationlevel = 30,

	durability = 4,		durability = 40,
	~~blockpower = 5,~~
	~~movementspeed = 6~~,

	~~parryforce~~ = 7,		slash = 50,
	~~parrybonus~~ = 8,		blunt = 60,
			pierce = 70,
			backstab = 80,
			knockback = 90,

	~~weight~~ = 9,		spirit = 100,
			poison = 110,

			blockpower = 120,
			movementspeed = 130,

	~~slash~~ = 10,		parryforce = 140,
	~~blunt~~ = ~~11,~~		parrybonus = 150,
	~~pierce = 12,~~
	~~backstab = 13,~~
	~~knockback = 14~~,

	~~spirit~~ = ~~15,~~		weight = 160,
	~~poison = 16~~,

	args = 999,		args = 999,

Mave at 22:41, 1 January 2022

2022-01-01T22:41:43Z

@@ Line 425: / Line 425: @@
 local tableBodyUpgrades = function(result, showResultId, withStation, needGroup, needCate, needLink, rootpagename, title, expectedrows, template, stationGroup)
 -- inputArgs = {} -- @TODO: Mave
@@ Line 486: / Line 512: @@
      local tableStart = tableStart()
      local tableContents = ''
      for prop, str in pairs(output) do
 --    for _, var in ipairs(output2) do
@@ Line 496: / Line 524: @@
      			tableStart = tableStart .. str:gsub('xxxyyyzzz', '</th><th>')
 			else
-	    	    tableContents = tableContents .. '<tr data-prop="' .. prop .. '">'
+				order = (propertyOrder[prop] or lastOrder)
 	    	    local td = '<td'
 	    	    local class = prop

Mave at 22:35, 1 January 2022

2022-01-01T22:35:11Z

← Older revision		Revision as of 22:35, 1 January 2022
Line 456:		Line 456:
	local count = 0		local count = 0
	local output = {}		local output = {}
	local output2 = {}		-- local output2 = {}
	local iOutput = 0;		-- local iOutput = 0;

	for _, row in ipairs(result) do		for _, row in ipairs(result) do
Line 471:		Line 471:
	output[prop] = (output[prop] or '') .. 'xxxyyyzzz' .. arg		output[prop] = (output[prop] or '') .. 'xxxyyyzzz' .. arg

	k["prop"] = prop		-- k["prop"] = prop
	k["value"] = output[prop]		-- k["value"] = output[prop]
	output2[iOutput] = k		-- output2[iOutput] = k
	iOutput = iOutput + 1		-- iOutput = iOutput + 1
	end		end
	end		end
Line 486:		Line 486:
	local tableStart = tableStart()		local tableStart = tableStart()
	local tableContents = ''		local tableContents = ''
	-- for prop, str in pairs(output) do		for prop, str in pairs(output) do
	for _, var in ipairs(output2) do		-- for _, var in ipairs(output2) do
	prop = var["prop"]		-- prop = var["prop"]
	str = var["value"]		-- str = var["value"]

	stringContents = string.sub(str, 10)		stringContents = string.sub(str, 10)

Mave at 22:33, 1 January 2022

2022-01-01T22:33:26Z

← Older revision		Revision as of 22:33, 1 January 2022
Line 468:		Line 468:
	arg = 'Quality ' .. arg		arg = 'Quality ' .. arg
	end		end
	k = {}		local k = {}
	output[prop] = (output[prop] or '') .. 'xxxyyyzzz' .. arg		output[prop] = (output[prop] or '') .. 'xxxyyyzzz' .. arg

	k["prop"] = prop		k["prop"] = prop
	k["value"] = output[prop]		k["value"] = output[prop]

Mave at 22:30, 1 January 2022

2022-01-01T22:30:26Z

← Older revision		Revision as of 22:30, 1 January 2022
Line 456:		Line 456:
	local count = 0		local count = 0
	local output = {}		local output = {}
			local output2 = {}
			local iOutput = 0;

	for _, row in ipairs(result) do		for _, row in ipairs(result) do
	count = count + 1		count = count + 1
Line 465:		Line 468:
	arg = 'Quality ' .. arg		arg = 'Quality ' .. arg
	end		end
			k = {}
	output[prop] = (output[prop] or '') .. 'xxxyyyzzz' .. arg		output[prop] = (output[prop] or '') .. 'xxxyyyzzz' .. arg
			k["prop"] = prop
			k["value"] = output[prop]
			output2[iOutput] = k
			iOutput = iOutput + 1
	end		end
	end		end
Line 477:		Line 485:
	local tableStart = tableStart()		local tableStart = tableStart()
	local tableContents = ''		local tableContents = ''
	for prop, str in pairs(output) do		-- for prop, str in pairs(output) do
			for _, var in ipairs(output2) do
			prop = var["prop"]
			str = var["value"]

	stringContents = string.sub(str, 10)		stringContents = string.sub(str, 10)
	if stringContents ~= emptyString then		if stringContents ~= emptyString then

Mave at 19:21, 4 March 2021

2021-03-04T19:21:30Z

← Older revision		Revision as of 19:21, 4 March 2021
Line 1,009:		Line 1,009:
	-- no station		-- no station
	-- query, still need contain station field for cate.		-- query, still need contain station field for cate.
	local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, backstab, knockback, repairstationlevel, station, stationlevel, args', {		local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, backstab, knockback, repairstationlevel, station, stationlevel, args', {
	where = where,		where = where,
	groupBy = "result, amount, quality, ings",		groupBy = "result, amount, quality, ings",
Line 1,023:		Line 1,023:
	end		end
	-- query		-- query
	local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, backstab, knockback, repairstationlevel, station, stationlevel, args', {		local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, backstab, knockback, repairstationlevel, station, stationlevel, args', {
	where = where,		where = where,
	groupBy = "result, amount, quality, ings",		groupBy = "result, amount, quality, ings",
Line 1,054:		Line 1,054:

	-- query:		-- query:
	local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, backstab, knockback, repairstationlevel, station, stationlevel, args', {		local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, backstab, knockback, repairstationlevel, station, stationlevel, args', {
	where = where,		where = where,
	groupBy = "result, amount, quality, ings",		groupBy = "result, amount, quality, ings",
Line 1,179:		Line 1,179:
	end		end
	-- query: since we must use group by to eliminate duplicates, so we can not use COUNT() to get row count directly.		-- query: since we must use group by to eliminate duplicates, so we can not use COUNT() to get row count directly.
	local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, backstab, knockback, repairstationlevel, station, stationlevel, args', {		local result = mw.ext.cargo.query('CraftingUpgrades', 'result, amount, quality, durability, blockpower, movementspeed, parryforce, parrybonus, weight, slot, slash, blunt, pierce, spirit, poison, backstab, knockback, repairstationlevel, station, stationlevel, args', {
	where = where,		where = where,
	groupBy = "result, amount, quality, ings",		groupBy = "result, amount, quality, ings",