517
edits
Module:Monsters: Difference between revisions
Added Barrier Dust drops to 'Always Drops'
(fixed getMonsterEffectiveBarrier, i think) |
(Added Barrier Dust drops to 'Always Drops') |
||
| Line 960: | 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,069: | 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 | ||