Module:CombatAreas/AreaTables: Difference between revisions

From Melvor Idle
m (added option to getDungeonDRTable to disable agility (should default to false))
(Add support for stronghold rewards in _getDungeonRewards)
 
(15 intermediate revisions by 4 users not shown)
Line 2: Line 2:


local p = {}
local p = {}
local AreaData = mw.loadData('Module:CombatAreas/data')


local Constants = require('Module:Constants')
local Constants = require('Module:Constants')
local Common = require('Module:Common')
local Shared = require('Module:Shared')
local Shared = require('Module:Shared')
local GameData = require('Module:GameData')
local Icons = require('Module:Icons')
local Icons = require('Module:Icons')
local Items = require('Module:Items')
local Items = require('Module:Items')
local Monsters = require('Module:Monsters')
local Monsters = require('Module:Monsters')
local CombatAreas = require('Module:CombatAreas')
local Pets = require('Module:Pets')
local Pets = require('Module:Pets')
local Areas = require('Module:CombatAreas')
local Num = require('Module:Number')


function p.getLowHighLevels(idList)
function p.getLowHighLevels(idList)
local lowLevel = 1000000
local lowLevel = 1000000
local highLevel = 0
local highLevel = 0
for i, monID in Shared.skpairs(idList) do
for i, monID in ipairs(idList) do
local monster = Monsters.getMonsterByID(monID)
local monster = Monsters.getMonsterByID(monID)
local cmbLevel = Monsters._getMonsterCombatLevel(monster)
local cmbLevel = Monsters._getMonsterCombatLevel(monster)
Line 25: Line 27:
end
end


function p.getCombatAreaTable()
function p.getAreaCategory(area)
for _, areaCat in ipairs(GameData.rawData.combatAreaCategories) do
if areaCat.areas ~= nil and Shared.contains(areaCat.areas, area.id) then
return areaCat
end
end
end
 
function p.getAreaCategoriesFromAreas(areas)
local areaCatIDs = {}
for i, area in ipairs(areas) do
local areaCat = p.getAreaCategory(area)
if areaCat ~= nil and areaCat.id ~= nil then
areaCatIDs[areaCat.id] = true
end
end
return GameData.getEntities('combatAreaCategories',
function(obj)
return obj.id ~= nil and areaCatIDs[obj.id] ~= nil
end
)
end
 
local function getAreasForTable(areaDataKey, categoryName, defaultCategoryID)
local areaCategories = p.getAreaCategoriesFromAreas(GameData.rawData[areaDataKey])
local areaCategory = nil
 
if categoryName == nil or categoryName == '' then
-- Default area category
areaCategory = GameData.getEntityByID(areaCategories, defaultCategoryID)
else
areaCategory = GameData.getEntityByName(areaCategories, categoryName)
end
if areaCategory == nil then
local catNames = {}
for _, areaCat in ipairs(areaCategories) do
if areaCat.name ~= nil then
table.insert(catNames, areaCat.name)
end
end
return nil, Shared.printError('Invalid area category, choose any of: ' .. table.concat(catNames, ', '))
end
 
local areas = GameData.getEntities(areaDataKey,
function(obj)
return obj.id ~= nil and Shared.contains(areaCategory.areas, obj.id)
end
)
areas = GameData.sortByOrderTable(areas, areaCategory.areas)
return areas, nil
end
 
function p.getCombatAreaTable(frame)
local args = frame.args ~= nil and frame.args or frame
local categoryName = args[1]
 
local areas, errText = getAreasForTable('combatAreas', categoryName, 'melvorD:CombatAreas')
if errText ~= nil then
return errText
elseif areas == nil then
return ''
end
 
local result = '{| class="wikitable sortable stickyHeader"'
local result = '{| class="wikitable sortable stickyHeader"'
result = result..'\r\n|- class="headerRow-0"'
result = result..'\r\n|- class="headerRow-0"'
result = result..'\r\n!colspan="2"|Zone!!Difficulty!!Lowest Monster Level!!Highest Monster Level'
result = result..'\r\n!colspan="2"|Zone!!Difficulty!!Lowest Monster Level!!Highest Monster Level!!Requirements'


for i, areaIdx in ipairs(AreaData.displayOrder.combatAreas) do
for i, area in ipairs(areas) do
local area = CombatAreas.getAreaByID('combat', areaIdx)
result = result..'\r\n|-'
result = result..'\r\n|-'
result = result..'\r\n|'..Icons.Icon({area.name, type='combat', size='50', notext=true})
result = result..'\r\n|class="table-img" data-sort-value="' .. area.name .. '"| '..Icons.Icon({area.name, type='combatArea', size='50', notext=true})
result = result..'||'..Icons.Icon({area.name, type='combat', noicon=true})
result = result..'||' .. Icons.getExpansionIcon(area.id) .. Icons.Icon({area.name, type='combatArea', noicon=true})
local diff1 = Constants.getDifficultyString(area.difficulty[1])
result = result..'||data-sort-value="'..area.difficulty[1]..'"|'..Areas._getAreaStat(area, 'difficulty')
local diff2 = Constants.getDifficultyString(area.difficulty[2])
local lowLvl, highLvl = p.getLowHighLevels(area.monsterIDs)
result = result..'||data-sort-value="'..area.difficulty[1]..'"|'..diff1
result = result .. '||data-sort-value="' .. lowLvl .. '"| ' .. Num.formatnum(lowLvl)
if diff1 ~= diff2 and diff2 ~= nil then result = result..' - '..diff2 end
result = result .. '||data-sort-value="' .. highLvl .. '"| ' .. Num.formatnum(highLvl)
local lowLvl, highLvl = p.getLowHighLevels(area.monsters)
local reqText = Areas._getAreaRequirements(area)
result = result..'||'..lowLvl..'||'..highLvl
if reqText == nil or reqText == '' then
result = result .. '||class="table-na"| None'
else
result = result .. '||' .. reqText
end
end
end
result = result..'\r\n|}'
result = result..'\r\n|}'
Line 47: Line 114:
end
end


function p.getSlayerAreaTable()
function p.getSlayerAreaTable(frame)
local args = frame.args ~= nil and frame.args or frame
local categoryName = args[1]
 
local areas, errText = getAreasForTable('slayerAreas', categoryName, 'melvorF:SlayerAreas')
if errText ~= nil then
return errText
elseif areas == nil then
return ''
end
 
local result = '{| class="wikitable sortable stickyHeader"'
local result = '{| class="wikitable sortable stickyHeader"'
result = result..'\r\n|- class="headerRow-0"'
result = result..'\r\n|- class="headerRow-0"'
result = result..'\r\n!colspan="2"|Zone!!Difficulty!!Highest Monster Level!!Requirements!!Area Effect'
result = result..'\r\n!colspan="2"|Zone!!Difficulty!!Highest Monster Level!!Requirements!!Area Effect'


for i, areaIdx in ipairs(AreaData.displayOrder.slayerAreas) do
for i, area in ipairs(areas) do
local area = CombatAreas.getAreaByID('slayer', areaIdx)
result = result..'\r\n|-'
result = result..'\r\n|-'
result = result..'\r\n|'..Icons.Icon({area.name, type='slayer', size='50', notext=true})
result = result..'\r\n|class="table-img" data-sort-value="' .. area.name .. '"| '..Icons.Icon({area.name, type='slayer', size='50', notext=true})
result = result..'||'..Icons.Icon({area.name, type='slayer', noicon=true})
result = result..'||' .. Icons.getExpansionIcon(area.id) .. Icons.Icon({area.name, type='slayer', noicon=true})
local diff1 = Constants.getDifficultyString(area.difficulty[1])
result = result..'||data-sort-value="'..area.difficulty[1]..'"|'..Areas._getAreaStat(area, 'difficulty')
local diff2 = Constants.getDifficultyString(area.difficulty[2])
local lowLvl, highLvl = p.getLowHighLevels(area.monsterIDs)
result = result..'||data-sort-value="'..area.difficulty[1]..'"|'..diff1
result = result..'||data-sort-value="' .. highLvl .. '"| ' .. Num.formatnum(highLvl)
if diff1 ~= diff2 and diff2 ~= nil then result = result..' - '..diff2 end
local reqText = Areas._getAreaRequirements(area)
local lowLvl, highLvl = p.getLowHighLevels(area.monsters)
if reqText == nil or reqText == '' then
result = result..'||'..highLvl
result = result .. '||class="table-na"| None'
result = result..'||'..CombatAreas._getAreaRequirements(area)
else
result = result..'|| '..CombatAreas._getAreaStat(area, 'areaEffectDesc')
result = result .. '||' .. reqText
end
local effectText = Areas._getAreaStat(area, 'areaEffectDesc')
local classText = ((effectText == nil or effectText == 'None') and 'class="table-na"|') or ''
result = result..'||' .. classText .. ' ' .. effectText
end
end


Line 76: Line 156:
asList = true
asList = true
elseif type(asList) == 'string' then
elseif type(asList) == 'string' then
asList = asList.upper ~= 'FALSE'
asList = string.upper(asList) ~= 'FALSE'
end
end


local chr = asList and '* ' or ''
local lineSep = (asList and '\n' or '<br>')
local rewardList = {}
local formatLine = nil
if asList then
formatLine = function(text) return '* ' .. text end
end
-- GP reward
-- Currency rewards
if area.isEvent == nil or not area.isEvent then
local rewardCurrency = {}
local bossMonster = Monsters.getMonsterByID(area.monsters[Shared.tableCount(area.monsters)])
if area.eventID == nil then
local gpMin = bossMonster.dropCoins[1]
local bossMonster = Monsters.getMonsterByID(area.monsterIDs[Shared.tableCount(area.monsterIDs)])
local gpMax = bossMonster.dropCoins[2]
rewardCurrency = bossMonster.currencyDrops
if gpMin > 0 and gpMax > 0 then
if gpMin == gpMax then
table.insert(rewardList, chr .. Icons.GP(gpMin))
else
table.insert(rewardList, chr .. Icons.GP(gpMin, gpMax))
end
end
end
end
-- Item rewards
-- Item rewards
if type(area.rewards) == 'table' then
local itemLists = {}
for i, rewardID in ipairs(area.rewards) do
if type(area.rewardItemIDs) == 'table' then
local rewardItem = Items.getItemByID(rewardID)
table.insert(itemLists, area.rewardItemIDs)
if rewardItem == nil then
elseif area.type == 'stronghold' then
table.insert(rewardList, chr .. 'Unknown item (ID ' .. tostring(rewardID) .. ')[[Category:Pages with script errors]]')
-- This won't show which tier each reward comes from
else
-- but there doesn't seem to be an easy way to do that
table.insert(rewardList, chr .. Icons.Icon({rewardItem.name, type='item', qty=1}))
local enhancementList = {}
for tier, tierData in pairs(area.tiers) do
if type(tierData.rewards) == 'table' and type(tierData.rewards.items) == 'table' then
for i, reward in ipairs(tierData.rewards.items) do
table.insert(enhancementList, reward.id)
end
end
end
end
if not Shared.tableIsEmpty(enhancementList) then
table.insert(itemLists, enhancementList)
end
end
end
end
if area.eventID ~= nil then
-- Event (Impending Darkness) rewards
local event = GameData.getEntityByID('combatEvents', area.eventID)
if area.isEvent ~= nil and area.isEvent then
if event ~= nil and type(event.itemRewardIDs) == 'table' then
for i, rewardID in ipairs(AreaData.event.rewards) do
table.insert(itemLists, event.itemRewardIDs)
local rewardItem = Items.getItemByID(rewardID)
table.insert(rewardList, chr .. Icons.Icon({rewardItem.name, type='item', qty=1}))
end
end
end
end


if asList then
local rewardItem = {}
return table.concat(rewardList, '\r\n')
for i, itemList in ipairs(itemLists) do
else
for j, rewardID in ipairs(itemList) do
return table.concat(rewardList, '<br/>')
table.insert(rewardItem, {
["id"] = rewardID,
["quantity"] = 1
})
end
end
end
return Common.getCostString({ ["items"] = rewardItem, ["currencies"] = rewardCurrency}, '', formatLine, lineSep)
end
end


Line 126: Line 214:
local areaName = frame.args ~= nil and frame.args[1] or frame
local areaName = frame.args ~= nil and frame.args[1] or frame
local asList = frame.args ~= nil and frame.args[2] or true
local asList = frame.args ~= nil and frame.args[2] or true
local area = CombatAreas.getArea(areaName)
local area = Areas.getArea(areaName)
if area == nil then
if area == nil then
return "ERROR: Could not find an area named "..areaName..'[[Category:Pages with script errors]]'
return Shared.printError('Could not find an area named "' .. areaName .. '"')
end
end


if area.type == 'dungeon' then
if area.type == 'dungeon' or area.type == 'abyssDepth' or area.type == 'stronghold' then
return p._getDungeonRewards(area, asList)
return p._getDungeonRewards(area, asList)
else
else
return "ERROR: "..areaName.." is not a dungeon[[Category:Pages with script errors]]"
return Shared.printError('"' .. areaName .. '" is not a dungeon')
end
end
end
end


function p.getDungeonTable(frame)
function p.getDungeonTable(frame)
local args = frame.args ~= nil and frame.args or frame
local categoryName = args[1]
local areas, errText = getAreasForTable('dungeons', categoryName, 'melvorD:Dungeons')
if errText ~= nil then
return errText
elseif areas == nil then
return ''
end
local result = '{| class="wikitable sortable stickyHeader"'
local result = '{| class="wikitable sortable stickyHeader"'
result = result..'\r\n|-class="headerRow-0"'
result = result..'\r\n|-class="headerRow-0"'
result = result..'\r\n!colspan="2"|Dungeon!!Difficulty!!Monsters!!Boss Level!!Reward(s)!!Boss Pet'
result = result..'\r\n!colspan="2"|Dungeon!!Difficulty!!Monsters!!Boss Level!!Requirements!!Rewards!!Boss Pet'
 
for i, dung in ipairs(areas) do
local monsterCount = Shared.tableCount(dung.monsterIDs)
local boss = Monsters.getMonsterByID(dung.monsterIDs[monsterCount])


for i, dungIdx in ipairs(AreaData.displayOrder.dungeons) do
local dung = CombatAreas.getAreaByID('dungeon', dungIdx)
result = result..'\r\n|-'
result = result..'\r\n|-'
result = result..'\r\n|data-sort-value="'..dung.name..'"|'..Icons.Icon({dung.name, type='dungeon', size='50', notext=true})
result = result..'\r\n|class="table-img" data-sort-value="'..dung.name..'"|'..Icons.Icon({dung.name, type='dungeon', size='50', notext=true})
result = result..'||'..Icons.Icon({dung.name, type='dungeon', noicon=true})
result = result..'||' .. Icons.getExpansionIcon(dung.id) .. Icons.Icon({dung.name, type='dungeon', noicon=true})
result = result..'||data-sort-value="'..dung.difficulty[1]..'"|'..CombatAreas._getAreaStat(dung, 'difficulty')
result = result..'||data-sort-value="'..dung.difficulty[1]..'"|'..Areas._getAreaStat(dung, 'difficulty')
result = result..'||'..Shared.tableCount(dung.monsters)
result = result..'||'..monsterCount
 
result = result..'||'..Num.formatnum(Monsters._getMonsterCombatLevel(boss))
local boss = Monsters.getMonsterByID(dung.monsters[Shared.tableCount(dung.monsters)])
local reqText = Areas._getAreaRequirements(dung)
result = result..'||'..Shared.formatnum(Monsters._getMonsterCombatLevel(boss))
if reqText == nil or reqText == '' then
 
result = result .. '||class="table-na"| None'
else
result = result .. '||' .. reqText
end
result = result..'||'..p._getDungeonRewards(dung, false)
result = result..'||'..p._getDungeonRewards(dung, false)
if dung.petID ~= nil then
local petAdded = false
local pet = Pets.getPetByID(dung.petID)
if dung.pet ~= nil then
result = result..'||data-sort-value="'..pet.name..'"|'..Icons.Icon({pet.name, type='pet'})
local pet = GameData.getEntityByID('pets', dung.pet.petID)
else
if pet ~= nil then
result = result..'|| '
result = result..'||data-sort-value="'..pet.name..'"|'..Icons.Icon({pet.name, type='pet'})
local petDrop = Pets._getPetChance(pet)
if petDrop ~= nil then
result = result..'<br/>'..petDrop
end
petAdded = true
end
end
if not petAdded then
result = result..'||class="table-na"| None'
end
end
end
end
Line 167: Line 279:
end
end


function p._getDungeonDRTable(dung, mode, doStuns, disableAgilityObstacles)
local function getAreaOrderTable(areaCategoryID)
local AutoEatVals = {T1 = 0.2, T2 = 0.3, T3 = 0.4, T3W = 0.45}
local areaCategory = GameData.getEntityByID('combatAreaCategories', areaCategoryID)
if disableAgilityObstacles ~= nil then
if areaCategory == nil then
AutoEatVals = {T1 = 0.2, T2 = 0.3, T3 = 0.4}
return {}
else
else
return areaCategory.areas
end
end
--NOTE: Due to Agility Obstacles, this value is a tad arbitrary
end
local MaxViableHP = 1120
function p.buildCombatNavText(frame)
--This is the highest DR to list as possible. Value might be slightly off right now, currently just setting up value for testing
--This isn't actually called on any pages but instead exists to save me time on updating Template:CombatNav for the new expansion
local MaxViableDR = 81
local areas = GameData.sortByOrderTable(GameData.rawData.slayerAreas, getAreaOrderTable('melvorD:SlayerAreas'))
--This is the highest DR row shown. This should be higher than MaxViableDR
local outArray = {}
local MaxVisibleDR = 85
for i, area in ipairs(areas) do
 
local id = area.id
if doStuns == nil then
if Shared.startsWith(id, 'melvorTotH') then
doStuns = true
table.insert(outArray, '|-')
elseif type(doStuns) == 'string' then
table.insert(outArray, '| {{TotH}} {{ZoneIcon|'..area.name..'}}')
doStuns = string.upper(doStuns) == 'TRUE'
local monsterArray = {}
end
for j, monsterID in ipairs(area.monsterIDs) do
 
local monster = Monsters.getMonsterByID(monsterID)
--First, figure out what our max hit for each style is
table.insert(monsterArray, '{{MonsterIcon|'..monster.name..'}}')
local MaxHits = { Melee = 0, Ranged = 0, Magic = 0 }
end
for i, monsterID in Shared.skpairs(dung.monsters) do
table.insert(outArray, '| class="center" style="vertical-align:middle;" | '..table.concat(monsterArray, ' {{*}} '))
local monster = Monsters.getMonsterByID(monsterID)
local styleName = Constants.getCombatStyleName(monster.attackType)
local maxHit = Monsters._getMonsterMaxHit(monster, doStuns)
if maxHit > MaxHits[styleName] then
MaxHits[styleName] = maxHit
end
end
end
end
 
--Then, figure out the DR row to start with
areas = GameData.sortByOrderTable(GameData.rawData.dungeons, getAreaOrderTable('melvorD:Dungeons'))
--This is the DR that is one lower than the lowest possible DR for the best style
for i, area in ipairs(areas) do
local StyleArray = {"Melee", "Ranged", "Magic"}
local id = area.id
local EatThreshold = math.floor(MaxViableHP * AutoEatVals.T3W)
if Shared.startsWith(id, 'melvorTotH') then
local minDR = 100
table.insert(outArray, '|-')
for i, playerStyle in Shared.skpairs(StyleArray) do
table.insert(outArray, '| {{TotH}} {{ZoneIcon|'..area.name..'}}')
local maxStyleDR = 0
local monsterArray = {}
for enemyStyle, styleHit in Shared.skpairs(MaxHits) do
local mCheck = {}
if styleHit > 0 and styleHit > EatThreshold then
for j, monsterID in ipairs(area.monsterIDs) do
local styleDR = math.ceil((1 - (EatThreshold / styleHit)) * 100)
local monster = Monsters.getMonsterByID(monsterID)
styleDR = math.ceil(styleDR / Constants.getTriangleDRModifier(playerStyle, enemyStyle, mode))
if mCheck[monster.name] == nil then
maxStyleDR = math.max(maxStyleDR, styleDR)
table.insert(monsterArray, '{{MonsterIcon|'..monster.name..'}}')
end
mCheck[monster.name] = 1
end
end
table.insert(outArray, '| class="center" style="vertical-align:middle;" | '..table.concat(monsterArray, ' {{*}} '))
end
end
minDR = math.min(minDR, maxStyleDR)
end
end
 
minDR = minDR - 1
return table.concat(outArray, '\r\n')
 
--Finally, build the table using those starting points
local StyleHeader = "Melee!!Ranged!!Magic"
StyleHeader = StyleHeader..'!!'..StyleHeader..'!!'..StyleHeader..'!!'..StyleHeader
 
local result = '{| class="wikitable stickyHeader"'
result = result..'\r\n|-class="headerRow-0"'
result = result..'\r\n!Pre-Triangle DR!!colspan=3|AE T3 + Wasteful!!colspan=3|Auto Eat Tier 3!!colspan=3|Auto Eat Tier 2!!colspan=3|Auto Eat Tier 1'
result = result..'\r\n|-class="headerRow-0"'
result = result..'\r\n!DR %!!'..StyleHeader
 
local getHpForStyle = function(playerStyle, autoEat, playerDR)
return nil
end
 
for dr = minDR, MaxVisibleDR, 1 do
end
 
result = result..'\r\n|}'
 
return result
end
 
function p.getDungeonDRTable(frame)
local dungName = frame.args ~= nil and frame.args[1] or frame[1]
local mode = frame.args ~= nil and frame.args[2] or frame[2]
local doStuns = frame.args ~= nil and frame.args[3] or frame[3]
local disableAgilityObstacles = frame.args ~= nil and frame.args[4] or frame[4]
local dung = CombatAreas.getArea(dungName)
 
if dung == nil then
return 'ERROR: Invalid dungeon name'
end
 
return p._getDungeonDRTable(dung, mode, doStuns, disableAgilityObstacles)
end
end


return p
return p

Latest revision as of 22:38, 7 August 2024

Documentation for this module may be created at Module:CombatAreas/AreaTables/doc

--Splitting this out so I can make Module:Monsters calls (Monsters calls CombatAreas, so this prevents a loop)

local p = {}

local Constants = require('Module:Constants')
local Common = require('Module:Common')
local Shared = require('Module:Shared')
local GameData = require('Module:GameData')
local Icons = require('Module:Icons')
local Items = require('Module:Items')
local Monsters = require('Module:Monsters')
local Pets = require('Module:Pets')
local Areas = require('Module:CombatAreas')
local Num = require('Module:Number')


function p.getLowHighLevels(idList)
	local lowLevel = 1000000
	local highLevel = 0
	for i, monID in ipairs(idList) do
		local monster = Monsters.getMonsterByID(monID)
		local cmbLevel = Monsters._getMonsterCombatLevel(monster)
		if cmbLevel < lowLevel then lowLevel = cmbLevel end
		if cmbLevel > highLevel then highLevel = cmbLevel end
	end
	return lowLevel, highLevel
end

function p.getAreaCategory(area)
	for _, areaCat in ipairs(GameData.rawData.combatAreaCategories) do
		if areaCat.areas ~= nil and Shared.contains(areaCat.areas, area.id) then
			return areaCat
		end
	end
end

function p.getAreaCategoriesFromAreas(areas)
	local areaCatIDs = {}
	for i, area in ipairs(areas) do
		local areaCat = p.getAreaCategory(area)
		if areaCat ~= nil and areaCat.id ~= nil then
			areaCatIDs[areaCat.id] = true
		end
	end
	return GameData.getEntities('combatAreaCategories',
		function(obj)
			return obj.id ~= nil and areaCatIDs[obj.id] ~= nil
		end
	)
end

local function getAreasForTable(areaDataKey, categoryName, defaultCategoryID)
	local areaCategories = p.getAreaCategoriesFromAreas(GameData.rawData[areaDataKey])
	local areaCategory = nil

	if categoryName == nil or categoryName == '' then
		-- Default area category
		areaCategory = GameData.getEntityByID(areaCategories, defaultCategoryID)
	else
		areaCategory = GameData.getEntityByName(areaCategories, categoryName)
	end
	if areaCategory == nil then
		local catNames = {}
		for _, areaCat in ipairs(areaCategories) do
			if areaCat.name ~= nil then
				table.insert(catNames, areaCat.name)
			end
		end
		return nil, Shared.printError('Invalid area category, choose any of: ' .. table.concat(catNames, ', '))
	end

	local areas = GameData.getEntities(areaDataKey,
		function(obj)
			return obj.id ~= nil and Shared.contains(areaCategory.areas, obj.id)
		end
	)
	areas = GameData.sortByOrderTable(areas, areaCategory.areas)
	return areas, nil
end

function p.getCombatAreaTable(frame)
	local args = frame.args ~= nil and frame.args or frame
	local categoryName = args[1]

	local areas, errText = getAreasForTable('combatAreas', categoryName, 'melvorD:CombatAreas')
	if errText ~= nil then
		return errText
	elseif areas == nil then
		return ''
	end

	local result = '{| class="wikitable sortable stickyHeader"'
	result = result..'\r\n|- class="headerRow-0"'
	result = result..'\r\n!colspan="2"|Zone!!Difficulty!!Lowest Monster Level!!Highest Monster Level!!Requirements'

	for i, area in ipairs(areas) do
		result = result..'\r\n|-'
		result = result..'\r\n|class="table-img" data-sort-value="' .. area.name .. '"| '..Icons.Icon({area.name, type='combatArea', size='50', notext=true})
		result = result..'||' .. Icons.getExpansionIcon(area.id) .. Icons.Icon({area.name, type='combatArea', noicon=true})
		result = result..'||data-sort-value="'..area.difficulty[1]..'"|'..Areas._getAreaStat(area, 'difficulty')
		local lowLvl, highLvl = p.getLowHighLevels(area.monsterIDs)
		result = result .. '||data-sort-value="' .. lowLvl .. '"| ' .. Num.formatnum(lowLvl)
		result = result .. '||data-sort-value="' .. highLvl .. '"| ' .. Num.formatnum(highLvl)
		local reqText = Areas._getAreaRequirements(area)
		if reqText == nil or reqText == '' then
			result = result .. '||class="table-na"| None'
		else
			result = result .. '||' .. reqText
		end
	end
	result = result..'\r\n|}'

	return result
end

function p.getSlayerAreaTable(frame)
	local args = frame.args ~= nil and frame.args or frame
	local categoryName = args[1]

	local areas, errText = getAreasForTable('slayerAreas', categoryName, 'melvorF:SlayerAreas')
	if errText ~= nil then
		return errText
	elseif areas == nil then
		return ''
	end

	local result = '{| class="wikitable sortable stickyHeader"'
	result = result..'\r\n|- class="headerRow-0"'
	result = result..'\r\n!colspan="2"|Zone!!Difficulty!!Highest Monster Level!!Requirements!!Area Effect'

	for i, area in ipairs(areas) do
		result = result..'\r\n|-'
		result = result..'\r\n|class="table-img" data-sort-value="' .. area.name .. '"| '..Icons.Icon({area.name, type='slayer', size='50', notext=true})
		result = result..'||' .. Icons.getExpansionIcon(area.id) .. Icons.Icon({area.name, type='slayer', noicon=true})
		result = result..'||data-sort-value="'..area.difficulty[1]..'"|'..Areas._getAreaStat(area, 'difficulty')
		local lowLvl, highLvl = p.getLowHighLevels(area.monsterIDs)
		result = result..'||data-sort-value="' .. highLvl .. '"| ' .. Num.formatnum(highLvl)
		local reqText = Areas._getAreaRequirements(area)
		if reqText == nil or reqText == '' then
			result = result .. '||class="table-na"| None'
		else
			result = result .. '||' .. reqText
		end
		local effectText = Areas._getAreaStat(area, 'areaEffectDesc')
		local classText = ((effectText == nil or effectText == 'None') and 'class="table-na"|') or ''
		result = result..'||' .. classText .. ' ' .. effectText
	end

	result = result..'\r\n|}'

	return result
end

function p._getDungeonRewards(area, asList)
	if asList == nil then
		asList = true
	elseif type(asList) == 'string' then
		asList = string.upper(asList) ~= 'FALSE'
	end

	local lineSep = (asList and '\n' or '<br>')
	local formatLine = nil
	if asList then
		formatLine = function(text) return '* ' .. text end
	end
	
	-- Currency rewards
	local rewardCurrency = {}
	if area.eventID == nil then
		local bossMonster = Monsters.getMonsterByID(area.monsterIDs[Shared.tableCount(area.monsterIDs)])
		rewardCurrency = bossMonster.currencyDrops
	end
	
	-- Item rewards
	local itemLists = {}
	if type(area.rewardItemIDs) == 'table' then
		table.insert(itemLists, area.rewardItemIDs)
	elseif area.type == 'stronghold' then
		-- This won't show which tier each reward comes from
		-- but there doesn't seem to be an easy way to do that
		local enhancementList = {}
		for tier, tierData in pairs(area.tiers) do
			if type(tierData.rewards) == 'table' and type(tierData.rewards.items) == 'table' then
				for i, reward in ipairs(tierData.rewards.items) do
					table.insert(enhancementList, reward.id)
				end
			end
		end
		if not Shared.tableIsEmpty(enhancementList) then
			table.insert(itemLists, enhancementList)
		end
	end
	if area.eventID ~= nil then
		local event = GameData.getEntityByID('combatEvents', area.eventID)
		if event ~= nil and type(event.itemRewardIDs) == 'table' then
			table.insert(itemLists, event.itemRewardIDs)
		end
	end

	local rewardItem = {}
	for i, itemList in ipairs(itemLists) do
		for j, rewardID in ipairs(itemList) do
			table.insert(rewardItem, {
				["id"] = rewardID,
				["quantity"] = 1
			})
		end
	end

	return Common.getCostString({ ["items"] = rewardItem, ["currencies"] = rewardCurrency}, '', formatLine, lineSep)
end

function p.getDungeonRewards(frame)
	local areaName = frame.args ~= nil and frame.args[1] or frame
	local asList = frame.args ~= nil and frame.args[2] or true
	local area = Areas.getArea(areaName)
	if area == nil then
		return Shared.printError('Could not find an area named "' .. areaName .. '"')
	end

	if area.type == 'dungeon' or area.type == 'abyssDepth' or area.type == 'stronghold' then
		return p._getDungeonRewards(area, asList)
	else
		return Shared.printError('"' .. areaName .. '" is not a dungeon')
	end
end

function p.getDungeonTable(frame)
	local args = frame.args ~= nil and frame.args or frame
	local categoryName = args[1]

	local areas, errText = getAreasForTable('dungeons', categoryName, 'melvorD:Dungeons')
	if errText ~= nil then
		return errText
	elseif areas == nil then
		return ''
	end

	local result = '{| class="wikitable sortable stickyHeader"'
	result = result..'\r\n|-class="headerRow-0"'
	result = result..'\r\n!colspan="2"|Dungeon!!Difficulty!!Monsters!!Boss Level!!Requirements!!Rewards!!Boss Pet'

	for i, dung in ipairs(areas) do
		local monsterCount = Shared.tableCount(dung.monsterIDs)
		local boss = Monsters.getMonsterByID(dung.monsterIDs[monsterCount])

		result = result..'\r\n|-'
		result = result..'\r\n|class="table-img" data-sort-value="'..dung.name..'"|'..Icons.Icon({dung.name, type='dungeon', size='50', notext=true})
		result = result..'||' .. Icons.getExpansionIcon(dung.id) .. Icons.Icon({dung.name, type='dungeon', noicon=true})
		result = result..'||data-sort-value="'..dung.difficulty[1]..'"|'..Areas._getAreaStat(dung, 'difficulty')
		result = result..'||'..monsterCount
		result = result..'||'..Num.formatnum(Monsters._getMonsterCombatLevel(boss))
		local reqText = Areas._getAreaRequirements(dung)
		if reqText == nil or reqText == '' then
			result = result .. '||class="table-na"| None'
		else
			result = result .. '||' .. reqText
		end
		result = result..'||'..p._getDungeonRewards(dung, false)
		local petAdded = false
		if dung.pet ~= nil then
			local pet = GameData.getEntityByID('pets', dung.pet.petID)
			if pet ~= nil then
				result = result..'||data-sort-value="'..pet.name..'"|'..Icons.Icon({pet.name, type='pet'})
				local petDrop = Pets._getPetChance(pet)
				if petDrop ~= nil then
					result = result..'<br/>'..petDrop
				end
				petAdded = true
			end
		end
		if not petAdded then
			result = result..'||class="table-na"| None'
		end
	end

	result = result..'\r\n|}'
	return result
end

local function getAreaOrderTable(areaCategoryID)
	local areaCategory = GameData.getEntityByID('combatAreaCategories', areaCategoryID)
	if areaCategory == nil then
		return {}
	else
		return areaCategory.areas
	end
end
function p.buildCombatNavText(frame)
	--This isn't actually called on any pages but instead exists to save me time on updating Template:CombatNav for the new expansion
	local areas = GameData.sortByOrderTable(GameData.rawData.slayerAreas, getAreaOrderTable('melvorD:SlayerAreas'))
	local outArray = {}
	for i, area in ipairs(areas) do
		local id = area.id
		if Shared.startsWith(id, 'melvorTotH') then
			table.insert(outArray, '|-')
			table.insert(outArray, '| {{TotH}} {{ZoneIcon|'..area.name..'}}')
			local monsterArray = {}
			for j, monsterID in ipairs(area.monsterIDs) do
				local monster = Monsters.getMonsterByID(monsterID)
				table.insert(monsterArray, '{{MonsterIcon|'..monster.name..'}}')
			end
			table.insert(outArray, '| class="center" style="vertical-align:middle;" | '..table.concat(monsterArray, ' {{*}} '))
		end
	end
	
	areas = GameData.sortByOrderTable(GameData.rawData.dungeons, getAreaOrderTable('melvorD:Dungeons'))
	for i, area in ipairs(areas) do
		local id = area.id
		if Shared.startsWith(id, 'melvorTotH') then
			table.insert(outArray, '|-')
			table.insert(outArray, '| {{TotH}} {{ZoneIcon|'..area.name..'}}')
			local monsterArray = {}
			local mCheck = {}
			for j, monsterID in ipairs(area.monsterIDs) do
				local monster = Monsters.getMonsterByID(monsterID)
				if mCheck[monster.name] == nil then
					table.insert(monsterArray, '{{MonsterIcon|'..monster.name..'}}')
					mCheck[monster.name] = 1
				end
					end
			table.insert(outArray, '| class="center" style="vertical-align:middle;" | '..table.concat(monsterArray, ' {{*}} '))
		end
	end
	
	return table.concat(outArray, '\r\n')
end

return p