Module:Skills/Gathering: Difference between revisions

no edit summary
No edit summary
No edit summary
Line 118: Line 118:
table.sort(itemArray, function(a, b) return a.weight > b.weight end)
table.sort(itemArray, function(a, b) return a.weight > b.weight end)


local resultPart = {}
local html = mw.html.create('table')
table.insert(resultPart, '\r\n{|class="wikitable sortable stickyHeader"')
html:addClass('wikitable sortable stickyHeader')
table.insert(resultPart, '\r\n|- class="headerRow-0"\r\n!colspan="2"| Item\r\n!Value\r\n!colspan="2"|Chance')
 
-- Add header row
local headerRow = html:tag('tr'):addClass('headerRow-0')
headerRow:tag('th'):attr('colspan', '2'):wikitext('Item')
headerRow:tag('th'):wikitext('Value')
headerRow:tag('th'):attr('colspan', '2'):wikitext('Chance')
 
-- Add item rows
for i, itemDef in ipairs(itemArray) do
for i, itemDef in ipairs(itemArray) do
local item = Items.getItemByID(itemDef.itemID)
local item = Items.getItemByID(itemDef.itemID)
Line 128: Line 135:
-- If chance is less than 0.10% then show 2 significant figures, otherwise 2 decimal places
-- If chance is less than 0.10% then show 2 significant figures, otherwise 2 decimal places
local fmt = (dropChance < 0.10 and '%.2g') or '%.2f'
local fmt = (dropChance < 0.10 and '%.2g') or '%.2f'
table.insert(resultPart, '\r\n|-\r\n|class="table-img"| ' .. Icons.Icon({item.name, type='item', notext=true}))
local row = html:tag('tr')
table.insert(resultPart, '\r\n| ' .. Icons.Icon({item.name, type='item', noicon=true}))
 
table.insert(resultPart, '\r\n|data-sort-value="' .. item.sellsFor .. '"| ' .. Items.getValueText(item))
row:tag('td'):addClass('table-img'):wikitext(Icons.Icon({item.name, type='item', notext=true}))
table.insert(resultPart, '\r\n|style="text-align:right" data-sort-value="' .. itemDef.weight .. '"| ' .. Shared.fraction(itemDef.weight, totalWt))
row:tag('td'):wikitext(Icons.Icon({item.name, type='item', noicon=true}))
table.insert(resultPart, '\r\n|style="text-align:right"| ' .. string.format(fmt, dropChance) .. '%')
row:tag('td')
:attr('data-sort-value', item.sellsFor)
:wikitext(Items.getValueText(item))
row:tag('td')
:css('text-align', 'right')
:attr('data-sort-value', itemDef.weight)
:wikitext(Shared.fraction(itemDef.weight, totalWt))
row:tag('td')
:css('text-align', 'right')
:wikitext(string.format(fmt, dropChance) .. '%')
 
if lootValue[currID] == nil then
if lootValue[currID] == nil then
lootValue[currID] = 0
lootValue[currID] = 0
Line 139: Line 156:
end
end
end
end
table.insert(resultPart, '\r\n|}\r\nThe average value of a roll on the special fishing loot table is ' .. lootValueText(lootValue))
 
return table.concat(resultPart)
local result = tostring(html)
local averageValueText = 'The average value of a roll on the special fishing loot table is ' .. lootValueText(lootValue)
return result .. '\n' .. averageValueText
end
end


function p.getFishingJunkTable(frame)
function p.getFishingJunkTable(frame)
local resultPart = {}
local html = mw.html.create('table')
table.insert(resultPart, '{| class="wikitable sortable stickyHeader"')
html:addClass('wikitable sortable stickyHeader')
table.insert(resultPart, '\r\n|- class="headerRow-0"')
 
table.insert(resultPart, '\r\n!colspan="2"|Item!!Value')
-- Add header row
local headerRow = html:tag('tr'):addClass('headerRow-0')
headerRow:tag('th'):attr('colspan', '2'):wikitext('Item')
headerRow:tag('th'):wikitext('Value')


local itemArray = {}
local itemArray = {}
Line 158: Line 180:
table.sort(itemArray, function(a, b) return a.name < b.name end)
table.sort(itemArray, function(a, b) return a.name < b.name end)


-- Add item rows
for i, item in ipairs(itemArray) do
for i, item in ipairs(itemArray) do
table.insert(resultPart, '\r\n|-')
local row = html:tag('tr')
table.insert(resultPart, '\r\n|class="table-img"| ' .. Icons.Icon({item.name, type='item', notext=true}))
row:tag('td'):addClass('table-img')
table.insert(resultPart, '\r\n| ' .. Icons.Icon({item.name, type='item', noicon=true}))
:wikitext(Icons.Icon({item.name, type='item', notext=true}))
table.insert(resultPart, '\r\n|data-sort-value="' .. item.sellsFor .. '"| ' .. Items.getValueText(item))
row:tag('td'):wikitext(Icons.Icon({item.name, type='item', noicon=true}))
row:tag('td')
:attr('data-sort-value', item.sellsFor)
:wikitext(Items.getValueText(item))
end
end
table.insert(resultPart, '\r\n|}')
 
return table.concat(resultPart)
return tostring(html)
end
end


Line 269: Line 295:
end
end
local resultPart = {}
local html = mw.html.create('table')
table.insert(resultPart, '{|class="wikitable sortable"')
:addClass('wikitable sortable')
table.insert(resultPart, '\n|- class="headerRow-0"')
table.insert(resultPart, '\n!colspan=2|Gem!!Gem Chance!!Gem Price')


-- Add header row
local headerRow = html:tag('tr'):addClass('headerRow-0')
:tag('th'):wikitext('Gem')
  :attr('colspan', '2')
:tag('th'):wikitext('[[DLC]]')
:tag('th'):wikitext('Gem Chance')
:tag('th'):wikitext('Gem Price')
-- Add gem rows
for i, gem in ipairs(gemData) do
for i, gem in ipairs(gemData) do
local gemItem = Items.getItemByID(gem.itemID)
local gemItem = Items.getItemByID(gem.itemID)
local gemPct = gem.weight / totalWeight * 100
local gemPct = gem.weight / totalWeight * 100
table.insert(resultPart, '\n|-\n|class="table-img"| ')
local row = html:tag('tr')
table.insert(resultPart, Icons.Icon({gemItem.name, type='item', notext=true}))
 
table.insert(resultPart, '\n| data-sort-value="'..gemItem.name..'"|'..Icons.getDLCColumnIcon(gemItem.id) .. Icons.Icon({gemItem.name, type='item', noicon=true}))
row:tag('td'):addClass('table-img')
table.insert(resultPart, '\n|style="text-align:right" data-sort-value="' .. gemPct .. '" | ' .. string.format("%.1f%%", gemPct))
:wikitext(Icons.Icon({gemItem.name, type='item', notext=true}))
table.insert(resultPart, '\n|data-sort-value="' .. gemItem.sellsFor .. '"| ' .. Items.getValueText(gemItem))
row:tag('td'):attr('data-sort-value', gemItem.name)
:wikitext('[[' .. gemItem.name ..']]')
row:tag('td'):wikitext(Icons.getDLCColumnIcon(gemItem.id))
:attr('data-sort-value', Icons.getExpansionID(gemItem.id))
:css('text-align', 'center')
row:tag('td'):css('text-align', 'right')
:attr('data-sort-value', gemPct)
:wikitext(string.format("%.1f%%", gemPct))
row:tag('td'):attr('data-sort-value', gemItem.sellsFor)
    :wikitext(Items.getValueText(gemItem))
end
end


table.insert(resultPart, '\n|}')
return tostring(html)
return table.concat(resultPart)
end
end


Line 302: Line 343:
local skillID = 'Fishing'
local skillID = 'Fishing'


local recipeList = GameData.getEntities(SkillData.Fishing.fish,
local recipeList = GameData.getEntities(SkillData.Fishing.fish, function(obj)
function(obj)
return Skills.getRecipeRealm(obj) == realm.id
return Skills.getRecipeRealm(obj) == realm.id
end)
end
)
table.sort(recipeList, function(a, b) return Skills.standardRecipeSort(skillID, a, b) end)
table.sort(recipeList, function(a, b) return Skills.standardRecipeSort(skillID, a, b) end)


Line 321: Line 360:
end
end


local resultPart = {}
local html = mw.html.create('table')
table.insert(resultPart, '{| class="wikitable sortable stickyHeader"')
html:addClass('wikitable sortable stickyHeader')
table.insert(resultPart, '\n|- class="headerRow-0"')
 
table.insert(resultPart, '\n!colspan="2" rowspan="2"|Fish\n!rowspan="2"|Requirements')
-- Add header row
table.insert(resultPart, '\n!colspan="3"|Catch Time\n!rowspan="2"|XP\n!rowspan="2"|Value\n!rowspan="2"|XP/s\n!rowspan="2"|Price/s')
local headerRow0 = html:tag('tr'):addClass('headerRow-0')
table.insert(resultPart, '\n!rowspan="2"|' .. Icons.Icon({'Cooking', type='skill', notext=true}) .. ' Level')
headerRow0:tag('th'):attr('colspan', '2'):attr('rowspan', '2'):wikitext('Fish')
table.insert(resultPart, '\n|- class="headerRow-1"\n!Min\n!Max\n!Avg')
headerRow0:tag('th'):attr('rowspan', '2'):wikitext(Icons.Icon({'Fishing', type='skill', notext=true}) .. '<br>Level')
headerRow0:tag('th'):attr('rowspan', '2'):wikitext('[[DLC]]')
headerRow0:tag('th'):attr('colspan', '3'):wikitext('Catch Time')
headerRow0:tag('th'):attr('rowspan', '2'):wikitext('XP')
headerRow0:tag('th'):attr('rowspan', '2'):wikitext('Value')
headerRow0:tag('th'):attr('rowspan', '2'):wikitext('XP/s')
 
local headerRow1 = html:tag('tr'):addClass('headerRow-1')
headerRow1:tag('th'):wikitext('Min')
headerRow1:tag('th'):wikitext('Max')
headerRow1:tag('th'):wikitext('Avg')
 
-- Add fish rows
for i, recipe in ipairs(recipeList) do
for i, recipe in ipairs(recipeList) do
local fish = Items.getItemByID(recipe.productId)
local fish = Items.getItemByID(recipe.productId)
Line 334: Line 385:
local timeAvg = (timeMin + timeMax) / 2
local timeAvg = (timeMin + timeMax) / 2
local timeSortVal = (recipe.baseMinInterval + recipe.baseMaxInterval) / 2000
local timeSortVal = (recipe.baseMinInterval + recipe.baseMaxInterval) / 2000
local timeStr = string.format("%.1fs - %.1fs", recipe.baseMinInterval / 1000, recipe.baseMaxInterval / 1000)
local level = Skills.getRecipeLevel(skillID, recipe)
local level = Skills.getRecipeLevel(skillID, recipe)
local reqText = Skills.getRecipeRequirementText(skillID, recipe)
local reqText = Skills.getRecipeRequirementText(skillID, recipe)
Line 340: Line 390:
local XPSec = baseXP / timeSortVal
local XPSec = baseXP / timeSortVal
local sellCurrency = fish.sellsForCurrency or 'melvorD:GP'
local sellCurrency = fish.sellsForCurrency or 'melvorD:GP'
local currPerSec = Shared.round(fish.sellsFor / timeSortVal, 2, 2)
 
local cookRecipe = cookRecipes[recipe.productId]
local row = html:tag('tr')
local cookLevel, cookStyle, cookStr = 0, 'class="table-na" ', 'N/A'
row:tag('td')
if cookRecipe ~= nil then
:addClass('table-img')
cookLevel = Skills.getRecipeLevel('Cooking', cookRecipe)
:wikitext(Icons.Icon({fish.name, type='item', notext=true}))
cookStyle = 'style="text-align:right" '
row:tag('td')
cookStr = Skills.getRecipeRequirementText('Cooking', cookRecipe)
:attr('data-sort-value', fish.name)
end
:wikitext('[[' .. fish.name .. ']]')
table.insert(resultPart, '\n|-')
row:tag('td')
table.insert(resultPart, '\n|class="table-img"| ' .. Icons.Icon({fish.name, type='item', notext=true}))
:css('text-align', 'center')
table.insert(resultPart, '\n|data-sort-value="'..fish.name..'"|'..Icons.getDLCColumnIcon(fish.id) .. Icons.Icon({fish.name, type='item', noicon=true}))
:attr('data-sort-value', level)
table.insert(resultPart, '\n|style="text-align:right" data-sort-value="' .. level .. '"| ' .. reqText)
:wikitext(level)
table.insert(resultPart, '\n|style="text-align:right" data-sort-value="' .. timeMin .. '"| ' .. string.format("%.1fs", timeMin))
row:tag('td')
table.insert(resultPart, '\n|style="text-align:right" data-sort-value="' .. timeMax .. '"| ' .. string.format("%.1fs", timeMax))
:css('text-align', 'center')
table.insert(resultPart, '\n|style="text-align:right" data-sort-value="' .. timeAvg .. '"| ' .. string.format("%.1fs", timeAvg))
:attr('data-sort-value', Icons.getExpansionID(fish.id))
table.insert(resultPart, '\n|style="text-align:right" data-sort-value="' .. baseXP .. '"| ' .. Shared.formatnum(baseXP))
:wikitext(Icons.getDLCColumnIcon(fish.id))
table.insert(resultPart, '\n|data-sort-value="' .. fish.sellsFor .. '"| ' .. Items.getValueText(fish))
row:tag('td')
table.insert(resultPart, '\n|style="text-align:right"| ' .. Shared.round(XPSec, 2, 2))
:css('text-align', 'right')
table.insert(resultPart, '\n|data-sort-value="' .. currPerSec .. '"|' .. Icons._Currency(sellCurrency, currPerSec))
:attr('data-sort-value', timeMin)
table.insert(resultPart, '\n|' .. cookStyle .. 'data-sort-value="' .. cookLevel .. '"| ' .. cookStr)
:wikitext(string.format("%.1fs", timeMin))
row:tag('td')
:css('text-align', 'right')
:attr('data-sort-value', timeMax)
:wikitext(string.format("%.1fs", timeMax))
row:tag('td')
:css('text-align', 'right')
:attr('data-sort-value', timeAvg)
:wikitext(string.format("%.1fs", timeAvg))
row:tag('td')
:css('text-align', 'right')
:attr('data-sort-value', baseXP)
:wikitext(Shared.formatnum(baseXP))
row:tag('td')
:attr('data-sort-value', fish.sellsFor)
:wikitext(Items.getValueText(fish))
row:tag('td')
:css('text-align', 'right')
:wikitext(Shared.round(XPSec, 2, 2))
end
end
end
end
table.insert(resultPart, '\n|}')
 
return table.concat(resultPart)
return tostring(html)
end
end


function p.getFishingAreasTable(frame)
function p.getFishingAreasTable(frame)
Line 375: Line 444:
local skillID = 'Fishing'
local skillID = 'Fishing'


local result = '{| class="wikitable sortable stickyHeader"'
local html = mw.html.create('table')
result = result..'\r\n|- class="headerRow-0"'
html:addClass('wikitable sortable stickyHeader')
result = result..'\r\n!Name\r\n!Fish\r\n!Fish Chance'
 
result = result..'\r\n!Junk Chance\r\n!Special Chance'
-- Add header row
local headerRow = html:tag('tr'):addClass('headerRow-0')
headerRow:tag('th'):wikitext('Name')
headerRow:tag('th'):wikitext('Fish')
headerRow:tag('th'):wikitext('[[DLC]]')
headerRow:tag('th'):wikitext('Fish Chance')
headerRow:tag('th'):wikitext('Junk Chance')
headerRow:tag('th'):wikitext('Special Chance')


local fishAreas = GameData.getEntities(SkillData.Fishing.areas,
-- Get fishing areas
function(obj)
local fishAreas = GameData.getEntities(SkillData.Fishing.areas, function(obj)
return Skills.getRecipeRealm(obj) == realm.id
return Skills.getRecipeRealm(obj) == realm.id
end
end)
)


-- Add rows for each fishing area
for i, area in ipairs(fishAreas) do
for i, area in ipairs(fishAreas) do
result = result..'\r\n|-'
local row = html:tag('tr')
result = result..'\r\n| style ="text-align: left;" |'..Icons.getDLCColumnIcon(area.id)..area.name
row:tag('td')
:css('text-align', 'left')
:wikitext(area.name)


local fishArray = {}
local fishArray = {}
Line 397: Line 475:
end
end
end
end
result = result..'\r\n|'..table.concat(fishArray, '<br/>')
row:tag('td')
 
:wikitext(table.concat(fishArray, '<br/>'))
result = result..'\r\n| style="text-align:right"|'..area.fishChance..'%'
row:tag('td')
result = result..'\r\n| style="text-align:right"|'..area.junkChance..'%'
:css('text-align', 'center')
result = result..'\r\n| style="text-align:right"|'..area.specialChance..'%'
:wikitext(Icons.getDLCColumnIcon(area.id))
:attr('data-sort-value', Icons.getExpansionID(area.id))
row:tag('td')
:css('text-align', 'right')
:wikitext(area.fishChance .. '%')
row:tag('td')
:css('text-align', 'right')
:wikitext(area.junkChance .. '%')
row:tag('td')
:css('text-align', 'right')
:wikitext(area.specialChance .. '%')
end
end


result = result..'\r\n|}'
return tostring(html)
return result
end
end


function p.getThievingGeneralRareTable(frame)
function p.getThievingGeneralRareTable(frame)
Line 418: Line 506:
end
end


local rareTxt = '{|class="wikitable sortable"'
local html = mw.html.create('table')
rareTxt = rareTxt..'\r\n!Item!!Qty'
html:addClass('wikitable sortable')
rareTxt = rareTxt..'!!Price!!colspan="2"|Chance'
 
-- Add header row
local headerRow = html:tag('tr')
headerRow:tag('th'):wikitext('Item')
headerRow:tag('th'):wikitext('[[DLC]]')
headerRow:tag('th'):wikitext('Qty')
headerRow:tag('th'):wikitext('Price')
headerRow:tag('th'):attr('colspan', '2'):wikitext('Chance')
 
-- Add rows for each rare item
for i, drop in ipairs(SkillData.Thieving.generalRareItems) do
for i, drop in ipairs(SkillData.Thieving.generalRareItems) do
-- If an npcID has been passed and the item is NPC specific, only display
-- If an npcID has been passed and the item is NPC specific, only display the item if it may be obtained while pickpocketing that NPC
-- the item if it may be obtained while pickpocketing that NPC
local npcMatch = (npc == nil or drop.npcs == nil or Shared.contains(drop.npcs, npc.id))
local npcMatch = (
local realmMatch = (npcRealm == nil or drop.realms == nil or Shared.contains(drop.realms, npcRealm))
npc == nil
 
or drop.npcs == nil
or Shared.contains(drop.npcs, npc.id)
)
local realmMatch = (
npcRealm == nil
or drop.realms == nil
or Shared.contains(drop.realms, npcRealm)
)
if npcMatch and realmMatch then
if npcMatch and realmMatch then
local thisItem = Items.getItemByID(drop.itemID)
local thisItem = Items.getItemByID(drop.itemID)
local odds = drop.chance
local odds = drop.chance
 
rareTxt = rareTxt..'\r\n|-\r\n|data-sort-value="'..thisItem.name..'"|'..Icons.getDLCColumnIcon(thisItem.id)..Icons.Icon({thisItem.name, type='item'})
local row = html:tag('tr')
rareTxt = rareTxt..'||1||data-sort-value="'..thisItem.sellsFor..'"|'..Items.getValueText(thisItem)
row:tag('td')
rareTxt = rareTxt..'||style="text-align:right" data-sort-value="'..odds..'"|'..Shared.fraction(1, Shared.round2(1/(odds/100), 0))
:attr('data-sort-value', thisItem.name)
rareTxt = rareTxt..'||style="text-align:right" data-sort-value="'..odds..'"|'..Shared.round(odds, 4, 4)..'%'
:wikitext(Icons.Icon({thisItem.name, type='item'}))
row:tag('td')
:wikitext(Icons.getDLCColumnIcon(thisItem.id))
:attr('data-sort-value', Icons.getExpansionID(thisItem.id))
:css('text-align', 'center')
row:tag('td')
:wikitext('1')
row:tag('td')
:attr('data-sort-value', thisItem.sellsFor)
:wikitext(Items.getValueText(thisItem))
row:tag('td')
:css('text-align', 'right')
:attr('data-sort-value', odds)
:wikitext(Shared.fraction(1, Shared.round2(1/(odds/100), 0)))
row:tag('td')
:css('text-align', 'right')
:attr('data-sort-value', odds)
:wikitext(Shared.round(odds, 4, 4) .. '%')
end
end
end
end
rareTxt = rareTxt..'\r\n|}'
 
return rareTxt
return tostring(html)
end
end


function p._getThievingNPCCurrencyText(npc)
function p._getThievingNPCCurrencyText(npc)
Line 612: Line 719:


function p.getThievingNPCTable(frame)
function p.getThievingNPCTable(frame)
local args = frame.args ~= nil and frame.args or frame
    local args = frame.args or frame:getParent().args
local realmName = args.realm
    local realmName = args.realm
local realm = Skills.getRealmFromName(realmName)
    local realm = Skills.getRealmFromName(realmName)
if realm == nil then
   
return Shared.printError('Failed to find a realm with name ' .. (realmName or 'nil'))
    if realm == nil then
end
        return Shared.printError('Failed to find a realm with name ' .. (realmName or 'nil'))
local skillID = 'Thieving'
    end
 
   
local result = '{| class="wikitable sortable stickyHeader"'
    local skillID = 'Thieving'
result = result..'\r\n|- class="headerRow-0"'
    local root = mw.html.create('table')
result = result..'\r\n!colspan="2"|Name!!Area!!'..Icons.Icon({'Thieving', type='skill', notext=true})..' Level!!Experience!!Max Hit!!Perception!!Currency!!Unique Drop'
        :addClass('wikitable sortable stickyHeader')
local npcArray = GameData.getEntities(SkillData.Thieving.npcs,
   
function(obj)
    -- Header row
return Skills.getRecipeRealm(obj) == realm.id
    local headerRow = root:tag('tr')
end
        :addClass('headerRow-0')
)
        :tag('th'):attr('colspan', '2'):wikitext('Name')
table.sort(npcArray, function(a, b) return Skills.standardRecipeSort(skillID, a, b) end)
        :tag('th'):wikitext('Area')
for i, npc in ipairs(npcArray) do
        :tag('th'):wikitext(Icons.Icon({'Thieving', type='skill', notext=true}) .. '<br>Level')
local level = Skills.getRecipeLevel(skillID, npc)
        :tag('th'):wikitext('[[DLC]]')
local baseXP = npc.baseAbyssalExperience or npc.baseExperience
        :tag('th'):wikitext('Experience')
local reqText = Skills.getRecipeRequirementText(SkillData.Thieving.name, npc)
        :tag('th'):wikitext('Max Hit')
local area = Skills.getThievingNPCArea(npc)
        :tag('th'):wikitext('Perception')
local currSortAmt = npc.currencyDrops[1].quantity
        :tag('th'):wikitext('Currency')
 
        :tag('th'):wikitext('Unique Drop')
result = result..'\r\n|-'
   
result = result..'\r\n|'..Icons.Icon({npc.name, type='thieving', notext=true})
    local npcArray = GameData.getEntities(SkillData.Thieving.npcs,
result = result..'||data-sort-value="'..npc.name..'"|'..Icons.getDLCColumnIcon(npc.id)..Icons.Icon({npc.name, type='thieving', noicon=true})
        function(obj)
 
            return Skills.getRecipeRealm(obj) == realm.id
result = result..'||'..area.name
        end
result = result..'||data-sort-value="' .. level .. '"| ' .. reqText
    )
result = result..'||style="text-align:right"|' .. Shared.formatnum(baseXP)
    table.sort(npcArray, function(a, b) return Skills.standardRecipeSort(skillID, a, b) end)
result = result..'||style="text-align:right"|' .. Shared.formatnum(npc.maxHit * 10)
   
result = result..'||style="text-align:right" data-sort-value="' .. npc.perception .. '| '..Shared.formatnum(npc.perception)
    for i, npc in ipairs(npcArray) do
result = result..'||data-sort-value="' .. currSortAmt .. '"|' .. p._getThievingNPCCurrencyText(npc)
        local level = Skills.getRecipeLevel(skillID, npc)
if npc.uniqueDrop ~= nil then
        local baseXP = npc.baseAbyssalExperience or npc.baseExperience
local uniqueDrop = Items.getItemByID(npc.uniqueDrop.id)
        local area = Skills.getThievingNPCArea(npc)
if npc.uniqueDrop.quantity > 1 then
        local currSortAmt = npc.currencyDrops[1].quantity
result = result..'||data-sort-value="'..uniqueDrop.name..'"|'..Icons.Icon({uniqueDrop.name, type='item', qty = npc.uniqueDrop.quantity})
       
else
        local row = root:tag('tr')
result = result..'||data-sort-value="'..uniqueDrop.name..'"|'..Icons.Icon({uniqueDrop.name, type='item'})
        row:tag('td'):wikitext(Icons.Icon({npc.name, type='thieving', notext=true}))
end
        row:tag('td'):attr('data-sort-value', npc.name)
else
            :wikitext('[[' .. npc.name .. ']]')
result = result..'|| '
        row:tag('td'):wikitext(area.name)
end
        row:tag('td'):wikitext(level)
end
        :css('text-align', 'center')
result = result..'\r\n|}'
        row:tag('td'):wikitext(Icons.getDLCColumnIcon(npc.id))
 
        :css('text-align', 'center')
return result
        :attr('data-sort-value', Icons.getExpansionID(npc.id))
        row:tag('td'):css('text-align', 'right')
            :wikitext(Shared.formatnum(baseXP))
        row:tag('td'):css('text-align', 'right')
            :wikitext(Shared.formatnum(npc.maxHit * 10))
        row:tag('td'):css('text-align', 'right')
            :attr('data-sort-value', npc.perception)
            :wikitext(Shared.formatnum(npc.perception))
        row:tag('td'):attr('data-sort-value', currSortAmt)
            :wikitext(p._getThievingNPCCurrencyText(npc))
       
        if npc.uniqueDrop ~= nil then
            local uniqueDrop = Items.getItemByID(npc.uniqueDrop.id)
            if npc.uniqueDrop.quantity > 1 then
                row:tag('td'):attr('data-sort-value', uniqueDrop.name)
                    :wikitext(Icons.Icon({uniqueDrop.name, type='item', qty=npc.uniqueDrop.quantity}))
            else
                row:tag('td'):attr('data-sort-value', uniqueDrop.name)
                    :wikitext(Icons.Icon({uniqueDrop.name, type='item'}))
            end
        else
            row:tag('td'):wikitext(' ')
        end
    end
   
    return tostring(root)
end
end


function p.getThievingAreaTable(frame)
function p.getThievingAreaTable(frame)
local args = frame.args ~= nil and frame.args or frame
    local args = frame.args or frame:getParent().args
local realmName = args.realm
    local realmName = args.realm
local realm = Skills.getRealmFromName(realmName)
    local realm = Skills.getRealmFromName(realmName)
if realm == nil then
   
return Shared.printError('Failed to find a realm with name ' .. (realmName or 'nil'))
    if realm == nil then
end
        return Shared.printError('Failed to find a realm with name ' .. (realmName or 'nil'))
local skillID = 'Thieving'
    end
 
   
local resultPart = {}
    local skillID = 'Thieving'
table.insert(resultPart, '{| class="wikitable sortable stickyHeader"')
    local root = mw.html.create('table')
table.insert(resultPart, '\r\n|- class="headerRow-0"')
        :addClass('wikitable sortable stickyHeader')
table.insert(resultPart, '\r\n!Area!!'..Icons.Icon({'Thieving', type='skill', notext=true})..' Level!!NPCs!!Unique Drops')
   
 
    -- Header row
local areas = GameData.getEntities(SkillData.Thieving.areas,
    local headerRow = root:tag('tr')
function(obj)
        :addClass('headerRow-0')
return Skills.getRecipeRealm(obj) == realm.id
    headerRow:tag('th'):wikitext('Area')
end
    headerRow:tag('th'):wikitext(Icons.Icon({'Thieving', type='skill', notext=true}) .. '<br>Level')
)
    headerRow:tag('th'):wikitext('NPCs')
    headerRow:tag('th'):wikitext('Unique Drops')
   
    local areas = GameData.getEntities(SkillData.Thieving.areas,
        function(obj)
            return Skills.getRecipeRealm(obj) == realm.id
        end
    )
   
    for i, area in ipairs(areas) do
        local minLevel, npcList, areaItemList = nil, {}, {}
       
        -- Build NPC list & determine minimum Thieving level
        if area.npcIDs and not Shared.tableIsEmpty(area.npcIDs) then
            for j, npcID in ipairs(area.npcIDs) do
                local npc = Skills.getThievingNPCByID(npcID)
                local level = Skills.getRecipeLevel(skillID, npc)
                if not minLevel or level < minLevel then
                    minLevel = level
                end
                table.insert(npcList, Icons.Icon({npc.name, type='thieving'}))
            end
        else
            table.insert(npcList, '')
        end
       
        -- Build area unique item list
        if area.uniqueDrops and Shared.tableCount(area.uniqueDrops) > 0 then
            for k, drop in ipairs(area.uniqueDrops) do
                local areaItem = Items.getItemByID(drop.id)
                if areaItem then
                    local iconDef = {areaItem.name, type='item'}
                    if drop.quantity > 1 then
                        iconDef.qty = drop.quantity
                    end
                    table.insert(areaItemList, Icons.Icon(iconDef))
                else
                    table.insert(areaItemList, 'Unknown[[Category:Pages with script errors]]')
                end
            end
        else
            table.insert(areaItemList, '')
        end
       
        -- Generate table row
        local row = root:tag('tr')
        row:tag('td'):wikitext(area.name)
        row:tag('td'):wikitext(minLevel)
        :css('text-align', 'center')
        row:tag('td'):wikitext(table.concat(npcList, '<br/>'))
        row:tag('td'):wikitext(table.concat(areaItemList, '<br/>'))
    end
   
    return tostring(root)
end


for i, area in ipairs(areas) do
local minLevel, npcList, areaItemList = nil, {}, {}
-- Build NPC list & determine level for area, this is the minimum
-- Thieving level required for all NPCs within that area
if area.npcIDs ~= nil and not Shared.tableIsEmpty(area.npcIDs) then
for j, npcID in ipairs(area.npcIDs) do
local npc = Skills.getThievingNPCByID(npcID)
local level = Skills.getRecipeLevel(skillID, npc)
if minLevel == nil or level < minLevel then
minLevel = level
end
table.insert(npcList, Icons.Icon({npc.name, type='thieving'}))
end
else
table.insert(npcList, '')
end
-- Build area unique item list
if area.uniqueDrops ~= nil and Shared.tableCount(area.uniqueDrops) > 0 then
for k, drop in ipairs(area.uniqueDrops) do
local areaItem = Items.getItemByID(drop.id)
if areaItem == nil then
table.insert(areaItemList, 'Unknown[[Category:Pages with script errors]]')
else
local iconDef = {areaItem.name, type='item'}
if drop.quantity > 1 then
iconDef.qty = drop.quantity
end
table.insert(areaItemList, Icons.Icon(iconDef))
end
end
else
table.insert(areaItemList, '')
end
-- Generate table row
table.insert(resultPart, '\r\n|-')
table.insert(resultPart, '\r\n|' .. area.name)
table.insert(resultPart, '\r\n|' .. Icons._SkillReq('Thieving', minLevel))
table.insert(resultPart, '\r\n|' .. table.concat(npcList, '<br/>'))
table.insert(resultPart, '\r\n|' .. table.concat(areaItemList, '<br/>'))
end
table.insert(resultPart, '\r\n|}')
return table.concat(resultPart)
end


function p._getFarmingTable(realmID, category)
function p._getFarmingTable(realmID, category)
Line 875: Line 1,015:


function p.getFarmingFoodTable(frame)
function p.getFarmingFoodTable(frame)
local result = '{| class="wikitable sortable stickyHeader"'
    local root = mw.html.create('table')
result = result..'\r\n|- class="headerRow-0"'
        :addClass('wikitable sortable stickyHeader')
result = result..'\r\n!colspan="2"|Crop!!'..Icons.Icon({"Farming", type="skill", notext=true})..' Level'
   
result = result..'!!Healing!!Value'
    -- Header row
    local headerRow = root:tag('tr')
        :addClass('headerRow-0')
    headerRow:tag('th'):attr('colspan', '2'):wikitext('Crop')
    headerRow:tag('th'):wikitext(Icons.Icon({"Farming", type="skill", notext=true}) .. '<br>Level')
    headerRow:tag('th'):wikitext('[[DLC]]')
    headerRow:tag('th'):wikitext('Healing')
    headerRow:tag('th'):wikitext('Value')
   
    local recipes = GameData.getEntities(SkillData.Farming.recipes,
        function(recipe)
            local product = Items.getItemByID(recipe.productId)
            return product ~= nil and product.healsFor ~= nil and product.healsFor > 0
        end
    )
    table.sort(recipes, function(a, b) return a.level < b.level end)
   
    for i, recipe in ipairs(recipes) do
        local product = Items.getItemByID(recipe.productId)
        if product and product.healsFor and product.healsFor > 0 then
            local row = root:tag('tr')
            row:tag('td'):wikitext(Icons.Icon({product.name, type='item', notext='true'}))
            row:tag('td'):wikitext('[[' .. product.name .. ']]')
            row:tag('td'):css('text-align', 'center')
            :wikitext(recipe.level)
            row:tag('td'):css('text-align', 'center')
                    :attr('data-sort-value', Icons.getExpansionID(product.id)) 
                :wikitext(Icons.getDLCColumnIcon(product.id))       
            row:tag('td'):css('text-align', 'right')
                :attr('data-sort-value', product.healsFor)
                :wikitext(Icons.Icon({"Hitpoints", type="skill", notext=true}) .. ' ' .. (product.healsFor * 10))
            row:tag('td'):css('text-align', 'right')
                :attr('data-sort-value', product.sellsFor)
                :wikitext(Items.getValueText(product))
        end
    end
   
    return tostring(root)
end


local recipes = GameData.getEntities(SkillData.Farming.recipes,
function(recipe)
local product = Items.getItemByID(recipe.productId)
return product ~= nil and product.healsFor ~= nil and product.healsFor > 0
end)
table.sort(recipes, function(a, b) return a.level < b.level end)


for i, recipe in ipairs(recipes) do
function p.getFarmingPlotTable(frame)
local product = Items.getItemByID(recipe.productId)
    local skillID = 'Farming'
if product ~= nil and product.healsFor ~= nil and product.healsFor > 0 then
    local areaName = frame.args ~= nil and frame.args[1] or frame
result = result..'\r\n|-'
    local category = GameData.getEntityByName(SkillData.Farming.categories, areaName)
result = result..'\r\n|'..Icons.Icon({product.name, type='item', notext='true'})
   
result = result..'|| ' .. Icons.getDLCColumnIcon(product.id) .. Icons.Icon({product.name, type='item', noicon=true})
    if category == nil then
result = result..'||style="text-align:right;"|'..recipe.level
        return Shared.printError('Invalid farming category. Please choose Allotments, Herbs, Trees or Special')
result = result..'||style="text-align:right" data-sort-value="'..product.healsFor..'"|'..Icons.Icon({"Hitpoints", type="skill", notext=true})..' '..(product.healsFor * 10)
    end
result = result..'||style="text-align:right" data-sort-value="'..product.sellsFor..'"|'..Items.getValueText(product)
   
end
    local patches = GameData.getEntities(SkillData.Farming.plots,
end
        function(plot)
 
            return plot.categoryID == category.id
result = result..'\r\n|}'
        end
 
    )
return result
   
    table.sort(patches,
        function(a, b)
            local abyssA, abyssB = a.abyssalLevel or 0, b.abyssalLevel or 0
            if abyssA == abyssB then
                if a.level == b.level then
                    return a.id < b.id
                else
                    return a.level < b.level
                end
            else
                return abyssA < abyssB
            end
        end
    )
   
    if Shared.tableIsEmpty(patches) then
        return ''
    end
   
    local root = mw.html.create('table')
        :addClass('wikitable sortable stickyHeader')
   
    -- Header row
    local headerRow = root:tag('tr')
    headerRow:tag('th'):wikitext('Plot')
    headerRow:tag('th'):wikitext('Requirements')
    headerRow:tag('th'):wikitext('Cost')
   
    for i, patch in ipairs(patches) do
        local level = Skills.getRecipeLevel(skillID, patch)
        local reqText = Skills.getRecipeRequirementText(skillID, patch)
        local costText = Common.getCostString({ items = patch.itemCosts, currencies = patch.currencyCosts }, 'Free')
        local costVal = (patch.currencyCosts and patch.currencyCosts[1] and patch.currencyCosts[1].quantity) or 0
       
        local row = root:tag('tr')
        row:tag('td'):wikitext(i)
        row:tag('td'):css('text-align', 'right')
            :attr('data-sort-value', level)
            :wikitext(reqText)
        row:tag('td'):css('text-align', 'right')
            :attr('data-sort-value', costVal)
            :wikitext(costText)
    end
   
    return tostring(root)
end
end


function p.getFarmingPlotTable(frame)
function p._buildAstrologyConstellationTable(realmID)
local skillID = 'Farming'
    local modTypes = {
local areaName = frame.args ~= nil and frame.args[1] or frame
        {
local category = GameData.getEntityByName(SkillData.Farming.categories, areaName)
            name = 'Standard',
if category == nil then
            modKey = 'standardModifiers',
return Shared.printError('Invalid farming category. Please choose Allotments, Herbs, or Trees')
            levels = SkillData.Astrology.standardModifierLevels,
end
            inUse = false
local patches = GameData.getEntities(SkillData.Farming.plots,
        },
function(plot)
        {
return plot.categoryID == category.id
            name = 'Unique',
end)
            modKey = 'uniqueModifiers',
table.sort(patches,
            levels = SkillData.Astrology.uniqueModifierLevels,
function(a, b)
            inUse = false
local abyssA, abyssB = a.abyssalLevel or 0, b.abyssalLevel or 0
        },
if abyssA == abyssB then
        {
if a.level == b.level then
            name = 'Abyssal',
return a.id < b.id
            modKey = 'abyssalModifiers',
else
            levels = SkillData.Astrology.abyssalModifierLevels,
return a.level < b.level
            inUse = false
end
        },
else
    }
return abyssA < abyssB
end
end)
if Shared.tableIsEmpty(patches) then
return ''
end
 
local result = '{|class="wikitable sortable stickyHeader"'
result = result..'\r\n!Plot!!Requirements!!Cost'
 
for i, patch in ipairs(patches) do
local level = Skills.getRecipeLevel(skillID, patch)
local reqText = Skills.getRecipeRequirementText(skillID, patch)
local costText = Common.getCostString({ items = patch.itemCosts, currencies = patch.currencyCosts }, 'Free')
local costVal = (patch.currencyCosts ~= nil and patch.currencyCosts[1].quantity) or 0
 
result = result..'\r\n|-\r\n|'..i
result = result..'||style="text-align:right;" data-sort-value="' .. level .. '"|'..reqText
result = result..'||style="text-align:right;" data-sort-value="'..costVal..'"|'..costText
end


result = result..'\r\n|}'
    local recipes = GameData.getEntities(SkillData.Astrology.recipes,
return result
        function(cons)
end
            return Skills.getRecipeRealm(cons) == realmID
        end
    )
    table.sort(recipes,
        function(a, b)
            return Skills.getRecipeLevel('Astrology', a) < Skills.getRecipeLevel('Astrology', b)
        end
    )


function p._buildAstrologyConstellationTable(realmID)
    -- Determine which mod types are in use
local modTypes = {
    for _, recipe in ipairs(recipes) do
{
        for _, modType in ipairs(modTypes) do
["name"] = 'Standard',
            if not modType.inUse then
["modKey"] = 'standardModifiers',
                local recipeMods = recipe[modType.modKey]
["levels"] = SkillData.Astrology.standardModifierLevels,
                if recipeMods ~= nil and not Shared.tableIsEmpty(recipeMods) then
["inUse"] = false
                    modType.inUse = true
},
                end
{
            end
["name"] = 'Unique',
        end
["modKey"] = 'uniqueModifiers',
    end
["levels"] = SkillData.Astrology.uniqueModifierLevels,
["inUse"] = false
},
{
["name"] = 'Abyssal',
["modKey"] = 'abyssalModifiers',
["levels"] = SkillData.Astrology.abyssalModifierLevels,
["inUse"] = false
},
}


local recipes = GameData.getEntities(SkillData.Astrology.recipes,
    local root = mw.html.create()
function(cons)
    local tableRoot = root:tag('table')
return Skills.getRecipeRealm(cons) == realmID
    tableRoot:addClass('wikitable stickyHeader')
end
)
table.sort(recipes,
function(a, b)
return Skills.getRecipeLevel('Astrology', a) < Skills.getRecipeLevel('Astrology', b)
end
)


-- Figure out which mod types are to be displayed
    -- Header rows
for _, recipe in ipairs(recipes) do
    local headerRow1 = tableRoot:tag('tr'):addClass('headerRow-0')
for _, modType in ipairs(modTypes) do
    headerRow1:tag('th'):attr('rowspan', 2)
if not modType.inUse then
    :attr('colspan', 2)
local recipeMods = recipe[modType.modKey]
    :wikitext('Constellation')
if recipeMods ~= nil and not Shared.tableIsEmpty(recipeMods) then
    headerRow1:tag('th'):attr('rowspan', 2)
modType.inUse = true
    :wikitext(Icons.Icon({ "Astrology", type='skill', notext='true' }) .. '<br>Level')
end
    headerRow1:tag('th'):attr('rowspan', 2)
end
    :wikitext('[[DLC]]')
end
    headerRow1:tag('th'):attr('rowspan', 2)
end
    :wikitext('XP')
    headerRow1:tag('th'):attr('rowspan', 2)
    :wikitext('Skills')


local resultPart = {}
    local headerRow2 = tableRoot:tag('tr'):addClass('headerRow-1')
table.insert(resultPart, '{|class="wikitable sortable stickyHeader"')
    for _, modType in ipairs(modTypes) do
table.insert(resultPart, '\n|- class="headerRow-0"')
        if modType.inUse then
table.insert(resultPart, '\n!rowspan="2" colspan="2"|Constellation!!rowspan="2"| ' .. Icons.Icon({"Astrology", type='skill', notext='true'}) .. ' Level')
            headerRow1:tag('th'):attr('colspan', 2):wikitext(modType.name .. ' Stars')
table.insert(resultPart, '!!rowspan="2"| XP!!rowspan="2"| Skills')
            headerRow2:tag('th'):wikitext(Icons.Icon({'Mastery', notext=true}) .. '<br>Level')
            headerRow2:tag('th'):wikitext('Modifiers')
        end
    end


local repCount = 0
    -- Data rows
for _, modType in ipairs(modTypes) do
    for _, cons in ipairs(recipes) do
if modType.inUse then
        local modData = Skills._getConstellationModifiers(cons)
repCount = repCount + 1
        local name = cons.name
table.insert(resultPart, '!!colspan="2"| ' .. modType.name .. ' Stars')
        local skillIconArray = {}
end
        for _, skillID in ipairs(cons.skillIDs) do
end
            table.insert(skillIconArray, Icons.Icon({Constants.getSkillName(skillID), type='skill'}))
table.insert(resultPart, '\n|- class="headerRow-1"')
        end
table.insert(resultPart, string.rep('\n! ' .. Icons.Icon({'Mastery', notext=true}) .. 'Level\n! Modifiers', repCount))


for i, cons in ipairs(recipes) do
        -- Calculate maximum rows needed
local modData = Skills._getConstellationModifiers(cons)
        local maxRows = 1
local name = cons.name
        for _, modTypeData in pairs(modData) do
local skillIconArray = {}
            maxRows = math.max(maxRows, Shared.tableCount(modTypeData))
for j, skillID in ipairs(cons.skillIDs) do
        end
table.insert(skillIconArray, Icons.Icon({Constants.getSkillName(skillID), type='skill'}))
end
local maxRows = 1
for _, modTypeData in pairs(modData) do
maxRows = math.max(maxRows, Shared.tableCount(modTypeData))
end
local rowSpan = (maxRows > 1 and 'rowspan="' .. maxRows .. '"') or ''


table.insert(resultPart, '\n|-')
        -- Iterate through rows
table.insert(resultPart, '\n|' .. rowSpan .. ' data-sort-value="' .. name .. '" id="'..name..'"| ')
        for rowIdx = 1, maxRows do
table.insert(resultPart, Icons.Icon({name, type='constellation', notext=true}))
            local row = tableRoot:tag('tr')
table.insert(resultPart, '\n|' .. rowSpan .. '| ' .. Icons.getDLCColumnIcon(cons.id) .. name)
            if rowIdx == 1 then
table.insert(resultPart, '\n|' .. rowSpan .. ' style="text-align:right"| ' .. cons.level)
                row:tag('td'):attr('rowspan', maxRows)
table.insert(resultPart, '\n|' .. rowSpan .. ' style="text-align:right"| ' .. cons.baseExperience)
                :wikitext(Icons.Icon({name, type='constellation', size=50, notext=true}))
table.insert(resultPart, '\n|' .. rowSpan .. '| ' .. table.concat(skillIconArray, '<br/>'))
                :css('text-align', 'center')
                row:tag('td'):attr('rowspan', maxRows)
                :wikitext(name)
                row:tag('td'):attr('rowspan', maxRows)
                :wikitext(cons.level)
                :css('text-align', 'center')
            row:tag('td'):css('text-align', 'center')
                    :attr('data-sort-value', Icons.getExpansionID(cons.id))  
                    :attr('rowspan', maxRows)
                :wikitext(Icons.getDLCColumnIcon(cons.id)) 
                row:tag('td'):attr('rowspan', maxRows)
                    :wikitext(cons.baseExperience)
                    :css('text-align', 'right')
                row:tag('td'):attr('rowspan', maxRows)
                :wikitext(table.concat(skillIconArray, '<br/>'))
                :css('text-wrap', 'nowrap')
            end


-- Generate table text for modifiers
            -- Modifiers data
for row = 1, maxRows, 1 do
            for _, modType in ipairs(modTypes) do
for _, modType in ipairs(modTypes) do
                if modType.inUse then
if modType.inUse then
                    local masteryLevel = modType.levels[rowIdx]
local masteryLevel = modType.levels[row]
                    local rowModData = modData[modType.modKey][rowIdx]
local rowModData = modData[modType.modKey][row]
                    local cell1 = row:tag('td')
if masteryLevel == nil or rowModData == nil then
                    local cell2 = row:tag('td')
table.insert(resultPart, '\n|colspan="2" class="table-na"| ')
                    if masteryLevel ~= nil and rowModData ~= nil then
else
                        cell1:wikitext(masteryLevel)
table.insert(resultPart, '\n|style="text-align:right"| ' .. masteryLevel)
                        :css('text-align', 'right')
table.insert(resultPart, '\n| ' .. Modifiers.getModifiersText(rowModData, false, false, 10))
                        cell2:wikitext(Modifiers.getModifiersText(rowModData, false, false, 10))
end
                    else
end
                        cell1:attr('colspan', 2)
end
                        :wikitext('N/A')
if row < maxRows then
                        :addClass('table-na')
table.insert(resultPart, '\n|-')
                    end
end
                end
end
            end
end
        end
table.insert(resultPart, '\n|}')
    end


return table.concat(resultPart)
    return tostring(root)
end
end


2,875

edits