Module:Monsters: Difference between revisions

Adjust various calls to _getMonsterStyleIcon
(Remove Impending Darkness special handling pending revised implementation)
(Adjust various calls to _getMonsterStyleIcon)
Line 504: Line 504:


   local result = ''
   local result = ''
   local iconText = p._getMonsterStyleIcon({monster})
   local iconText = p._getMonsterStyleIcon({monster, notext=true, nolink=true})
   local typeText = ''
   local typeText = ''
   if  monster.attackType == 'melee' then
   if  monster.attackType == 'melee' then
Line 838: Line 838:
     tableTxt = tableTxt..'||'..Shared.formatnum(p.getMonsterHP(monster.name))
     tableTxt = tableTxt..'||'..Shared.formatnum(p.getMonsterHP(monster.name))
     tableTxt = tableTxt..'||'..Shared.formatnum(p.getMonsterMaxHit(monster.name))
     tableTxt = tableTxt..'||'..Shared.formatnum(p.getMonsterMaxHit(monster.name))
     tableTxt = tableTxt..'||'..p.getMonsterStyleIcon({monster.name, nolink='true'})
     tableTxt = tableTxt..'||'..p.getMonsterStyleIcon({monster.name, nolink=true})
   end
   end
   tableTxt = tableTxt..'\r\n|}'
   tableTxt = tableTxt..'\r\n|}'
Line 1,210: Line 1,210:
     table.insert(tableParts, '\r\n|style="text-align:right" data-sort-value="' .. cmbLevel .. '" |' .. Shared.formatnum(cmbLevel))
     table.insert(tableParts, '\r\n|style="text-align:right" data-sort-value="' .. cmbLevel .. '" |' .. Shared.formatnum(cmbLevel))
     table.insert(tableParts, '\r\n|style="text-align:right" data-sort-value="' .. p._getMonsterHP(monster) .. '" |' .. Shared.formatnum(p._getMonsterHP(monster)))
     table.insert(tableParts, '\r\n|style="text-align:right" data-sort-value="' .. p._getMonsterHP(monster) .. '" |' .. Shared.formatnum(p._getMonsterHP(monster)))
     table.insert(tableParts, '\r\n|style="text-align:right;white-space:nowrap" |' .. p._getMonsterStyleIcon({monster, nolink='true'}))
     table.insert(tableParts, '\r\n|style="text-align:right;white-space:nowrap" |' .. p._getMonsterStyleIcon({monster, nolink=true, notext=true}))
     table.insert(tableParts, '\r\n|style="text-align:right" data-sort-value="' .. atkSpeed .. '" |' .. Shared.round(atkSpeed, 1, 1))
     table.insert(tableParts, '\r\n|style="text-align:right" data-sort-value="' .. atkSpeed .. '" |' .. Shared.round(atkSpeed, 1, 1))
     table.insert(tableParts, '\r\n|style="text-align:right" data-sort-value="' .. maxHit .. '" |' .. Shared.formatnum(maxHit))
     table.insert(tableParts, '\r\n|style="text-align:right" data-sort-value="' .. maxHit .. '" |' .. Shared.formatnum(maxHit))