12,787
edits
Module:CombatAreas/AreaTables: Difference between revisions
getDungeonTable: Add Requirements column; getSlayerAreaTable: Additional formatting for Requirements & area effects columns
(getCombatAreaTable: Fix area icons) |
(getDungeonTable: Add Requirements column; getSlayerAreaTable: Additional formatting for Requirements & area effects columns) |
||
| (One intermediate revision by the same user not shown) | |||
| Line 27: | 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) | local areas = GameData.sortByOrderTable(GameData.rawData.combatAreas, GameData.rawData.combatAreaDisplayOrder) | ||
| Line 38: | Line 38: | ||
result = result .. '||data-sort-value="' .. lowLvl .. '"| ' .. Shared.formatnum(lowLvl) | result = result .. '||data-sort-value="' .. lowLvl .. '"| ' .. Shared.formatnum(lowLvl) | ||
result = result .. '||data-sort-value="' .. highLvl .. '"| ' .. Shared.formatnum(highLvl) | result = result .. '||data-sort-value="' .. highLvl .. '"| ' .. Shared.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 | end | ||
result = result..'\r\n|}' | result = result..'\r\n|}' | ||
| Line 57: | Line 63: | ||
local lowLvl, highLvl = p.getLowHighLevels(area.monsterIDs) | local lowLvl, highLvl = p.getLowHighLevels(area.monsterIDs) | ||
result = result..'||data-sort-value="' .. highLvl .. '"| ' .. Shared.formatnum(highLvl) | result = result..'||data-sort-value="' .. highLvl .. '"| ' .. Shared.formatnum(highLvl) | ||
result = result..'||'..Areas. | local reqText = Areas._getAreaRequirements(area) | ||
result = result..'|| '.. | 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 | end | ||
| Line 136: | 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) | local areas = GameData.sortByOrderTable(GameData.rawData.dungeons, GameData.rawData.dungeonDisplayOrder) | ||
| Line 149: | Line 162: | ||
result = result..'||'..monsterCount | 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) | ||
local petAdded = false | |||
if dung.pet ~= nil then | if dung.pet ~= nil then | ||
local pet = GameData.getEntityByID('pets', dung.pet.petID) | local pet = GameData.getEntityByID('pets', dung.pet.petID) | ||
| Line 158: | Line 178: | ||
result = result..'<br/>'..petDrop | result = result..'<br/>'..petDrop | ||
end | end | ||
petAdded = true | |||
end | end | ||
end | |||
result = result..'|| ' | if not petAdded then | ||
result = result..'||class="table-na"| None' | |||
end | end | ||
end | end | ||