Module:Pets: Difference between revisions

From Melvor Idle
(Use tabs instead of spaces for indentation)
m (Add Superior Tier only note to stronghold pet drops)
 
(26 intermediate revisions by 3 users not shown)
Line 2: Line 2:


local p = {}
local p = {}
local PetData = mw.loadData('Module:Pets/data')


local Shared = require( "Module:Shared" )
local Shared = require( "Module:Shared" )
local Constants = require('Module:Constants')
local Constants = require('Module:Constants')
local GameData = require('Module:GameData')
local Modifiers = require('Module:Modifiers')
local Icons = require('Module:Icons')
local Icons = require('Module:Icons')
local CombatAreas = require('Module:CombatAreas')
local Num = require('Module:Number')


local areaDataKeys = { 'combatAreas', 'slayerAreas', 'dungeons', 'strongholds', 'abyssDepths' }
-- Compute combat pet sources once for use later
local function getCombatPetSources()
local result = {}
for _, key in ipairs(areaDataKeys) do
local areas = GameData.getEntities(key,
function(area)
-- Lazy exclusion of event namespaces
local areaNS, areaLocalID = Shared.getLocalID(area.id)
if areaNS == 'melvorBirthday2023' or areaNS == 'melvorAprilFools2024' then
return false
end
return area.pet ~= nil
end
)
for i, area in ipairs(areas) do
result[area.pet.petID] = {
id = area.id,
name = area.name,
type = area.type,
isCombat = true,
weight = area.pet.weight,
fixedChance = (area.fixedPetClears ~= nil and area.fixedPetClears) or area.pet.weight == 1
}
end
end
return result
end
local CombatPetSources = getCombatPetSources()


function p.getPetByID(ID)
function p.getPetByID(ID)
local result = Shared.clone(PetData.Pets[ID + 1])
return GameData.getEntityByID('pets', ID)
if result ~= nil then
result.id = ID
end
return result
end
end


function p.getPet(name)
function p.getPet(name)
local result = nil
return GameData.getEntityByName('pets', Shared.fixPagename(name))
name = string.gsub(name, "%%27", "'")
end
name = string.gsub(name, "'", "'")
 
name = string.gsub(name, "'", "'")
function p.getPets(checkFunc)
for i, pet in pairs(PetData.Pets) do
return GameData.getEntities('pets', checkFunc)
local PetName = string.gsub(pet.name, '#', '')
end
if name == PetName then
 
result = Shared.clone(pet)
--Returns the expansion icon for the pet if it has one
--Make sure every pet has an id, and account for Lua being 1-index
function p.getExpansionIcon(frame)
result.id = i - 1
local petName = frame.args ~= nil and frame.args[1] or frame
result.skill = p._getPetSkill(result)
local pet = p.getPet(petName)
break
if pet == nil then
end
return Shared.printError('No pet named "' .. petName .. '" exists in the data module')
end
end
return result
return Icons.getExpansionIcon(pet.id)
end
end


function p.getPets(checkFunc)
function p._getPetSource(pet)
local result = {}
if CombatPetSources ~= nil and CombatPetSources[pet.id] ~= nil then
for i, pet in Shared.skpairs(PetData.Pets) do
return CombatPetSources[pet.id]
if checkFunc(pet) then
else
local newPet = Shared.clone(pet)
local skillID = p._getPetSkill(pet)
newPet.id = i - 1
if skillID ~= nil then
newPet.skill = p._getPetSkill(newPet)
local skillName = Constants.getSkillName(skillID)
table.insert(result, newPet)
return { id = skillID, name = skillName, type = 'skill', isCombat = false }
end
end
end
end
return result
end
end


function p._getPetSource(pet)
function p._getPetSourceText(pet)
local sourceOverrides = {
local sourceOverrides = {
-- Format: ['PetName'] = {'Source', UseIcon}
-- useIcon: true if Source has an associated icon, false otherwise
-- UseIcon = true if Source has an associated icon, false otherwise
['Ripper the Reindeer'] = { text = '[[Events#Christmas Event 2020|Christmas Event 2020]]', useIcon = false },
['Asura'] = {'Slayer', true},
['Festive Chio'] = { text = '[[Holiday Event 2021]]', useIcon = false },
['Ripper the Reindeer'] = {'[[Events#Christmas_Event_2020|Christmas Event 2020]]', false},
['Festive Cool Rock'] = { text = '[[Holiday Event 2021]]', useIcon = false },
['Festive Chio'] = {'[[Holiday Event 2021]]'},
['Jerry the Giraffe'] = { text = '[[Golbin Raid|Golbin Raid Shop]]', useIcon = false },
['Festive Cool Rock'] = {'[[Holiday Event 2021]]'},
['Preston the Platypus'] = { text = '[[Golbin Raid|Golbin Raid Shop]]', useIcon = false },
['Jerry the Giraffe'] = {'[[Golbin Raid|Golbin Raid Shop]]', false},
['Ty'] = { text = 'Mastery', useIcon = true },
['Preston the Platypus'] = {'[[Golbin Raid|Golbin Raid Shop]]', false},
['Golden Golbin'] = { text = Icons.Icon({'Golbin', type='monster'}) .. ' kills', useIcon = false},
['Mark'] = {'Summoning', true},
['Saki'] = { text = 'Mastery', useIcon = true }
['Bone'] = {'Impending Darkness Event', true}
}
}
local petSource = ''
local petSourceText = nil
local iconType = nil
local useIcon = true
local useIcon = true
local override = sourceOverrides[pet.name]
local override = sourceOverrides[pet.name]
if override ~= nil then
if override ~= nil then
petSource = override[1] ~= nil and override[1] or pet.acquiredBy
petSourceText = override.text
useIcon = override[2]
if override.useIcon ~= nil then
elseif pet.acquiredBy ~= nil then
useIcon = override.useIcon
petSource = pet.acquiredBy
end
end
end


-- Determine icon type (if any)
if petSourceText == nil then
local iconType = nil
local petSource = p._getPetSource(pet)
if Constants.getSkillID(petSource) ~= nil then
if petSource ~= nil then
iconType = 'skill'
if petSource.isCombat then
else
iconType = (petSource.type == 'dungeon' and 'dungeon') or 'combatArea'
local combatArea = CombatAreas.getArea(petSource)
else
if combatArea ~= nil then
iconType = petSource.type
iconType = combatArea.type
end
petSourceText = petSource.name
else
useIcon = false
petSourceText = ''
end
end
end
end


if useIcon then
if useIcon then
petSource = Icons.Icon({petSource, type=iconType})
return Icons.Icon({petSourceText, type=iconType})
else
return petSourceText
end
end
return petSource
end
end


function p._getPetEffect(pet)
function p._getPetEffect(pet)
local effectOverrides = {
local modKeys = {'modifiers', 'enemyModifiers'}
['Ripper the Reindeer'] = 'None',
local effects = {}
}
for i, key in ipairs(modKeys) do
if effectOverrides[pet.name] ~= nil then
if pet[key] ~= nil and not Shared.tableIsEmpty(pet[key]) then
return effectOverrides[pet.name]
local preText = (key == 'enemyModifiers' and 'All enemies have: ' or '')
table.insert(effects, preText .. Modifiers.getModifiersText(pet[key], false))
end
end
if Shared.tableIsEmpty(effects) then
return 'None'
else
else
local modKeys = {'modifiers', 'enemyModifiers'}
return table.concat(effects, '<br/>')
local effects = {}
for i, key in ipairs(modKeys) do
if pet[key] ~= nil and Shared.tableCount(pet[key]) > 0 then
for effectName, effectValue in pairs(pet[key]) do
local preText = (key == 'enemyModifiers' and 'All enemies have: ' or '')
table.insert(effects, preText .. Constants._getModifierText(effectName, effectValue, false))
end
end
end
if Shared.tableCount(effects) > 0 then
return table.concat(effects, '<br/>')
elseif pet.skill ~= nil and pet.skill >= 0 then
-- Attempt to remove skill prefix from description
local newDesc, subIdx = string.gsub(pet.description, '^' .. Constants.getSkillName(pet.skill) .. '<br>', '')
return newDesc
else
return pet.description
end
end
end
end
end


function p._getPetChance(pet)
function p._getPetChance(pet)
if pet.obtained ~= nil and pet.obtained.dungeonCompletion ~= nil then
local source = p._getPetSource(pet)
local odds = pet.obtained.dungeonCompletion[1][2]
if source ~= nil and source.weight ~= nil then
if pet.name == 'Pablo' then
-- Pet is from a dungeon or combat/slayer area
-- Special handling for Into the Mist/Pablo
if source.fixedChance then
return 'Guaranteed after ' .. odds .. ' clears'
return 'Guaranteed after ' .. Num.formatnum(source.weight) .. (source.weight == 1 and ' clear' or ' clears')
else
else
-- Dungeon pet
return '1 in ' .. Num.formatnum(source.weight) .. ' (' .. Num.round(100 / source.weight, 2, 2) .. '%)'
return '1 in ' .. odds .. ' (' .. Shared.round(100 / odds, 2, 2) .. '%)'
end
end
elseif pet.name == 'Bone' then
-- Special handling for Impending Darkness/Bone
return 'Guaranteed after 1 clear'
elseif pet.name == 'Peri' or pet.name == 'Otto' then
-- Slayer area pets
local odds = 7500
return '1 in ' .. odds .. ' (' .. Shared.round(100 / odds, 2, 2) .. '%)'
else
else
-- Skill pet or other
-- Skill pet or other
Line 144: Line 153:
function p._getPetSkill(pet)
function p._getPetSkill(pet)
local skillOverrides = {
local skillOverrides = {
['Ty'] = -1,
['melvorD:Ty'] = nil,
['Mark'] = 21
['melvorF:Mark'] = 'melvorD:Summoning'
}
}


local skillID = pet.skill
if skillOverrides[pet.id] ~= nil then
if skillOverrides[pet.name] ~= nil then
return skillOverrides[pet.id]
skillID = skillOverrides[pet.name]
end
if skillID < 0 then
return nil
else
else
return skillID
return pet.skillID
end
end
end
end


function p._getPetTable(pets)
function p._getPetTable(pets)
if pets == nil or Shared.tableCount(pets) == 0 then return nil end
if type(pets) ~= 'table' or Shared.tableIsEmpty(pets) then
return nil
end


local resultPart = {}
local html = mw.html.create('table')
table.insert(resultPart, '{| class="wikitable"\r\n!Pet!!Name!!Effect')
:addClass('wikitable')
html:tag('tr')
:tag('th'):wikitext('Pet')
:tag('th'):wikitext('Name')
:tag('th'):wikitext('[[DLC]]')
:tag('th'):wikitext('Effect')


for i, pet in pairs(pets) do
for i, pet in ipairs(pets) do
table.insert(resultPart, '|-')
html:tag('tr')
table.insert(resultPart, '|style="text-align: center;"|' .. Icons.Icon({pet.name, type='pet', size=60, notext=true}))
:tag('td'):wikitext(Icons.Icon({pet.name, type='pet', notext=true}))
table.insert(resultPart, '|' .. Icons.Icon({pet.name, type='pet', noicon=true}))
  :css('text-align', 'center')
table.insert(resultPart, '| ' .. p._getPetEffect(pet))
:tag('td'):wikitext('[[' .. pet.name .. ']]')
:tag('td'):wikitext(Icons.getDLCColumnIcon(pet.id))
  :css('text-align', 'center')
:tag('td'):wikitext(p._getPetEffect(pet))
end
end
table.insert(resultPart, '|}')
 
return tostring(html)
return table.concat(resultPart, '\r\n')
end
end


Line 181: Line 196:


if skillID == nil then
if skillID == nil then
return ''
error("SkillID not found for skill: " .. skillName)
else
else
local pets = p.getPets(function(pet) return p._getPetSkill(pet) == skillID end)
local pets = p.getPets(function(pet) return p._getPetSkill(pet) == skillID end)
if pets == nil then
if pets == nil or Shared.tableIsEmpty(pets) then
return ''
return ''
else
else
Line 197: Line 212:
local name = (args.name ~= nil and args.name ~= '') and args.name or args[1]
local name = (args.name ~= nil and args.name ~= '') and args.name or args[1]
local pet = p.getPet(name)
local pet = p.getPet(name)
if pet == nil then
return Shared.printError('No pet named "' .. (name or 'Unknown') .. '" exists in the data module')
end
local effect = (args.effect ~= nil and args.effect ~= '') and args.effect or p._getPetEffect(pet)
local effect = (args.effect ~= nil and args.effect ~= '') and args.effect or p._getPetEffect(pet)
local completionReq = (pet.ignoreCompletion ~= nil and pet.ignoreCompletion) and 'No' or 'Yes'
local completionReq = (pet.ignoreCompletion ~= nil and pet.ignoreCompletion) and 'No' or 'Yes'
local dropChance = p._getPetChance(pet)
local dropChance = p._getPetChance(pet)


result = '{| class="wikitable" style="float:right; clear:right;"\r\n|-\r\n'
result = '{| class="wikitable infobox"\r\n|-\r\n'
result = result..'! '..name..'\r\n|-\r\n| '
result = result..'! ' .. Icons.getExpansionIcon(pet.id) .. name .. '\r\n|-\r\n| '
result = result..'style="text-align: center;"|' .. Icons.Icon({name, type='pet', size='250', notext=true})
result = result..'style="text-align: center;"|' .. Icons.Icon({name, type='pet', size='250', notext=true})
result = result.."\r\n|-\r\n|'''Pet ID:''' "..pet.id
result = result.."\r\n|-\r\n|'''Pet ID:''' "..pet.id
result = result.."\r\n|-\r\n|'''Source:''' "..p._getPetSource(pet)
result = result.."\r\n|-\r\n|'''Source:''' "..p._getPetSourceText(pet)
if dropChance ~= nil then
if dropChance ~= nil then
result = result.."\r\n|-\r\n|'''Drop Chance:''' "..dropChance
result = result.."\r\n|-\r\n|'''Drop Chance:''' "..dropChance
Line 216: Line 234:


function p.getPetPageTable()
function p.getPetPageTable()
local result = ''
    local html = mw.html.create('table')
local petList = Shared.clone(PetData.Pets)
        :addClass('wikitable sortable lighttable stickyHeader')
 
result = '{|class="wikitable sortable lighttable stickyHeader"'
result = result..'\r\n|- class="headerRow-0"\r\n! Name !! Image !! Acquired From !! Effect'


table.sort(petList, function(a, b)
    html:tag('tr'):addClass('headerRow-0')
return p.getPet(a.name).id < p.getPet(b.name).id
        :tag('th'):attr('colspan', '2')
end)
          :wikitext('Pet')
       
        :tag('th'):wikitext('[[DLC]]')
        :tag('th'):wikitext('Acquired From')
        :tag('th'):wikitext('Effect')


for i, thisPet in pairs(petList) do
    for i, thisPet in ipairs(GameData.rawData.pets) do
result = result..'\r\n|-\r\n|'..Icons.Icon({thisPet.name, type='pet', noicon=true})
        html:tag('tr')
result = result..'||style="text-align: center;"|'..Icons.Icon({thisPet.name, size='60', type='pet', notext=true})
            :tag('td'):addClass('table-img')
result = result..'||'..p._getPetSource(thisPet)
                  :attr('data-sort-value', thisPet.name)
result = result..'||'..p._getPetEffect(thisPet)
                      :wikitext(Icons.Icon({thisPet.name, type='pet', notext=true}))
end
                      :css('text-align', 'center')
result = result..'\r\n|}'
            :tag('td'):wikitext('[[' .. thisPet.name .. ']]')
            :tag('td'):wikitext(Icons.getDLCColumnIcon(thisPet.id))
              :css('text-align', 'center')
              :attr('data-sort-value', Icons.getExpansionID(thisPet.id))
            :tag('td'):wikitext(p._getPetSourceText(thisPet))
            :tag('td'):wikitext(p._getPetEffect(thisPet))
    end


return result
    return tostring(html)
end
end


function p.getDungeonBoxPetText(frame)
function p.getDungeonBoxPetText(frame)
local dungeonName = frame.args ~= nil and frame.args[1] or frame
local dungeonName = frame.args ~= nil and frame.args[1] or frame
local dung = CombatAreas.getArea(dungeonName)
local dung = nil
for i, key in ipairs(areaDataKeys) do
dung = GameData.getEntityByName(key, dungeonName)
if dung ~= nil then
break
end
end
if dung == nil then
if dung == nil then
return 'ERROR: Invalid dungeon name '..dungeonName..'[[Category:Pages with script errors]]'
return Shared.printError('No dungeon named "' .. dungeonName .. '" exists in the data module')
end
end


local result = ''
if dung.pet ~= nil then
local pet = p.getPetByID(dung.petID)
local pet = p.getPetByID(dung.pet.petID)
if pet ~= nil then
if pet ~= nil then
result = "\r\n|-\r\n|'''[[Pets#Boss Pets|Pet]]:'''<br/>"
local result = "\r\n|-\r\n|'''[[Pets#Boss Pets|Pet]]:'''<br/>"
result = result..Icons.Icon({pet.name, type='pet'})
result = result..Icons.Icon({pet.name, type='pet'})
result = result.."\r\n|-\r\n|'''Pet Drop Chance:'''<br/>"..p._getPetChance(pet)
result = result.."\r\n|-\r\n|'''Pet Drop Chance:'''<br/>"..p._getPetChance(pet)
end
if dung.type == 'stronghold' then
 
result = result..' - Superior Tier only'
return result
end
end
return result
 
function p.getPetNavbox()
--•
local result = '{| class="wikitable" style="margin:auto; text-align:center; clear:both; width: 100%"'
result = result..'\r\n|-\r\n!colspan="2"|[[Pets]]'
 
local skillPetList = {}
local bossPetList = {}
local otherPetList = {}
for i, petData in Shared.skpairs(PetData.Pets) do
if p._getPetSkill(petData) ~= nil then
table.insert(skillPetList, Icons.Icon({petData.name, type='pet'}))
elseif petData.obtained ~= nil and petData.obtained.dungeonCompletion ~= nil then
table.insert(bossPetList, Icons.Icon({petData.name, type='pet'}))
else
table.insert(otherPetList, Icons.Icon({petData.name, type='pet'}))
end
end
end
end
table.sort(skillPetList, function(a, b) return a < b end)
table.sort(bossPetList, function(a, b) return a < b end)
table.sort(otherPetList, function(a, b) return a < b end)
result = result..'\r\n|-\r\n!Skill Pets\r\n|'..table.concat(skillPetList, ' • ')
result = result..'\r\n|-\r\n!Boss Pets\r\n|'..table.concat(bossPetList, ' • ')
result = result..'\r\n|-\r\n!Other Pets\r\n|'..table.concat(otherPetList, ' • ')
result = result..'\r\n|}'
return result
end
end


return p
return p

Latest revision as of 22:43, 7 August 2024

Data for this page is stored in Module:GameData/data


--This module contains all sorts of functions for getting data on pets

local p = {}

local Shared = require( "Module:Shared" )
local Constants = require('Module:Constants')
local GameData = require('Module:GameData')
local Modifiers = require('Module:Modifiers')
local Icons = require('Module:Icons')
local Num = require('Module:Number')

local areaDataKeys = { 'combatAreas', 'slayerAreas', 'dungeons', 'strongholds', 'abyssDepths' }
-- Compute combat pet sources once for use later
local function getCombatPetSources()
	local result = {}
	for _, key in ipairs(areaDataKeys) do
		local areas = GameData.getEntities(key,
			function(area)
				-- Lazy exclusion of event namespaces
				local areaNS, areaLocalID = Shared.getLocalID(area.id)
				if areaNS == 'melvorBirthday2023' or areaNS == 'melvorAprilFools2024' then
					return false
				end
				return area.pet ~= nil
			end
		)
		for i, area in ipairs(areas) do
			result[area.pet.petID] = {
				id = area.id,
				name = area.name,
				type = area.type,
				isCombat = true,
				weight = area.pet.weight,
				fixedChance = (area.fixedPetClears ~= nil and area.fixedPetClears) or area.pet.weight == 1
			}
		end
	end
	return result
end
local CombatPetSources = getCombatPetSources()

function p.getPetByID(ID)
	return GameData.getEntityByID('pets', ID)
end

function p.getPet(name)
	return GameData.getEntityByName('pets', Shared.fixPagename(name))
end

function p.getPets(checkFunc)
	return GameData.getEntities('pets', checkFunc)
end

--Returns the expansion icon for the pet if it has one
function p.getExpansionIcon(frame)
	local petName = frame.args ~= nil and frame.args[1] or frame
	local pet = p.getPet(petName)
	if pet == nil then
		return Shared.printError('No pet named "' .. petName .. '" exists in the data module')
	end
	
	return Icons.getExpansionIcon(pet.id)
end

function p._getPetSource(pet)
	if CombatPetSources ~= nil and CombatPetSources[pet.id] ~= nil then
		return CombatPetSources[pet.id]
	else
		local skillID = p._getPetSkill(pet)
		if skillID ~= nil then
			local skillName = Constants.getSkillName(skillID)
			return { id = skillID, name = skillName, type = 'skill', isCombat = false }
		end
	end
end

function p._getPetSourceText(pet)
	local sourceOverrides = {
		-- useIcon: true if Source has an associated icon, false otherwise
		['Ripper the Reindeer'] = { text = '[[Events#Christmas Event 2020|Christmas Event 2020]]', useIcon = false },
		['Festive Chio'] = { text = '[[Holiday Event 2021]]', useIcon = false },
		['Festive Cool Rock'] = { text = '[[Holiday Event 2021]]', useIcon = false },
		['Jerry the Giraffe'] = { text = '[[Golbin Raid|Golbin Raid Shop]]', useIcon = false },
		['Preston the Platypus'] = { text = '[[Golbin Raid|Golbin Raid Shop]]', useIcon = false },
		['Ty'] = { text = 'Mastery', useIcon = true },
		['Golden Golbin'] = { text = Icons.Icon({'Golbin', type='monster'}) .. ' kills', useIcon = false},
		['Saki'] = { text = 'Mastery', useIcon = true }
	}
	local petSourceText = nil
	local iconType = nil
	local useIcon = true
	local override = sourceOverrides[pet.name]
	if override ~= nil then
		petSourceText = override.text
		if override.useIcon ~= nil then
			useIcon = override.useIcon
		end
	end

	if petSourceText == nil then
		local petSource = p._getPetSource(pet)
		if petSource ~= nil then
			if petSource.isCombat then
				iconType = (petSource.type == 'dungeon' and 'dungeon') or 'combatArea'
			else
				iconType = petSource.type
			end
			petSourceText = petSource.name
		else
			useIcon = false
			petSourceText = ''
		end
	end

	if useIcon then
		return Icons.Icon({petSourceText, type=iconType})
	else
		return petSourceText
	end
end

function p._getPetEffect(pet)
	local modKeys = {'modifiers', 'enemyModifiers'}
	local effects = {}
	for i, key in ipairs(modKeys) do
		if pet[key] ~= nil and not Shared.tableIsEmpty(pet[key]) then
			local preText = (key == 'enemyModifiers' and 'All enemies have: ' or '')
			table.insert(effects, preText .. Modifiers.getModifiersText(pet[key], false))
		end
	end
	if Shared.tableIsEmpty(effects) then
		return 'None'
	else
		return table.concat(effects, '<br/>')
	end
end

function p._getPetChance(pet)
	local source = p._getPetSource(pet)
	if source ~= nil and source.weight ~= nil then
		-- Pet is from a dungeon or combat/slayer area
		if source.fixedChance then
			return 'Guaranteed after ' .. Num.formatnum(source.weight) .. (source.weight == 1 and ' clear' or ' clears')
		else
			return '1 in ' .. Num.formatnum(source.weight) .. ' (' .. Num.round(100 / source.weight, 2, 2) .. '%)'
		end
	else
		-- Skill pet or other
		return 'See: [[Pets#Acquiring Pets|Acquiring Pets]]'
	end
end

function p._getPetSkill(pet)
	local skillOverrides = {
		['melvorD:Ty'] = nil,
		['melvorF:Mark'] = 'melvorD:Summoning'
	}

	if skillOverrides[pet.id] ~= nil then
		return skillOverrides[pet.id]
	else
		return pet.skillID
	end
end

function p._getPetTable(pets)
	if type(pets) ~= 'table' or Shared.tableIsEmpty(pets) then
		return nil
	end

	local html = mw.html.create('table')
		:addClass('wikitable')
		
	html:tag('tr')
			:tag('th'):wikitext('Pet')
			:tag('th'):wikitext('Name')
			:tag('th'):wikitext('[[DLC]]')
			:tag('th'):wikitext('Effect')

	for i, pet in ipairs(pets) do
		html:tag('tr')
				:tag('td'):wikitext(Icons.Icon({pet.name, type='pet', notext=true}))
						  :css('text-align', 'center')
				:tag('td'):wikitext('[[' .. pet.name .. ']]')
				:tag('td'):wikitext(Icons.getDLCColumnIcon(pet.id))
						  :css('text-align', 'center')
				:tag('td'):wikitext(p._getPetEffect(pet))
	end
	
	return tostring(html)
end

function p.getPetTableBySkill(frame)
	local skillName = frame.args ~= nil and frame.args[1] or frame
	local skillID = Constants.getSkillID(skillName)

	if skillID == nil then
		error("SkillID not found for skill: " .. skillName)
	else
		local pets = p.getPets(function(pet) return p._getPetSkill(pet) == skillID end)
		if pets == nil or Shared.tableIsEmpty(pets) then
			return ''
		else
			return p._getPetTable(pets)
		end
	end
end

function p.getPetSidebar(frame)
	local args = frame.args ~= nil and frame.args or frame
	local result = nil
	local name = (args.name ~= nil and args.name ~= '') and args.name or args[1]
	local pet = p.getPet(name)
	if pet == nil then
		return Shared.printError('No pet named "' .. (name or 'Unknown') .. '" exists in the data module')
	end
	local effect = (args.effect ~= nil and args.effect ~= '') and args.effect or p._getPetEffect(pet)
	local completionReq = (pet.ignoreCompletion ~= nil and pet.ignoreCompletion) and 'No' or 'Yes'
	local dropChance = p._getPetChance(pet)

	result = '{| class="wikitable infobox"\r\n|-\r\n'
	result = result..'! ' .. Icons.getExpansionIcon(pet.id) .. name .. '\r\n|-\r\n| '
	result = result..'style="text-align: center;"|' .. Icons.Icon({name, type='pet', size='250', notext=true})
	result = result.."\r\n|-\r\n|'''Pet ID:''' "..pet.id
	result = result.."\r\n|-\r\n|'''Source:''' "..p._getPetSourceText(pet)
	if dropChance ~= nil then
		result = result.."\r\n|-\r\n|'''Drop Chance:''' "..dropChance
	end
	result = result.."\r\n|-\r\n| style =\"width: 250px;\"|'''Effect:''' "..effect
	result = result .. "\r\n|-\r\n|'''Part of 100% Completion:''' " .. completionReq .. "\r\n|}"

	return result
end

function p.getPetPageTable()
    local html = mw.html.create('table')
        :addClass('wikitable sortable lighttable stickyHeader')

    html:tag('tr'):addClass('headerRow-0')
        	:tag('th'):attr('colspan', '2')
        			  :wikitext('Pet')
        	
        	:tag('th'):wikitext('[[DLC]]')
        	:tag('th'):wikitext('Acquired From')
        	:tag('th'):wikitext('Effect')

    for i, thisPet in ipairs(GameData.rawData.pets) do
        html:tag('tr')
            	:tag('td'):addClass('table-img')
                		  :attr('data-sort-value', thisPet.name)
                	      :wikitext(Icons.Icon({thisPet.name, type='pet', notext=true}))
                	      :css('text-align', 'center')
            	:tag('td'):wikitext('[[' .. thisPet.name .. ']]')
            	:tag('td'):wikitext(Icons.getDLCColumnIcon(thisPet.id))
            			  :css('text-align', 'center')
            			  :attr('data-sort-value', Icons.getExpansionID(thisPet.id))
            	:tag('td'):wikitext(p._getPetSourceText(thisPet))
            	:tag('td'):wikitext(p._getPetEffect(thisPet))
    end

    return tostring(html)
end

function p.getDungeonBoxPetText(frame)
	local dungeonName = frame.args ~= nil and frame.args[1] or frame
	local dung = nil
	for i, key in ipairs(areaDataKeys) do
		dung = GameData.getEntityByName(key, dungeonName)
		if dung ~= nil then
			break
		end
	end
	if dung == nil then
		return Shared.printError('No dungeon named "' .. dungeonName .. '" exists in the data module')
	end

	if dung.pet ~= nil then
		local pet = p.getPetByID(dung.pet.petID)
		if pet ~= nil then
			local result = "\r\n|-\r\n|'''[[Pets#Boss Pets|Pet]]:'''<br/>"
			result = result..Icons.Icon({pet.name, type='pet'})
			result = result.."\r\n|-\r\n|'''Pet Drop Chance:'''<br/>"..p._getPetChance(pet)
			if dung.type == 'stronghold' then
				result = result..' - Superior Tier only'
			end
			return result
		end
	end
end

return p