Ignore installed entities

Author: TristanCacqueray

src/Swarm/Game/State.hs

@@ -42,7 +42,6 @@ module Swarm.Game.State (
   availableRecipes,
   availableRecipesNewCount,
   allDiscoveredEntities,
-  allInstalledDevices,
   gensym,
   randGen,
   adjList,
@@ -191,7 +190,6 @@ data GameState = GameState
     _waitingRobots :: Map Integer [RID]
   , _robotsByLocation :: Map (V2 Int64) IntSet
   , _allDiscoveredEntities :: Inventory
-  , _allInstalledDevices :: Inventory
   , _availableRecipes :: [Recipe Entity]
   , _availableRecipesNewCount :: Int
   , _gensym :: Int
@@ -259,9 +257,6 @@ robotsByLocation :: Lens' GameState (Map (V2 Int64) IntSet)
 -- | The list of entities that have been discovered.
 allDiscoveredEntities :: Lens' GameState Inventory
 
--- | The list of devices that have been installed once.
-allInstalledDevices :: Lens' GameState Inventory
-
 -- | The list of available recipes.
 availableRecipes :: Lens' GameState [Recipe Entity]
 
@@ -463,7 +458,6 @@ initGameState cmdlineSeed scenarioToLoad toRun = do
           , _availableRecipes = mempty
           , _availableRecipesNewCount = 0
           , _allDiscoveredEntities = empty
-          , _allInstalledDevices = empty
           , _activeRobots = IS.empty
           , _waitingRobots = M.empty
           , _gensym = 0

src/Swarm/Game/Step.hs

@@ -859,7 +859,6 @@ execConst c vs s k = do
               -- either robot's inventory
               when (focusedID == myID || focusedID == otherID) flagRedraw
 
-        updateInstalledDevice item
         return $ Out VUnit s k
       _ -> badConst
     Make -> case vs of
@@ -1371,7 +1370,7 @@ execConst c vs s k = do
       [VBool b] -> return $ Out (VBool (not b)) s k
       _ -> badConst
     Neg -> case vs of
-      [VInt n] -> return $ Out (VInt (- n)) s k
+      [VInt n] -> return $ Out (VInt (-n)) s k
       _ -> badConst
     Eq -> returnEvalCmp
     Neq -> returnEvalCmp
@@ -1643,23 +1642,9 @@ updateDiscoveredEntities e = do
     then pure ()
     else do
       let newAllDiscovered = E.insertCount 1 e allDiscovered
-      allDevices <- use allInstalledDevices
-      updateAvailableRecipes (newAllDiscovered, allDevices) e
+      updateAvailableRecipes (newAllDiscovered, newAllDiscovered) e
       allDiscoveredEntities .= newAllDiscovered
 
--- | Update the global list of installed devices, and check for new recipes.
-updateInstalledDevice :: (Has (State GameState) sig m, Has (State Robot) sig m) => Entity -> m ()
-updateInstalledDevice e = do
-  allDevices <- use allInstalledDevices
-  if E.contains0plus e allDevices
-    then pure ()
-    else do
-      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)
-      allInstalledDevices .= newAllDevices
-
 -- | Update the availableRecipes list.
 -- This implementation is not efficient:
 -- * Every time we discover a new entity, we iterate through the entire list of recipes to see which ones we can make.