Merge branch 'develop' of https://github.com/DFHack/dfhack into develop

Contributors.rst

@@ -80,6 +80,7 @@ melkor217               melkor217
 acwatkins               acwatkins
 Wes Malone              wesQ3
 Michon van Dooren       MaienM
+Seth Woodworth          sethwoodworth
 ======================= ====================    ===========================
 
 And these are the cool people who made **Stonesense**.

NEWS

@@ -22,8 +22,9 @@ DFHack Future
     New scripts
         burial:  sets all unowned coffins to allow burial ("-pets" to allow pets too)
         fix-ster:  changes fertility/sterility of animals or dwarves
-        view-item-info: adds information and customisable descriptions to item viewscreens
+        view-item-info:  adds information and customisable descriptions to item viewscreens
         warn-starving:  check for starving, thirsty, or very drowsy units and pause with warning if any are found
+        points:  set number of points available at embark screen
     New tweaks
         kitchen-keys: Fixes DF kitchen meal keybindings
         kitchen-prefs-color: Changes color of enabled items to green in kitchen preferences

Readme.rst

@@ -291,6 +291,11 @@ control of the game.
 * Activate with 'forcepause 1'
 * Deactivate with 'forcepause 0'
 
+hide / show
+-----------
+Hides or shows the DFHack terminal window, respectively.  To use ``show``, use
+the in-game console (default keybinding Ctrl-Shift-P).  Only available on Windows.
+
 nopause
 -------
 Disables pausing (both manual and automatic) with the exception of pause forced
@@ -2589,6 +2594,12 @@ Example::
 
     multicmd locate-ore iron ; digv
 
+points
+======
+Sets available points at the embark screen to the specified number.  Eg.
+``points 1000000`` would allow you to buy everything, or ``points 0`` would
+make life quite difficult.
+
 position
 ========
 Reports the current time:  date, clock time, month, and season.  Also reports
@@ -2670,6 +2681,13 @@ Other options available: ``del``, ``clear``, ``list``.
 
 This plugin also shortens the 'sleeping' and 'on break' periods of targets.
 
+startdwarf
+==========
+Use at the embark screen to embark with the specified number of dwarves.  Eg.
+``startdwarf 500`` would lead to a severe food shortage and FPS issues, while
+``startdwarf 10`` would just allow a few more warm bodies to dig in.
+The number must be 7 or greater.
+
 stripcaged
 ==========
 For dumping items inside cages. Will mark selected items for dumping, then

library/xml

@@ -1 +1 @@
-Subproject commit 7cfed040fe83b94fb6b97afec1c5d86ccf1cb81e
+Subproject commit fd62449d10f58726996c26cf31f02912e7ef692d

scripts/points.lua

@@ -0,0 +1,3 @@
+-- by Meph
+-- http://www.bay12forums.com/smf/index.php?topic=135506.msg4925005#msg4925005
+df.global.world.worldgen.worldgen_parms.embark_points=tonumber(...)