Module:Monsters: Difference between revisions

Module:Monsters (view source)

Revision as of 20:42, 26 October 2022

645 bytes added , 26 October 2022

Fix RandomSpiderLair handling

Auron956

Interface administrators, Administrators

17,101

edits

@@ Line 83: / Line 83: @@
 		iconText = Icons.Icon({'Magic', type='skill', notext=notext, nolink=nolink})
 	elseif monster.attackType == 'random' then
-		iconText = Icons.Icon({'Bane', notext=notext, nolink=nolink, img='Question'})
+		iconText = Icons.Icon({monster.name, notext=notext, nolink=nolink, img='Question'})
 	end
@@ Line 965: / Line 965: @@
 			elseif specialType == 'Spider' then
 				local iconQ = Icons.Icon({'', notext=true, nolink=true, img='Question'})
+				local monIconPart = { 'Any of the following:' }
+				for i, monsterID in ipairs(GameData.rawData.spiderLairMonsters) do
+					local monster = p.getMonsterByID(monsterID)
+					if monster ~= nil then
+						table.insert(monIconPart, Icons.Icon({monster.name, type='monster'}))
+					end
+				end
+				monIcon = table.concat(monIconPart, '<br/>')
 				monLevel, monHP, monMaxHit, monStyle, monCount = iconQ, iconQ, iconQ, iconQ, monsterCount
 			elseif specialType == 'SlayerArea' then
@@ Line 1,109: / Line 1,117: @@
 			table.insert(monsterList, Icons.Icon({'Affliction', 'Afflicted Monster', img='Question', qty=monster.count}))
 		elseif monster.id == 'melvorTotH:RandomSpiderLair' then
-			table.insert(monsterList, Icons.Icon({'Spider', img='Question', nolink=true, qty=monster.count}))
+			local monIconPart = { Shared.formatnum(monster.count) .. ' Spiders:' }
+			for i, monsterID in ipairs(GameData.rawData.spiderLairMonsters) do
+				local monster = p.getMonsterByID(monsterID)
+				if monster ~= nil then
+					table.insert(monIconPart, '&nbsp;&nbsp;&nbsp;' .. Icons.Icon({monster.name, type='monster'}))
+				end
+			end
+			table.insert(monsterList, table.concat(monIconPart, '<br/>'))
 		else
 			local monsterObj = p.getMonsterByID(monster.id)