12,883
edits
(Update for v1.1) |
(_getCategoryTable: Fix skill cape classification for Superior Cape of Completion) |
||
(13 intermediate revisions by 2 users not shown) | |||
Line 10: | Line 10: | ||
local styleOverrides = { | local styleOverrides = { | ||
Melee = {'Slayer Helmet (Basic)', 'Slayer Platebody (Basic)', 'Paladin Gloves', 'Desert Wrappings', 'Almighty Lute', 'Candy Cane', 'Bob's Rake'}, | Melee = {'Slayer Helmet (Basic)', 'Slayer Platebody (Basic)', 'Paladin Gloves', 'Desert Wrappings', 'Almighty Lute', 'Candy Cane', 'Bob's Rake', "Knight's Defender", "Ward of Flame Platebody"}, | ||
Ranged = {'Slayer Cowl (Basic)', 'Slayer Leather Body (Basic)', 'Ice Arrows'}, | Ranged = {'Slayer Cowl (Basic)', 'Slayer Leather Body (Basic)', 'Ice Arrows'}, | ||
Magic = {'Slayer Wizard Hat (Basic)', 'Slayer Wizard Robes (Basic)', 'Enchanted Shield', 'Elementalist Gloves'}, | Magic = {'Slayer Wizard Hat (Basic)', 'Slayer Wizard Robes (Basic)', 'Enchanted Shield', 'Elementalist Gloves', 'Frostspark Boots', 'Freezing Touch Body', 'Lightning Boots'}, | ||
None = {}, | None = {}, | ||
NotMelee = {'Frostspark Boots', 'Freezing Touch Body', 'Lightning Boots'}, | |||
NotRanged = {}, | |||
NotMagic = {'Torrential Blast Crossbow', 'Spectral Ice Sword', 'Lightning Strike 1H Sword', 'FrostSpark 1H Sword'} | |||
} | } | ||
Line 73: | Line 76: | ||
end | end | ||
if attBonusCols > 0 then | if attBonusCols > 0 then | ||
table.insert(resultPart, '\r\n!colspan="'..attBonusCols..' | table.insert(resultPart, '\r\n!colspan="'..attBonusCols..'"|Attack Bonus') | ||
end | end | ||
if strBonusCols > 0 then | if strBonusCols > 0 then | ||
table.insert(resultPart, '\r\n!colspan="'..strBonusCols..' | table.insert(resultPart, '\r\n!colspan="'..strBonusCols..'"|Str. Bonus') | ||
end | end | ||
if Shared.contains(statColumns, 'magicDamageBonus') then | if Shared.contains(statColumns, 'magicDamageBonus') then | ||
table.insert(resultPart, '\r\n!colspan="1 | table.insert(resultPart, '\r\n!colspan="1"|% Dmg Bonus') | ||
end | end | ||
if defBonusCols > 0 then | if defBonusCols > 0 then | ||
table.insert(resultPart, '\r\n!colspan="'..defBonusCols..' | table.insert(resultPart, '\r\n!colspan="'..defBonusCols..'"|Defence Bonus') | ||
end | end | ||
if Shared.contains(statColumns, 'damageReduction') then | if Shared.contains(statColumns, 'damageReduction') then | ||
table.insert(resultPart, '\r\n!colspan="1 | table.insert(resultPart, '\r\n!colspan="1"|DR') | ||
end | end | ||
if lvlReqCols > 0 then | if lvlReqCols > 0 then | ||
table.insert(resultPart, '\r\n!colspan="'..lvlReqCols..' | table.insert(resultPart, '\r\n!colspan="'..lvlReqCols..'"|Lvl Req') | ||
end | end | ||
if includeModifiers and includeDescription then | if includeModifiers and includeDescription then | ||
Line 97: | Line 100: | ||
--One header row down, one to go | --One header row down, one to go | ||
table.insert(resultPart, '\r\n|-class="headerRow-1"') | table.insert(resultPart, '\r\n|-class="headerRow-1"') | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!Item') | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!Name') | ||
--Weapons have Attack Speed here | --Weapons have Attack Speed here | ||
if isWeaponType then | if isWeaponType then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!Attack Speed') | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!Two Handed?') | ||
end | end | ||
--Attack bonuses | --Attack bonuses | ||
if Shared.contains(statColumns, 'slashAttackBonus') then | if Shared.contains(statColumns, 'slashAttackBonus') then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!'..Icons.Icon({'Attack', type='skill', notext='true'})) | ||
end | end | ||
if Shared.contains(statColumns, 'stabAttackBonus') then | if Shared.contains(statColumns, 'stabAttackBonus') then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!'..Icons.Icon({'Strength', type='skill', notext='true'})) | ||
end | end | ||
if Shared.contains(statColumns, 'blockAttackBonus') then | if Shared.contains(statColumns, 'blockAttackBonus') then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!'..Icons.Icon({'Defence', type='skill', notext='true'})) | ||
end | end | ||
if Shared.contains(statColumns, 'rangedAttackBonus') then | if Shared.contains(statColumns, 'rangedAttackBonus') then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!'..Icons.Icon({'Ranged', type='skill', notext='true'})) | ||
end | end | ||
if Shared.contains(statColumns, 'magicAttackBonus') then | if Shared.contains(statColumns, 'magicAttackBonus') then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!'..Icons.Icon({'Magic', type='skill', notext='true'})) | ||
end | end | ||
--Strength bonuses | --Strength bonuses | ||
if Shared.contains(statColumns, 'meleeStrengthBonus') then | if Shared.contains(statColumns, 'meleeStrengthBonus') then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!'..Icons.Icon({'Strength', type='skill', notext='true'})) | ||
end | end | ||
if Shared.contains(statColumns, 'rangedStrengthBonus') then | if Shared.contains(statColumns, 'rangedStrengthBonus') then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!'..Icons.Icon({'Ranged', type='skill', notext='true'})) | ||
end | end | ||
if Shared.contains(statColumns, 'magicDamageBonus') then | if Shared.contains(statColumns, 'magicDamageBonus') then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!'..Icons.Icon({'Magic', type='skill', notext='true'})) | ||
end | end | ||
--Defence bonuses | --Defence bonuses | ||
if Shared.contains(statColumns, 'meleeDefenceBonus') then | if Shared.contains(statColumns, 'meleeDefenceBonus') then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!'..Icons.Icon({'Defence', type='skill', notext='true'})) | ||
end | end | ||
if Shared.contains(statColumns, 'rangedDefenceBonus') then | if Shared.contains(statColumns, 'rangedDefenceBonus') then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!'..Icons.Icon({'Ranged', type='skill', notext='true'})) | ||
end | end | ||
if Shared.contains(statColumns, 'magicDefenceBonus') then | if Shared.contains(statColumns, 'magicDefenceBonus') then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!'..Icons.Icon({'Magic', type='skill', notext='true'})) | ||
end | end | ||
if Shared.contains(statColumns, 'damageReduction') then | if Shared.contains(statColumns, 'damageReduction') then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!'..Icons.Icon({'Defence', type='skill', notext='true'})) | ||
end | end | ||
--Level requirements | --Level requirements | ||
if Shared.contains(statColumns, 'attackLevelRequired') then | if Shared.contains(statColumns, 'attackLevelRequired') then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!'..Icons.Icon({'Attack', type='skill', notext='true'})) | ||
end | end | ||
if Shared.contains(statColumns, 'defenceLevelRequired') then | if Shared.contains(statColumns, 'defenceLevelRequired') then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!'..Icons.Icon({'Defence', type='skill', notext='true'})) | ||
end | end | ||
if Shared.contains(statColumns, 'rangedLevelRequired') then | if Shared.contains(statColumns, 'rangedLevelRequired') then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!'..Icons.Icon({'Ranged', type='skill', notext='true'})) | ||
end | end | ||
if Shared.contains(statColumns, 'magicLevelRequired') then | if Shared.contains(statColumns, 'magicLevelRequired') then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!'..Icons.Icon({'Magic', type='skill', notext='true'})) | ||
end | end | ||
--If includeModifiers is set to 'true', add the Modifiers column | --If includeModifiers is set to 'true', add the Modifiers column | ||
if includeModifiers then | if includeModifiers then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!Modifiers') | ||
end | end | ||
--If includeDescription is set to 'true', add the Description column | --If includeDescription is set to 'true', add the Description column | ||
if includeDescription then | if includeDescription then | ||
table.insert(resultPart, '\r\n! | table.insert(resultPart, '\r\n!Description') | ||
end | end | ||
Line 173: | Line 176: | ||
local atkSpeed = Items._getItemStat(item, 'attackSpeed', true) | local atkSpeed = Items._getItemStat(item, 'attackSpeed', true) | ||
table.insert(resultPart, '\r\n|-') | table.insert(resultPart, '\r\n|-') | ||
table.insert(resultPart, '\r\n|style ="text-align: | table.insert(resultPart, '\r\n|style="text-align: centre;"|'..Icons.Icon({item.name, type='item', size=50, notext=true})) | ||
table.insert(resultPart, '\r\n| | table.insert(resultPart, '\r\n|' .. Icons.getExpansionIcon(item.id) .. Icons.Icon({item.name, type='item', noicon=true})) | ||
table.insert(resultPart, '\r\n| data-sort-value="' .. atkSpeed .. '" style ="text-align: right | table.insert(resultPart, '\r\n| data-sort-value="' .. atkSpeed .. '" style="text-align:right;" |'..Shared.round(atkSpeed / 1000, 3, 1) .. 's') | ||
--That's the first list out of the way, now for 2-Handed | --That's the first list out of the way, now for 2-Handed | ||
table.insert(resultPart, '\r\n| style ="text-align: right;"|') | table.insert(resultPart, '\r\n| style="text-align: right;"|') | ||
table.insert(resultPart, Items._getItemStat(item, 'isTwoHanded') and 'Yes' or 'No') | table.insert(resultPart, Items._getItemStat(item, 'isTwoHanded') and 'Yes' or 'No') | ||
for j, statName in pairs(statColumns) do | for j, statName in pairs(statColumns) do | ||
local statValue = Items._getItemStat(item, statName, true) | local statValue = Items._getItemStat(item, statName, true) | ||
table.insert(resultPart, '\r\n| style ="text-align: right; | table.insert(resultPart, '\r\n| style="text-align:right;" class="') | ||
if string.find(statName, '^(.+)LevelRequired$') == nil then | if string.find(statName, '^(.+)LevelRequired$') == nil then | ||
if statValue > 0 then | if statValue > 0 then | ||
table.insert(resultPart, ' | table.insert(resultPart, 'table-positive') | ||
elseif statValue < 0 then | elseif statValue < 0 then | ||
table.insert(resultPart, ' | table.insert(resultPart, 'table-negative') | ||
end | end | ||
end | end | ||
Line 194: | Line 197: | ||
--If requested, add the item Modifiers | --If requested, add the item Modifiers | ||
if includeModifiers then | if includeModifiers then | ||
table.insert(resultPart, '\r\n | table.insert(resultPart, '\r\n|') | ||
local txtLines = {} | local txtLines = {} | ||
local modTxt = Constants.getModifiersText(item.modifiers, true) | local modTxt = Constants.getModifiersText(item.modifiers, true) | ||
Line 201: | Line 204: | ||
end | end | ||
--For items with a special attack, show the details | --For items with a special attack, show the details | ||
if not Shared.tableIsEmpty(item.specialAttacks) then | if item.specialAttacks ~= nil and not Shared.tableIsEmpty(item.specialAttacks) then | ||
table.insert(txtLines, "'''Special Attack:'''") | table.insert(txtLines, "'''Special Attack:'''") | ||
for i, spAttID in ipairs(item.specialAttacks) do | for i, spAttID in ipairs(item.specialAttacks) do | ||
Line 213: | Line 216: | ||
--If requested, add description | --If requested, add description | ||
if includeDescription then | if includeDescription then | ||
table.insert(resultPart, '\r\n | table.insert(resultPart, '\r\n| ') | ||
table.insert(resultPart, item.customDescription | table.insert(resultPart, Constants.getDescription(item.customDescription, item.modifiers) or '') | ||
end | end | ||
else | else | ||
--Building rows for armour | --Building rows for armour | ||
table.insert(resultPart, '\r\n|-') | table.insert(resultPart, '\r\n|-') | ||
table.insert(resultPart, '\r\n | table.insert(resultPart, '\r\n|'..Icons.Icon({item.name, type='item', size=50, notext=true})) | ||
table.insert(resultPart, '\r\n| | table.insert(resultPart, '\r\n|' .. Icons.getExpansionIcon(item.id) .. Icons.Icon({item.name, type='item', noicon=true})) | ||
for j, statName in pairs(statColumns) do | for j, statName in pairs(statColumns) do | ||
local statValue = Items._getItemStat(item, statName, true) | local statValue = Items._getItemStat(item, statName, true) | ||
table.insert(resultPart, '\r\n| style ="text-align: right; | table.insert(resultPart, '\r\n|style="text-align:right;" class="') | ||
if statValue > 0 then | if statValue > 0 then | ||
table.insert(resultPart, ' | table.insert(resultPart, 'table-positive') | ||
elseif statValue < 0 then | elseif statValue < 0 then | ||
table.insert(resultPart, ' | table.insert(resultPart, 'table-negative') | ||
end | end | ||
table.insert(resultPart, '"|'..Shared.formatnum(statValue)) | table.insert(resultPart, '"|'..Shared.formatnum(statValue)) | ||
Line 234: | Line 237: | ||
--If requested, add the item Modifiers | --If requested, add the item Modifiers | ||
if includeModifiers then | if includeModifiers then | ||
table.insert(resultPart, '\r\n | table.insert(resultPart, '\r\n| ') | ||
local txtLines = {} | local txtLines = {} | ||
local modTxt = Constants.getModifiersText(item.modifiers, true) | local modTxt = Constants.getModifiersText(item.modifiers, true) | ||
Line 241: | Line 244: | ||
end | end | ||
--For items with a special attack, show the details | --For items with a special attack, show the details | ||
if not Shared.tableIsEmpty(item.specialAttacks) then | if item.specialAttacks ~= nil and not Shared.tableIsEmpty(item.specialAttacks) then | ||
table.insert(txtLines, "'''Special Attack:'''") | table.insert(txtLines, "'''Special Attack:'''") | ||
for i, spAttID in ipairs(item.specialAttacks) do | for i, spAttID in ipairs(item.specialAttacks) do | ||
Line 253: | Line 256: | ||
--If requested, add description | --If requested, add description | ||
if includeDescription then | if includeDescription then | ||
table.insert(resultPart, '\r\n | table.insert(resultPart, '\r\n| ') | ||
table.insert(resultPart, item.customDescription | table.insert(resultPart, Constants.getDescription(item.customDescription, item.modifiers) or '') | ||
end | end | ||
end | end | ||
Line 277: | Line 280: | ||
local isMatch = true | local isMatch = true | ||
if style == 'Melee' then | if style == 'Melee' then | ||
if (Items._getItemStat(item, 'defenceLevelRequired') == nil and Items._getItemStat(item, 'attackLevelRequired') == nil) and not Shared.contains(styleOverrides.Melee, item.name) then isMatch = false end | if ((Items._getItemStat(item, 'defenceLevelRequired') == nil and Items._getItemStat(item, 'attackLevelRequired') == nil) and not Shared.contains(styleOverrides.Melee, item.name)) or Shared.contains(styleOverrides.NotMelee, item.name) then isMatch = false end | ||
elseif style == 'Ranged' then | elseif style == 'Ranged' then | ||
if Items._getItemStat(item, 'rangedLevelRequired') == nil and not Shared.contains(styleOverrides.Ranged, item.name) then isMatch = false end | if (Items._getItemStat(item, 'rangedLevelRequired') == nil and not Shared.contains(styleOverrides.Ranged, item.name)) or Shared.contains(styleOverrides.NotRanged, item.name) then isMatch = false end | ||
elseif style == 'Magic' then | elseif style == 'Magic' then | ||
if Items._getItemStat(item, 'magicLevelRequired') == nil and not Shared.contains(styleOverrides.Magic, item.name) then isMatch = false end | if (Items._getItemStat(item, 'magicLevelRequired') == nil and not Shared.contains(styleOverrides.Magic, item.name)) or Shared.contains(styleOverrides.NotMagic, item.name) then isMatch = false end | ||
elseif style == 'None' then | elseif style == 'None' then | ||
if (Items._getItemStat(item, 'defenceLevelRequired') ~= nil or Items._getItemStat(item, 'rangedLevelRequired') ~= nil or Items._getItemStat(item, 'magicLevelRequired') ~= nil or | if (Items._getItemStat(item, 'defenceLevelRequired') ~= nil or Items._getItemStat(item, 'rangedLevelRequired') ~= nil or Items._getItemStat(item, 'magicLevelRequired') ~= nil or | ||
Line 293: | Line 296: | ||
if isMatch and other ~= nil then | if isMatch and other ~= nil then | ||
if slot == 'Cape' then | if slot == 'Cape' then | ||
local isSkillcape = Shared.contains(item.name, 'Skillcape') or item.name | -- TODO Would be more reliable if based on items appearing within the relevant shop categories instead | ||
local isSkillcape = Shared.contains(item.name, 'Skillcape') or Shared.contains(item.name, 'Cape of Completion') | |||
if other == 'Skillcapes' then | if other == 'Skillcapes' then | ||
isMatch = isSkillcape | isMatch = isSkillcape | ||
Line 301: | Line 305: | ||
end | end | ||
if slot == 'Weapon' then --For quiver slot or weapon slot, 'other' is the ammo type | if slot == 'Weapon' then --For quiver slot or weapon slot, 'other' is the ammo type | ||
isMatch = other == item.ammoTypeRequired | |||
elseif slot == 'Quiver' then | elseif slot == 'Quiver' then | ||
if other == ' | if other == 'Thrown' and Shared.contains({'Javelins', 'ThrowingKnives'}, item.ammoType) then | ||
isMatch = true | |||
else | |||
isMatch = other == item.ammoType | |||
end | end | ||
end | end | ||
Line 403: | Line 397: | ||
table.insert(resultPart, '\r\n|-') | table.insert(resultPart, '\r\n|-') | ||
table.insert(resultPart, '\r\n|data-sort-value="'..item.name..'"|'..Icons.Icon({item.name, type='item', size=50, notext=true})) | table.insert(resultPart, '\r\n|data-sort-value="'..item.name..'"|'..Icons.Icon({item.name, type='item', size=50, notext=true})) | ||
table.insert(resultPart, '||'..Icons.Icon({item.name, type='item', noicon=true})) | table.insert(resultPart, '||' .. Icons.getExpansionIcon(item.id) .. Icons.Icon({item.name, type='item', noicon=true})) | ||
table.insert(resultPart, '||style ="text-align: right;" data-sort-value="'..lootValue..'"|'..lootValue..'%') | table.insert(resultPart, '||style ="text-align: right;" data-sort-value="'..lootValue..'"|'..lootValue..'%') | ||
table.insert(resultPart, '||'..(item.customDescription or '')) | table.insert(resultPart, '||'..(Constants.getDescription(item.customDescription, item.modifiers) or '')) | ||
end | end | ||
Line 458: | Line 452: | ||
function p.getItemUpgradeTable(frame) | function p.getItemUpgradeTable(frame) | ||
local category = frame.args ~= nil and frame.args[1] or frame | local category = frame.args ~= nil and frame.args[1] or frame | ||
local | local upgradeArray = {} | ||
local isEquipment = false | local isEquipment = false | ||
if string.upper(category) == 'POTION' then | if string.upper(category) == 'POTION' then | ||
upgradeArray = GameData.getEntities('itemUpgrades', | |||
function(upgrade) return Shared.contains(upgrade.upgradedItemID, 'Potion') end | |||
) | |||
elseif string.upper(category) == 'OTHER' then | elseif string.upper(category) == 'OTHER' then | ||
upgradeArray = GameData.getEntities('itemUpgrades', | |||
function(upgrade) | |||
end) | if not Shared.contains(upgrade.upgradedItemID, 'Potion') then | ||
local item = Items.getItemByID(upgrade.upgradedItemID) | |||
if item ~= nil then | |||
return item.validSlots == nil or Shared.tableIsEmpty(item.validSlots) | |||
end | |||
end | |||
return false | |||
end | |||
) | |||
else | else | ||
if Constants.getEquipmentSlotID(category) == nil then | if Constants.getEquipmentSlotID(category) == nil then | ||
Line 472: | Line 476: | ||
end | end | ||
isEquipment = true | isEquipment = true | ||
upgradeArray = GameData.getEntities('itemUpgrades', | |||
return item. | function(upgrade) | ||
end) | local item = Items.getItemByID(upgrade.upgradedItemID) | ||
if item ~= nil then | |||
return item.validSlots ~= nil and Shared.contains(item.validSlots, category) | |||
end | |||
return false | |||
end | |||
) | |||
end | end | ||
Line 483: | Line 493: | ||
if isEquipment then table.insert(resultPart, '!!Stat Change') end | if isEquipment then table.insert(resultPart, '!!Stat Change') end | ||
for i, item | for i, upgrade in ipairs(upgradeArray) do | ||
local item = Items.getItemByID(upgrade.upgradedItemID) | |||
table.insert(resultPart, '\r\n|-') | table.insert(resultPart, '\r\n|-') | ||
table.insert(resultPart, '\r\n|'..Icons.Icon({item.name, type='item', size='50', notext=true})) | table.insert(resultPart, '\r\n|'..Icons.Icon({item.name, type='item', size='50', notext=true})) | ||
table.insert(resultPart, '||'..Icons.Icon({item.name, type='item', noicon=true})) | table.insert(resultPart, '||' .. Icons.getExpansionIcon(item.id) .. Icons.Icon({item.name, type='item', noicon=true})) | ||
local matArray = {} | local matArray = {} | ||
local statChangeString = '' | local statChangeString = '' | ||
for i, | for i, itemCost in ipairs(upgrade.itemCosts) do | ||
local mat = Items.getItemByID( | local mat = Items.getItemByID(itemCost.id) | ||
table.insert(matArray, Icons.Icon({mat.name, type='item', qty= | if mat ~= nil then | ||
table.insert(matArray, Icons.Icon({mat.name, type='item', qty=itemCost.quantity})) | |||
if isEquipment and item.validSlots ~= nil and mat.validSlots ~= nil and statChangeString == '' then | |||
statChangeString = p.getStatChangeString(item, mat) | |||
end | |||
end | end | ||
end | end | ||
if | if upgrade.gpCost ~= nil and upgrade.gpCost > 0 then | ||
table.insert(matArray, Icons.GP( | table.insert(matArray, Icons.GP(upgrade.gpCost)) | ||
end | |||
if upgrade.scCost ~= nil and upgrade.scCost > 0 then | |||
table.insert(matArray, Icons.SC(upgrade.scCost)) | |||
end | end | ||
table.insert(resultPart, '||'..table.concat(matArray, '<br/>')) | table.insert(resultPart, '||'..table.concat(matArray, '<br/>')) |