Update chapter 2; sans-serif keyboard style

chapters/chap02-workshops-digging.rst

@@ -26,18 +26,18 @@ haven’t dug a nice enough space for the workshop yet, so lets chuck it
 outside for now:
 
 * Move the view to the front of the fortress.
-* Hit :kbd:`b` for :guilabel:`build`, and then :kbd:`w` for
+* Hit :kbd:`b` for :guilabel:`Building`, and then :kbd:`w` for
-  :guilabel:`workshop`. You can also just scroll down to
+  :guilabel:`Workshops`. You can also just scroll down to
-  :guilabel:`Workshops` using :kbd:`Alt`-:kbd:`↓` and hit :kbd:`Enter`.
+  :guilabel:`Workshops` using :kbd:`=` and hit :kbd:`Enter`.
 * You will now see a list of workshops. It scrolls off the bottom of
   the page (scroll around if you like)! Hit :kbd:`c` for
-  :guilabel:`Carpenter's workshop`.
+  :guilabel:`Carpenters workshop`.
 * The menu will vanish and the placement menu will appear. The green
   X’s mark out the workshop’s footprint. The dark green Xs are squares
   that will be impassible once the workshop is built, keep this in mind
   when building in an enclosed space, you don’t want to block the door!
 
-.. image:: images/dftutorial18.png
+.. image:: images/02-carpenter-place.png
    :align: center
 
 * Chose a spot in front of the fortress. Somewhere around where mine is
@@ -47,12 +47,12 @@ outside for now:
   use to build the workshop with. Mostly it will be a list of wood and it
   will look something like this:
 
-.. image:: images/dftutorial19.png
+.. image:: images/02-carpenter-material.png
    :align: center
 
 * At this point you could just hit enter and the first item on the list
   will be used to build the workshop. Instead, for fun, hit :kbd:`x` and
-  :guilabel:`expand` the view to show a list of every single item the workshop
+  :guilabel:`Expand` the view to show a list of every single item the workshop
   can be built from. Expanding the item selection is a nice way to chose
   exactly the item you want to be used. Most of the time you can ignore
   this option, but it will come in handy later on.
@@ -63,18 +63,18 @@ outside for now:
 * Once you’ve hit enter (selecting the building material) the workshop
   will be placed in an un-built state on the map. It will look like this:
 
-.. image:: images/dftutorial20.png
+.. image:: images/02-carpenter-template.png
    :align: center
 
-Your workshop is now about to be built. You will have to hit space a
+Your workshop is now about to be built. You will have to hit :kbd`Esc` a
 couple of times to un-pause the game, but as soon as you do I bet you
 that a helpful wee dwarf will run over and start building it. If you’re
 quick you can hit :kbd:`q` and see the status of the workshop, it
-should say :guilabel:`Construction initiated` or something similar.
+should say :guilabel:`Construction initiated.`.
 
 A few seconds later, the workshop is built!
 
-.. image:: images/dftutorial21.png
+.. image:: images/02-carpenter-built.png
    :align: center
 
 It doesn’t look like much, but it’s really useful! I promise! So lets
@@ -95,7 +95,7 @@ Follow along with me:
 * Hit :kbd:`a` (duh)!
 * Note the right menu is now a large list of stuff we can make. We’re
   after beds.
-* You can scroll down to beds using :kbd:`↓`, or simply hit :kbd:`b`.
+* You can scroll down to beds using :kbd:`=`, or simply hit :kbd:`b`.
 * The menu now changes back to the :kbd:`q` list and you’ll see
   :guilabel:`Construct bed` listed. But we want more than one bed!
 * Hit :kbd:`a` again, and then :kbd:`b`. Repeat until we’ve got five
@@ -104,31 +104,30 @@ Follow along with me:
 
 Your carpentry workshop menu should now look like this:
 
-.. image:: images/dftutorial22.png
+.. image:: images/02-carpenter-menu.png
    :align: center
 
 If your workshop menu looks like this, well done! Five beds are queued
-up and hitting space a couple of times will un-pause the game and set a
+up and hitting :kbd:`Esc` a couple of times will un-pause the game and set a
 dwarf working, building your beds. You may have noted that there are a
 lot of other workshop options available to us now we have items on the
 build list. We can :kbd:`s` suspend any construction, set any item to
 be :kbd:`r`, repeat built, or we can hit :kbd:`c` and cancel the
-construction of the current listed item. We can also fiddle with the
+construction of the current listed item. We can also have the entire workshop
-workshop profile by using :kbd:`P`, or have the entire workshop removed
+removed using :kbd:`x`. For now, lets just watch the beds get built!
-using :kbd:`x`. For now, lets just watch the beds get built!
 
 Note, you won’t see the beds being put anywhere. Want to know why? The
 answer is simple, and if you’re extra-special clever you may have
 already worked it out: We have no furniture stockpile! Lets fix that:
 
 * Hit :kbd:`p` from the main menu.
-* hit :kbd:`u` for :guilabel:`Furniture stockpile`.
+* hit :kbd:`u` for :guilabel:`Furniture Storage`.
-* Move the X near the workshop, hit enter, and designate a pile about 5
+* Move the X near the workshop, hit :kbd:`Enter`, and designate a pile about 5
   tiles by 5 tiles.
 
 Here’s my pile after a few seconds of the game resumed:
 
-.. image:: images/dftutorial23.png
+.. image:: images/02-pile-furniture.png
    :align: center
 
 You’ll note the dwarfs have moved the constructed beds to the pile as
@@ -152,36 +151,24 @@ of this mound like dirty hobbits? We want to dig down, down, down! The
 easiest way of doing this is to build some stairs. Well, to be precise,
 we’re going to designate some stairs using the :kbd:`d` menu. We are
 going to designate some un-dug space to be stairs and then see what’s
-going on a few feet down. So follow along, and lets get expanding!
+going on a few metres down. So follow along, and lets get expanding!
 
-* Move the map to the bottom end of our corridor.
+* Move the map to the top side of our corridor.
 * Hit :kbd:`d` and then :kbd:`j` for :guilabel:`downward stairway`.
 * Move the X into the black and hit enter, move the cursor down one,
   and hit enter again.
 
-You should see two downwards stairs marked, like this:
+You should see six downwards stairs marked.
-
+You may be wondering why I have set six stairs down. The reason is that
-.. image:: images/dftutorial24.png
-   :align: center
-
-But what’s this? We have a problem! How will our miners get there to
-dig out our stairs? Best we designate an area around those stairs to be
-dug using :kbd:`d` and :kbd:`d` (:guilabel:`Mine`). Here’s how I set it
-up:
-
-.. image:: images/dftutorial25.png
-   :align: center
-
-You may be wondering why I have set two stairs down. The reason is that
 dwarfs need space to move past each other. If the corridor, or stairs,
 are only 1 wide, then they have to pause to let each other pass. This
 slows movement around your fortress down terribly once you have dozens
-of dwarfs running around. Two stairs down should be enough for now.
+of dwarfs running around. Six stairs will be plenty for a long time.
 
 Hit space until the game is running and let that area get built. It
 should look something like this when it’s done:
 
-.. image:: images/dftutorial26.png
+.. image:: images/02-stairs-down.png
    :align: center
 
 Super! A hallway and two downward staircases! At this point you may be
@@ -189,7 +176,7 @@ feeling pretty chuffed with yourself. But if you go down a level
 (:kbd:`>`, you’ll recall) you’ll not see any stairs going up, or much
 of anything, just these tan blobs:
 
-.. image:: images/dftutorial27.png
+.. image:: images/02-stairs-lower.png
    :align: center
 
 Where are our stairs going up? Where are our vast stores of mineral
@@ -207,41 +194,42 @@ long way. An Up/Down stairway pokes the proverbial holes in both
 directions. It links up with a stairway above (if there’s one there)
 and tries to link up with a stairway below (if there’s one there). If
 there’s no stairway to link up with it will provide access to those
-other levels so you can build the needed stairs. To build one, do this:
+other levels so you can build the needed stairs.
+
+Here's a handy side-on diagram:
+
+.. image:: images/stairs-diagram.png
+   :align: center
+
+To build an up/down stairway, do this:
 
 * Go down one level from our main area.
-* At this level, below our down stairs, hit :kbd:`d` and then :kbd:`i`
+* At this level, below our down stairs, hit :kbd:`d`, :kbd:`i`
-  for :guilabel:`Up/Down Stairway`.
+  to designate an :guilabel:`Up/Down Stairway`.
-* Move the X over the two tan blocks. Hit enter, move down one, hit
+* Move the X over the tan blocks. Hit :kbd:`Enter`, move down one level,
-  enter again.
+  and hit :kbd:`Enter` again.
-* Two brown X’s now show that your up-down stairway has been designated.
+* Brown X’s now show that your up-down stairway has been designated.
 * If you mess it up, :kbd:`d` and then :kbd:`x` can un-designate the
   space for you.
-* Resume the game and the up/down stairs will be dug. Once dug, they
+* Resume the game and the up/down stairs will be dug. The designation
-  will look like this:
+  looks like this:
 
-.. image:: images/dftutorial28.png
+.. image:: images/02-stairs-updown.png
    :align: center
 
-Lovely! Two perfect up-down stairs. But we’re not done yet. **Go down a
+Lovely! Perfect up-down stairs. But we’re not done yet.
-level and build two more up-down stairs.** Once you’ve done this, drop
-a level again and designate two upward stairways using :kbd:`d` and
-:kbd:`u`. You should end up seeing something like this once they are
-built. This is on level 142 141 (see top right for current level), or
-three levels down. If you don’t see stone, you’re on the wrong level!
 
-.. image:: images/dftutorial29.png
+So far you've been selecting two corners to designate a rectangle in
-   :align: center
+two dimensions - but laying out a staircase would get pretty tedious
+like that!  Luckily DF supports three-dimensional designations as well,
+so lay it out in 2D, then :kbd:`>` to level 103 to finish the column.
 
 Rock! We’ve got some rock around us! This is the sort of place a good
-dwarf loves! How about we dig out some of this space? I suggest a long
+dwarf loves! How about we dig out some of this space? I suggest a set
-corridor running north some twenty squares, and we’ll make it three
+of square rooms just off the staircase, with two tile wide doorways.
-squares wide. Midway down this corridor we will have some stairs going
+It's a simple layout, but enough for now. See if you can match mine.
-down and some 15×15 size rooms on each side. Just a simple layout for
-now, but it will be enough for our needs for now. See if you can match
-mine.
 
-.. image:: images/dftutorial30.png
+.. image:: images/02-rooms-large.png
    :align: center
 
 Now let your boys dig! Dig boys, dig! And make sure all your areas set
@@ -259,12 +247,12 @@ look around. An X will appear and you can direct it using
 the arrow keys. As you move it around you’ll see what’s under the
 arrow. Check my example:
 
-.. image:: images/dftutorial31.png
+.. image:: images/02-look-around.png
    :align: center
 
 As you can see, underneath my X is a dwarf, some limestone, and a
-limestone cavern floor. I can use :kbd:`-` to scroll down
+limestone cavern floor. I can use :kbd:`=` to scroll down
-through those three items, and hitting enter will display me some info
+through those three items, and hitting :kbd:`Enter` will display me some info
 about each. Ok, except for the floor. I mean, what do you want to know?
 It’s a floor!
 
@@ -276,35 +264,28 @@ you won’t be able to build a farm plot inside on anything but soil,
 sand, silt, clay or loam. :guilabel:`Look around` will show you what
 the ground is made of.
 
-Toy with :kbd:`k` for a while, see if you can find the bauxite. We’re
+Toy with :kbd:`k` for a while, and see what minerals are being dug up.
-lucky, bauxite is a very handy material to make magma-proof mechanisms
+Then lets leave the dwarfs digging, we’ve got a very important job to do...
-and floodgates out of. Lets leave the dwarfs digging, we’ve got a very
-important job to do…
 
 Chucking out the trash!
 =======================
 By now, believe it or not, some rubbish may be building up in your
 fortress. I’ve taken a shot of some rubbish near our food pile. Have a
-look:
+look at those slimy bones in with the barrels of booze:
 
-.. image:: images/dftutorial32.png
+.. image:: images/02-food-trash.png
    :align: center
 
 Using :kbd:`k` I can have a closer look and see exactly what this trash
-is:
+is... :guilabel:`Rat remains`. Yuck!
-
+We can’t have this left lying around our tidy fortress,
-.. image:: images/dftutorial33.png
-   :align: center
-
-Yuck! This is the remains of some food turtles we brought with us on
-our journey. We can’t have this left lying around our tidy fortress,
 can we? Well, we could, but the end result would be a stinking cloud of
 purple miasma. Miasma makes our dwarfs unhappy. While they may never
 shower and probably reek to high-heaven, they really don’t like the
 smell of rotting leftovers. Go figure.
 
-So how do we get rid of the refuse? Easy! We build a :kbd:`p`
+So how do we get rid of the refuse? Easy! We build :kbd:`p`
-:guilabel:`stockpile` for :kbd:`r` :guilabel:`refuse`. But note, we
+:guilabel:`Stockpiles` for :kbd:`r` :guilabel:`Refuse`. But note, we
 need to build this pile outside or we’ll get miasma build-up. Outside,
 the wind blows the stink away.
 
@@ -312,11 +293,11 @@ See if you can set up a refuse pile on your own like mine. It’s just
 like making any other pile, except we set :kbd:`r` for refuse as we
 plot it.
 
-.. image:: images/dftutorial34.png
+.. image:: images/02-pile-refuse.png
    :align: center
 
-Look, one of my adorable wee dwarfs is moving rubbish there as we
+Look, some of the refuse has already been moved!
-speak! Phew, miasma criss averted!
+Phew, miasma criss averted!
 
 But we still have one really, really important job to do…
 
@@ -324,9 +305,8 @@ Making booze!
 =============
 Booze is the lifeblood of dwarven society. Literally so. Dwarfs, unless
 injured, will prefer to drink booze over water 100% of the time. If
-there is no booze, they will drink water, and that's terrible.
+there is no booze, they will drink water, and that's terrible - they work
-
+slower, and are more prone to murderous tantrums.
-Dwarfs without booze also work slower. Like me.
 
 So what do we do about the dwarf booze demands? Simple! We build a still!
 
@@ -336,9 +316,9 @@ Follow along, dear reader:
 * Hit :kbd:`w` for :guilabel:`Workshops`.
 * Hit :kbd:`l` for :guilabel:`Still`, or scroll through and find the
   still yourself, and hit enter.
-* Place the still in the room next to the food stockpile, like this.
+* Place the still in the room above the food stockpile, like this.
 
-.. image:: images/dftutorial35.png
+.. image:: images/02-still-place.png
    :align: center
 
 Placing it near food makes sense, as it will turn food items into
@@ -346,14 +326,14 @@ booze. The less walking for our brewer, the better. Once you’ve placed
 it and selected the materials (any will do), your still should be
 quickly built and look something like this:
 
-.. image:: images/dftutorial36.png
+.. image:: images/02-still-built.png
    :align: center
 
 Now to make it start churning out the brewskies!
 
 * Hit :kbd:`q` and move the cursor to the still.
-* Hit :kbd:`a` for :guilabel:`add task`.
+* Hit :kbd:`a` for :guilabel:`Add new task`.
-* Hit :kbd:`b` for :guilabel:`Brew a Drink`
+* Hit :kbd:`b` for :guilabel:`Brew drink from plant`
 * Hit :kbd:`a` and :kbd:`b` another 7 or so times.
 
 Yay! You have now queued up a lot of beer to be made. But you’re going
@@ -366,15 +346,25 @@ need to make barrels.
 * Scroll down to :guilabel:`Make wooden Barrel`, or just hit :kbd:`v`.
 * Fill the queue with barrels.
 
-That should see your dwarfs produce enough booze to keep them going for
+To keep booze production at an acceptable rate, there's a couple of
-a while. Repeat that process a few times or put :guilabel:`Brew Drink`
+options.  One is to keep checking manually, but you only have to be
-and :guilabel:`Make Barrels` on repeat for five minutes. End result,
+late once to cause a tantrum!  The second is to set up repeating jobs
-happy drunk dwarfs! An important thing to note at this point is that
+(:kbd:`q`, select job, :kbd:`r`), but then it's easy for production
+of drinks and barrels to get out of sync and waste valuable materials.
+
+The third option is a plugin called ``workflow``, which lets you set a
+target amount and will suspend and unsuspend production jobs to keep you
+at that level.  :kbd:`q`, select job, :kbd:`Alt`-:kbd:`w`, :kbd:`A` to
+:guilabel:`Add limit`, :kbd:`R` adjust the range.  This might seem
+complicated, but setting 50-100 drinks and 10-20 barrels will keep things
+flowing smoothly until your population is a lot larger.
+
+End result, happy dwarfs! An important thing to note at this point is that
 brewing alcohol uses plants, but doesn’t destroy the seeds. Cooking
 does destroy the seeds of any plant cooked, which can seriously
 compromise your ability to grow more food! So for now, lets just stick
 to making some extra booze. We should be ok for food for a while yet
-with our farm running.
+with our farm running, since dwarves love raw mushrooms.
 
 Time to head back down stairs to see how our miners are going. Let them
 dig at least one room out before continuing with the next step.
@@ -397,20 +387,20 @@ do that? I’m glad you asked! We build a masons workshop. Here’s how:
 
 * Hit :kbd:`b` for :guilabel:`Build`.
 * :kbd:`w` for :guilabel:`Workshops`.
-* :kbd:`m` for :guilabel:`Mason’s Workshop`.
+* :kbd:`m` for :guilabel:`Masons Workshop`.
 
 Chose an area near our main stairs up, in one of our new rooms. You can
 check the shot below to see where I’m going to place mine.
 
-.. image:: images/dftutorial37.png
+.. image:: images/02-mason-where.png
    :align: center
 
 * Select some stone and get the thing built!
 
 Once it’s up it’s time to get it producing some useful items:
 
-* :kbd:`q` over the Mason’s Workshop.
+* :kbd:`q` over the Mason's Workshop.
-* :kbd:`a` for :guilabel:`add task`, then :kbd:`d` for door. Do this
+* :kbd:`a` for :guilabel:`Add new task`, then :kbd:`d` for door. Do this
   four times.
 * :kbd:`a` for add task, then :kbd:`t` for table, do this twice.
 * :kbd:`a` for add task, then :kbd:`c` for chair, do this twice.
@@ -423,12 +413,12 @@ so lets make a big stockpile in the middle of this room.
 
 While you’re at it, why not remove the furniture stockpile upstairs and
 get all of that stuff out of the rain. Go up to the pile, hit :kbd:`p`
-for pile, then :kbd:`x` and then hit enter at one corner of the
+for pile, then :kbd:`x` and then hit :kbd:`Enter` at one corner of the
 outdoors furniture stockpile, and then move the cursor to the other end
-and hit enter again. Here’s my downstairs stockpile, complete with some
+and hit :kbd:`Enter` again. Here’s my downstairs stockpile, complete with
-just-moved furniture and some doors!
+some just-moved furniture and a mason hard at work!
 
-.. image:: images/dftutorial38.png
+.. image:: images/02-mason-use.png
    :align: center
 
 Now it’s time to get those doors and beds into use, and when the tables
@@ -441,53 +431,53 @@ when they get tired. This is really not much fun for them and we’d like
 to give them a place to stay. With some beds built, lets set up a big
 bedroom on the top floor so our dwarfs can get some shuteye.
 
-* Head to the top floor, we’re going to build in the spare room.
+* Head to the top floor, and dig out a small room at the end of the hallway.
-* Hit :kbd:`b` and then :kbd:`b` again (for :guilabel:`bed`).
+* Hit :kbd:`b` and then :kbd:`b` again (for :guilabel:`Bed`).
 * Move the cursor and place a bed in the corner (hit enter, select a
   bed and hit enter again).
-* Spread the five bed around the room.
+* Spread the five beds around the room.
-* Hit :kbd:`Space` until we’re back at the main menu.
+* Hit :kbd:`Esc` until we’re back at the main menu.
-* Hit :kbd:`b` again, and :kbd:`d` for :guilabel:`door`.
+* Hit :kbd:`b` again, and :kbd:`d` for :guilabel:`Door`.
-* Place doors at each of the room entrances.
+* Place doors across the room entrance.
 
 Here’s my room layout. The shadowy beds and door show that the beds and
-doors aren’t placed yet. The green :guilabel:`X` shows me about to
+doors aren’t placed yet. The green X shows me about to
 place the next door.
 
-.. image:: images/dftutorial39.png
+.. image:: images/02-beds-shadows.png
    :align: center
 
 Pretty soon the room will be laid out and we’ll be ready to use it to
 house our little workers. Here’s mine finished, doesn’t it look pretty?
 
-.. image:: images/dftutorial40.png
+.. image:: images/02-beds-built.png
    :align: center
 
 But the dwarfs won’t use it as a bedroom yet. We have to specify what
 the room is to be used for first. To do this:
 
 * Hit :kbd:`q`.
-* Move the cursor near one of the beds. It will start flashing.
+* Move the cursor near one of the beds. It will start flashing green.
 * On the right, you’ll see the option :kbd:`r` :guilabel:`Make Bedroom`.
 * Hit :kbd:`r`.
 * You will now see a flashing blue square. Here’s mine, as selected
   from the bottom-left bed.
 
-.. image:: images/dftutorial41.png
+.. image:: images/02-beds-room.png
    :align: center
 
 We could hit enter now and set the room at this size, but that would
 leave two beds out. So we need to make the room size bigger. With the
 blue square flashing…
 
-* Hit :kbd:`Alt`-:kbd:`↓` and this will make the blue square bigger
+* Hit :kbd:`=` and this will make the blue square bigger
   until it fills the whole room.
 
 You will note that the room won't "leak" beyond the boundaries of the
 walls and doors. This is why we need doors, to prevent leaky rooms!
 Makes sense? Right? Ok… moving on…
 
-* Hit enter with the room set at max size, a new menu will appear on
+* Hit :kbd:`Enter` with the room set at max size, a new menu will appear on
   the right.
 
 This menu gives you options for the room. It will always appear when
@@ -498,29 +488,16 @@ bedroom, and all the beds in the room should be used.
 
 On the new menu you want to:
 
-* Hit :kbd:`b` for :guilabel:`Barracks`, this will turn the
+* Hit :kbd:`d` for :guilabel:`Dormitory`, this will turn the
   :guilabel:`(N)` to a :guilabel:`(Y)`.
 
-With the room set as a barracks any dwarf without their own room will
+With the room set as a dormitory any dwarf without their own room will
-use the beds in the barracks to sleep in. When you have a military, the
+use the beds in the dormitory to sleep in. When you have a military, a
-barracks is also where dwarfs will spar and sleep when off duty.
+:guilabel:`Barracks` is where dwarfs will spar and sleep when off duty.
 
-Well done! We have a bedroom for our shorties to sleep in! But what’s
+Well done! We have a shared bedroom for our shorties to sleep in! 
-this, something weird has happened…
 
-.. image:: images/dftutorial42.png
+In the next chapter of the walkthrough, we’ll build a fine dining
-   :align: center
-
-…a monkey ran into our fortress, probably planning to steal something,
-when it came face to face with our woodcutter (the sandy-coloured
-dwarf). End result, chop-chop, a dead monkey! The red :guilabel:`M` is
-the dead monkey, the other red stuff is the monkey’s blood splattered
-everywhere. Don’t worry though, your dwarfs will soon drag the body
-outside and throw it on the refuse pile. This may not happen in your
-game, but it’s good to know what  a fight looks like when it does.
-
-That’s all for now! In the next tutorial we’ll build a fine dining
 room, set up some more workshops, and start to build some proper living
-quarters for our dwarfs. We might also build some fearsome traps! I
+quarters for our dwarves. I can’t wait!
-can’t wait!
 

misc/_static/dftext.css

@@ -18,8 +18,8 @@
     background-image: -webkit-linear-gradient(top, #eee, #f9f9f9, #eee);
     background-image: linear-gradient(to bottom, #eee, #f9f9f9, #eee);
     padding: 0.1em 0.3em;
-    font-family: inherit;
+    font-family: sans-serif;
-    font-size: 0.9em;
+    font-size: 0.8em;
 }
 
 @font-face {