diff --git a/src/coffee/models/mod_version.coffee b/src/coffee/models/mod_version.coffee index ae9bb91b0..eeeea8c26 100644 --- a/src/coffee/models/mod_version.coffee +++ b/src/coffee/models/mod_version.coffee @@ -145,6 +145,7 @@ module.exports = class ModVersion extends BaseModel for recipe in _.values @_recipes continue unless recipe.isConditionSatisfied() + continue unless recipe.hasAllTools() if recipe.itemSlug.matches itemSlug primaryRecipes.push recipe diff --git a/src/coffee/models/recipe.coffee b/src/coffee/models/recipe.coffee index b355e2206..caac27642 100644 --- a/src/coffee/models/recipe.coffee +++ b/src/coffee/models/recipe.coffee @@ -115,6 +115,14 @@ module.exports = class Recipe extends BaseModel return total + hasAllTools: (modPack)-> + modPack ?= @modVersion?.mod?.modPack + return true unless modPack + + for stack in @tools + return false unless modPack.findItem stack.itemSlug + return true + isConditionSatisfied: (modPack)-> return true unless @condition modPack ?= @modVersion?.mod?.modPack