Use the new knowsIngredientsFor helper

Author: TristanCacqueray

src/Swarm/Game/Recipe.hs

@@ -34,6 +34,7 @@ module Swarm.Game.Recipe (
 
   -- * Looking up recipes
   missingIngredientsFor,
+  knowsIngredientsFor,
   recipesFor,
   make,
   make',
@@ -187,6 +188,13 @@ missingIngredientsFor (inv, ins) (Recipe inps _ reqs _ _) =
   findLacking inven = filter ((> 0) . fst) . map (countNeeded inven)
   countNeeded inven (need, entity) = (need - E.lookup entity inven, entity)
 
+-- | Figure out if a recipe is available, but it can be lacking items.
+knowsIngredientsFor :: (Inventory, Inventory) -> Recipe Entity -> Bool
+knowsIngredientsFor (inv, ins) recipe =
+  knowsAll inv (recipe ^. recipeInputs) && knowsAll ins (recipe ^. recipeRequirements)
+  where
+    knowsAll xs = all (E.contains xs . snd)
+
 -- | Try to make a recipe, deleting the recipe's inputs from the
 --   inventory. Return either a description of which items are
 --   lacking, if the inventory does not contain sufficient inputs,

src/Swarm/Game/Step.hs

@@ -1642,7 +1642,7 @@ updateDiscoveredEntities e = do
   if E.contains0plus e allDiscovered
     then pure ()
     else do
-      let newAllDiscovered = E.insertCount 9001 e allDiscovered
+      let newAllDiscovered = E.insertCount 1 e allDiscovered
       allDevices <- use allInstalledDevices
       updateAvailableRecipes (newAllDiscovered, allDevices) e
       allDiscoveredEntities .= newAllDiscovered
@@ -1654,7 +1654,7 @@ updateInstalledDevice e = do
   if E.contains0plus e allDevices
     then pure ()
     else do
-      let newAllDevices = E.insertCount 9001 e allDevices
+      let newAllDevices = E.insertCount 1 e allDevices
       -- Check every known entities to see if the new device enables new recipes
       allDiscovered <- use allDiscoveredEntities
       traverse_ (updateAvailableRecipes (allDiscovered, newAllDevices) . snd) (elems allDiscovered)
@@ -1672,10 +1672,7 @@ updateAvailableRecipes :: Has (State GameState) sig m => (Inventory, Inventory)
 updateAvailableRecipes invs e = do
   allInRecipes <- use recipesIn
   let entityRecipes = recipesFor allInRecipes e
-  let canMake recipe = case missingIngredientsFor invs recipe of
-        [] -> True
-        _ -> False
-  let usableRecipes = filter canMake entityRecipes
+      usableRecipes = filter (knowsIngredientsFor invs) entityRecipes
   (knownLength, knownRecipes) <- use availableRecipes
   let newRecipes = filter (`notElem` knownRecipes) usableRecipes
       newLength = case newRecipes of