Module:Enemies - Revision history

Mave at 22:57, 20 December 2022

2022-12-20T22:57:37Z

← Older revision		Revision as of 22:57, 20 December 2022
Line 435:		Line 435:
	_field = 'col-B-' .. _i		_field = 'col-B-' .. _i
	end		end
	str = str .. '<th class="ingredients">' .. (getArg('header-stars') or l10n('~~stars~~')) .. '</th>'		str = str .. '<th class="ingredients">' .. (getArg('header-stars') or l10n('Stars')) .. '</th>'
	_i = 1		_i = 1
	_field = 'col-C-1'		_field = 'col-C-1'

Mave at 22:57, 20 December 2022

2022-12-20T22:57:20Z

← Older revision		Revision as of 22:57, 20 December 2022
Line 344:		Line 344:
	return l10n('By Hand')		return l10n('By Hand')
	elseif true == is_crafting_station(station) then		elseif true == is_crafting_station(station) then
	~~-- station == 'Workbench' or station == 'Forge' or station == 'Cauldron' or station == 'Fermenter' then~~
	local linkItem = enemyLink(station, options)		local linkItem = enemyLink(station, options)
	if (level or '') ~= '' then		if (level or '') ~= '' then
Line 351:		Line 350:

	return linkItem		return linkItem
	~~-- return enemyLink(station, options)~~
	~~elseif station == "Station One and Station Two" then~~
	~~return enemyLink("Station One", options) .. l10n('And').. enemyLink('Station Two', {mode = 'text'})~~
	else		else
	return station		return station
	~~end~~
	~~end~~
	~~-- for extract.~~
	~~local compactStation = function(station)~~
	~~if station == 'By Hand' then~~
	~~return ''~~
	~~else~~
	~~return l10n('compact_before') .. station .. l10n('compact_after')~~
	end		end
	end		end
Line 400:		Line 388:
	return needCate, needLink		return needCate, needLink
	end		end

	~~local addCate, cateStr -- for table body. init in p.query~~

	local tableStart = function(title, withStation)		local tableStart = function(title, withStation)
Line 449:		Line 435:
	_field = 'col-B-' .. _i		_field = 'col-B-' .. _i
	end		end
	str = str .. '<th class="ingredients">' .. (getArg('header-~~ingredients~~') or l10n('~~Ingredients~~')) .. '</th>'		str = str .. '<th class="ingredients">' .. (getArg('header-stars') or l10n('stars')) .. '</th>'
	_i = 1		_i = 1
	_field = 'col-C-1'		_field = 'col-C-1'
Line 540:		Line 526:
	}		}

	~~-- inputArgs = {} -- @TODO: Mave~~
	-- matches the definition and order in Template:Enemies		-- matches the definition and order in Template:Enemies
	properties = {		properties = {
Line 574:		Line 559:
	local k = {}		local 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 593:		Line 573:
	lastOrder = 800		lastOrder = 800
	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
Line 613:		Line 589:
	td = td .. ' data-prop="' .. prop .. '"'		td = td .. ' data-prop="' .. prop .. '"'
	td = td .. '>'		td = td .. '>'
	~~-- local replaced, _ = str:gsub('xxxyyyzzz', '</td>' .. td)~~

	local rowContents = ''		local rowContents = ''
Line 625:		Line 600:
	end		end

	~~-- local rowContents = replaced~~
	tableContents = tableContents .. '<td data-propHeader="' .. prop .. '">'		tableContents = tableContents .. '<td data-propHeader="' .. prop .. '">'
	.. propCell(prop)		.. propCell(prop)
Line 986:		Line 960:
	-- table end		-- table end
	str = str .. tableEnd(rows_count, expectedrows)		str = str .. tableEnd(rows_count, expectedrows)

	~~-- cate~~
	~~-- if needCate then~~
	~~-- str = str .. cateStr()~~
	~~-- end~~

	return str		return str
Line 1,047:		Line 1,016:

	resultanchor = trim(args['resultanchor'] or '')		resultanchor = trim(args['resultanchor'] or '')

	~~addCate, cateStr = (function()~~
	~~local cate = l10n('station_cate')~~
	~~local cateCache = {}~~
	~~local addCate = function(station)~~
	~~cateCache[station] = true~~
	~~end~~
	~~local cateStr = function()~~
	~~local str = ''~~
	~~for station, _ in pairs(cateCache) do~~
	~~str = str .. '[[Category:'..(cate[station] or frame:expandTemplate{ title = 'tr', args = {station, lang=lang, link='y'}})..']]'~~
	~~end~~
	~~if str ~= '' then~~
	~~str = '[[Category:'.. l10n('cate_craftable').. ']]' .. str~~
	~~end~~
	~~return str~~
	~~end~~
	~~return addCate, cateStr~~
	~~end)()~~

	local where = trim(args['where'] or '')		local where = trim(args['where'] or '')
Line 1,210:		Line 1,160:
	end		end
	str = str .. enemyLink(row['result'], args)		str = str .. enemyLink(row['result'], args)
	~~end~~
	~~if withStation then~~
	~~str = str .. compactStation(row['station'])~~
	end		end
	str = str..'</span>'		str = str..'</span>'

Mave at 22:46, 20 December 2022

2022-12-20T22:46:09Z

← Older revision		Revision as of 22:46, 20 December 2022
Line 292:		Line 292:

	local resultCell = function(row, showResultId, needLink, noVersion, template)		local resultCell = function(row, showResultId, needLink, noVersion, template)
	~~mw.logObject(row)~~
	local enemy, star, health = row['enemy'], row['star'], row['health']		local enemy, star, health = row['enemy'], row['star'], row['health']
	~~star = tonumber(star)~~
	local str = ''		local str = ''
	local args = {anchor = resultanchor, nolink = not needLink, class='multi-line'}		local args = {anchor = resultanchor, nolink = not needLink, class='multi-line'}
Line 302:		Line 300:
	if resultimage then		if resultimage then
	if tonumber(star) > 0 then		if tonumber(star) > 0 then
	~~mw.logObject('star: ')~~
	~~mw.logObject(star)~~
	resultimage = resultimage:gsub('.png', '_' .. star .. '_Star.png')		resultimage = resultimage:gsub('.png', '_' .. star .. '_Star.png')
	end		end
Line 318:		Line 314:
	args['icons'] = 'n'		args['icons'] = 'n'
	end		end
	~~str~~ = ~~str ..~~ enemyLink(enemy, args)
	~~mw.logObject~~(~~enemyLink~~(~~enemy~~, ~~args)~~)		local enemyLinkCell = enemyLink(enemy, args)
			if tonumber(star) > 0 then
			enemyLinkCell = enemyLinkCell:gsub('.png', '_' .. star .. '_Star.png')
			end
			str = str .. enemyLinkCell

	if template then		if template then
	local template_str = currentFrame:expandTemplate{ title = template, args = {		local template_str = currentFrame:expandTemplate{ title = template, args = {

Mave at 22:42, 20 December 2022

2022-12-20T22:42:35Z

← Older revision		Revision as of 22:42, 20 December 2022
Line 294:		Line 294:
	mw.logObject(row)		mw.logObject(row)
	local enemy, star, health = row['enemy'], row['star'], row['health']		local enemy, star, health = row['enemy'], row['star'], row['health']
			star = tonumber(star)
	local str = ''		local str = ''
	local args = {anchor = resultanchor, nolink = not needLink, class='multi-line'}		local args = {anchor = resultanchor, nolink = not needLink, class='multi-line'}
Line 307:		Line 308:
	mw.logObject(resultimage)		mw.logObject(resultimage)
	args['image'] = resultimage		args['image'] = resultimage
			end
			if (args['image'] or '' == '') then
			args['image'] = ''
	end		end
	if resulttext then		if resulttext then
Line 315:		Line 319:
	end		end
	str = str .. enemyLink(enemy, args)		str = str .. enemyLink(enemy, args)
	mw.logObject(~~template~~)		mw.logObject(enemyLink(enemy, args))
	if template then		if template then
	local template_str = currentFrame:expandTemplate{ title = template, args = {		local template_str = currentFrame:expandTemplate{ title = template, args = {

Mave at 22:38, 20 December 2022

2022-12-20T22:38:23Z

← Older revision		Revision as of 22:38, 20 December 2022
Line 300:		Line 300:
	end		end
	if resultimage then		if resultimage then
	if star > 0 then		if tonumber(star) > 0 then
	mw.logObject('star: ')		mw.logObject('star: ')
	mw.logObject(star)		mw.logObject(star)

Mave at 22:37, 20 December 2022

2022-12-20T22:37:47Z

← Older revision		Revision as of 22:37, 20 December 2022
Line 292:		Line 292:

	local resultCell = function(row, showResultId, needLink, noVersion, template)		local resultCell = function(row, showResultId, needLink, noVersion, template)
			mw.logObject(row)
	local enemy, star, health = row['enemy'], row['star'], row['health']		local enemy, star, health = row['enemy'], row['star'], row['health']
	local str = ''		local str = ''

Mave at 22:37, 20 December 2022

2022-12-20T22:37:23Z

← Older revision		Revision as of 22:37, 20 December 2022
Line 300:		Line 300:
	if resultimage then		if resultimage then
	if star > 0 then		if star > 0 then
			mw.logObject('star: ')
			mw.logObject(star)
	resultimage = resultimage:gsub('.png', '_' .. star .. '_Star.png')		resultimage = resultimage:gsub('.png', '_' .. star .. '_Star.png')
	end		end

Mave at 22:36, 20 December 2022

2022-12-20T22:36:14Z

← Older revision		Revision as of 22:36, 20 December 2022
Line 299:		Line 299:
	end		end
	if resultimage then		if resultimage then
			if star > 0 then
			resultimage = resultimage:gsub('.png', '_' .. star .. '_Star.png')
			end
	mw.logObject(resultimage)		mw.logObject(resultimage)
	args['image'] = resultimage		args['image'] = resultimage

Mave at 22:33, 20 December 2022

2022-12-20T22:33:22Z

← Older revision		Revision as of 22:33, 20 December 2022
Line 299:		Line 299:
	end		end
	if resultimage then		if resultimage then
			mw.logObject(resultimage)
	args['image'] = resultimage		args['image'] = resultimage
	end		end
Line 314:		Line 315:
	} }		} }
	str = template_str:gsub('@@@@', str)		str = template_str:gsub('@@@@', str)
			else
			str = str .. '<td class="star">' .. star .. ' ★</td>'
	end		end
	return str		return str

Mave at 22:29, 20 December 2022

2022-12-20T22:29:35Z

← Older revision		Revision as of 22:29, 20 December 2022
Line 744:		Line 744:

	str = str .. str_w .. str_resultCell .. str_x .. str_y		str = str .. str_w .. str_resultCell .. str_x .. str_y

			withStation = false -- TODO, remove station altogether?

	if withStation then		if withStation then