Start base with finite supply of basic robot parts (#361)

There is no longer a list of "default devices" which can be generated out of thin air.

Closes #35.

TUTORIAL.md

@@ -148,8 +148,8 @@ build {make "curry"}
 The info panel should automatically switch to showing your `logger`
 device, with an error message at the bottom saying something like
 ```
-build: this would require installing devices you don't have:
-  workbench
+build: You do not have required devices, please obtain:
+  - workbench
 ```
 This is telling you that in order to `build` a robot which has the right
 capabilities to run this program, you would need to
@@ -189,7 +189,7 @@ Now let's use them:
 ```
 build { turn left; m4; m }
 ```
-This should build a robot that moves toward the green mass to the west.
+This should build a robot that moves toward the west.
 The base is still turned north, so the robot needs to turn left
 to be oriented to the west. Once you have a compass to install on
 the robot, you will be able to `turn west` directly.

data/entities.yaml

@@ -613,13 +613,12 @@
   capabilities: [grab, harvest]
   properties: [portable]
 
-- name: plasma cutter
+- name: toolkit
   display:
     attr: device
-    char: 'P'
+    char: 'Ѣ'
   description:
-  - "A plasma cutter uses a jet of hot plasma to cut through metal like
-    butter.  Used via the 'salvage' command to cut apart old robots."
+  - "A toolkit can be used, via the 'salvage' command, to take apart old robots."
   - "'salvage' takes no arguments. It looks for an inactive
     robot (one which is not currently running a program) in the
     current cell. If an inactive robot is found, its log (if any) is
@@ -637,6 +636,7 @@
   - An extremely efficient solar panel, capable of generating sufficient power
     from ambient starlight alone. A robot powered by one of these can operate any time,
     including on cloudy days and at night.
+  capabilities: [power]
   properties: [portable]
 
 - name: drill

data/recipes.yaml

@@ -393,6 +393,15 @@
   out:
   - [1, metal drill]
 
+- in:
+  - [1, box]
+  - [2, board]
+  - [4, copper pipe]
+  - [2, iron plate]
+  - [2, rubber]
+  out:
+  - [1, toolkit]
+
 - in:
   - [2, small motor]
   - [8, iron plate]

data/scenarios/Challenges/drill_test.yaml

@@ -19,7 +19,7 @@ robots:
     devices:
       - logger
       - grabber
-      - plasma cutter
+      - toolkit
       - 3D printer
     inventory:
       - [2, metal drill]

data/scenarios/Tutorials/build.yaml

@@ -56,6 +56,9 @@ robots:
     inventory:
       - [10, logger]
       - [10, compass]
+      - [10, solar panel]
+      - [10, grabber]
+      - [10, treads]
 world:
   default: [blank, none]
   palette:

data/scenarios/Tutorials/crash.yaml

@@ -72,7 +72,10 @@ robots:
       - [10, logger]
       - [10, compass]
       - [10, scanner]
-      - [10, plasma cutter]
+      - [10, toolkit]
+      - [10, solar panel]
+      - [10, treads]
+      - [10, grabber]
   - name: secret
     loc: [3, 0]
     dir: [0, 0]

data/scenarios/Tutorials/install.yaml

@@ -49,7 +49,8 @@ robots:
       - compass
       - grabber
     inventory:
-      - [1, logger]
+      - [10, solar panel]
+      - [10, logger]
 world:
   default: [blank, none]
   palette:

data/scenarios/Tutorials/scan.yaml

@@ -40,6 +40,8 @@ robots:
       - [10, logger]
       - [10, compass]
       - [10, scanner]
+      - [10, treads]
+      - [10, solar panel]
 world:
   default: [blank, none]
   palette:

data/scenarios/classic.yaml

@@ -13,8 +13,16 @@ robots:
       - grabber
       - life support system
       - logger
+      - toolkit
       - solar panel
       - workbench
+    inventory:
+      - [5, 3D printer]
+      - [100, treads]
+      - [70, grabber]
+      - [100, solar panel]
+      - [50, scanner]
+      - [5, toolkit]
 world:
   seed: null
   offset: true

src/Swarm/Game/Step.hs

@@ -1248,26 +1248,16 @@ execConst c vs s k = do
       -- hopefully without duplicating too much code.
       [VDelay cmd e] -> do
         r <- get @Robot
-        em <- use entityMap
         creative <- use creativeMode
 
         pid <- use robotID
 
-        let -- Standard devices that are always installed.
-            -- XXX in the future, make a way to build these and just start the base
-            -- out with a large supply of each?
-            stdDeviceList =
-              ["treads", "grabber", "solar panel", "scanner", "plasma cutter"]
-            stdDevices = S.fromList $ mapMaybe (`lookupEntityName` em) stdDeviceList
-            addStdDevs i = foldr insert i stdDevices
-
-        deviceSets <- checkRequiredDevices (addStdDevs $ r ^. robotInventory) cmd "You" FixByObtain
+        deviceSets <- checkRequiredDevices (r ^. robotInventory) cmd "You" FixByObtain
 
         let devices =
-              stdDevices
-                `S.union` if creative -- if given a choice between required devices giving same capability
-                  then S.unions deviceSets -- give them all in creative
-                  else S.unions $ map (S.take 1) deviceSets -- give first one otherwise
+              if creative -- if given a choice between required devices giving same capability
+                then S.unions deviceSets -- give them all in creative
+                else S.unions $ map (S.take 1) deviceSets -- give first one otherwise
 
         -- Pick a random display name.
         displayName <- randomName
@@ -1295,7 +1285,7 @@ execConst c vs s k = do
         -- Remove from the inventory any devices which were installed on the new robot,
         -- if not in creative mode.
         unless creative $
-          forM_ (devices `S.difference` stdDevices) $ \d ->
+          forM_ devices $ \d ->
             robotInventory %= delete d
 
         -- Flag the world for a redraw and return the name of the newly constructed robot.

src/Swarm/Language/Capability.hs

@@ -32,12 +32,15 @@ import Data.Data (Data)
 import Data.Yaml
 import GHC.Generics (Generic)
 
+import Data.Bifunctor (first)
 import Swarm.Language.Context
 import Swarm.Language.Syntax
 
 -- | Various capabilities which robots can have.
 data Capability
-  = -- | Execute the 'Move' command
+  = -- | Be powered, i.e. execute anything at all
+    CPower
+  | -- | Execute the 'Move' command
     CMove
   | -- | Execute the 'Turn' command
     --
@@ -141,7 +144,7 @@ type CapCtx = Ctx (Set Capability)
 --   be safe in the sense that a robot with the indicated capabilities
 --   will always be able to run the given program.
 requiredCaps :: CapCtx -> Term -> (Set Capability, CapCtx)
-requiredCaps ctx tm = case tm of
+requiredCaps ctx tm = first (S.insert CPower) $ case tm of
   -- First, at the top level, we have to keep track of the
   -- capabilities needed by variables bound with the 'TDef' command.