12,872
edits
m (added option to getDungeonDRTable to disable agility (should default to false)) |
(getDungeonTable: Add Requirements column; getSlayerAreaTable: Additional formatting for Requirements & area effects columns) |
||
(11 intermediate revisions by 3 users not shown) | |||
Line 2: | Line 2: | ||
local p = {} | local p = {} | ||
local Constants = require('Module:Constants') | local Constants = require('Module:Constants') | ||
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 Pets = require('Module:Pets') | local Pets = require('Module:Pets') | ||
local Areas = require('Module:CombatAreas') | |||
function p.getLowHighLevels(idList) | function p.getLowHighLevels(idList) | ||
local lowLevel = 1000000 | local lowLevel = 1000000 | ||
local highLevel = 0 | local highLevel = 0 | ||
for i, monID in | 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 28: | Line 27: | ||
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' | ||
local areas = GameData.sortByOrderTable(GameData.rawData.combatAreas, GameData.rawData.combatAreaDisplayOrder) | |||
for i, area in ipairs(areas) do | |||
result = result..'\r\n|-' | result = result..'\r\n|-' | ||
result = result..'\r\n|'..Icons.Icon({area.name, type=' | 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=' | 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 | local lowLvl, highLvl = p.getLowHighLevels(area.monsterIDs) | ||
result = result..'||data-sort-value="'.. | result = result .. '||data-sort-value="' .. lowLvl .. '"| ' .. Shared.formatnum(lowLvl) | ||
result = result .. '||data-sort-value="' .. highLvl .. '"| ' .. Shared.formatnum(highLvl) | |||
local | local reqText = Areas._getAreaRequirements(area) | ||
result = result..'||' | 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 52: | Line 55: | ||
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' | ||
local areas = GameData.sortByOrderTable(GameData.rawData.slayerAreas, GameData.rawData.slayerAreaDisplayOrder) | |||
for i, area in ipairs(areas) do | |||
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}) | ||
result = result..'||data-sort-value="'..area.difficulty[1]..'"|'..Areas._getAreaStat(area, 'difficulty') | |||
local | local lowLvl, highLvl = p.getLowHighLevels(area.monsterIDs) | ||
result = result..'||data-sort-value="'.. | result = result..'||data-sort-value="' .. highLvl .. '"| ' .. Shared.formatnum(highLvl) | ||
if | local reqText = Areas._getAreaRequirements(area) | ||
if reqText == nil or reqText == '' then | |||
result = result .. '||class="table-na"| None' | |||
else | |||
result = result..'|| '.. | 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 83: | ||
asList = true | asList = true | ||
elseif type(asList) == 'string' then | elseif type(asList) == 'string' then | ||
asList = | asList = string.upper(asList) ~= 'FALSE' | ||
end | end | ||
Line 83: | Line 90: | ||
-- GP reward | -- GP reward | ||
if area. | if area.eventID == nil then | ||
local bossMonster = Monsters.getMonsterByID(area. | local bossMonster = Monsters.getMonsterByID(area.monsterIDs[Shared.tableCount(area.monsterIDs)]) | ||
local | local gp = bossMonster.gpDrops | ||
if gp.min > 0 and gp.max > 0 then | |||
if gp.min == gp.max then | |||
if | table.insert(rewardList, chr .. Icons.GP(gp.min)) | ||
table.insert(rewardList, chr .. Icons.GP( | |||
else | else | ||
table.insert(rewardList, chr .. Icons.GP( | table.insert(rewardList, chr .. Icons.GP(gp.min, gp.max)) | ||
end | end | ||
end | end | ||
Line 97: | Line 103: | ||
-- Item rewards | -- Item rewards | ||
if type(area. | local itemLists = {} | ||
for i, rewardID in ipairs( | if type(area.rewardItemIDs) == 'table' then | ||
table.insert(itemLists, area.rewardItemIDs) | |||
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 | |||
for i, itemList in ipairs(itemLists) do | |||
for j, rewardID in ipairs(itemList) do | |||
local rewardItem = Items.getItemByID(rewardID) | local rewardItem = Items.getItemByID(rewardID) | ||
if rewardItem == nil then | if rewardItem == nil then | ||
table.insert(rewardList, chr .. 'Unknown item (ID ' .. | table.insert(rewardList, chr .. 'Unknown item (ID ' .. rewardID .. ')[[Category:Pages with script errors]]') | ||
else | else | ||
table.insert(rewardList, chr .. Icons.Icon({rewardItem.name, type='item', qty=1})) | table.insert(rewardList, chr .. Icons.Icon({rewardItem.name, type='item', qty=1})) | ||
end | end | ||
end | end | ||
end | end | ||
Line 126: | Line 134: | ||
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 = | local area = Areas.getArea(areaName) | ||
if area == nil then | if area == nil then | ||
return | return Shared.printError('Could not find an area named "' .. areaName .. '"') | ||
end | end | ||
Line 134: | Line 142: | ||
return p._getDungeonRewards(area, asList) | return p._getDungeonRewards(area, asList) | ||
else | else | ||
return " | return Shared.printError('"' .. areaName .. '" is not a dungeon') | ||
end | end | ||
end | end | ||
Line 141: | Line 149: | ||
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!! | result = result..'\r\n!colspan="2"|Dungeon!!Difficulty!!Monsters!!Boss Level!!Requirements!!Rewards!!Boss Pet' | ||
local areas = GameData.sortByOrderTable(GameData.rawData.dungeons, GameData.rawData.dungeonDisplayOrder) | |||
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|-' | ||
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]..'"|'.. | result = result..'||data-sort-value="'..dung.difficulty[1]..'"|'..Areas._getAreaStat(dung, 'difficulty') | ||
result = result..'||'.. | result = result..'||'..monsterCount | ||
result = result..'||'..Shared.formatnum(Monsters._getMonsterCombatLevel(boss)) | result = result..'||'..Shared.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) | result = result..'||'..p._getDungeonRewards(dung, false) | ||
if dung. | local petAdded = false | ||
local pet = | 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) | ||
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 190: | ||
end | end | ||
function p. | function p.buildCombatNavText(frame) | ||
local | --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, GameData.rawData.slayerAreaDisplayOrder) | |||
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 | ||
end | end | ||
areas = GameData.sortByOrderTable(GameData.rawData.dungeons, GameData.rawData.dungeonDisplayOrder) | |||
for i, area in ipairs(areas) do | |||
local id = area.id | |||
if Shared.startsWith(id, 'melvorTotH') then | |||
table.insert(outArray, '|-') | |||
for i, | table.insert(outArray, '| {{TotH}} {{ZoneIcon|'..area.name..'}}') | ||
local | 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 | ||
end | end | ||
return table.concat(outArray, '\r\n') | |||
end | end | ||
return p | return p |