Module:Items/UseTables: Difference between revisions

Module:Items/UseTables (view source)

Revision as of 21:33, 4 September 2024

123 bytes added , 4 September

Re-implement modifier skill checks, and clean up itemUseArray accordingly

Auron956

Interface administrators, Administrators

17,097

edits

@@ Line 6: / Line 6: @@
 local GameData = require('Module:GameData')
 local SkillData = GameData.skillData
+local Modifiers = require('Module:Modifiers')
 local Skills = require('Module:Skills')
 local Magic = require('Module:Magic')
@@ Line 19: / Line 20: @@
 	Agility = {},
 	Astrology = {'melvorF:Stardust', 'melvorF:Golden_Stardust', 'melvorItA:Abyssal_Stardust'},
-	Archaeology = {'melvorAoD:Archaeologist_Gloves'},
+	Archaeology = {},
 	Attack = {},
-	Cartography = {'melvorD:Crown_of_Rhaelyx'},
+	Cartography = {},
 	Combat = {'melvorF:Gold_Emerald_Ring', 'melvorD:Obsidian_Cape', 'melvorF:Throwing_Power_Gloves'},
-	Cooking = {'melvorD:Cooking_Gloves', 'melvorD:Crown_of_Rhaelyx'},
+	Cooking = {'melvorD:Cooking_Gloves'},
-	Crafting = {'melvorD:Crown_of_Rhaelyx', 'melvorItA:Abyssal_Crafting_Gloves', 'melvorAoD:Old_Crafting_Gloves'},
+	Crafting = {'melvorItA:Abyssal_Crafting_Gloves'},
 	Defence = {},
-	Farming = {'melvorD:Compost', 'melvorD:Weird_Gloop', 'melvorItA:Abyssal_Compost', 'melvorD:Bobs_Rake', 'melvorItA:Bobs_Lost_Gloves', 'melvorItA:Bobs_Lost_Rake'},
+	Farming = {'melvorD:Compost', 'melvorD:Weird_Gloop', 'melvorItA:Abyssal_Compost', 'melvorD:Bobs_Rake'},
-	Firemaking = {'melvorD:Crown_of_Rhaelyx', 'melvorItA:Abyssal_Firemaking_Gloves',
+	Firemaking = {'melvorItA:Abyssal_Firemaking_Gloves'},
-		'melvorItA:Abyssal_Firemaking_Oil', 'melvorItA:Twisted_Firemaking_Oil', 'melvorItA:Gloom_Firemaking_Oil',
+	Fishing = {'melvorD:Message_In_A_Bottle', 'melvorD:Barbarian_Gloves'},
-		'melvorItA:Shadow_Firemaking_Oil', 'melvorItA:Obsidian_Firemaking_Oil', 'melvorItA:Voidfire_Firemaking_Oil'},
+	Fletching = {'melvorItA:Abyssal_Fletching_Gloves'},
-	Fishing = {'melvorD:Amulet_of_Fishing', 'melvorD:Message_In_A_Bottle', 'melvorD:Barbarian_Gloves'},
-	Fletching = {'melvorD:Crown_of_Rhaelyx', 'melvorItA:Abyssal_Fletching_Gloves', 'melvorTotH:Sharp_Fletcher_Gloves'},
 	Harvesting = {'melvorItA:Abyssal_Harvesting_Gloves'},
-	Herblore = {'melvorD:Crown_of_Rhaelyx', 'melvorItA:Abyssal_Herblore_Gloves', 'melvorTotH:Toxic_Maker_Gloves'},
+	Herblore = {'melvorItA:Abyssal_Herblore_Gloves'},
 	Hitpoints = {},
 	Magic = {},
@@ Line 39: / Line 38: @@
 	Prayer = {},
 	Ranged = {},
-	Runecrafting = {'melvorD:Crown_of_Rhaelyx', 'melvorItA:Abyssal_Runecrafting_Gloves'},
+	Runecrafting = {'melvorItA:Abyssal_Runecrafting_Gloves'},
 	Slayer = {},
-	Smithing = {'melvorD:Smithing_Gloves', 'melvorD:Crown_of_Rhaelyx', 'melvorItA:Abyssal_Smithing_Gloves', 'melvorTotH:Blacksmiths_Gloves'},
+	Smithing = {'melvorD:Smithing_Gloves', 'melvorItA:Abyssal_Smithing_Gloves'},
+	Smithing = {},
 	Strength = {},
-	Summoning = {'melvorD:Crown_of_Rhaelyx', 'melvorAoD:Old_Summoning_Gloves'},
+	Summoning = {},
-	Thieving = {'melvorF:Chapeau_Noir', 'melvorF:Thieving_Gloves', 'melvorF:Gloves_of_Silence'},
+	Thieving = {'melvorF:Thieving_Gloves'},
 	Township = {},
-	Woodcutting = {'melvorAoD:Old_Woodcutting_Gloves'},
+	Woodcutting = {},
-	}
+}
+-- List of modifier IDs which, if present on an item and not specific to any
+-- particular skill, indicate that the item applies to all skills
+local allSkillModIDs = {
+	-- Skill XP
+	'skillXP',
+	'nonCombatSkillXP',
+	'abyssalSkillXP',
+	-- Mastery
+	'flatMasteryTokens',
+	'xpFromMasteryTokens',
+	'masteryPoolCap',
+	'masteryXP',
+	'masteryPoolProgress',
+	-- Resource preservation
+	'bypassGlobalPreservationChance',
+	'skillPreservationChance',
+	'skillPreservationCap',
+	-- Other preservation (consumables, summons, potion charges)
+	'consumablePreservationChance',
+	'summoningChargePreservationChance',
+	'potionChargePreservationChance',
+	-- Item doubling
+	'globalItemDoublingChance',
+	-- Resource quantity
+	'flatBasePrimaryProductQuantity',
+	'basePrimaryProductQuantity',
+	'flatBaseRandomProductQuantity',
+	'flatAdditionalSkillItem',
+	'flatAdditionalPrimaryProductQuantity',
+	-- Cost reduction
+	'skillCostReduction',
+	-- Off item chance
+	'offItemChance'
+}
+local function allSkillModCriteriaFromIDs(modIDs)
+	local modIDsWithProps = {}
+	for i, modID in ipairs(allSkillModIDs) do
+		table.insert(modIDsWithProps, {
+			["id"] = modID,
+			["type"] = 'id',
+			["props"] = {
+				["skillID"] = 'nil',
+				["modType"] = 'pos'
+			}
+		})
+	end
+	return Modifiers.getMatchCriteriaFromIDs(modIDsWithProps)
+end
+local allSkillModCriteria = allSkillModCriteriaFromIDs(allSkillModIDs)
 function p._getItemUses(item, asList, addCategories)
@@ Line 106: / Line 158: @@
 			-- Mastery tokens
 			addUse('Mastery')
-		--[=[else
+		else
-			local globalMods = {
+			local modsAllSkills = Modifiers.getMatchingModifiers(item.modifiers, allSkillModCriteria)
-				'increasedChanceToDoubleItemsGlobal',
+			if not Shared.tableIsEmpty(modsAllSkills.matched) then
-				'decreasedChanceToDoubleItemsGlobal',
+				addUse('AllSkills')
-				'increasedGlobalSkillIntervalPercent',
+			else
-				'decreasedGlobalSkillIntervalPercent',
+				local skillArray = Modifiers.getModifierSkills(item.modifiers)
-				'increasedGlobalSkillXP',
-				'decreasedGlobalSkillXP'
-			}
-			for i, globalMod in ipairs(globalMods) do
-				if item.modifiers[globalMod] ~= nil then
-					addUse('AllSkills')
-					break
-				end
-			end
-			if not hasUse('AllSkills') then
-				local skillArray = Constants.getModifierSkills(item.modifiers)
 				for i, skillName in ipairs(skillArray) do
 					addUse(skillName)
 				end
-			end--]=]
+			end
 		end
 	end
@@ Line 334: / Line 375: @@
 	end
-	--Other things that affect everything
-	affectsAll = {
-		'melvorItA:Abyssal_Skilling_Gem',
-		'melvorItA:Golem_Gloves',
-	}
-	if Shared.contains(affectsAll, item.id) then
-		addUse('AllSkills')
-	end
 	--Special note for Charge Stone of Rhaelyx
 	if item.id == 'melvorD:Charge_Stone_of_Rhaelyx' then