11
edits
Falterfire (talk | contribs) (Added handling for barriers) |
(Add column name for average healing) |
||
(7 intermediate revisions by 5 users not shown) | |||
Line 138: | Line 138: | ||
if monster ~= nil then | if monster ~= nil then | ||
return math.floor((p._getMonsterHP(monster)/(1 - p._getMonsterStat(monster, 'damageReduction')/100)) + 0.5) | return math.floor((p._getMonsterHP(monster)/(1 - p._getMonsterStat(monster, 'damageReduction')/100)) + 0.5) | ||
else | |||
return Shared.printError('No monster with that name found') | |||
end | |||
end | |||
function p.getMonsterEffectiveBarrier(frame) | |||
local MonsterName = frame.args ~= nil and frame.args[1] or frame | |||
local monster = p.getMonster(MonsterName) | |||
if monster ~= nil then | |||
return math.floor((p._getMonsterBarrier(monster)/(1 - p._getMonsterStat(monster, 'damageReduction')/100)) + 0.5) | |||
else | else | ||
return Shared.printError('No monster with that name found') | return Shared.printError('No monster with that name found') | ||
Line 950: | Line 960: | ||
local bones = p._getMonsterBones(monster) | local bones = p._getMonsterBones(monster) | ||
local boneVal = 0 | local boneVal = 0 | ||
local barrierDust = Items.getItemByID("melvorAoD:Barrier_Dust") | |||
local dustVal = 0 | |||
--Show the bones only if either the monster shows up outside of dungeons _or_ the monster drops shards | --Show the bones only if either the monster shows up outside of dungeons _or_ the monster drops shards | ||
if bones ~= nil then | if bones ~= nil then | ||
local boneQty = (bones.quantity ~= nil and bones.quantity or 1) | local boneQty = (bones.quantity ~= nil and bones.quantity or 1) | ||
local barrier = p._getMonsterBarrier(monster) | |||
result = result.."'''Always Drops:'''" | result = result.."'''Always Drops:'''" | ||
result = result..'\r\n{|class="wikitable" id="bonedrops"' | result = result..'\r\n{|class="wikitable" id="bonedrops"' | ||
result = result..'\r\n!Item !! Qty' | result = result..'\r\n!Item !! Qty' | ||
result = result..'\r\n|-\r\n|'..Icons.Icon({bones.item.name, type='item'}) | result = result..'\r\n|-\r\n|'..Icons.Icon({bones.item.name, type='item'}) | ||
result = result..'||'..boneQty..'\r\n'..'|}' | result = result..'||'..boneQty | ||
if barrier > 0 then | |||
local dustQty = math.max(math.floor(barrier / 10 / 20), 1) | |||
result = result..'\r\n|-\r\n|'..Icons.Icon({barrierDust.name, type='item'}) | |||
result = result..'||'..dustQty | |||
dustVal = dustQty * barrierDust.sellsFor | |||
end | |||
result = result..'\r\n'..'|}' | |||
boneVal = boneQty * bones.item.sellsFor | boneVal = boneQty * bones.item.sellsFor | ||
end | end | ||
Line 1,059: | Line 1,079: | ||
result = result..' and bones' | result = result..' and bones' | ||
end | end | ||
result = result..', the average kill is worth '..Icons.GP(Shared.round(avgGp + lootValue + boneVal, 2, 0))..'.' | if dustVal > 0 then | ||
result = result..' and barrier dust' | |||
end | |||
result = result..', the average kill is worth '..Icons.GP(Shared.round(avgGp + lootValue + boneVal + dustVal, 2, 0))..'.' | |||
end | end | ||
end | end | ||
Line 1,172: | Line 1,195: | ||
return Shared.printError(chestName .. ' does not have a drop table') | return Shared.printError(chestName .. ' does not have a drop table') | ||
else | else | ||
local lootValue = 0 | |||
local function formatNumRange(minValue, maxValue) | |||
if maxValue ~= nil and maxValue > minValue then | |||
return Shared.formatnum(minValue) .. ' - ' .. Shared.formatnum(maxValue) | |||
else | |||
return Shared.formatnum(minValue) | |||
end | |||
end | |||
local lootValue, foodValue = 0, 0 | |||
local totalWt = 0 | local totalWt = 0 | ||
for i, row in | local isAllFood = true | ||
for i, row in ipairs(chest.dropTable) do | |||
totalWt = totalWt + row.weight | totalWt = totalWt + row.weight | ||
if isAllFood then | |||
-- If the container's contents are entirely food then we add additional | |||
-- information to the output, so we determine this here | |||
local item = Items.getItemByID(row.itemID) | |||
if item ~= nil and item.healsFor == nil then | |||
isAllFood = false | |||
end | |||
end | |||
end | end | ||
result = result..'\r\n{|class="wikitable sortable"' | result = result..'\r\n{|class="wikitable sortable"' | ||
result = result..'\r\n!Item!!Qty' | result = result..'\r\n!Item!!Qty' | ||
result = result..'!!colspan="2"|Chance!!Price' | result = result..'!!colspan="2"|Chance!!Price' .. (isAllFood and '!!Healing!!Avg. Healing' or '') | ||
--Sort the loot table by weight in descending order | --Sort the loot table by weight in descending order | ||
local chestDrops = | local chestDrops = Shared.shallowClone(chest.dropTable) | ||
table.sort(chestDrops, function(a, b) return a.weight > b.weight end) | table.sort(chestDrops, function(a, b) return a.weight > b.weight end) | ||
for i, row in ipairs(chestDrops) do | for i, row in ipairs(chestDrops) do | ||
local thisItem = Items.getItemByID(row.itemID) | local thisItem = Items.getItemByID(row.itemID) | ||
result = result..'\r\n|-\r\n|'..Icons.Icon({thisItem.name, type='item'}) | result = result..'\r\n|-\r\n|'..Icons.Icon({thisItem.name, type='item'}) | ||
result = result..'||style="text-align:right" data-sort-value="'..(row.minQuantity + row.maxQuantity)..'"|' | result = result..'||style="text-align:right" data-sort-value="'..(row.minQuantity + row.maxQuantity)..'"| ' .. formatNumRange(row.minQuantity, row.maxQuantity) | ||
local dropChance = (row.weight / totalWt) * 100 | local dropChance = (row.weight / totalWt) * 100 | ||
Line 1,211: | Line 1,243: | ||
end | end | ||
lootValue = lootValue + (dropChance * 0.01 * thisItem.sellsFor * ((row.minQuantity + row.maxQuantity)/ 2)) | lootValue = lootValue + (dropChance * 0.01 * thisItem.sellsFor * ((row.minQuantity + row.maxQuantity)/ 2)) | ||
if isAllFood then | |||
local hp = thisItem.healsFor * 10 | |||
local minHeal, maxHeal = hp * row.minQuantity, hp * row.maxQuantity | |||
local avgHpPerLoot = (dropChance * 0.01 * (minHeal + maxHeal) / 2) | |||
foodValue = foodValue + avgHpPerLoot | |||
result = result .. '||data-sort-value="' .. thisItem.healsFor .. '"' | |||
result = result .. '|' .. Icons.Icon({'Hitpoints', type='skill', notext=true, nolink=true}) .. ' ' .. formatNumRange(minHeal, maxHeal) | |||
result = result .. '||data-sort-value="' .. avgHpPerLoot .. '"' | |||
result = result .. '|' .. Icons.Icon({'Hitpoints', type='skill', notext=true, nolink=true}) .. ' ' .. Shared.round(avgHpPerLoot, 2, 0) | |||
end | |||
end | end | ||
result = result..'\r\n|}' | result = result..'\r\n|}' | ||
result = result..'\r\nThe average value of the contents of one chest is '..Icons.GP(Shared.round(lootValue, 2, 0))..'.' | result = result..'\r\nThe average value of the contents of one chest is '..Icons.GP(Shared.round(lootValue, 2, 0))..'.' | ||
if isAllFood then | |||
result = result..'\r\n\r\nThe average healing of the contents of one chest is ' .. Icons.Icon({'Hitpoints', type='skill', notext=true, nolink=true}) .. ' ' .. Shared.round(foodValue, 2, 0) .. '.' | |||
end | |||
end | end | ||
Line 1,397: | Line 1,443: | ||
table.insert(returnPart, '\r\n! Name !! Combat Level ') | table.insert(returnPart, '\r\n! Name !! Combat Level ') | ||
if hasBarrier then | if hasBarrier then | ||
table.insert(returnPart, '!! Barrier ') | table.insert(returnPart, '!! [[Barrier]] ') | ||
end | end | ||
table.insert(returnPart, '!! Hitpoints !! colspan="2" | Max Hit !! [[Combat Triangle|Combat Style]] !! Count') | table.insert(returnPart, '!! Hitpoints !! colspan="2" | Max Hit !! [[Combat Triangle|Combat Style]] !! Count') |
edits