2,875
edits
Falterfire (talk | contribs) m (I'm dumb. Properly fixed the DR table) |
No edit summary |
||
(17 intermediate revisions by 3 users not shown) | |||
Line 1: | Line 1: | ||
local p = {} | local p = {} | ||
local Shared = require('Module:Shared') | local Shared = require('Module:Shared') | ||
local GameData = require('Module:GameData') | local GameData = require('Module:GameData') | ||
local Common = require('Module:Common') | |||
local Modifiers = require('Module:Modifiers') | |||
local Icons = require('Module:Icons') | local Icons = require('Module:Icons') | ||
local Items = require('Module:Items') | local Items = require('Module:Items') | ||
local Num = require('Module:Number') | |||
local weaponTypes = {'Magic Staff', 'Magic Wand', 'Ranged Weapon', 'Weapon'} | local weaponTypes = {'Magic Staff', 'Magic Wand', 'Ranged Weapon', 'Weapon'} | ||
local styleOverrides = { | local styleOverrides = { | ||
Melee = {'Slayer Helmet (Basic)', 'Slayer Platebody (Basic)', 'Paladin Gloves', 'Desert Wrappings', 'Almighty Lute', 'Candy Cane', ' | 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', 'Frostspark Boots', 'Freezing Touch Body', 'Lightning Boots'}, | Magic = {'Slayer Wizard Hat (Basic)', 'Slayer Wizard Robes (Basic)', 'Enchanted Shield', 'Elementalist Gloves', 'Frostspark Boots', 'Freezing Touch Body', 'Lightning Boots'}, | ||
Line 18: | Line 20: | ||
NotMagic = {'Torrential Blast Crossbow', 'Spectral Ice Sword', 'Lightning Strike 1H Sword', 'FrostSpark 1H Sword'} | NotMagic = {'Torrential Blast Crossbow', 'Spectral Ice Sword', 'Lightning Strike 1H Sword', 'FrostSpark 1H Sword'} | ||
} | } | ||
local function getSlotID(slot) | |||
-- If slot is a slot name, convert it to the slot ID instead | |||
local slotID = Shared.getNamespacedID('melvorD', slot) | |||
local slotData = GameData.getEntityByID('equipmentSlots', slotID) | |||
-- Validate slotID | |||
if slotData == nil then | |||
-- slotID invalid, check if user provided a slot name | |||
slotData = GameData.getEntityByProperty('equipmentSlots', 'emptyName', slot) | |||
if slotData == nil then | |||
return nil | |||
end | |||
slotID = slotData.id | |||
end | |||
return slotID | |||
end | |||
local function getItemDesc(item) | |||
if item.customDescription ~= nil then | |||
return item.customDescription | |||
elseif item.modifiers ~= nil then | |||
return Modifiers.getModifiersText(item.modifiers, false, false) | |||
else | |||
return '' | |||
end | |||
end | |||
function p._getEquipmentTable(itemList, includeModifiers, includeDescription, sortByName) | function p._getEquipmentTable(itemList, includeModifiers, includeDescription, sortByName) | ||
Line 25: | Line 53: | ||
--Getting some lists set up here that will be used later | --Getting some lists set up here that will be used later | ||
--First, the list of columns used by both weapons & armour | --First, the list of columns used by both weapons & armour | ||
local statColumns = {'stabAttackBonus', 'slashAttackBonus','blockAttackBonus','rangedAttackBonus', 'magicAttackBonus', 'meleeStrengthBonus', 'rangedStrengthBonus', 'magicDamageBonus', 'meleeDefenceBonus', 'rangedDefenceBonus', 'magicDefenceBonus', 'damageReduction', 'attackLevelRequired', 'defenceLevelRequired', 'rangedLevelRequired', 'magicLevelRequired'} | local statColumns = { | ||
'stabAttackBonus', 'slashAttackBonus', 'blockAttackBonus', | |||
'rangedAttackBonus', 'magicAttackBonus', 'meleeStrengthBonus', | |||
'rangedStrengthBonus', 'magicDamageBonus', 'meleeDefenceBonus', | |||
'rangedDefenceBonus', 'magicDefenceBonus', 'damageReduction', | |||
'attackLevelRequired', 'strengthLevelRequired', 'defenceLevelRequired', | |||
'rangedLevelRequired', 'magicLevelRequired' | |||
} | |||
if Shared.tableIsEmpty(itemList) then | if Shared.tableIsEmpty(itemList) then | ||
Line 51: | Line 86: | ||
local strBonusCols = 2 | local strBonusCols = 2 | ||
local defBonusCols = 3 | local defBonusCols = 3 | ||
local lvlReqCols = | local lvlReqCols = 5 | ||
local ndx = 1 | local ndx = 1 | ||
while Shared.tableCount(statColumns) >= ndx do | while Shared.tableCount(statColumns) >= ndx do | ||
Line 149: | Line 184: | ||
if Shared.contains(statColumns, 'attackLevelRequired') then | if Shared.contains(statColumns, 'attackLevelRequired') then | ||
table.insert(resultPart, '\r\n!'..Icons.Icon({'Attack', type='skill', notext='true'})) | table.insert(resultPart, '\r\n!'..Icons.Icon({'Attack', type='skill', notext='true'})) | ||
end | |||
if Shared.contains(statColumns, 'strengthLevelRequired') then | |||
table.insert(resultPart, '\r\n!'..Icons.Icon({'Strength', type='skill', notext='true'})) | |||
end | end | ||
if Shared.contains(statColumns, 'defenceLevelRequired') then | if Shared.contains(statColumns, 'defenceLevelRequired') then | ||
Line 178: | Line 216: | ||
table.insert(resultPart, '\r\n|style="text-align: centre;"|'..Icons.Icon({item.name, type='item', size=50, notext=true})) | table.insert(resultPart, '\r\n|style="text-align: centre;"|'..Icons.Icon({item.name, type='item', size=50, notext=true})) | ||
table.insert(resultPart, '\r\n|' .. Icons.getExpansionIcon(item.id) .. Icons.Icon({item.name, type='item', noicon=true})) | 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;" |'..Num.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;"|') | ||
Line 192: | Line 230: | ||
end | end | ||
end | end | ||
table.insert(resultPart, '"|'.. | table.insert(resultPart, '"|'..Num.formatnum(statValue)) | ||
if statName == 'magicDamageBonus' or statName == 'damageReduction' then table.insert(resultPart, '%') end | if statName == 'magicDamageBonus' or statName == 'damageReduction' then table.insert(resultPart, '%') end | ||
end | end | ||
--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 = {} | ||
if item.modifiers ~= nil then | |||
table.insert(txtLines, Modifiers.getModifiersText(item.modifiers, true, false, 10)) | |||
table.insert(txtLines, | |||
end | end | ||
--For items with a special attack, show the details | --For items with a special attack, show the details | ||
Line 208: | Line 245: | ||
for i, spAttID in ipairs(item.specialAttacks) do | for i, spAttID in ipairs(item.specialAttacks) do | ||
local spAtt = GameData.getEntityByID('attacks', spAttID) | local spAtt = GameData.getEntityByID('attacks', spAttID) | ||
table.insert(txtLines, | local attChance = spAtt.defaultChance | ||
if item.overrideSpecialChances ~= nil then | |||
attChance = item.overrideSpecialChances[i] | |||
end | |||
table.insert(txtLines, attChance .. '% chance for ' .. spAtt.name .. ':') | |||
table.insert(txtLines, spAtt.description) | table.insert(txtLines, spAtt.description) | ||
end | end | ||
Line 216: | Line 257: | ||
--If requested, add description | --If requested, add description | ||
if includeDescription then | if includeDescription then | ||
table.insert(resultPart, '\r\n| ' | table.insert(resultPart, '\r\n| ' .. getItemDesc(item)) | ||
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|'..Icons.Icon({item.name, type='item', size=50, notext=true})) | table.insert(resultPart, '\r\n|'..Icons.Icon({(item.name or 'Unknown'), type='item', size=50, notext=true})) | ||
table.insert(resultPart, '\r\n|' .. Icons.getExpansionIcon(item.id) .. Icons.Icon({item.name, type='item', noicon=true})) | 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 | ||
Line 232: | Line 272: | ||
table.insert(resultPart, 'table-negative') | table.insert(resultPart, 'table-negative') | ||
end | end | ||
table.insert(resultPart, '"|'.. | table.insert(resultPart, '"|'..Num.formatnum(statValue)) | ||
if statName == 'magicDamageBonus' or statName == 'damageReduction' then table.insert(resultPart, '%') end | if statName == 'magicDamageBonus' or statName == 'damageReduction' then table.insert(resultPart, '%') end | ||
end | end | ||
Line 239: | Line 279: | ||
table.insert(resultPart, '\r\n| ') | table.insert(resultPart, '\r\n| ') | ||
local txtLines = {} | local txtLines = {} | ||
if item.modifiers ~= nil then | |||
table.insert(txtLines, Modifiers.getModifiersText(item.modifiers, true, false, 10)) | |||
table.insert(txtLines, | |||
end | end | ||
--For items with a special attack, show the details | --For items with a special attack, show the details | ||
Line 248: | Line 287: | ||
for i, spAttID in ipairs(item.specialAttacks) do | for i, spAttID in ipairs(item.specialAttacks) do | ||
local spAtt = GameData.getEntityByID('attacks', spAttID) | local spAtt = GameData.getEntityByID('attacks', spAttID) | ||
table.insert(txtLines, | local attChance = spAtt.defaultChance | ||
if item.overrideSpecialChances ~= nil then | |||
attChance = item.overrideSpecialChances[i] | |||
end | |||
table.insert(txtLines, attChance .. '% chance for ' .. spAtt.name .. ':') | |||
table.insert(txtLines, spAtt.description) | table.insert(txtLines, spAtt.description) | ||
end | end | ||
Line 256: | Line 299: | ||
--If requested, add description | --If requested, add description | ||
if includeDescription then | if includeDescription then | ||
table.insert(resultPart, '\r\n| ' | table.insert(resultPart, '\r\n| ' .. getItemDesc(item)) | ||
end | end | ||
end | end | ||
Line 268: | Line 310: | ||
function p._getCategoryTable(style, slot, other, includeModifiers, includeDescription, sortByName) | function p._getCategoryTable(style, slot, other, includeModifiers, includeDescription, sortByName) | ||
-- If slot is a slot name, convert it to the slot ID instead | |||
slot | local slotID = getSlotID(slot) | ||
if slotID == nil then | |||
return Shared.printError('Invalid slot ID: ' .. (slot or 'nil')) | |||
end | end | ||
local slotNS, slotLocalID = Shared.getLocalID(slotID) | |||
local itemList = Items.getItems(function(item) | local itemList = Items.getItems(function(item) | ||
-- Exclude the debug item | |||
if item.id == 'melvorD:DEBUG_ITEM' then | |||
return false | |||
end | |||
-- Exclude Golbin raid exclusives for now, such that they don't | -- Exclude Golbin raid exclusives for now, such that they don't | ||
-- pollute various equipment tables | -- pollute various equipment tables | ||
Line 292: | Line 341: | ||
end | end | ||
end | end | ||
if | local sID = slotLocalID | ||
if sID == nil or not Shared.contains(item.validSlots, sID) then isMatch = false end | |||
if isMatch and other ~= nil then | if isMatch and other ~= nil then | ||
Line 304: | Line 354: | ||
end | end | ||
end | end | ||
if | if slotLocalID == 'Weapon' then --For quiver slot or weapon slot, 'other' is the ammo type | ||
isMatch = other == item.ammoTypeRequired | isMatch = other == item.ammoTypeRequired | ||
elseif | elseif slotLocalID == 'Quiver' then | ||
if other == 'Thrown' and Shared.contains({'Javelins', 'ThrowingKnives'}, item.ammoType) then | if other == 'Thrown' and Shared.contains({'Javelins', 'ThrowingKnives'}, item.ammoType) then | ||
isMatch = true | isMatch = true | ||
Line 337: | Line 387: | ||
function p.getTableForList(frame) | function p.getTableForList(frame) | ||
local | local pFrame = frame:getParent() | ||
local frameArgs = pFrame.args ~= nil and pFrame.args or frame | |||
local includeModifiers = frameArgs.includeModifiers ~= nil and string.upper(frameArgs.includeModifiers) == 'TRUE' or false | |||
local | |||
includeModifiers = includeModifiers ~= nil and string.upper(includeModifiers) == 'TRUE' or false | |||
local itemList = {} | local itemList, errItems = {}, {} | ||
local errMsg = 'Some items not found in database: ' | local errMsg = 'Some items not found in database: ' | ||
local hasErr = false | local hasErr = false | ||
for i, | for i, rawItemName in ipairs(frameArgs) do | ||
local | local itemName = Shared.trim(rawItemName) | ||
if | local item = Items.getItem(itemName) | ||
if item == nil then | |||
table.insert(errItems, "'" .. itemName .. "'") | |||
else | else | ||
table.insert(itemList, | table.insert(itemList, item) | ||
end | end | ||
end | end | ||
if | if not Shared.tableIsEmpty(errItems) then | ||
return Shared.printError( | return Shared.printError('Some items not found in database: ' .. table.concat(errItems, ', ')) | ||
else | else | ||
return p._getEquipmentTable(itemList, includeModifiers) | return p._getEquipmentTable(itemList, includeModifiers) | ||
Line 365: | Line 413: | ||
function p.getDoubleLootTable(frame) | function p.getDoubleLootTable(frame) | ||
local modsDL = { | local modsDL = { | ||
' | ["id"] = { | ||
'melvorD:doubleItemsSkill', | |||
' | 'melvorD:doubleItemsChanceAgainstDamageType' | ||
}, | |||
["alias"] = { | |||
'increasedChanceToDoubleLootCombat', | |||
'decreasedChanceToDoubleLootCombat', | |||
'increasedChanceToDoubleItemsGlobal', | |||
'decreasedChanceToDoubleItemsGlobal' | |||
} | |||
} | } | ||
local | local matchCriteria = Modifiers.getMatchCriteriaFromIDs(modsDL.id, modsDL.alias) | ||
local itemMatchedMods = {} | |||
local itemList = Items.getItems( | |||
function(item) | |||
local itemList = Items.getItems(function(item) | |||
if item.modifiers ~= nil then | if item.modifiers ~= nil then | ||
local matchedMods = Modifiers.getMatchingModifiers(item.modifiers, matchCriteria) | |||
if Shared.tableIsEmpty(matchedMods.matched) then | |||
return false | |||
else | |||
itemMatchedMods[item.id] = matchedMods.matched | |||
return true | |||
end | end | ||
end | end | ||
end) | end | ||
) | |||
local resultPart = {} | local resultPart = {} | ||
Line 391: | Line 444: | ||
table.insert(resultPart, '\r\n!colspan="2"|Name!!Bonus!!Description') | table.insert(resultPart, '\r\n!colspan="2"|Name!!Bonus!!Description') | ||
for i, item in Shared.skpairs(itemList) do | for i, item in Shared.skpairs(itemList) do | ||
local lootValue = | local lootValue = Modifiers.getModifierValue(itemMatchedMods[item.id]) | ||
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.getExpansionIcon(item.id) .. 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, '||'..( | table.insert(resultPart, '||' .. getItemDesc(item)) | ||
end | end | ||
Line 406: | Line 457: | ||
end | end | ||
function p. | function p.getItemUpgradeTable(frame) | ||
local args = frame.args ~= nil and frame.args or frame | |||
local | local category, usedItemName = args[1], args.usedItem | ||
local upgradeArray = {} | |||
local | local isEquipment = false | ||
local usedItemID = nil | |||
if usedItemName ~= nil and usedItemName ~= '' then | |||
if | local usedItem = Items.getItem(usedItemName) | ||
if usedItem == nil then | |||
return Shared.printError('Used item not found: ' .. usedItemName) | |||
end | |||
usedItemID = usedItem.id | |||
end | |||
local function upgradeConsumesItem(itemUpgrade, itemID) | |||
if itemID == nil then | |||
return true | |||
end | |||
for i, itemCost in ipairs(itemUpgrade.itemCosts) do | |||
if itemCost.id == itemID then | |||
return true | |||
end | end | ||
end | end | ||
return false | |||
end | end | ||
if string.upper(category) == 'POTION' then | if string.upper(category) == 'POTION' then | ||
upgradeArray = GameData.getEntities('itemUpgrades', | upgradeArray = GameData.getEntities('itemUpgrades', | ||
function(upgrade) return Shared.contains(upgrade.upgradedItemID, 'Potion') end | function(upgrade) | ||
return Shared.contains(upgrade.upgradedItemID, 'Potion') and upgradeConsumesItem(upgrade, usedItemID) | |||
end | |||
) | ) | ||
elseif string.upper(category) == 'OTHER' then | elseif string.upper(category) == 'OTHER' then | ||
upgradeArray = GameData.getEntities('itemUpgrades', | upgradeArray = GameData.getEntities('itemUpgrades', | ||
function(upgrade) | function(upgrade) | ||
if not Shared.contains(upgrade.upgradedItemID, 'Potion') then | if not Shared.contains(upgrade.upgradedItemID, 'Potion') and upgradeConsumesItem(upgrade, usedItemID) then | ||
local item = Items.getItemByID(upgrade.upgradedItemID) | local item = Items.getItemByID(upgrade.upgradedItemID) | ||
if item ~= nil then | if item ~= nil then | ||
Line 472: | Line 503: | ||
) | ) | ||
else | else | ||
if | -- If category is a slot name, convert it to the slot ID instead | ||
local slotID = getSlotID(category) | |||
if slotID ~= nil then | |||
local slotNS, slotLocalID = Shared.getLocalID(slotID) | |||
category = slotLocalID | |||
end | |||
if category == nil then | |||
return Shared.printError('Invalid option. Choose either an equipment slot, Potion, or Other') | return Shared.printError('Invalid option. Choose either an equipment slot, Potion, or Other') | ||
end | end | ||
Line 478: | Line 516: | ||
upgradeArray = GameData.getEntities('itemUpgrades', | upgradeArray = GameData.getEntities('itemUpgrades', | ||
function(upgrade) | function(upgrade) | ||
local item = Items.getItemByID(upgrade.upgradedItemID) | if upgradeConsumesItem(upgrade, usedItemID) then | ||
local item = Items.getItemByID(upgrade.upgradedItemID) | |||
if item ~= nil then | |||
return item.validSlots ~= nil and Shared.contains(item.validSlots, category) | |||
end | |||
end | end | ||
return false | return false | ||
Line 487: | Line 527: | ||
end | end | ||
local useStatChange = isEquipment or (string.upper(category) == 'POTION') | |||
local resultPart = {} | local resultPart = {} | ||
table.insert(resultPart, '{| class="wikitable sortable stickyHeader"') | table.insert(resultPart, '{| class="wikitable sortable stickyHeader"') | ||
table.insert(resultPart, '\r\n|- class="headerRow-0"') | table.insert(resultPart, '\r\n|- class="headerRow-0"') | ||
table.insert(resultPart, '\r\n!colspan="2"|Upgraded Item!!Ingredients') | table.insert(resultPart, '\r\n!colspan="2"|Upgraded Item!!Ingredients') | ||
if | if useStatChange then table.insert(resultPart, '!!Stat Change') end | ||
for i, upgrade in ipairs(upgradeArray) do | for i, upgrade in ipairs(upgradeArray) do | ||
Line 499: | Line 540: | ||
table.insert(resultPart, '||' .. Icons.getExpansionIcon(item.id) .. 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, '|| ' .. Common.getCostString({ items = upgrade.itemCosts, gp = upgrade.gpCost, sc = upgrade.scCost}, 'None')) | |||
local statChangeString = '' | |||
if useStatChange then | |||
-- Generate stat change column | |||
local statChangeString = '' | |||
if not Shared.tableIsEmpty(upgrade.rootItemIDs) then | |||
if | -- Some items (e.g. FEZ) may have multiple root items. Simply use the first one | ||
statChangeString = | local rootItem = Items.getItemByID(upgrade.rootItemIDs[1]) | ||
if rootItem ~= nil then | |||
statChangeString = Items.getStatChangeString(item, rootItem) | |||
end | end | ||
end | end | ||
table.insert(resultPart, '|| '..statChangeString) | |||
table.insert(resultPart, '||'..statChangeString) | |||
end | end | ||
end | end |
edits