Module:Skills/Gathering: Difference between revisions

no edit summary
(Fixed Level/XP issues with Abyssal Constellations; Added additional requirements to Abyssal Stars;)
No edit summary
Line 367: Line 367:
local headerRow0 = html:tag('tr'):addClass('headerRow-0')
local headerRow0 = html:tag('tr'):addClass('headerRow-0')
headerRow0:tag('th'):attr('colspan', '2'):attr('rowspan', '2'):wikitext('Fish')
headerRow0:tag('th'):attr('colspan', '2'):attr('rowspan', '2'):wikitext('Fish')
headerRow0:tag('th'):attr('rowspan', '2'):wikitext(Icons.Icon({'Fishing', type='skill', notext=true}) .. '<br>Level')
headerRow0:tag('th'):attr('rowspan', '2'):wikitext(Icons._SkillRealmIcon('Fishing', realm.id) .. '<br>Level')
headerRow0:tag('th'):attr('rowspan', '2'):wikitext('[[DLC]]')
headerRow0:tag('th'):attr('rowspan', '2'):wikitext('[[DLC]]')
headerRow0:tag('th'):attr('colspan', '3'):wikitext('Catch Time')
headerRow0:tag('th'):attr('colspan', '3'):wikitext('Catch Time')
headerRow0:tag('th'):attr('rowspan', '2'):wikitext('XP')
headerRow0:tag('th'):attr('rowspan', '2'):wikitext('XP')
headerRow0:tag('th'):attr('rowspan', '2'):wikitext('XP/s')
headerRow0:tag('th'):attr('rowspan', '2'):wikitext('Value')
headerRow0:tag('th'):attr('rowspan', '2'):wikitext('Value')
headerRow0:tag('th'):attr('rowspan', '2'):wikitext('XP/s')
headerRow0:tag('th'):attr('rowspan', '2'):wikitext('GP/s')


local headerRow1 = html:tag('tr'):addClass('headerRow-1')
local headerRow1 = html:tag('tr'):addClass('headerRow-1')
Line 391: Line 392:
local XPSec = baseXP / timeSortVal
local XPSec = baseXP / timeSortVal
local sellCurrency = fish.sellsForCurrency or 'melvorD:GP'
local sellCurrency = fish.sellsForCurrency or 'melvorD:GP'
local GPSec = fish.sellsFor / timeSortVal


local row = html:tag('tr')
local row = html:tag('tr')
Line 423: Line 425:
:attr('data-sort-value', baseXP)
:attr('data-sort-value', baseXP)
:wikitext(Num.formatnum(baseXP))
:wikitext(Num.formatnum(baseXP))
row:tag('td')
:css('text-align', 'right')
:wikitext(Num.round(XPSec, 2, 2))
row:tag('td')
row:tag('td')
:attr('data-sort-value', fish.sellsFor)
:attr('data-sort-value', fish.sellsFor)
Line 428: Line 433:
row:tag('td')
row:tag('td')
:css('text-align', 'right')
:css('text-align', 'right')
:wikitext(Num.round(XPSec, 2, 2))
:wikitext(Icons._Currency(sellCurrency, Num.round(GPSec, 2, 2)))
end
end
end
end
2,875

edits