Better setup instructions

chapters/chap01-setup-starting.rst

@@ -19,21 +19,11 @@ dwarfy fun! And carp. Never forget the carp…
 
 Set Up
 ======
+:DFFD:`Download the walkthrough pack here. <11171>`
 
-.. note::
-
-    This tutorial uses a pre-configured install of DF, with a basic
-    save generated for you and less extra stuff than general-purpose
-    community packages.  It still includes graphics and UI upgrades,
-    though!
-
-    :DFFD:`Download the walkthrough pack here. <11171>`
-
-    Later, you might prefer to move your save over to the
-    :DFFD:`Starter Pack <7622>`, to take advantage of all the other
-    tools and options it offers - to suit everyone up to long-time
-    players and DF experts.
-
+This tutorial uses a pre-configured install of DF, with the same
+save and all the extras you need - but no more.  If that's not
+going to work for you, see the guide to :ref:`setting-up-df`.
 
 After downloading the pack, you need to unzip the folder onto your hard
 drive (but *not* in ``Program Files``). Then create a shortcut on your
@@ -89,9 +79,8 @@ While you examine your surroundings you should be able to spot tree
 trunks and the grassy areas easy enough, same with (frozen) ponds and
 the stream and bushes. Other tiles won’t make much sense, these tend to
 be the slightly-arcane zones like open air spaces (pale blue tiles, or
-tiles with dots) and the earth (brown tiles) and slope tiles (up and
-down triangles). The screenshot below should help point those features
-out.
+tiles with dots) and the earth (brown tiles) and slope or ramp tiles (upward
+triangles). The screenshot below should help point those features out.
 
 .. image:: images/01-features-lvl108.png
    :align: center
@@ -362,7 +351,7 @@ you’ve got food production up and running, you’ve set up a stockpile,
 you’ve set wood to be chopped and plants to be gathered and you know
 how to do some basic digging! You’ve come far!
 
-Before reading the next instalment, how about setting some more pants
+Before reading the next instalment, how about setting some more plants
 to be gathered and more wood to be chopped. Then, head on to Part 2 and
 we’ll learn all about workshops, bedrooms, dinning rooms and stairs! It
 will be ever so exciting, I promise!

chapters/chap09-end.rst

@@ -820,16 +820,15 @@ bones will build character, not body count!
 The End!
 ========
 And welcome to the end of the tutorial! By now you should be able
-to play the game on your own. If you`re lost as to what to do next,
-how about digging around and looking for more ore to smelt? How
-about poking around the caverns for some spider silk?
+to play the game on your own.  You can also check out the tutorials
+in the index, for short chapters that cover a particular topic.
 
-You can also check out the tutorials in the index, for short
-chapters that cover a particular topic. Generating a new world is
-always fun when your fort gets too stable!
-
-You might also consider a mega project like an enormous tower,
+You might consider a mega project like an enormous tower, a
 castle, or a fortress entirely surrounded by magma. There are many
 options, and just surviving the increasingly severe raids from
 goblins and other critters can be a challenge.
 
+You're also ready to upgrade to the :DFFD:`Starter Pack <7622>`,
+and explore the wider world of DF addons.  From alternative graphics
+to advanced tools or a real 3D visualiser... the world is your oyster!
+

misc/onLoadWorld.init

@@ -0,0 +1,22 @@
+# The contents of this file are executed as DFHack commands
+# when a world is loaded - good for bugfixes and other options.
+# In this case, it's used to deal with a number of issues that
+# new players don't need, to streamline the walkthrough.
+
+# Automatically manage labors (easier than Dwarf Therapist)
+autolabor 1
+
+# Better repeat jobs in workshops
+workflow enable
+
+# Automate nestbox and coffin assignment
+autonestbox start
+repeat -time 7 -timeUnits days -command [ burial ]
+
+# Add mouse-hover to scroll the game window
+mousequery edge enable
+
+# Performance tweaks
+tweak fast-heat
+repeat -time 1 -timeUnits months -command [ cleanowned scattered x ]
+repeat -time 1 -timeUnits months -command [ clean all ]

misc/setting-up.rst

@@ -0,0 +1,30 @@
+:orphan:
+
+.. _setting-up-df:
+
+#######################
+Setting up your install
+#######################
+
+For most people, the :DFFD:`standard pack <11171>` is the best way
+to get started - but not always.  If you're on OSX or Linux, or
+have some other reason to avoid the preset walkthrough pack, here's
+what you'll need:
+
+#. `Dwarf Fortress <http://bay12games.com/dwarves/>`_
+#. :forums:`DFHack <139553>`
+#. :wiki:`A graphics pack <Graphics_set_repository>`
+#. The save file from the standard pack (yep, download it anyway!)
+
+The easiest way to get all this working is usually via a
+:wiki:`Starter Pack <Utility:Lazy_Newb_Pack>`, which are also suitable
+for more advanced players (eg if you want to dive into the tutorials
+or even a masterclass).
+
+Just add :download:`this file <onLoadWorld.init>` to your DF
+folder; it configures DFHack to automate away many of the worst pain
+points for new players.
+
+Instructions for how to set up all of the components individually are
+beyond the scope of this quick guide, so check the link for each and
+experiment if anything is unclear.