Module:Items: Difference between revisions

Module:Items (view source)

Revision as of 12:25, 5 March 2022

1,545 bytes removed , 5 March 2022

Update for v1.0.3

Auron956

Interface administrators, Administrators

17,105

edits

@@ Line 12: / Line 12: @@
 local Icons = require('Module:Icons')
-p.EasterEggs = {'Amulet of Calculated Promotion', 'Clue Chasers Insignia', '8', 'Lemon', 'Easter Egg', 'Abnormal Log', 'Red Herring', 'Cool Glasses'}
+p.EasterEggs = {'Amulet of Calculated Promotion', 'Clue Chasers Insignia', '8', 'Lemon', 'Easter Egg',
+				'Abnormal Log', 'Red Herring', 'Cool Glasses'}
 p.EventItems = {'Christmas Cracker', 'Christmas Coal', 'Christmas Sweater',
 				'Christmas Wreath', 'Candy Cane', 'Santa Hat',
@@ Line 23: / Line 24: @@
 				'Holiday Scarf', 'Gingerbread House', 'Gingerbread Man', 'Edible Candy Cane',
 				'Locked Chest', 'Locked Chest Key', 'Event Token (Holiday 2021)'}
-p.OtherShopItems = {'Cooking Gloves', 'Mining Gloves', 'Gem Gloves', 'Smithing Gloves', 'Thieving Gloves'}
 --This is hardcoded, so there's no easy way to scrape it. Hopefully it doesn't change
 p.GemTable = {["Topaz"] = {name = 'Topaz', id = 128, chance = 50},
@@ Line 32: / Line 32: @@
 --The base chance to receive a gem while mining
 p.GemChance = .01
---The number of different fishing junk items
-p.junkCount = 8
---Items (aside from bars & gems) which can be created via Alt Magic
-p.AltMagicProducts = {'Rune Essence', 'Bones', 'Holy Dust'}
---The kinds of gloves with cost & charges
-p.GloveTable = {['Cooking Gloves'] = {cost=50000, charges=500},
-				['Mining Gloves'] = {cost=75000, charges=500},
-				['Smithing Gloves'] = {cost=100000, charges=500},
-				['Thieving Gloves'] = {cost=100000, charges=500},
-				['Gem Gloves'] = {cost=500000, charges=2000}}
-p.specialFishWt = 6722
-p.specialFishLoot = {{128, 2000}, {129, 1600}, {130, 1400}, {131, 1000}, {132, 400}, {667, 10}, {668, 10}, {902, 1}, {670, 1}, {669, 50}, {120, 250}}
-function p.buildSpecialFishingTable()
-	--This shouldn't ever be included in a page
-	--This is for generating the above 'specialFishLoot' variable if it ever needs to change
-	--To re-run, edit the module, type in "console.log(p.buildSpecialFishingTable())" and copy+paste the result as the new value of the variable
-	--Also gives you the total fishing weight for saving time later
-	local lootArray = {}
-	local totalWt = 0
-	for i, item in pairs(ItemData.Items) do
-		if item.fishingCatchWeight ~= nil then
-			totalWt = totalWt + item.fishingCatchWeight
-			table.insert(lootArray, '{'..(i - 1)..', '..item.fishingCatchWeight..'}')
-		end
-	end
-	local result = 'p.specialFishWt = '..totalWt..'\r\n'
-	result = result..'p.specialFishLoot = {'..table.concat(lootArray, ', ')..'}'
-	return result
-end
 function p.getItemByID(ID)
@@ Line 269: / Line 235: @@
 		return 'ERROR: No potion named "' .. potionName .. '" was found[[Category:Pages with script errors]]'
 	end
-	for i, tier in pairs(tiers) do
+	for i, tier in ipairs(tiers) do
 		local tierName = potionName..' '..tier
 		local potion = p.getItemByID(tier1potion.id + i - 1)
@@ Line 406: / Line 372: @@
 	local skillName = frame.args ~= nil and frame.args[1] or frame
 	local cape = p.getItem(skillName..' Skillcape')
-	local resultPart = {}
+	if cape == nil then
-	table.insert(resultPart, '{| class="wikitable"\r\n')
+		return ''
-	table.insert(resultPart, '!Skillcape!!Name!!Effect')
+	else
-	table.insert(resultPart, '\r\n|-\r\n|'..Icons.Icon({cape.name, type='item', size='60', notext=true}))
+		local resultPart = {}
-	table.insert(resultPart, '||'..Icons.Icon({cape.name, type='item', noicon=true})..'||'..cape.description)
+		table.insert(resultPart, '{| class="wikitable"\r\n')
-	table.insert(resultPart, '\r\n|}')
+		table.insert(resultPart, '!Skillcape!!Name!!Effect')
-	return table.concat(resultPart)
+		table.insert(resultPart, '\r\n|-\r\n|'..Icons.Icon({cape.name, type='item', size='60', notext=true}))
+		table.insert(resultPart, '||'..Icons.Icon({cape.name, type='item', noicon=true})..'||'..cape.description)
+		table.insert(resultPart, '\r\n|}')
+		return table.concat(resultPart)
+	end
 end
@@ Line 436: / Line 406: @@
 		return "ERROR: No item named "..itemName.." exists in the data module[[Category:Pages with script errors]]"
 	end
 	local ico = {
 		["Attack"] = Icons.Icon({'Attack', type='skill', notext=true}),
@@ Line 450: / Line 420: @@
 	table.insert(resultPart, '\r\n|-\r\n!colspan="2" style="border-bottom:solid thin black;"| Offensive Stats')
 	table.insert(resultPart, '\r\n!colspan="2" style="border-bottom:solid thin black;"| Defensive Stats')
 	table.insert(resultPart, '\r\n|-\r\n!style="text-align:right;"| Attack Speed')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. Shared.round(p._getItemStat(item, 'attackSpeed', true) / 1000, 3, 1) .. 's')
 	table.insert(resultPart, '\r\n!style="text-align:right;"| ' .. ico['Defence'] .. ' Defence Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'meleeDefenceBonus', true))
 	table.insert(resultPart, '\r\n|-\r\n!style="text-align:right;"| Attack Type')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'attackType'))
 	table.insert(resultPart, '\r\n!style="text-align:right;"| ' .. ico['Defence'] .. ' Damage Reduction')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'damageReduction', true) .. '%')
 	table.insert(resultPart, '\r\n|-\r\n!style="text-align:right;"| ' .. ico['Strength'] .. ' Strength Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'meleeStrengthBonus', true))
 	table.insert(resultPart, '\r\n!style="text-align:right;"| ' .. ico['Ranged'] .. ' Defence Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'rangedDefenceBonus', true))
 	table.insert(resultPart, '\r\n|-\r\n!style="text-align:right;"| ' .. ico['Combat'] .. ' Stab Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'stabAttackBonus', true))
 	table.insert(resultPart, '\r\n!style="text-align:right;border-bottom:solid thin black;"| ' .. ico['Magic'] .. ' Defence Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;border-bottom:solid thin black;"| ' .. p._getItemStat(item, 'magicDefenceBonus', true))
 	table.insert(resultPart, '\r\n|-\r\n!style="text-align:right;"| ' .. ico['Combat'] .. ' Slash Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'slashAttackBonus', true))
 	table.insert(resultPart, '\r\n!colspan="2" style="border-bottom:solid thin black;"| Other')
 	table.insert(resultPart, '\r\n|-\r\n!style="text-align:right;"| ' .. ico['Combat'] .. ' Block Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'blockAttackBonus', true))
 	table.insert(resultPart, '\r\n!style="text-align:right;"| ' .. ico['Slayer'] .. ' Bonus Slayer XP')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'slayerBonusXP', true) .. '%')
 	table.insert(resultPart, '\r\n|-\r\n!style="text-align:right;"| ' .. ico['Ranged'] .. ' Attack Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'rangedAttackBonus', true))
 	table.insert(resultPart, '\r\n!style="text-align:right;"| ' .. ico['Attack'] .. ' Level Required')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'attackLevelRequired', true))
 	table.insert(resultPart, '\r\n|-\r\n!style="text-align:right;"| ' .. ico['Ranged'] .. ' Strength Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'rangedStrengthBonus', true))
 	table.insert(resultPart, '\r\n!style="text-align:right;"| ' .. ico['Ranged'] .. ' Level Required')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'rangedLevelRequired', true))
 	table.insert(resultPart, '\r\n|-\r\n!style="text-align:right;"| ' .. ico['Magic'] .. ' Attack Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'magicAttackBonus', true))
 	table.insert(resultPart, '\r\n!style="text-align:right;"| ' .. ico['Magic'] .. ' Level Required')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'magicLevelRequired', true))
 	table.insert(resultPart, '\r\n|-\r\n!style="text-align:right;"| ' .. ico['Magic'] .. ' % Damage Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'magicDamageBonus', true) .. '%')
 	table.insert(resultPart, '\r\n!style="text-align:right;"| Two Handed?')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. (p._getItemStat(item, 'isTwoHanded') and 'Yes' or 'No'))
 	table.insert(resultPart, '\r\n|}')
 	return table.concat(resultPart)
@@ Line 510: / Line 480: @@
 		return "ERROR: No item named "..itemName.." exists in the data module[[Category:Pages with script errors]]"
 	end
 	local ico = {
 		["Attack"] = Icons.Icon({'Attack', type='skill', notext=true}),
@@ Line 524: / Line 494: @@
 	table.insert(resultPart, '\r\n|-\r\n!colspan="2" style="border-bottom:solid thin black;"| Offensive Stats')
 	table.insert(resultPart, '\r\n!colspan="2" style="border-bottom:solid thin black;"| Defensive Stats')
 	table.insert(resultPart, '\r\n|-\r\n!style="text-align:right;"| ' .. ico['Strength'] .. ' Strength Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'meleeStrengthBonus', true))
 	table.insert(resultPart, '\r\n!style="text-align:right;"| ' .. ico['Defence'] .. ' Defence Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'meleeDefenceBonus', true))
 	table.insert(resultPart, '\r\n|-\r\n!style="text-align:right;"| ' .. ico['Combat'] .. ' Stab Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'stabAttackBonus', 0))
 	table.insert(resultPart, '\r\n!style="text-align:right;"| ' .. ico['Defence'] .. ' Damage Reduction')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'damageReduction', true) .. '%')
 	table.insert(resultPart, '\r\n|-\r\n!style="text-align:right;"| ' .. ico['Combat'] .. ' Slash Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'slashAttackBonus', true))
 	table.insert(resultPart, '\r\n!style="text-align:right;"| ' .. ico['Ranged'] .. ' Defence Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'rangedDefenceBonus', true))
 	table.insert(resultPart, '\r\n|-\r\n!style="text-align:right;"| ' .. ico['Combat'] .. ' Block Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'blockAttackBonus', true))
 	table.insert(resultPart, '\r\n!style="text-align:right;border-bottom:solid thin black;"| ' .. ico['Magic'] .. ' Defence Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;border-bottom:solid thin black;"| ' .. p._getItemStat(item, 'magicDefenceBonus', true))
 	table.insert(resultPart, '\r\n|-\r\n!style="text-align:right;"| ' .. ico['Ranged'] .. ' Attack Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'rangedAttackBonus', true))
 	table.insert(resultPart, '\r\n!colspan="2" style="border-bottom:solid thin black;"| Other')
 	table.insert(resultPart, '\r\n|-\r\n!style="text-align:right;"| ' .. ico['Ranged'] .. ' Strength Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'rangedStrengthBonus', true))
 	table.insert(resultPart, '\r\n!style="text-align:right;"| ' .. ico['Slayer'] .. ' Bonus Slayer XP')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'slayerBonusXP', true) .. '%')
 	table.insert(resultPart, '\r\n|-\r\n!style="text-align:right;"| ' .. ico['Magic'] .. ' Attack Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'magicAttackBonus', true))
 	table.insert(resultPart, '\r\n!style="text-align:right;"| ' .. ico['Defence'] .. ' Level Required')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'defenceLevelRequired', true))
 	table.insert(resultPart, '\r\n|-\r\n!style="text-align:right;"| ' .. ico['Magic'] .. ' % Damage Bonus')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'magicDamageBonus', true) .. '%')
 	table.insert(resultPart, '\r\n!style="text-align:right;"| ' .. ico['Ranged'] .. ' Level Required')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'rangedLevelRequired', true))
 	table.insert(resultPart, '\r\n|-\r\n| colspan="2"|')
 	table.insert(resultPart, '\r\n!style="text-align:right;"| ' .. ico['Magic'] .. ' Level Required')
 	table.insert(resultPart, '\r\n|style="text-align:right;"| ' .. p._getItemStat(item, 'magicLevelRequired', true))
 	table.insert(resultPart, '\r\n|}')
 	return table.concat(resultPart)