Update chapter eight

chapters/chap08-military.rst

@@ -2,18 +2,12 @@
 Soldiers and your army
 ######################
 
-.. warning::
+While you're exploring and digging around, how about we
-
+set up a military? You're going to need one, goblins are pesky bastards
-    This information is for an old version of the game.  Don't take it
+and likely to bother you more and more (if they haven't already).
-    too seriously until it's updated.
-
-    See :wiki:`Military` for up-to-date information.
-
-While you’re exploring and digging around (see chapter 7), how about we
-set up a military? You’re going to need one, goblins are pesky bastards
-and likely to bother you more and more (if they haven’t already).
 Soldiers can be a bit fiddly to manipulate, but once you get the hang
-of it you’ll find it second nature.
+of it you'll find it second nature.
+
 
 Drafting some dwarves
 =====================
@@ -26,39 +20,44 @@ and toughness before drafting them. Others like to use miners (which
 train up quickly and are thus easy to replace) as they usually are
 quite strong and tough already.
 
-As a further consideration, some don’t like to recruit women as
+As a further consideration, some don't like to recruit women as
-soldiers. When they give birth it’s not uncommon to see them running
+soldiers. When they give birth it's not uncommon to see them running
 into battle carrying a baby. This is both somewhat alarming and
-somewhat risky as you’re going to have potentially dead babies on your
+somewhat risky as you're going to have potentially dead babies on your
 hands due to combat, something that might cause a lot of emo among your
 dwarves.
 
-For this tutorial we’re not going to worry about detail to much and
+For this tutorial we're not going to worry about detail to much and
-we’re just going to grab 6 peasants – which is 10% of my current
+we're just going to grab 6 peasants – which is 10% of my current
 fortress population. Something similar will work for you for now. So
-here’s what we’ll do:
+here's what we'll do:
 
 * Hit :kbd:`m` for the :guilabel:`military` screen.
 
-You’ll note this screen is not unlike the :kbd:`u`, :guilabel:`units` screen.
+You'll note this screen is not unlike the :kbd:`u`, :guilabel:`units` screen.
 The difference is that there are a few different commands at the bottom of
 the panel. Primarily, this screen lets you organise your squads and it
-lets you set squad weapons. We’re going to aim for two squads of three
+lets you set squad weapons. We're going to aim for two squads of three
 dwarves. Smaller squads helps your response time to enemy threat and
 gives you a bit more control. Lets get on with it:
 
 * Scroll to one of your no-life peasant dwarves, hit :kbd:`Enter`. Now when
-  you move your arrow you will see the peasant is marked and there’s an
+  you move your arrow you will see the peasant is marked and there's an
-  arrow to chose another dwarf. Chose another pleb, hit enter.
+  arrow to chose another dwarf. Chose another pleb, hit :kbd:`Enter`.
-* Scroll, chose another dwarf, and hit enter again.
+* Scroll, chose another dwarf, and hit :kbd:`Enter` again.
-* Hit space to stop promoting. We’ve created our first squad.
+* Hit space to stop promoting. We've created our first squad.
-* Chose another spare peasant, hit enter to promote and then choosing
+* Chose another spare peasant, hit :kbd:`Enter` to promote and then choosing
   two more dwarves, create squad two.
 
 You will now note that the dwarves in the same squad are now sharing the
-same squad name, 'The Relieved Irons' and 'The Muscular Palaces' for
+same squad name, :guilabel:`The Razonrs of Handling` and
-me, awesome! But they’re not doing anything yet, they’re assigned to
+:guilabel:`Fortresses of Sorcery` for me!
-squads but aren’t active doing soldierly stuff, so:
+
+.. image:: images/08-barracks.png
+   :align: center
+
+But they're not doing anything yet, they're assigned to
+squads but aren't active doing soldierly stuff, so:
 
 * Scroll to the first squad leader, hit :kbd:`a` for activate.
 * Scroll to the second squad leaders and :kbd:`a` activate him as well.
@@ -66,13 +65,13 @@ squads but aren’t active doing soldierly stuff, so:
   with their names in grey.
 * On the first squad leader, hit :kbd:`v` for view squad.
 * If the squad is :guilabel:`on duty` hit :kbd:`t`  to stand them down.
-* Hit :kbd:`f` for :guilabel:`Food carried` and they’ll go get backpacks
+* Hit :kbd:`f` for :guilabel:`Food carried` and they'll go get backpacks
   and put a stock of food in them for long duties.
 * Leave other settings and repeat for squad two.
 
 Our dwarves are now soldiers and are going to go do soldierly things.
-What’s that you ask? Well, drink, eat and hang around the barracks
+What's that you ask? Well, drink, eat and hang around the barracks
-sparing mostly. But shouldn’t we give them some weapons and armor?
+sparing mostly. But shouldn't we give them some weapons and armor?
 Maybe, is the answer, lets show you how:
 
 * With the military screen up, hit :kbd:`w` for weapons.
@@ -83,8 +82,8 @@ Maybe, is the answer, lets show you how:
   Then go to the next column and hit :kbd:`Enter` until you see
   :guilabel:`Shd` for shield.
 * If you look further down your weapons list you may note how
-  woodcutters are armed with an axe. And note that any you’ve told to be
+  woodcutters are armed with an axe. And note that any you've told to be
-  woodcutters who don’t have an axe won’t cut wood… although they might
+  woodcutters who don't have an axe won't cut wood… although they might
   try and arm themselves due to being tasked. Anyway…
 * Space back out.
 
@@ -106,39 +105,42 @@ to spar unarmed? A few reasons:
    micromanagement in the stocks screen (ie. forcing them to pick up
    wooden weapons and later on dropping them in favour of proper weapons).
 
-One thing you might want to think about is providing food and drink and
+Using the :kbd:`m` military :kbd:`a` alerts system, start training!
-somewhere to eat close to your military dwarves. That way they will
-hopefully spend more time training and less time walking! Here’s how I
-set up a small dining room and a small food stockpile. Note, the whole
-area is outside – I’m hoping that some regular exposure to the sun
-while the soldiers eat will prevent them getting too cave adapted. I’ve
-had to roof over the bit with the tables and chairs though, those need
-to be placed inside. You can :kbd:`b`, :kbd:`C` construct a ramp in
-the outdoors area and then :kbd:`b`, :kbd:`C` construct a floor to
-cover the area (you go up a
-level, build a floor over the space, and it thus becomes a roof). But
-we will cover some of this in another tutorial as well.
 
-.. image:: images/08-barracks.png
+.. image:: images/08-training.png
    :align: center
 
-…hmm, actually, I have so many bloody dwarves I’m going to put each
+Specifically:  we want them training in small groups, in every month.
-squad up to four members each. That means we’ll have up to 8 dwarves
+This is the fastest way to build martial skill, since they don't all stop
+if one lazy midget wants a drink.
+
+.. image:: images/08-schedule.png
+   :align: center
+
+One thing you might want to think about is providing food and drink and
+somewhere to eat close to your military dwarves. That way they will
+hopefully spend more time training and less time walking!
+
+.. image:: images/08-squad.png
+   :align: center
+
+...hmm, actually, I have so many bloody dwarves I'm going to put each
+squad up to four members each. That means we'll have up to 8 dwarves
 sparing at once, good stuff. To add more dwarves, go to the military
 screen again, hit enter on the leader and then chose a dwarf to add to
 the squad.
 
-Note: It’s possible to end up with really convoluted command structures
+Note: It's possible to end up with really convoluted command structures
 by accidentally making the boss of one squad the boss of another squad.
 This is annoying and pointless, as far as I can tell. To fix it, chose
 the problematic squad or person, hit enter on them, and then hit enter
 again. Hopefully that will remove them back up the chain of command.
 Or, hit enter on the boss and then enter on the dwarves 2 steps down,
-that will pull them back up to being directly under the boss’s command.
+that will pull them back up to being directly under the boss's command.
 
 While the boys are sparring go to your leather workshop and make sure
-you’ve got some backpacks, armor and helms on order. You can check your
+you've got some backpacks, armor and helms on order. You can check your
-stocks too, to make sure there’s enough kit to go around. In time we’ll
+stocks too, to make sure there's enough kit to go around. In time we'll
 get our lads into steel chainmail and plate, but for now, we need to
 get them into leather, and yes, armor does stack later.
 
@@ -153,7 +155,7 @@ on (so it gets built and so you will be training animals).
 Then, go to the kennels using :kbd:`q` and hit :kbd:`a` for add task
 and then :kbd:`w` for :guilabel:`Train War Dog`. Hit :kbd:`r` to set
 the task on repeat. Hopefully all
-the adult dogs will now go about being trained. You’ll soon start
+the adult dogs will now go about being trained. You'll soon start
 getting messages like :guilabel:`An animal has become a stray war dog`. Good!
 
 How can these help us? Well, we can either assign them to restraints we
@@ -170,19 +172,7 @@ can assign them to soldiers. Lets assign one to each soldier:
 
 You can also train hunting dogs at a kennels and they are quite handy
 for hunters, since they too have the ambush skill that Hunters use. I
-don’t usually bother with hunter dwarves so wardogs is all I want!
+don't usually bother with hunter dwarves so wardogs is all I want!
-Hordes of the buggers! Oh, a note on caged animals. Cages, when built
-(:kbd:`b`, :kbd:`j`), allow the assigning of animals to them, and can be
-used as a zoo. dwarves enjoy relaxing in Zoos and looking at animals they
-like (happy thoughts). Consider building a zoo near the dining room.
-When placing cages, if you already have animals in them, hit :kbd:`x` to
-expand the view and chose the exact cage you want to place. Here’s my
-zoo, where the old housing used to be before we moved it all down stairs.
-
-.. image:: images/08-zoo.png
-   :align: center
-
-Right, where were we!?
 
 Get tough, little guys!
 =======================
@@ -196,46 +186,42 @@ point they will no longer accept work dogs and become impossible to
 assign other jobs. The good news though, is that champions will
 actually use artifact items! Yay! So, let them train and while that
 goes on, keep digging as per the last chapter. Grid up all the digable
-space on the various levels and find gems, ore and a special surprise!
+space on the various levels and find gems, ore and whatever else is around!
-You’ll know it when you find it, you’ll be alerted by  DF’s equivalent
-of a popup. We’ll cover what to do with your special surprise later. If
-you come across it put a door on the passage to the surprise and leave
-it until later.
 
 Ok, lets assume your boys have trained up to pretty damn good
-wrestlers, getting very tough and agile in the process. What’s the next
+wrestlers, getting very tough and agile in the process. What's the next
-step? Well, we’d like them to use chainmail, right? We could set them
+step? Well, we'd like them to use chainmail, right? We could set them
-right into plate, but plate slows them down if they aren’t very good
+right into plate, but plate slows them down if they aren't very good
-armor users (they won’t be yet). Chain will be just fine. Hopefully
+armor users (they won't be yet). Chain will be just fine. Hopefully
-you’ve build a good pile of steel chainmail, helms, shields, grieves
+you've build a good pile of iron chainmail, helms, shields, grieves
-and whatever else you can see on the list. Now it’s time to assign.
+and whatever else you can see on the list. Now it's time to assign.
 
-At the same time you’ve set a lot of steel warhammers to be built,
+At the same time you've set a lot of iron warhammers to be built,
 right? Good!
 
 But before we assign the weapons we want to make sure our soldiers
-don’t pick up the wrong armor, right? So this is what we do:
+don't pick up the wrong armor, right? So this is what we do:
 
 * Go to your stocks menu under :kbd:`z`. You should now see all your stocks
   updated by your bookkeeper, handy!
 * Find the :guilabel:`weapons` first. Scroll through and look for any other
-  hammers. Chances are :guilabel:`steel hammers` are all you have. For good
+  hammers. Chances are :guilabel:`iron hammers` are all you have. For good
   measure, set everything that looks useless (ie, not an axe or a pick)
   to :kbd:`m` for melt. Or put that trash into weapon traps.
 * Go to the :guilabel:`armor` list (and subsequent clothing lists) and look for
-  chainmail. Any chain item that isn’t steel chainmail set to :guilabel:`forbid`
+  chainmail. Any chain item that isn't iron chainmail set to :guilabel:`forbid`
-  using :kbd:`f`. Now your boys won’t go picking up the rubbish when you
+  using :kbd:`f`. Now your boys won't go picking up the rubbish when you
-  change their armor setting. Make sure you’ve got enough suits of
+  change their armor setting. Make sure you've got enough suits of
-  chainmail armor, steel shields, helms, etc, to equip your lads. Or near
+  chainmail armor, shields, helms, etc, to equip your lads. Or near
   enough.
-* If you’re unhappy with how your armor settings turn out, set everyone
+* If you're unhappy with how your armor settings turn out, set everyone
-  to no armor and once they’ve dumped all their items, go back through
+  to no armor and once they've dumped all their items, go back through
   the equiping process again.
 
 Now, you can go to the :kbd:`m` military menu and hit :kbd:`w` for the weapons
 and change them from :guilabel:`Lth` to :guilabel:`Chn` and the
 weapon to :guilabel:`Ham`. Your
-dwarves will rush off, grab a warhammer and throw some steel chainmail
+dwarves will rush off, grab a warhammer and throw some chainmail
 on top of their leather armor, great! If a few of them get to be
 awesome armor users you can change them to plate and they will even put
 the plate on top of their chain on top of their leather. A tiny, cute,
@@ -243,7 +229,7 @@ drunk, ball of fury!
 
 MAD: Mutually Assured Dwarfiness
 ================================
-How do you use your dwarves then? Well, when they aren’t mucking about
+How do you use your dwarves then? Well, when they aren't mucking about
 your barracks working on their skills they can be out fighting bad
 guys! How I do it, when invaded is:
 
@@ -258,14 +244,14 @@ guys! How I do it, when invaded is:
   point (and keep hitting :kbd:`p` to place more).
 
 Your soldiers will now stop what they are doing and rush to the station
-point. Sometimes it’s a good idea to set it in a safe place first, so
+point. Sometimes it's a good idea to set it in a safe place first, so
 you can at least get a few moving all at the same time. If you just
 drop the station point in the middle of the bad guys you risk your lads
 charging in one by one.
 
-There’s a lot of ways of handling military, and we haven’t even covered
+There's a lot of ways of handling military, and we haven't even covered
 crossbow weilding marksdwarves, multiple weapons, archery targets, or
 any of that stuff. For now, go and build your military and come back
-for the next tutorial where we’ll round out your Dwarf Fortress lesson
+for the next tutorial where we'll round out your Dwarf Fortress lesson
-with some thoughts on magma, construction and fortress design!
+with some final touches!