17,101
edits
No edit summary |
(getChestDrops: Refactor to avoid modifying item object; Other optimizations) |
||
Line 713: | Line 713: | ||
--Sort the loot table by weight in descending order | --Sort the loot table by weight in descending order | ||
table.sort(monster.lootTable, function(a, b) return a[2] > b[2] end) | table.sort(monster.lootTable, function(a, b) return a[2] > b[2] end) | ||
for i, row in | for i, row in ipairs(monster.lootTable) do | ||
local thisItem = Items.getItemByID(row[1]) | local thisItem = Items.getItemByID(row[1]) | ||
Line 817: | Line 817: | ||
end | end | ||
for i, row in | for i, row in ipairs(monster.lootTable) do | ||
local thisItem = Items.getItemByID(row[1]) | local thisItem = Items.getItemByID(row[1]) | ||
Line 867: | Line 867: | ||
local dropChance = 0 | local dropChance = 0 | ||
local dropWt = 0 | local dropWt = 0 | ||
for i, row in | for i, row in ipairs(monster.lootTable) do | ||
totalWt = totalWt + row[2] | totalWt = totalWt + row[2] | ||
if item | if item.id == row[1] then | ||
dropWt = row[2] | dropWt = row[2] | ||
end | end | ||
Line 886: | Line 885: | ||
return "ERROR: No item named "..ChestName..' found[[Category:Pages with script errors]]' | return "ERROR: No item named "..ChestName..' found[[Category:Pages with script errors]]' | ||
end | end | ||
local result = '' | local result = '' | ||
Line 905: | Line 903: | ||
--Sort the loot table by weight in descending order | --Sort the loot table by weight in descending order | ||
local chestDrops, dropIdx = {}, 0 | |||
local hasQty = type(chest.dropQty) == 'table' | |||
for i, row in pairs(chest.dropTable) do | for i, row in pairs(chest.dropTable) do | ||
local qty = hasQty and chest.dropQty[i] or 1 | |||
dropIdx = dropIdx + 1 | |||
chestDrops[dropIdx] = {row[1], row[2], qty} | |||
end | end | ||
table.sort( | table.sort(chestDrops, function(a, b) return a[2] > b[2] end) | ||
for i, row in | for i, row in ipairs(chestDrops) do | ||
local thisItem = Items.getItemByID(row[1]) | local thisItem = Items.getItemByID(row[1]) | ||
local qty = row[3] | local qty = row[3] |