From 9d4d0b195a3fbf3c1e672deb0be87c81b9d0cd66 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Wed, 22 Jan 2020 17:33:39 +0100
Subject: [PATCH 001/547] Added switches for farm seeds and plant counts

---
 docs/changelog.txt    |   5 ++
 plugins/getplants.cpp | 198 +++++++++++++++++++++++++++++++++++-------
 2 files changed, 172 insertions(+), 31 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 5c1b37561..41b371a8e 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -35,6 +35,11 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ======== IMPORTANT: rename this, and add a new "future" section, BEFORE ========
 ======== making a new DFHack release!                                   ========
 ================================================================================
+# Future
+
+## Misc Improvements
+- `getplants`: added switches for designations for farming seeds and for max number designated per plant
+
 # 0.44.12-r3
 
 ## New Plugins
diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp
index ebd64d8d1..11717b36b 100644
--- a/plugins/getplants.cpp
+++ b/plugins/getplants.cpp
@@ -38,16 +38,53 @@ enum class selectability {
     Unselected
 };
 
-//selectability selectablePlant(color_ostream &out, const df::plant_raw *plant)
-selectability selectablePlant(const df::plant_raw *plant)
+//  Determination of whether seeds can be collected is somewhat messy:
+//    - Growths of type SEEDS are collected only if they are edible either raw or cooked.
+//    - Growths of type PLANT_GROWTH are collected provided the STOCKPILE_PLANT_GROWTH
+//      flag is set.
+//  The two points above were determined through examination of the DF code, while the ones
+//  below were determined through examination of the behavior of bugged, working, and
+//  RAW manipulated shrubs on embarks.
+//    - If seeds are defined as explicit growths, they are the source of seeds, overriding
+//      the default STRUCTURAL part as the source.
+//    - If a growth has the reaction that extracts seeds as a side effect of other
+//      processing (brewing, eating raw, etc.), this overrides the STRUCTURAL part as the
+//      source of seeds. However, for some reason it does not produce seeds from eating
+//      raw growths unless the structural part is collected (at least for shrubs: other
+//      processing was not examined).
+//    - If a growth has a (non vanilla) reaction that produces seeds, seeds are produced,
+//      provided there is something (such as a workshop order) that triggers it.
+//  The code below is satisfied with detection of a seed producing reaction, and does not
+//  detect the bugged case where a seed extraction process is defined but doesn't get
+//  triggered. Such a process can be triggered either as a side effect of other
+//  processing, or as a workshop reaction, and it would be overkill for this code to
+//  try to determine if a workshop reaction exists and has been permitted for the played
+//  race.
+//  There are two bugged cases of this in the current vanilla RAWs:
+//  Both Red Spinach and Elephant-Head Amaranth have the seed extraction reaction
+//  explicitly specified for the structural part, but no other use for it. This causes
+//  these parts to be collected (a valid reaction is defined), but remain unusable. This
+//  is one ofthe issues in bug 9640 on the bug tracker (the others cases are detected and
+//  result in the plants not being usable for farming or even collectable at all).
+
+//selectability selectablePlant(color_ostream &out, const df::plant_raw *plant, bool farming)
+selectability selectablePlant(const df::plant_raw *plant, bool farming)
 {
     const DFHack::MaterialInfo basic_mat = DFHack::MaterialInfo(plant->material_defs.type_basic_mat, plant->material_defs.idx_basic_mat);
     bool outOfSeason = false;
+    selectability result = selectability::Nonselectable;
 
     if (plant->flags.is_set(plant_raw_flags::TREE))
     {
 //        out.print("%s is a selectable tree\n", plant->id.c_str());
-        return selectability::Selectable;
+        if (farming)
+        {
+            return selectability::Nonselectable;
+        }
+        else
+        {
+            return selectability::Selectable;
+        }
     }
     else if (plant->flags.is_set(plant_raw_flags::GRASS))
     {
@@ -55,11 +92,26 @@ selectability selectablePlant(const df::plant_raw *plant)
         return selectability::Grass;
     }
 
+    if (farming && plant->material_defs.type_seed == -1)
+    {
+        return selectability::Nonselectable;
+    }
+
     if (basic_mat.material->flags.is_set(material_flags::EDIBLE_RAW) ||
         basic_mat.material->flags.is_set(material_flags::EDIBLE_COOKED))
     {
 //        out.print("%s is edible\n", plant->id.c_str());
-        return selectability::Selectable;
+        if (farming)
+        {
+            if (basic_mat.material->flags.is_set(material_flags::EDIBLE_RAW))
+            {
+                result = selectability::Selectable;
+            }
+        }
+        else
+        {
+            return selectability::Selectable;
+        }
     }
 
     if (plant->flags.is_set(plant_raw_flags::THREAD) ||
@@ -69,14 +121,28 @@ selectability selectablePlant(const df::plant_raw *plant)
         plant->flags.is_set(plant_raw_flags::EXTRACT_STILL_VIAL))
     {
 //        out.print("%s is thread/mill/extract\n", plant->id.c_str());
-        return selectability::Selectable;
+        if (farming)
+        {
+            result = selectability::Selectable;
+        }
+        else
+        {
+            return selectability::Selectable;
+        }
     }
 
     if (basic_mat.material->reaction_product.id.size() > 0 ||
         basic_mat.material->reaction_class.size() > 0)
     {
 //        out.print("%s has a reaction\n", plant->id.c_str());
-        return selectability::Selectable;
+        if (farming)
+        {
+            result = selectability::Selectable;
+        }
+        else
+        {
+            return selectability::Selectable;
+        }
     }
 
     for (size_t i = 0; i < plant->growths.size(); i++)
@@ -91,16 +157,37 @@ selectability selectablePlant(const df::plant_raw *plant)
                 (plant->growths[i]->item_type == df::item_type::PLANT_GROWTH &&
                  growth_mat.material->flags.is_set(material_flags::LEAF_MAT)))  //  Will change name to STOCKPILE_PLANT_GROWTH any day now...
             {
+                bool seedSource = plant->growths[i]->item_type == df::item_type::SEEDS;
+
+                if (plant->growths[i]->item_type == df::item_type::PLANT_GROWTH)
+                {
+                    for (size_t k = 0; growth_mat.material->reaction_product.material.mat_type.size(); k++)
+                    {
+                        if (growth_mat.material->reaction_product.material.mat_type[k] == plant->material_defs.type_seed &&
+                            growth_mat.material->reaction_product.material.mat_index[k] == plant->material_defs.idx_seed)
+                        {
+                            seedSource = true;
+                            break;
+                        }
+                    }
+                }
+
                 if (*cur_year_tick >= plant->growths[i]->timing_1 &&
                     (plant->growths[i]->timing_2 == -1 ||
                         *cur_year_tick <= plant->growths[i]->timing_2))
                 {
 //                     out.print("%s has an edible seed or a stockpile growth\n", plant->id.c_str());
-                    return selectability::Selectable;
+                    if (!farming || seedSource)
+                    {
+                        return selectability::Selectable;
+                    }
                 }
                 else
                 {
-                    outOfSeason = true;
+                    if (!farming || seedSource)
+                    {
+                        outOfSeason = true;
+                    }
                 }
             }
         }
@@ -133,7 +220,7 @@ selectability selectablePlant(const df::plant_raw *plant)
     else
     {
 //        out.printerr("%s cannot be gathered\n", plant->id.c_str());
-        return selectability::Nonselectable;
+        return result;
     }
 }
 
@@ -143,8 +230,8 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
     std::vector<selectability> plantSelections;
     std::vector<size_t> collectionCount;
     set<string> plantNames;
-    bool deselect = false, exclude = false, treesonly = false, shrubsonly = false, all = false, verbose = false;
-
+    bool deselect = false, exclude = false, treesonly = false, shrubsonly = false, all = false, verbose = false, farming = false;
+    size_t maxCount = 999999;
     int count = 0;
 
     plantSelections.resize(world->raws.plants.all.size());
@@ -160,20 +247,43 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
 
     for (size_t i = 0; i < parameters.size(); i++)
     {
-        if(parameters[i] == "help" || parameters[i] == "?")
+        if (parameters[i] == "help" || parameters[i] == "?")
             return CR_WRONG_USAGE;
-        else if(parameters[i] == "-t")
+        else if (parameters[i] == "-t")
             treesonly = true;
-        else if(parameters[i] == "-s")
+        else if (parameters[i] == "-s")
             shrubsonly = true;
-        else if(parameters[i] == "-c")
+        else if (parameters[i] == "-c")
             deselect = true;
-        else if(parameters[i] == "-x")
+        else if (parameters[i] == "-x")
             exclude = true;
-        else if(parameters[i] == "-a")
+        else if (parameters[i] == "-a")
             all = true;
-        else if(parameters[i] == "-v")
+        else if (parameters[i] == "-v")
             verbose = true;
+        else if (parameters[i] == "-f")
+            farming = true;
+        else if (parameters[i] == "-n")
+        {
+            if (parameters.size() > i + 1)
+            {
+                maxCount = atoi(parameters[i + 1].c_str());
+                if (maxCount >= 1)
+                {
+                    i++;  //  We've consumed the next parameter, so we need to progress the iterator.
+                }
+                else
+                {
+                    out.printerr("-n requires a positive integer parameter!\n");
+                    return CR_WRONG_USAGE;
+                }
+            }
+            else
+            {
+                out.printerr("-n requires a positive integer parameter!\n");
+                return CR_WRONG_USAGE;
+            }
+        }
         else
             plantNames.insert(parameters[i]);
     }
@@ -182,6 +292,11 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
         out.printerr("Cannot specify both -t and -s at the same time!\n");
         return CR_WRONG_USAGE;
     }
+    if (treesonly && farming)
+    {
+        out.printerr("Cannot specify both -t and -f at the same time!\n");
+        return CR_WRONG_USAGE;
+    }
     if (all && exclude)
     {
         out.printerr("Cannot specify both -a and -x at the same time!\n");
@@ -200,14 +315,14 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
         df::plant_raw *plant = world->raws.plants.all[i];
         if (all)
         {
-//            plantSelections[i] = selectablePlant(out, plant);
-            plantSelections[i] = selectablePlant(plant);
+//            plantSelections[i] = selectablePlant(out, plant, farming);
+            plantSelections[i] = selectablePlant(plant, farming);
         }
          else if (plantNames.find(plant->id) != plantNames.end())
         {
             plantNames.erase(plant->id);
-//            plantSelections[i] = selectablePlant(out, plant);
-            plantSelections[i] = selectablePlant(plant);
+//            plantSelections[i] = selectablePlant(out, plant, farming);
+            plantSelections[i] = selectablePlant(plant, farming);
             switch (plantSelections[i])
             {
             case selectability::Grass:
@@ -215,7 +330,14 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
                 break;
 
             case selectability::Nonselectable:
-                out.printerr("%s does not have any parts that can be gathered\n", plant->id.c_str());
+                if (farming)
+                {
+                    out.printerr("%s does not have any parts that can be gathered for seeds for farming\n", plant->id.c_str());
+                }
+                else
+                {
+                    out.printerr("%s does not have any parts that can be gathered\n", plant->id.c_str());
+                }
                 break;
 
             case selectability::OutOfSeason:
@@ -255,8 +377,8 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
         for (size_t i = 0; i < world->raws.plants.all.size(); i++)
         {
             df::plant_raw *plant = world->raws.plants.all[i];
-//            switch (selectablePlant(out, plant))
-            switch (selectablePlant(plant))
+//            switch (selectablePlant(out, plant, farming))
+            switch (selectablePlant(plant, farming))
                 {
             case selectability::Grass:
             case selectability::Nonselectable:
@@ -264,13 +386,21 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
 
             case selectability::OutOfSeason:
             {
-                out.print("* (shrub) %s - %s is out of season\n", plant->id.c_str(), plant->name.c_str());
+                if (!treesonly)
+                {
+                    out.print("* (shrub) %s - %s is out of season\n", plant->id.c_str(), plant->name.c_str());
+                }
                 break;
             }
 
             case selectability::Selectable:
             {
-                out.print("* (%s) %s - %s\n", plant->flags.is_set(plant_raw_flags::TREE) ? "tree" : "shrub", plant->id.c_str(), plant->name.c_str());
+                if ((treesonly && plant->flags.is_set(plant_raw_flags::TREE)) ||
+                    (shrubsonly && !plant->flags.is_set(plant_raw_flags::TREE)) ||
+                    (!treesonly && !shrubsonly))  // 'farming' weeds out trees when determining selectability, so no need to test that explicitly
+                {
+                    out.print("* (%s) %s - %s\n", plant->flags.is_set(plant_raw_flags::TREE) ? "tree" : "shrub", plant->id.c_str(), plant->name.c_str());
+                }
                 break;
             }
 
@@ -311,6 +441,8 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
             continue;
         if (cur->designation[x][y].bits.hidden)
             continue;
+        if (collectionCount[plant->material] >= maxCount)
+            continue;
         if (deselect && Designations::unmarkPlant(plant))
         {
             collectionCount[plant->material]++;
@@ -350,12 +482,16 @@ DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCom
         "Options:\n"
         "  -t - Tree: Select trees only (exclude shrubs)\n"
         "  -s - Shrub: Select shrubs only (exclude trees)\n"
+        "  -f - Farming: Designate only shrubs that yield seeds for farming. Implies -s\n"
         "  -c - Clear: Clear designations instead of setting them\n"
         "  -x - eXcept: Apply selected action to all plants except those specified\n"
-        "  -a - All: Select every type of plant (obeys -t/-s)\n"
-        "  -v - Verbose: lists the number of (un)designations per plant\n"
-        "Specifying both -t and -s will have no effect.\n"
-        "If no plant IDs are specified, all valid plant IDs will be listed.\n"
+        "  -a - All: Select every type of plant (obeys -t/-s/-f)\n"
+        "  -v - Verbose: List the number of (un)designations per plant\n"
+        "  -n * - Number: Designate up to * (an integer number) plants of each species\n"
+        "Specifying both -t and -s or -f will have no effect.\n"
+        "If no plant IDs are specified, and the -a switch isn't given, all valid plant\n"
+        "IDs will be listed with -t, -s, and -f restricting the list to trees, shrubs,\n"
+        "and farmable shrubs, respectively.\n"
     ));
     return CR_OK;
 }

From 04550499b698bd6484dd2d82886937e89411f343 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Wed, 22 Jan 2020 19:41:06 +0100
Subject: [PATCH 002/547] Updated getplants documentation

---
 docs/Plugins.rst | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index ac1f7dae8..d8d8bb85e 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -2298,16 +2298,19 @@ by spaces.
 
 Options:
 
-:``-t``: Select trees only (exclude shrubs)
-:``-s``: Select shrubs only (exclude trees)
-:``-c``: Clear designations instead of setting them
-:``-x``: Apply selected action to all plants except those specified (invert
+:``-t``: Tree: Select trees only (exclude shrubs)
+:``-s``: Shrub: Select shrubs only (exclude trees)
+:``-f``: Farming: Designate only shrubs that yield seeds for farming. Implies -s
+:``-c``: Clear: Clear designations instead of setting them
+:``-x``: eXcept: Apply selected action to all plants except those specified (invert
      selection)
-:``-a``: Select every type of plant (obeys ``-t``/``-s``)
-:``-v``: Lists the number of (un)designations per plant
+:``-a``: All: Select every type of plant (obeys ``-t``/``-s``/``-f``)
+:``-v``: Verbose: Lists the number of (un)designations per plant
+:``-n *``: Number: Designate up to * (an integer number) plants of each species
 
-Specifying both ``-t`` and ``-s`` will have no effect. If no plant IDs are specified,
-all valid plant IDs will be listed.
+Specifying both ``-t`` and ``-s`` or ``-f`` will have no effect. If no plant IDs are
+specified, all valid plant IDs will be listed, with ``-t``, ``-s``, and ``-f``
+restricting the list to trees, shrubs, and farmable shrubs, respectively.
 
 .. note::
 
@@ -2317,7 +2320,13 @@ all valid plant IDs will be listed.
     This leads to some shrubs being designated when they shouldn't be, causing a
     plant gatherer to walk there and do nothing (except clearing the
     designation). See :issue:`1479` for details.
-
+    
+    The implementation another known deficiency: it's incapable of detecting that
+    RAW definitions that specify a seed extraction reaction for the structural part
+    but has no other use for it cannot actually yield any seeds, as the part is
+    never used (parts of bug tracker report 6940, e.g. Red Spinach), even though DF
+    collects it, unless there's a workshop reaction to do it (which there isn't
+    in vanilla).
 
 .. _infiniteSky:
 

From c6bbf39c6c906a1600b9597f96da2760d6be7dd4 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Sat, 25 Jan 2020 12:43:02 +0100
Subject: [PATCH 003/547] Issue #1262. Added Items::getTitle and used in stocks

---
 docs/changelog.txt              |  8 ++++
 library/include/modules/Items.h |  5 ++
 library/modules/Items.cpp       | 81 +++++++++++++++++++++++++++++++++
 plugins/stocks.cpp              | 14 ++++--
 4 files changed, 105 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 5c1b37561..9e4bef7a0 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -35,6 +35,14 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ======== IMPORTANT: rename this, and add a new "future" section, BEFORE ========
 ======== making a new DFHack release!                                   ========
 ================================================================================
+# Future
+
+## Fixes
+- `stocks`: fixed display of titles by using the new ``Items::`getTitle`` operation before the original one, issue 1262
+
+## API
+- Added ``Items::`getTitle`` to get titles of "books". Catches titles buried in improvements, unlike getDescription.
+
 # 0.44.12-r3
 
 ## New Plugins
diff --git a/library/include/modules/Items.h b/library/include/modules/Items.h
index 776e935eb..e232bc953 100644
--- a/library/include/modules/Items.h
+++ b/library/include/modules/Items.h
@@ -159,6 +159,11 @@ DFHACK_EXPORT df::unit *getHolderUnit(df::item *item);
 /// Returns the true position of the item.
 DFHACK_EXPORT df::coord getPosition(df::item *item);
 
+/// Returns the title of a codex or "tool", either as the codex title or as the title of the
+/// first page or writing it has that has a non blank title. An empty string is returned if
+/// no title is found (which is the casee for everything that isn't a "book").
+DFHACK_EXPORT std::string getTitle(df::item *item);
+
 /// Returns the description string of the item.
 DFHACK_EXPORT std::string getDescription(df::item *item, int type = 0, bool decorate = false);
 
diff --git a/library/modules/Items.cpp b/library/modules/Items.cpp
index a1b4ace4d..f102bcc78 100644
--- a/library/modules/Items.cpp
+++ b/library/modules/Items.cpp
@@ -59,6 +59,8 @@ using namespace std;
 #include "df/general_ref_unit_holderst.h"
 #include "df/historical_entity.h"
 #include "df/item.h"
+#include "df/item_bookst.h"
+#include "df/item_toolst.h"
 #include "df/item_type.h"
 #include "df/itemdef_ammost.h"
 #include "df/itemdef_armorst.h"
@@ -74,6 +76,9 @@ using namespace std;
 #include "df/itemdef_toyst.h"
 #include "df/itemdef_trapcompst.h"
 #include "df/itemdef_weaponst.h"
+#include "df/itemimprovement.h"
+#include "df/itemimprovement_pagesst.h"
+#include "df/itemimprovement_writingst.h"
 #include "df/job_item.h"
 #include "df/mandate.h"
 #include "df/map_block.h"
@@ -90,6 +95,7 @@ using namespace std;
 #include "df/viewscreen_itemst.h"
 #include "df/world.h"
 #include "df/world_site.h"
+#include "df/written_content.h"
 
 using namespace DFHack;
 using namespace df::enums;
@@ -681,6 +687,81 @@ static void addQuality(std::string &tmp, int quality)
     }
 }
 
+//  It's not impossible the functionality of this operation is provided by one of the unmapped item functions.
+std::string Items::getTitle(df::item *item)
+{
+    CHECK_NULL_POINTER(item);
+
+    std::string tmp;
+
+    if (item->getType() == df::item_type::BOOK)
+    {
+        if (virtual_cast<df::item_bookst>(item)->title != "")
+        {
+            return virtual_cast<df::item_bookst>(item)->title;
+        }
+        else
+        {
+            for (size_t i = 0; i < virtual_cast<df::item_bookst>(item)->improvements.size(); i++)
+            {
+                if (virtual_cast<df::item_bookst>(item)->improvements[i]->getType() == df::improvement_type::PAGES)
+                {
+                    for (size_t k = 0; k < virtual_cast<df::itemimprovement_pagesst>(virtual_cast<df::item_bookst>(item)->improvements[i])->contents.size(); k++)
+                    {
+                        df::written_content *contents = world->written_contents.all[virtual_cast<df::itemimprovement_pagesst>(virtual_cast<df::item_bookst>(item)->improvements[i])->contents[k]];
+                        if (contents->title != "")
+                        {
+                            return contents->title;
+                        }
+                    }
+                }
+                else if (virtual_cast<df::item_bookst>(item)->improvements[i]->getType() == df::improvement_type::WRITING)
+                {
+                    for (size_t k = 0; k < virtual_cast<df::itemimprovement_writingst>(virtual_cast<df::item_bookst>(item)->improvements[i])->contents.size(); k++)
+                    {
+                        df::written_content *contents = world->written_contents.all[virtual_cast<df::itemimprovement_writingst>(virtual_cast<df::item_bookst>(item)->improvements[i])->contents[k]];
+                        if (contents->title != "")
+                        {
+                            return contents->title;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    else if (item->getType() == df::item_type::TOOL &&
+        virtual_cast<df::item_toolst>(item)->hasToolUse(df::tool_uses::CONTAIN_WRITING))
+    {
+        for (size_t i = 0; i < virtual_cast<df::item_toolst>(item)->improvements.size(); i++)
+        {
+            if (virtual_cast<df::item_toolst>(item)->improvements[i]->getType() == df::improvement_type::PAGES)
+            {
+                for (size_t k = 0; k < virtual_cast<df::itemimprovement_pagesst>(virtual_cast<df::item_toolst>(item)->improvements[i])->contents.size(); k++)
+                {
+                    df::written_content *contents = world->written_contents.all[virtual_cast<df::itemimprovement_pagesst>(virtual_cast<df::item_toolst>(item)->improvements[i])->contents[k]];
+                    if (contents->title != "")
+                    {
+                        return contents->title;
+                    }
+                }
+            }
+            else if (virtual_cast<df::item_toolst>(item)->improvements[i]->getType() == df::improvement_type::WRITING)
+            {
+                for (size_t k = 0; k < virtual_cast<df::itemimprovement_writingst>(virtual_cast<df::item_toolst>(item)->improvements[i])->contents.size(); k++)
+                {
+                    df::written_content *contents = world->written_contents.all[virtual_cast<df::itemimprovement_writingst>(virtual_cast<df::item_toolst>(item)->improvements[i])->contents[k]];
+                    if (contents->title != "")
+                    {
+                        return contents->title;
+                    }
+                }
+            }
+        }
+    }
+
+    return "";
+}
+
 std::string Items::getDescription(df::item *item, int type, bool decorate)
 {
     CHECK_NULL_POINTER(item);
diff --git a/plugins/stocks.cpp b/plugins/stocks.cpp
index b5831d159..e44cbb431 100644
--- a/plugins/stocks.cpp
+++ b/plugins/stocks.cpp
@@ -30,7 +30,7 @@
 #include "df/ui_advmode.h"
 
 DFHACK_PLUGIN("stocks");
-#define PLUGIN_VERSION 0.12
+#define PLUGIN_VERSION 0.13
 
 REQUIRE_GLOBAL(world);
 
@@ -248,7 +248,11 @@ static string get_keywords(df::item *item)
 
 static string get_item_label(df::item *item, bool trim = false)
 {
-    auto label = Items::getDescription(item, 0, false);
+    auto label = Items::getTitle(item);
+    if (label == "")
+    {
+        label = Items::getDescription(item, 0, false);
+    }
     if (trim && item->getType() == item_type::BIN)
     {
         auto pos = label.find("<#");
@@ -562,7 +566,11 @@ class StockListColumn : public ListColumn<T>
         if (!ListColumn<T>::showEntry(entry, search_tokens))
             return false;
 
-        string item_name = toLower(Items::getDescription(entry->elem->entries[0], 0, false));
+        string item_name = toLower(Items::getTitle(entry->elem->entries[0]));
+        if (item_name == "")
+        {
+            item_name = toLower(Items::getDescription(entry->elem->entries[0], 0, false));
+        }
 
         if ((match_start || match_end) && raw_search.size() > item_name.size())
             return false;

From 876ac6c056a0a9f0ce91ea2a06fe46efa8f01953 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Sat, 25 Jan 2020 21:46:10 +0100
Subject: [PATCH 004/547] Renamed to getBookTitle, cut down on virtual_cast

---
 library/include/modules/Items.h |  2 +-
 library/modules/Items.cpp       | 56 ++++++++++++++++++---------------
 plugins/stocks.cpp              |  4 +--
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/library/include/modules/Items.h b/library/include/modules/Items.h
index e232bc953..838104bfe 100644
--- a/library/include/modules/Items.h
+++ b/library/include/modules/Items.h
@@ -162,7 +162,7 @@ DFHACK_EXPORT df::coord getPosition(df::item *item);
 /// Returns the title of a codex or "tool", either as the codex title or as the title of the
 /// first page or writing it has that has a non blank title. An empty string is returned if
 /// no title is found (which is the casee for everything that isn't a "book").
-DFHACK_EXPORT std::string getTitle(df::item *item);
+DFHACK_EXPORT std::string getBookTitle(df::item *item);
 
 /// Returns the description string of the item.
 DFHACK_EXPORT std::string getDescription(df::item *item, int type = 0, bool decorate = false);
diff --git a/library/modules/Items.cpp b/library/modules/Items.cpp
index f102bcc78..14700f9e7 100644
--- a/library/modules/Items.cpp
+++ b/library/modules/Items.cpp
@@ -688,7 +688,7 @@ static void addQuality(std::string &tmp, int quality)
 }
 
 //  It's not impossible the functionality of this operation is provided by one of the unmapped item functions.
-std::string Items::getTitle(df::item *item)
+std::string Items::getBookTitle(df::item *item)
 {
     CHECK_NULL_POINTER(item);
 
@@ -696,30 +696,32 @@ std::string Items::getTitle(df::item *item)
 
     if (item->getType() == df::item_type::BOOK)
     {
-        if (virtual_cast<df::item_bookst>(item)->title != "")
+        auto book = virtual_cast<df::item_bookst>(item);
+
+        if (book->title != "")
         {
-            return virtual_cast<df::item_bookst>(item)->title;
+            return book->title;
         }
         else
         {
-            for (size_t i = 0; i < virtual_cast<df::item_bookst>(item)->improvements.size(); i++)
+            for (size_t i = 0; i < book->improvements.size(); i++)
             {
-                if (virtual_cast<df::item_bookst>(item)->improvements[i]->getType() == df::improvement_type::PAGES)
+                if (auto page = virtual_cast<df::itemimprovement_pagesst>(book->improvements[i]))
                 {
-                    for (size_t k = 0; k < virtual_cast<df::itemimprovement_pagesst>(virtual_cast<df::item_bookst>(item)->improvements[i])->contents.size(); k++)
+                    for (size_t k = 0; k < page->contents.size(); k++)
                     {
-                        df::written_content *contents = world->written_contents.all[virtual_cast<df::itemimprovement_pagesst>(virtual_cast<df::item_bookst>(item)->improvements[i])->contents[k]];
+                        df::written_content *contents = world->written_contents.all[page->contents[k]];
                         if (contents->title != "")
                         {
                             return contents->title;
                         }
                     }
                 }
-                else if (virtual_cast<df::item_bookst>(item)->improvements[i]->getType() == df::improvement_type::WRITING)
+                else if (auto writing = virtual_cast<df::itemimprovement_writingst>(book->improvements[i]))
                 {
-                    for (size_t k = 0; k < virtual_cast<df::itemimprovement_writingst>(virtual_cast<df::item_bookst>(item)->improvements[i])->contents.size(); k++)
+                    for (size_t k = 0; k < writing->contents.size(); k++)
                     {
-                        df::written_content *contents = world->written_contents.all[virtual_cast<df::itemimprovement_writingst>(virtual_cast<df::item_bookst>(item)->improvements[i])->contents[k]];
+                        df::written_content *contents = world->written_contents.all[writing->contents[k]];
                         if (contents->title != "")
                         {
                             return contents->title;
@@ -729,30 +731,34 @@ std::string Items::getTitle(df::item *item)
             }
         }
     }
-    else if (item->getType() == df::item_type::TOOL &&
-        virtual_cast<df::item_toolst>(item)->hasToolUse(df::tool_uses::CONTAIN_WRITING))
+    else if (item->getType() == df::item_type::TOOL)
     {
-        for (size_t i = 0; i < virtual_cast<df::item_toolst>(item)->improvements.size(); i++)
+        auto book = virtual_cast<df::item_toolst>(item);
+
+        if (book->hasToolUse(df::tool_uses::CONTAIN_WRITING))
         {
-            if (virtual_cast<df::item_toolst>(item)->improvements[i]->getType() == df::improvement_type::PAGES)
+            for (size_t i = 0; i < book->improvements.size(); i++)
             {
-                for (size_t k = 0; k < virtual_cast<df::itemimprovement_pagesst>(virtual_cast<df::item_toolst>(item)->improvements[i])->contents.size(); k++)
+                if (auto page = virtual_cast<df::itemimprovement_pagesst>(book->improvements[i]))
                 {
-                    df::written_content *contents = world->written_contents.all[virtual_cast<df::itemimprovement_pagesst>(virtual_cast<df::item_toolst>(item)->improvements[i])->contents[k]];
-                    if (contents->title != "")
+                    for (size_t k = 0; k < page->contents.size(); k++)
                     {
-                        return contents->title;
+                        df::written_content *contents = world->written_contents.all[page->contents[k]];
+                        if (contents->title != "")
+                        {
+                            return contents->title;
+                        }
                     }
                 }
-            }
-            else if (virtual_cast<df::item_toolst>(item)->improvements[i]->getType() == df::improvement_type::WRITING)
-            {
-                for (size_t k = 0; k < virtual_cast<df::itemimprovement_writingst>(virtual_cast<df::item_toolst>(item)->improvements[i])->contents.size(); k++)
+                else if (auto writing = virtual_cast<df::itemimprovement_writingst>(book->improvements[i]))
                 {
-                    df::written_content *contents = world->written_contents.all[virtual_cast<df::itemimprovement_writingst>(virtual_cast<df::item_toolst>(item)->improvements[i])->contents[k]];
-                    if (contents->title != "")
+                    for (size_t k = 0; k < writing->contents.size(); k++)
                     {
-                        return contents->title;
+                        df::written_content *contents = world->written_contents.all[writing->contents[k]];
+                        if (contents->title != "")
+                        {
+                            return contents->title;
+                        }
                     }
                 }
             }
diff --git a/plugins/stocks.cpp b/plugins/stocks.cpp
index e44cbb431..4439d820a 100644
--- a/plugins/stocks.cpp
+++ b/plugins/stocks.cpp
@@ -248,7 +248,7 @@ static string get_keywords(df::item *item)
 
 static string get_item_label(df::item *item, bool trim = false)
 {
-    auto label = Items::getTitle(item);
+    auto label = Items::getBookTitle(item);
     if (label == "")
     {
         label = Items::getDescription(item, 0, false);
@@ -566,7 +566,7 @@ class StockListColumn : public ListColumn<T>
         if (!ListColumn<T>::showEntry(entry, search_tokens))
             return false;
 
-        string item_name = toLower(Items::getTitle(entry->elem->entries[0]));
+        string item_name = toLower(Items::getBookTitle(entry->elem->entries[0]));
         if (item_name == "")
         {
             item_name = toLower(Items::getDescription(entry->elem->entries[0], 0, false));

From 121497a466df789cac5a6d9ecf206538c01d0cb7 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Sun, 26 Jan 2020 11:47:47 +0100
Subject: [PATCH 005/547] Propagated getBookTitle to Lua

---
 docs/Lua API.rst                | 6 ++++++
 docs/changelog.txt              | 4 ++--
 library/LuaApi.cpp              | 1 +
 library/include/modules/Items.h | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index a4130096b..d7e94b92a 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -1292,6 +1292,12 @@ Items module
 
   Returns true *x,y,z* of the item, or *nil* if invalid; may be not equal to item.pos if in inventory.
 
+* ``dfhack.items.getBookTitle(item)``
+
+  Returns the title of the "book" item, or an empty string if the item isn't a "book" or it doesn't
+  have a title. A "book" is a codex or a tool item that has page or writings improvements, such as
+  scrolls and quires.
+
 * ``dfhack.items.getDescription(item, type[, decorate])``
 
   Returns the string description of the item, as produced by the ``getItemDescription``
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 9e4bef7a0..36ac237be 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -38,10 +38,10 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 # Future
 
 ## Fixes
-- `stocks`: fixed display of titles by using the new ``Items::`getTitle`` operation before the original one, issue 1262
+- `stocks`: fixed display of titles by using the new ``Items::getBookTitle`` operation before the original one
 
 ## API
-- Added ``Items::`getTitle`` to get titles of "books". Catches titles buried in improvements, unlike getDescription.
+- Added ``Items::getBookTitle`` to get titles of "books". Catches titles buried in improvements, unlike getDescription.
 
 # 0.44.12-r3
 
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 7c3ef965d..1d127930e 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -1766,6 +1766,7 @@ static const LuaWrapper::FunctionReg dfhack_items_module[] = {
     WRAPM(Items, getContainer),
     WRAPM(Items, getHolderBuilding),
     WRAPM(Items, getHolderUnit),
+    WRAPM(Items, getBookTitle),
     WRAPM(Items, getDescription),
     WRAPM(Items, isCasteMaterial),
     WRAPM(Items, getSubtypeCount),
diff --git a/library/include/modules/Items.h b/library/include/modules/Items.h
index 838104bfe..33feea222 100644
--- a/library/include/modules/Items.h
+++ b/library/include/modules/Items.h
@@ -161,7 +161,7 @@ DFHACK_EXPORT df::coord getPosition(df::item *item);
 
 /// Returns the title of a codex or "tool", either as the codex title or as the title of the
 /// first page or writing it has that has a non blank title. An empty string is returned if
-/// no title is found (which is the casee for everything that isn't a "book").
+/// no title is found (which is the case for everything that isn't a "book").
 DFHACK_EXPORT std::string getBookTitle(df::item *item);
 
 /// Returns the description string of the item.

From c859076a3fd663f8ff004dd78d212eaed20a16a4 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Fri, 7 Feb 2020 20:49:56 +0100
Subject: [PATCH 006/547] Adjusted to int-> enum defs, fixed bug

---
 plugins/embark-assistant/survey.cpp | 54 ++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/plugins/embark-assistant/survey.cpp b/plugins/embark-assistant/survey.cpp
index a2fb648f2..94e4bd832 100644
--- a/plugins/embark-assistant/survey.cpp
+++ b/plugins/embark-assistant/survey.cpp
@@ -1909,12 +1909,12 @@ uint8_t embark_assist::survey::translate_ew_edge(embark_assist::defs::world_tile
     df::world_region_type east_region_type;
 
     if (own_edge) {
-        effective_edge = world_data->region_details[0]->edges.biome_x[i][k];
+        effective_edge = world_data->region_details[0]->edges.biome_y[i][k];
         east_region_type = embark_assist::survey::region_type_of(survey_results, x, y, i, k);
         west_region_type = embark_assist::survey::region_type_of(survey_results, x, y, i - 1, k);
     }
     else {
-        effective_edge = world_data->region_details[0]->edges.biome_x[i + 1][k];
+        effective_edge = world_data->region_details[0]->edges.biome_y[i + 1][k];
         west_region_type = embark_assist::survey::region_type_of(survey_results, x, y, i, k);
         east_region_type = embark_assist::survey::region_type_of(survey_results, x, y, i + 1, k);
     }
@@ -1995,14 +1995,18 @@ void embark_assist::survey::survey_region_sites(embark_assist::defs::site_lists
             break;
 
         case df::world_site_type::Monument:
-            if (site->subtype_info->lair_type != -1 ||
-                site->subtype_info->is_monument == 0) {  //  Not Tomb, which is visible already
-            }
-            else if (site->subtype_info->lair_type == -1) {
-                site_list->push_back({ (uint8_t)site->rgn_min_x , (uint8_t)site->rgn_min_y, 'V' });  //  Vault
-            }
-            else {
+            switch (site->subtype_info->monument_type) {
+            case df::monument_type::NONE:
+            case df::monument_type::TOMB:
+                break;  //  NONE shouldn't appear, and Tombs are visible already
+
+            case df::monument_type::VAULT:
+                site_list->push_back({ (uint8_t)site->rgn_min_x , (uint8_t)site->rgn_min_y, 'V' });
+                break;
+
+            default:
                 site_list->push_back({ (uint8_t)site->rgn_min_x , (uint8_t)site->rgn_min_y, 'M' });  //  Any other Monument type. Pyramid?
+                break;
             }
             break;
 
@@ -2011,19 +2015,27 @@ void embark_assist::survey::survey_region_sites(embark_assist::defs::site_lists
             break;
 
         case df::world_site_type::LairShrine:
-            if (site->subtype_info->lair_type == 0 ||
-                site->subtype_info->lair_type == 1 ||
-                site->subtype_info->lair_type == 4) {  // Only Rocs seen. Mountain lair?
-                site_list->push_back({ (uint8_t)site->rgn_min_x , (uint8_t)site->rgn_min_y, 'l' });  //  Lair
-            }
-            else if (site->subtype_info->lair_type == 2) {
-                site_list->push_back({ (uint8_t)site->rgn_min_x , (uint8_t)site->rgn_min_y, 'L' });  //  Labyrinth
-            }
-            else if (site->subtype_info->lair_type == 3) {
-                site_list->push_back({ (uint8_t)site->rgn_min_x , (uint8_t)site->rgn_min_y, 'S' });  //  Shrine
-            }
-            else {
+            switch (site->subtype_info->lair_type) {
+            case df::lair_type::NONE:
+                break;
+
+            case df::lair_type::SIMPLE_MOUND:
+            case df::lair_type::SIMPLE_BURROW:
+            case df::lair_type::WILDERNESS_LOCATION:
+                site_list->push_back({ (uint8_t)site->rgn_min_x , (uint8_t)site->rgn_min_y, 'l' });
+                break;
+
+            case df::lair_type::LABYRINTH:
+                site_list->push_back({ (uint8_t)site->rgn_min_x , (uint8_t)site->rgn_min_y, 'L' });
+                break;
+
+            case df::lair_type::SHRINE:
+                site_list->push_back({ (uint8_t)site->rgn_min_x , (uint8_t)site->rgn_min_y, 'S' });
+                break;
+
+            default:
                 site_list->push_back({ (uint8_t)site->rgn_min_x , (uint8_t)site->rgn_min_y, '?' });  //  Can these exist?
+                break;
             }
             break;
 

From 63a26b987de676d2cdf81974ac9a393abcfbcf8e Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Wed, 1 Apr 2020 11:16:24 +0200
Subject: [PATCH 007/547] Fix issue #1528

---
 library/modules/Translation.cpp | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/library/modules/Translation.cpp b/library/modules/Translation.cpp
index d836e6122..e05154b44 100644
--- a/library/modules/Translation.cpp
+++ b/library/modules/Translation.cpp
@@ -180,14 +180,11 @@ string Translation::TranslateName(const df::language_name * name, bool inEnglish
                 word.append(*world->raws.language.translations[name->language]->words[name->words[1]]);
             addNameWord(out, word);
         }
-        if (name->words[5] >= 0)
-        {
-            word.clear();
-            for (int i = 2; i <= 5; i++)
-                if (name->words[i] >= 0)
-                    word.append(*world->raws.language.translations[name->language]->words[name->words[i]]);
-            addNameWord(out, word);
-        }
+        word.clear();
+        for (int i = 2; i <= 5; i++)
+            if (name->words[i] >= 0)
+                word.append(*world->raws.language.translations[name->language]->words[name->words[i]]);
+        addNameWord(out, word);
         if (name->words[6] >= 0)
         {
             word.clear();
@@ -206,18 +203,17 @@ string Translation::TranslateName(const df::language_name * name, bool inEnglish
                 word.append(world->raws.language.words[name->words[1]]->forms[name->parts_of_speech[1]]);
             addNameWord(out, word);
         }
-        if (name->words[5] >= 0)
+        if (name->words[2] >= 0 || name->words[3] >= 0 || name->words[4] >= 0 || name->words[5] >= 0)
         {
             if (out.length() > 0)
                 out.append(" the");
             else
                 out.append("The");
-
-            for (int i = 2; i <= 5; i++)
-            {
-                if (name->words[i] >= 0)
-                    addNameWord(out, world->raws.language.words[name->words[i]]->forms[name->parts_of_speech[i]]);
-            }
+        }
+        for (int i = 2; i <= 5; i++)
+        {
+            if (name->words[i] >= 0)
+                addNameWord(out, world->raws.language.words[name->words[i]]->forms[name->parts_of_speech[i]]);
         }
         if (name->words[6] >= 0)
         {

From 897e78b174d62d5782317b1a6ebc0e1c0fab4749 Mon Sep 17 00:00:00 2001
From: ymber <mtaylor1252dev@gmail.com>
Date: Wed, 1 Apr 2020 15:09:51 +0100
Subject: [PATCH 008/547] Activate autodump in default config

---
 dfhack.init-example | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dfhack.init-example b/dfhack.init-example
index d8cf832c7..0fd445fff 100644
--- a/dfhack.init-example
+++ b/dfhack.init-example
@@ -245,6 +245,7 @@ enable \
  dwarfmonitor \
  mousequery \
  autogems \
+ autodump \
  automelt \
  autotrade \
  buildingplan \

From a0e2abe20a1906f5449be6d931e7b53f1b4f7e21 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Sat, 4 Apr 2020 14:00:26 +0200
Subject: [PATCH 009/547] Units update need coordination with structure
 identity

---
 library/modules/Units.cpp                     | 32 ++++++++++++-------
 .../remotefortressreader.cpp                  |  2 +-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp
index 3ac235203..07c3a7acf 100644
--- a/library/modules/Units.cpp
+++ b/library/modules/Units.cpp
@@ -58,6 +58,7 @@ using namespace std;
 #include "df/entity_position_assignment.h"
 #include "df/entity_raw.h"
 #include "df/entity_raw_flags.h"
+#include "df/identity_type.h"
 #include "df/game_mode.h"
 #include "df/histfig_entity_link_positionst.h"
 #include "df/historical_entity.h"
@@ -200,13 +201,23 @@ void Units::setNickname(df::unit *unit, std::string nick)
 
         if (auto identity = getFigureIdentity(figure))
         {
-            auto id_hfig = df::historical_figure::find(identity->histfig_id);
+            df::historical_figure *id_hfig = NULL;
+
+            switch (identity->type) {
+            case df::identity_type::Hiding_Curse:
+            case df::identity_type::Identity:
+            case df::identity_type::False_Identity:
+                break;  //  We want the nickname to end up in the identity
+
+            case df::identity_type::Unk_1:  // Guess, but that's how it worked in the past
+            case df::identity_type::Demon_Alias:
+            case df::identity_type::Unk_4:  // Pure guess, as this is a new case, still unseen
+                id_hfig = df::historical_figure::find(identity->histfig_nemesis_id);
+                break;
+            }
 
             if (id_hfig)
             {
-                // Even DF doesn't do this bit, because it's apparently
-                // only used for demons masquerading as gods, so you
-                // can't ever change their nickname in-game.
                 Translation::setNickname(&id_hfig->name, nick);
             }
             else
@@ -247,7 +258,7 @@ bool Units::isHidingCurse(df::unit *unit)
     if (!unit->job.hunt_target)
     {
         auto identity = Units::getIdentity(unit);
-        if (identity && identity->unk_4c == 0)
+        if (identity && identity->type == df::identity_type::Hiding_Curse)
             return true;
     }
 
@@ -722,12 +733,11 @@ double Units::getAge(df::unit *unit, bool true_age)
     double birth_time = unit->birth_year + unit->birth_time/year_ticks;
     double cur_time = *cur_year + *cur_year_tick / year_ticks;
 
-    if (!true_age && unit->curse_year >= 0)
-    {
-        if (auto identity = getIdentity(unit))
-        {
-            if (identity->histfig_id < 0)
-                birth_time = identity->birth_year + identity->birth_second/year_ticks;
+    if (!true_age) {
+        if (auto identity = getIdentity(unit)) {
+            if (identity->birth_year != -1) {
+                birth_time = identity->birth_year + identity->birth_second / year_ticks;
+            }
         }
     }
 
diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp
index f63ae5b2c..6ab401027 100644
--- a/plugins/remotefortressreader/remotefortressreader.cpp
+++ b/plugins/remotefortressreader/remotefortressreader.cpp
@@ -1701,7 +1701,7 @@ static command_result GetUnitListInside(color_ostream &stream, const BlockReques
         {
             if (auto identity = Units::getIdentity(unit))
             {
-                if (identity->histfig_id < 0)
+                if (identity->histfig_nemesis_id < 0)
                     birth_time = identity->birth_year * year_ticks + identity->birth_second;
             }
         }

From f4dc5e827782f9e20ca62aacc472d706d656de18 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 6 Apr 2020 19:57:20 -0400
Subject: [PATCH 010/547] Add an initial build workflow

---
 .github/workflows/build.yml | 43 +++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 .github/workflows/build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 000000000..1b8a6f715
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,43 @@
+name: Build and test
+
+on: [push, pull_request]
+
+jobs:
+  setup:
+    runs-on: ubuntu-18.04
+    steps:
+    - name: Install dependencies
+      run: |
+        sudo apt install \
+            libsdl-image1.2-dev \
+            libsdl-ttf2.0-dev \
+            libsdl1.2-dev \
+            libxml-libxml-perl \
+            libxml-libxslt-perl \
+            lua5.3 \
+            ninja-build \
+            zlib1g-dev
+        sudo pip3 install --system sphinx
+    - name: Clone DFHack
+      uses: actions/checkout@v1
+    - name: Set up environment
+      run: |
+        export DF_VERSION=$(sh travis/get-df-version.sh)
+        export DF_FOLDER="$HOME/DF/$DF_VERSION/df_linux"
+    - name: Download DF
+      run: |
+        sh travis/download-df.sh
+    - name: Git information
+      run: |
+        sh travis/git-info.sh
+  docs:
+    needs: [setup]
+    runs-on: ubuntu-18.04
+    steps:
+    - name: Build docs
+      run: |
+        sphinx-build -qW -j3 . docs/html
+    - uses: actions/upload-artifact@master
+      with:
+        name: docs
+        path: docs/html

From 6c9e3909fd62484d1dd75c834f49faa4baa777fd Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 6 Apr 2020 20:00:10 -0400
Subject: [PATCH 011/547] Run apt-get update first

---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1b8a6f715..1f3a66451 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,8 @@ jobs:
     steps:
     - name: Install dependencies
       run: |
-        sudo apt install \
+        sudo apt-get update
+        sudo apt-get install \
             libsdl-image1.2-dev \
             libsdl-ttf2.0-dev \
             libsdl1.2-dev \

From 55988e3fc4042af34408f362772c09d9a88b21f9 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Wed, 8 Apr 2020 08:45:40 +0200
Subject: [PATCH 012/547] adapted to updated structures, remote Using units for
 age

---
 library/modules/Units.cpp                         |  2 +-
 .../remotefortressreader/remotefortressreader.cpp | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp
index 07c3a7acf..fa7007574 100644
--- a/library/modules/Units.cpp
+++ b/library/modules/Units.cpp
@@ -210,7 +210,7 @@ void Units::setNickname(df::unit *unit, std::string nick)
                 break;  //  We want the nickname to end up in the identity
 
             case df::identity_type::Unk_1:  // Guess, but that's how it worked in the past
-            case df::identity_type::Demon_Alias:
+            case df::identity_type::True_Name:
             case df::identity_type::Unk_4:  // Pure guess, as this is a new case, still unseen
                 id_hfig = df::historical_figure::find(identity->histfig_nemesis_id);
                 break;
diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp
index 6ab401027..686c32211 100644
--- a/plugins/remotefortressreader/remotefortressreader.cpp
+++ b/plugins/remotefortressreader/remotefortressreader.cpp
@@ -1693,20 +1693,7 @@ static command_result GetUnitListInside(color_ostream &stream, const BlockReques
         using df::global::cur_year;
         using df::global::cur_year_tick;
 
-        int year_ticks = 403200;
-        int birth_time = unit->birth_year * year_ticks + unit->birth_time;
-        int cur_time = *cur_year * year_ticks + *cur_year_tick;
-
-        if (unit->curse_year >= 0)
-        {
-            if (auto identity = Units::getIdentity(unit))
-            {
-                if (identity->histfig_nemesis_id < 0)
-                    birth_time = identity->birth_year * year_ticks + identity->birth_second;
-            }
-        }
-
-        send_unit->set_age(cur_time - birth_time);
+       send_unit->set_age(Units::getAge(unit, false));
 
         ConvertDfColor(Units::getProfessionColor(unit), send_unit->mutable_profession_color());
         send_unit->set_flags1(unit->flags1.whole);

From 125f4b129bba54448f14031ef510d6e35a4cffc2 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 9 Apr 2020 00:02:07 -0400
Subject: [PATCH 013/547] Add ref_target attribute to primitive field
 references

---
 library/LuaTypes.cpp         | 11 +++++++++++
 library/LuaWrapper.cpp       | 10 ++++++++--
 library/include/LuaWrapper.h | 11 ++---------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/library/LuaTypes.cpp b/library/LuaTypes.cpp
index 306538f51..4e90265ce 100644
--- a/library/LuaTypes.cpp
+++ b/library/LuaTypes.cpp
@@ -536,6 +536,7 @@ static void field_reference(lua_State *state, const struct_field_info *field, vo
         case struct_field_info::PRIMITIVE:
         case struct_field_info::SUBSTRUCT:
             push_object_internal(state, field->type, ptr);
+            get_object_ref_header(state, -1)->field_info = field;
             return;
 
         case struct_field_info::POINTER:
@@ -706,6 +707,16 @@ static type_identity *find_primitive_field(lua_State *state, int field, const ch
  */
 static int meta_primitive_index(lua_State *state)
 {
+    const char *attr = lua_tostring(state, -1);
+    if (attr == std::string("ref_target")) {
+        const struct_field_info *field_info = get_object_ref_header(state, 1)->field_info;
+        if (field_info && field_info->extra && field_info->extra->ref_target) {
+            LookupInTable(state, field_info->extra->ref_target, &DFHACK_TYPEID_TABLE_TOKEN);
+        } else {
+            lua_pushnil(state);
+        }
+        return 1;
+    }
     uint8_t *ptr = get_object_addr(state, 1, 2, "read");
     auto type = find_primitive_field(state, 2, "read", &ptr);
     if (!type)
diff --git a/library/LuaWrapper.cpp b/library/LuaWrapper.cpp
index 497addd5c..05c4db789 100644
--- a/library/LuaWrapper.cpp
+++ b/library/LuaWrapper.cpp
@@ -170,18 +170,24 @@ void LuaWrapper::push_object_ref(lua_State *state, void *ptr)
     // stack: [metatable]
     auto ref = (DFRefHeader*)lua_newuserdata(state, sizeof(DFRefHeader));
     ref->ptr = ptr;
+    ref->field_info = NULL;
 
     lua_swap(state);
     lua_setmetatable(state, -2);
     // stack: [userdata]
 }
 
-void *LuaWrapper::get_object_ref(lua_State *state, int val_index)
+DFRefHeader *LuaWrapper::get_object_ref_header(lua_State *state, int val_index)
 {
     assert(!lua_islightuserdata(state, val_index));
 
     auto ref = (DFRefHeader*)lua_touserdata(state, val_index);
-    return ref->ptr;
+    return ref;
+}
+
+void *LuaWrapper::get_object_ref(lua_State *state, int val_index)
+{
+    return get_object_ref_header(state, val_index)->ptr;
 }
 
 /**
diff --git a/library/include/LuaWrapper.h b/library/include/LuaWrapper.h
index 4cbf9d34f..b23e1f912 100644
--- a/library/include/LuaWrapper.h
+++ b/library/include/LuaWrapper.h
@@ -126,6 +126,7 @@ namespace LuaWrapper {
      */
     struct DFRefHeader {
         void *ptr;
+        const struct_field_info *field_info;
     };
 
     /**
@@ -133,15 +134,7 @@ namespace LuaWrapper {
      */
     void push_object_ref(lua_State *state, void *ptr);
     DFHACK_EXPORT void *get_object_ref(lua_State *state, int val_index);
-
-    /*
-     * The system might be extended to carry some simple
-     * objects inline inside the reference buffer.
-     */
-    inline bool is_self_contained(DFRefHeader *ptr) {
-        void **pp = &ptr->ptr;
-        return **(void****)pp == (pp + 1);
-    }
+    DFHACK_EXPORT DFRefHeader *get_object_ref_header(lua_State *state, int val_index);
 
     /**
     * Report an error while accessing a field (index = field name).

From d72c3956608aa00afcc1a3115df3b6f664333545 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 10 Apr 2020 23:33:06 -0400
Subject: [PATCH 014/547] Merge into one job

---
 .github/workflows/build.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1f3a66451..96a623457 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ name: Build and test
 on: [push, pull_request]
 
 jobs:
-  setup:
+  main:
     runs-on: ubuntu-18.04
     steps:
     - name: Install dependencies
@@ -31,10 +31,6 @@ jobs:
     - name: Git information
       run: |
         sh travis/git-info.sh
-  docs:
-    needs: [setup]
-    runs-on: ubuntu-18.04
-    steps:
     - name: Build docs
       run: |
         sphinx-build -qW -j3 . docs/html

From 385aa0877d2e1c72319e93160739877b09213c0e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 10 Apr 2020 23:38:32 -0400
Subject: [PATCH 015/547] Checkout submodules too

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 96a623457..10a653932 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,6 +21,8 @@ jobs:
         sudo pip3 install --system sphinx
     - name: Clone DFHack
       uses: actions/checkout@v1
+      with:
+        submodules: true
     - name: Set up environment
       run: |
         export DF_VERSION=$(sh travis/get-df-version.sh)

From daad14ee66dd46f19e81d860992fd56c14f4c09b Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 10 Apr 2020 23:46:19 -0400
Subject: [PATCH 016/547] Implement linting checks

---
 .github/workflows/build.yml | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 10a653932..4db414bd1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ name: Build and test
 on: [push, pull_request]
 
 jobs:
-  main:
+  build:
     runs-on: ubuntu-18.04
     steps:
     - name: Install dependencies
@@ -36,7 +36,32 @@ jobs:
     - name: Build docs
       run: |
         sphinx-build -qW -j3 . docs/html
-    - uses: actions/upload-artifact@master
+    - name: Upload docs
+      uses: actions/upload-artifact@master
       with:
         name: docs
         path: docs/html
+  lint:
+    runs-on: ubuntu-18.04
+    steps:
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install \
+          lua5.3 \
+          ruby
+    - name: Check whitespace
+      run: |
+        python travis/lint.py
+    - name: Check Authors.rst
+      run: |
+        python travis/authors-rst.py
+    - name: Check for missing documentation
+      run: |
+        python travis/script-docs.py
+    - name: Check Lua syntax
+      run: |
+        python travis/script-syntax.py --ext=lua --cmd="luac5.3 -p"
+    - name: Check Ruby syntax
+      run: |
+        python travis/script-syntax.py --ext=rb --cmd="ruby -c"

From 9a7c07b42bc32827d21cbc1ed2080eb0d56a4811 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 10 Apr 2020 23:47:47 -0400
Subject: [PATCH 017/547] Clone the repo

---
 .github/workflows/build.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4db414bd1..dad202209 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,6 +50,10 @@ jobs:
         sudo apt-get install \
           lua5.3 \
           ruby
+    - name: Clone DFHack
+      uses: actions/checkout@v1
+      with:
+        submodules: true
     - name: Check whitespace
       run: |
         python travis/lint.py

From 1ebad37c2cb33bf97c6f9ec7c8fec08a64333f48 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 10 Apr 2020 23:53:12 -0400
Subject: [PATCH 018/547] Attempt to fix DF installation

---
 .github/workflows/build.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dad202209..6594dcb85 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,10 +25,11 @@ jobs:
         submodules: true
     - name: Set up environment
       run: |
-        export DF_VERSION=$(sh travis/get-df-version.sh)
-        export DF_FOLDER="$HOME/DF/$DF_VERSION/df_linux"
+        echo 'export DF_VERSION=$(sh travis/get-df-version.sh)' >> "$HOME/.dfhackrc"
+        echo 'export DF_FOLDER="$HOME/DF/$DF_VERSION/df_linux"' >> "$HOME/.dfhackrc"
     - name: Download DF
       run: |
+        source "$HOME/.dfhackrc"
         sh travis/download-df.sh
     - name: Git information
       run: |

From 0d4572e40a41f3ca152473762c1653c1a93a57e1 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 10 Apr 2020 23:56:28 -0400
Subject: [PATCH 019/547] Build DFHack

---
 .github/workflows/build.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6594dcb85..5b28ab101 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,6 +42,18 @@ jobs:
       with:
         name: docs
         path: docs/html
+    - name: Build DFHack
+      run: |
+        source "$HOME/.dfhackrc"
+        mkdir build-ci
+        cd build-ci
+        cmake .. \
+          -G Ninja \
+          -DDFHACK_BUILD_ARCH=64 \
+          -DBUILD_DOCS:BOOL=ON \
+          -DBUILD_TESTS:BOOL=ON \
+          -DCMAKE_INSTALL_PREFIX="$DF_FOLDER"
+        ninja install
   lint:
     runs-on: ubuntu-18.04
     steps:

From d2ba91e2cd3caf61d95896d835a101e0b3d05c99 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Apr 2020 00:10:28 -0400
Subject: [PATCH 020/547] Run tests

---
 .github/workflows/build.yml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5b28ab101..aa179eb91 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,7 +38,7 @@ jobs:
       run: |
         sphinx-build -qW -j3 . docs/html
     - name: Upload docs
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v1
       with:
         name: docs
         path: docs/html
@@ -54,6 +54,20 @@ jobs:
           -DBUILD_TESTS:BOOL=ON \
           -DCMAKE_INSTALL_PREFIX="$DF_FOLDER"
         ninja install
+    - name: Run tests
+      run: |
+        cd ..
+        mv "$DF_FOLDER"/dfhack.init-example "$DF_FOLDER"/dfhack.init
+        python travis/run-tests.py --headless --keep-status "$DF_FOLDER"
+        python travis/check-rpc.py "$DF_FOLDER/dfhack-rpc.txt"
+        mkdir -p artifacts
+        cp "$DF_FOLDER/test_status.json" "$DF_FOLDER"/*.log artifacts
+    - name: Upload test artifacts
+      uses: actions/upload-artifact@v1
+      if: success() || failure()
+      with:
+        name: test-artifacts
+        path: artifacts
   lint:
     runs-on: ubuntu-18.04
     steps:

From 19f84603cd56dce355020944e49f92e8c737f015 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Apr 2020 00:18:01 -0400
Subject: [PATCH 021/547] Fix test environment

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aa179eb91..b5283258f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,6 +56,7 @@ jobs:
         ninja install
     - name: Run tests
       run: |
+        source "$HOME/.dfhackrc"
         cd ..
         mv "$DF_FOLDER"/dfhack.init-example "$DF_FOLDER"/dfhack.init
         python travis/run-tests.py --headless --keep-status "$DF_FOLDER"

From 35dbf6cf5f46216e87ef902f9dfeb30c9ecd751c Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Apr 2020 00:31:15 -0400
Subject: [PATCH 022/547] Avoid changing working directory

---
 .github/workflows/build.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b5283258f..1b4ac36b7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,19 +45,18 @@ jobs:
     - name: Build DFHack
       run: |
         source "$HOME/.dfhackrc"
-        mkdir build-ci
-        cd build-ci
-        cmake .. \
+        cmake \
+          -S . \
+          -B build-ci \
           -G Ninja \
           -DDFHACK_BUILD_ARCH=64 \
           -DBUILD_DOCS:BOOL=ON \
           -DBUILD_TESTS:BOOL=ON \
           -DCMAKE_INSTALL_PREFIX="$DF_FOLDER"
-        ninja install
+        ninja -C build-ci install
     - name: Run tests
       run: |
         source "$HOME/.dfhackrc"
-        cd ..
         mv "$DF_FOLDER"/dfhack.init-example "$DF_FOLDER"/dfhack.init
         python travis/run-tests.py --headless --keep-status "$DF_FOLDER"
         python travis/check-rpc.py "$DF_FOLDER/dfhack-rpc.txt"

From ab81b1f06d9ac86adbccd6c957d439b67f52dee0 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Apr 2020 00:40:25 -0400
Subject: [PATCH 023/547] Avoid running travis commands when starting DF

---
 .github/workflows/build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1b4ac36b7..afa907958 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,11 +25,11 @@ jobs:
         submodules: true
     - name: Set up environment
       run: |
-        echo 'export DF_VERSION=$(sh travis/get-df-version.sh)' >> "$HOME/.dfhackrc"
-        echo 'export DF_FOLDER="$HOME/DF/$DF_VERSION/df_linux"' >> "$HOME/.dfhackrc"
+        echo export DF_VERSION="$(sh travis/get-df-version.sh)" >> "$HOME/.df-env"
+        echo export DF_FOLDER="$HOME/DF/$DF_VERSION/df_linux" >> "$HOME/.df-env"
     - name: Download DF
       run: |
-        source "$HOME/.dfhackrc"
+        source "$HOME/.df-env"
         sh travis/download-df.sh
     - name: Git information
       run: |
@@ -44,7 +44,7 @@ jobs:
         path: docs/html
     - name: Build DFHack
       run: |
-        source "$HOME/.dfhackrc"
+        source "$HOME/.df-env"
         cmake \
           -S . \
           -B build-ci \
@@ -56,7 +56,7 @@ jobs:
         ninja -C build-ci install
     - name: Run tests
       run: |
-        source "$HOME/.dfhackrc"
+        source "$HOME/.df-env"
         mv "$DF_FOLDER"/dfhack.init-example "$DF_FOLDER"/dfhack.init
         python travis/run-tests.py --headless --keep-status "$DF_FOLDER"
         python travis/check-rpc.py "$DF_FOLDER/dfhack-rpc.txt"

From 023575071a165d7541d2956287421bafbbd1c351 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Apr 2020 00:49:16 -0400
Subject: [PATCH 024/547] Run tests with TERM=dumb

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index afa907958..2d158dc7c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,6 +57,7 @@ jobs:
     - name: Run tests
       run: |
         source "$HOME/.df-env"
+        export TERM=dumb
         mv "$DF_FOLDER"/dfhack.init-example "$DF_FOLDER"/dfhack.init
         python travis/run-tests.py --headless --keep-status "$DF_FOLDER"
         python travis/check-rpc.py "$DF_FOLDER/dfhack-rpc.txt"

From 8b7989e93f69021f7d4b37aefb6b6c907e87995b Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Apr 2020 01:17:43 -0400
Subject: [PATCH 025/547] Try with TERM=xterm to get test output logged to
 console

It's currently going to stderr.log only
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2d158dc7c..0c5c857f5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,7 +57,7 @@ jobs:
     - name: Run tests
       run: |
         source "$HOME/.df-env"
-        export TERM=dumb
+        export TERM=xterm
         mv "$DF_FOLDER"/dfhack.init-example "$DF_FOLDER"/dfhack.init
         python travis/run-tests.py --headless --keep-status "$DF_FOLDER"
         python travis/check-rpc.py "$DF_FOLDER/dfhack-rpc.txt"

From 9e9e71cad7f43a224c069adf2cd327e48fa3f175 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Apr 2020 01:31:41 -0400
Subject: [PATCH 026/547] Fix spacing in error message

---
 conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf.py b/conf.py
index bfd69d828..2f47d5644 100644
--- a/conf.py
+++ b/conf.py
@@ -174,7 +174,7 @@ def all_keybinds_documented():
         plugin_binds = set(re.findall(':dfhack-keybind:`(.*?)`', f.read()))
     undocumented_binds = configured_binds - script_commands - plugin_binds
     if undocumented_binds:
-        raise ValueError('The following DFHack commands have undocumented'
+        raise ValueError('The following DFHack commands have undocumented '
                          'keybindings: {}'.format(sorted(undocumented_binds)))
 
 

From 148b5495cc589d2a4ddd6c0be67ae7f3dea3ad92 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Apr 2020 01:32:05 -0400
Subject: [PATCH 027/547] Fall back to dfout_C if set before stderr.log

---
 library/Console-posix.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/Console-posix.cpp b/library/Console-posix.cpp
index 6fb1cbff3..76b5a8cb2 100644
--- a/library/Console-posix.cpp
+++ b/library/Console-posix.cpp
@@ -903,7 +903,10 @@ void Console::add_text(color_value color, const std::string &text)
     if (inited)
         d->print_text(color, text);
     else
-        fwrite(text.data(), 1, text.size(), stderr);
+    {
+        FILE *out = d->dfout_C ? d->dfout_C : stderr;
+        fwrite(text.data(), 1, text.size(), out);
+    }
 }
 
 int Console::get_columns(void)

From 44be99388e487998661a851ffdd72cb7fd4bb3f0 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Apr 2020 01:43:06 -0400
Subject: [PATCH 028/547] Revert "Fall back to dfout_C if set before
 stderr.log"

Makes stuff go to stdout.log instead

This reverts commit 148b5495cc589d2a4ddd6c0be67ae7f3dea3ad92.
---
 library/Console-posix.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/library/Console-posix.cpp b/library/Console-posix.cpp
index 76b5a8cb2..6fb1cbff3 100644
--- a/library/Console-posix.cpp
+++ b/library/Console-posix.cpp
@@ -903,10 +903,7 @@ void Console::add_text(color_value color, const std::string &text)
     if (inited)
         d->print_text(color, text);
     else
-    {
-        FILE *out = d->dfout_C ? d->dfout_C : stderr;
-        fwrite(text.data(), 1, text.size(), out);
-    }
+        fwrite(text.data(), 1, text.size(), stderr);
 }
 
 int Console::get_columns(void)

From cdc82bd7dbfb85f9294adcb62cb55da26b4bb29f Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Apr 2020 01:49:53 -0400
Subject: [PATCH 029/547] Run tests within `script`

---
 .github/workflows/build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0c5c857f5..bc8101b8f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,9 +57,8 @@ jobs:
     - name: Run tests
       run: |
         source "$HOME/.df-env"
-        export TERM=xterm
         mv "$DF_FOLDER"/dfhack.init-example "$DF_FOLDER"/dfhack.init
-        python travis/run-tests.py --headless --keep-status "$DF_FOLDER"
+        script -qe -c "python travis/run-tests.py --headless --keep-status \"$DF_FOLDER\""
         python travis/check-rpc.py "$DF_FOLDER/dfhack-rpc.txt"
         mkdir -p artifacts
         cp "$DF_FOLDER/test_status.json" "$DF_FOLDER"/*.log artifacts

From 6bbda95dd4fc3519fd65c773849d4bdada3352f3 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Apr 2020 01:58:06 -0400
Subject: [PATCH 030/547] Add TERM=dumb back

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bc8101b8f..bb1791a67 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,6 +57,7 @@ jobs:
     - name: Run tests
       run: |
         source "$HOME/.df-env"
+        export TERM=dumb
         mv "$DF_FOLDER"/dfhack.init-example "$DF_FOLDER"/dfhack.init
         script -qe -c "python travis/run-tests.py --headless --keep-status \"$DF_FOLDER\""
         python travis/check-rpc.py "$DF_FOLDER/dfhack-rpc.txt"

From b3db62742c0ca150aa442bda7e81b5a99db35fb0 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Apr 2020 02:15:57 -0400
Subject: [PATCH 031/547] Rename workflow to match Travis, update badge

---
 .github/workflows/build.yml | 2 +-
 README.md                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bb1791a67..deab07958 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Build and test
+name: Build
 
 on: [push, pull_request]
 
diff --git a/README.md b/README.md
index fd95e1e5e..a0499a333 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # DFHack Readme
 
-[![Build Status](https://travis-ci.org/DFHack/dfhack.svg?branch=develop)](https://travis-ci.org/DFHack/dfhack)
+[![Build Status](https://github.com/DFHack/dfhack/workflows/Build/badge.svg)](https://github.com/DFHack/dfhack/actions?query=workflow%3ABuild)
 [![Documentation Status](https://readthedocs.org/projects/dfhack/badge)](https://dfhack.readthedocs.org)
 [![License](https://img.shields.io/badge/license-ZLib-blue.svg)](https://en.wikipedia.org/wiki/Zlib_License)
 

From dbdd98829f46f6e9e98196a94dbfed20844bded8 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Apr 2020 02:22:12 -0400
Subject: [PATCH 032/547] Add check for PR base branch

---
 .github/workflows/build.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index deab07958..a585b6e80 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -97,3 +97,13 @@ jobs:
     - name: Check Ruby syntax
       run: |
         python travis/script-syntax.py --ext=rb --cmd="ruby -c"
+  check-pr:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check that PR is based on develop branch
+      if: github.event_name == 'pull_request'
+      env:
+        BASE_BRANCH: ${{ github.base_ref }}
+      run: |
+        echo "PR base branch: $BASE_BRANCH"
+        test "$BASE_BRANCH" = develop

From dc598d501a799e043b6d5c04ab8e075091d58542 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Apr 2020 02:24:40 -0400
Subject: [PATCH 033/547] Limit entire check-pr job to PRs only

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a585b6e80..f737a1539 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -99,9 +99,9 @@ jobs:
         python travis/script-syntax.py --ext=rb --cmd="ruby -c"
   check-pr:
     runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
     steps:
     - name: Check that PR is based on develop branch
-      if: github.event_name == 'pull_request'
       env:
         BASE_BRANCH: ${{ github.base_ref }}
       run: |

From dbff3355ba92d2ba944b5093ec0e781cec9719c8 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Apr 2020 02:32:07 -0400
Subject: [PATCH 034/547] Remove .travis.yml

---
 .travis.yml | 64 -----------------------------------------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index c096552bc..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-sudo: false
-language: cpp
-cache:
-  pip: true
-  directories:
-    - $HOME/DF-travis
-    - $HOME/lua53
-addons:
-  apt:
-    packages: &default_packages
-      - libsdl-image1.2-dev
-      - libsdl-ttf2.0-dev
-      - libsdl1.2-dev
-      - libxml-libxml-perl
-      - libxml-libxslt-perl
-      - ninja-build
-      - zlib1g-dev
-matrix:
-  include:
-    - env: GCC_VERSION=4.8
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - *default_packages
-            - gcc-4.8
-            - g++-4.8
-before_install:
-- export DF_VERSION=$(sh travis/get-df-version.sh)
-- export DF_FOLDER="$HOME/DF-travis/$DF_VERSION/df_linux"
-- pip install --user "sphinx==1.4" "requests[security]"
-- sh travis/build-lua.sh
-- sh travis/download-df.sh
-script:
-- export PATH="$PATH:$HOME/lua53/bin"
-- git tag tmp-travis-build
-- sh travis/git-info.sh
-- sphinx-build -qW -j3 . docs/html
-- python travis/pr-check-base.py
-- python travis/lint.py
-- python travis/authors-rst.py
-- python travis/script-docs.py
-- python travis/script-syntax.py --ext=lua --cmd="luac5.3 -p"
-- python travis/script-syntax.py --ext=rb --cmd="ruby -c"
-- mkdir build-travis
-- cd build-travis
-- cmake .. -G Ninja -DCMAKE_C_COMPILER=gcc-$GCC_VERSION -DCMAKE_CXX_COMPILER=g++-$GCC_VERSION -DDFHACK_BUILD_ARCH=64 -DBUILD_DOCS:BOOL=ON -DBUILD_TESTS:BOOL=ON -DCMAKE_INSTALL_PREFIX="$DF_FOLDER"
-- ninja -j3 install
-- mv "$DF_FOLDER"/dfhack.init-example "$DF_FOLDER"/dfhack.init
-- cd ..
-- python travis/run-tests.py --headless --keep-status "$DF_FOLDER"
-- python travis/check-rpc.py "$DF_FOLDER/dfhack-rpc.txt"
-- cat "$DF_FOLDER/test_status.json"
-before_cache:
-- cat "$DF_FOLDER/stderr.log"
-- rm -rf "$DF_FOLDER"
-notifications:
-  email: false
-  irc:
-    channels:
-      - "chat.freenode.net#dfhack"
-    on_success: change
-    on_failure: always

From ba12e0c6d4446248683f0fa6ae3fc8709898e34d Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Apr 2020 02:33:50 -0400
Subject: [PATCH 035/547] Remove obsolete travis scripts

---
 .github/workflows/build.yml |  3 ---
 travis/build-lua.sh         | 54 -------------------------------------
 travis/git-info.sh          |  2 --
 travis/pr-check-base.py     | 18 -------------
 4 files changed, 77 deletions(-)
 delete mode 100644 travis/build-lua.sh
 delete mode 100644 travis/git-info.sh
 delete mode 100644 travis/pr-check-base.py

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f737a1539..17af62cb1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,9 +31,6 @@ jobs:
       run: |
         source "$HOME/.df-env"
         sh travis/download-df.sh
-    - name: Git information
-      run: |
-        sh travis/git-info.sh
     - name: Build docs
       run: |
         sphinx-build -qW -j3 . docs/html
diff --git a/travis/build-lua.sh b/travis/build-lua.sh
deleted file mode 100644
index e29d7ce87..000000000
--- a/travis/build-lua.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-set -e
-
-LUA_ROOT="$HOME/lua53"
-LUA_URL="http://www.lua.org/ftp/lua-5.3.3.tar.gz"
-LUA_TAR=$(basename "$LUA_URL")
-LUA_DIR="$LUA_ROOT/${LUA_TAR%.tar.*}"
-LUA_SHA1="a0341bc3d1415b814cc738b2ec01ae56045d64ef"
-
-echo LUA_ROOT $LUA_ROOT
-echo LUA_TAR $LUA_TAR
-echo LUA_DIR $LUA_DIR
-
-sha1() {
-    python -c 'import hashlib, sys; print(hashlib.sha1(open(sys.argv[1],"rb").read()).hexdigest())' "$1"
-}
-
-download() {
-    echo "Downloading $LUA_URL"
-    wget -O "$LUA_ROOT/$LUA_TAR" "$LUA_URL"
-    tar xvf "$LUA_ROOT/$LUA_TAR"
-}
-
-build() {
-    cd "$LUA_DIR/src"
-    make generic
-}
-
-main() {
-    mkdir -p "$LUA_ROOT"
-    cd "$LUA_ROOT"
-    mkdir -p bin
-
-    if [ "$(sha1 "$LUA_ROOT/$LUA_TAR" 2>/dev/null)" != "$LUA_SHA1" ]; then
-        download
-        build
-    else
-        echo "Already downloaded"
-
-        if [ -x "$LUA_DIR/src/luac" ]; then
-            echo "Already built"
-        else
-            build
-        fi
-    fi
-
-    echo "Linking"
-    ln -sf "$LUA_DIR/src/lua" "$LUA_ROOT/bin/lua5.3"
-    ln -sf "$LUA_DIR/src/luac" "$LUA_ROOT/bin/luac5.3"
-    echo "Done"
-}
-
-main
diff --git a/travis/git-info.sh b/travis/git-info.sh
deleted file mode 100644
index 333d13bc1..000000000
--- a/travis/git-info.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-git log --pretty="commit %h (parents: %p): %s" -1
diff --git a/travis/pr-check-base.py b/travis/pr-check-base.py
deleted file mode 100644
index 47605b051..000000000
--- a/travis/pr-check-base.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import os, sys
-repo = os.environ.get('TRAVIS_REPO_SLUG', 'dfhack/dfhack').lower()
-branch = os.environ.get('TRAVIS_BRANCH', 'master')
-try:
-    pr_id = int(os.environ.get('TRAVIS_PULL_REQUEST', 'false'))
-except ValueError:
-    print('Not a pull request')
-    sys.exit(0)
-print('Pull request %s#%i' % (repo, pr_id))
-if repo != 'dfhack/dfhack':
-    print('Not in dfhack/dfhack')
-    sys.exit(0)
-if branch != 'develop':
-    print('Not based on develop branch')
-    sys.exit(1)
-else:
-    print('Ok')
-    sys.exit(0)

From 362e49c0bc9c0c5cde28e1e9ff3a0ae427e27dd8 Mon Sep 17 00:00:00 2001
From: Nilsolm <nilsolm@outlook.com>
Date: Sun, 12 Apr 2020 11:02:26 +0200
Subject: [PATCH 036/547] autogems: check bin content in linked stockpiles

---
 plugins/autogems.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plugins/autogems.cpp b/plugins/autogems.cpp
index 4121b562f..f22d20d30 100644
--- a/plugins/autogems.cpp
+++ b/plugins/autogems.cpp
@@ -167,6 +167,16 @@ void create_jobs() {
                         stockpiled.insert(item->id);
                         piled[item->getMaterialIndex()] += 1;
                     }
+                    else if (item->flags.bits.container) {
+                        std::vector<df::item*> binneditems;
+                        Items::getContainedItems(item, &binneditems);
+                        for (df::item *it : binneditems) {
+                            if (valid_gem(it)) {
+                                stockpiled.insert(it->id);
+                                piled[it->getMaterialIndex()] += 1;
+                            }
+                        }
+                    }
                 }
 
                 // Decrement current jobs from all linked workshops, not just this one.

From f7630a52707b9d8e5e4d0ae82ed98244c71a7b8b Mon Sep 17 00:00:00 2001
From: Nilsolm <nilsolm@outlook.com>
Date: Sun, 12 Apr 2020 11:03:28 +0200
Subject: [PATCH 037/547] update changelog

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index d2404c951..ba75f09fb 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -40,6 +40,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 # Future
 
 ## Fixes
+- `autogems`: fixed an issue with binned gems being ignored in linked stockpiles
 - `tweak` embark-profile-name: fixed handling of the native shift+space key
 
 ## Misc Improvements

From c97adb91735becad845d8af630e62c19c8e94d03 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 15 Apr 2020 01:09:16 -0400
Subject: [PATCH 038/547] Update changelog (#1528, #1530)

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index ba75f09fb..11734d9f7 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -40,6 +40,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 # Future
 
 ## Fixes
+- Fixed translation of certain types of in-game names
 - `autogems`: fixed an issue with binned gems being ignored in linked stockpiles
 - `tweak` embark-profile-name: fixed handling of the native shift+space key
 

From 79387647d39a326fa3c82e620e7c435b4f7c2002 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 15 Apr 2020 01:09:29 -0400
Subject: [PATCH 039/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 8618cd0b0..b3ce8fa65 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 8618cd0b0a17935fe07f329b249726cda61f5bdf
+Subproject commit b3ce8fa650f86c7a1dbd5329d72c3d73dd76d05d

From 36df6eac8b649f7787c54d95c93b42280a7f6d81 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 15 Apr 2020 01:15:09 -0400
Subject: [PATCH 040/547] Restrict status badge to push events only

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a0499a333..e4bfefb38 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # DFHack Readme
 
-[![Build Status](https://github.com/DFHack/dfhack/workflows/Build/badge.svg)](https://github.com/DFHack/dfhack/actions?query=workflow%3ABuild)
+[![Build Status](https://github.com/DFHack/dfhack/workflows/Build/badge.svg?event=push)](https://github.com/DFHack/dfhack/actions?query=workflow%3ABuild)
 [![Documentation Status](https://readthedocs.org/projects/dfhack/badge)](https://dfhack.readthedocs.org)
 [![License](https://img.shields.io/badge/license-ZLib-blue.svg)](https://en.wikipedia.org/wiki/Zlib_License)
 

From f4f2aa0d5ef0814adce64af3f8339207e9c97aef Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Wed, 15 Apr 2020 10:18:37 +0200
Subject: [PATCH 041/547] removed underscores, adapted to structure (re)naming

---
 library/modules/Items.cpp |  2 +-
 library/modules/Job.cpp   |  4 ++--
 library/modules/Units.cpp |  8 ++++----
 plugins/orders.cpp        |  6 +++---
 plugins/stocks.cpp        | 10 +++++-----
 plugins/workflow.cpp      |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/library/modules/Items.cpp b/library/modules/Items.cpp
index 4939aa9dd..4b6010718 100644
--- a/library/modules/Items.cpp
+++ b/library/modules/Items.cpp
@@ -658,7 +658,7 @@ df::coord Items::getPosition(df::item *item)
             switch (ref->type)
             {
             case specific_ref_type::VERMIN_ESCAPED_PET:
-                return ref->data.VERMIN_ESCAPED_PET->pos;
+                return ref->data.vermin->pos;
 
             default:
                 break;
diff --git a/library/modules/Job.cpp b/library/modules/Job.cpp
index d0487941f..0aa01af95 100644
--- a/library/modules/Job.cpp
+++ b/library/modules/Job.cpp
@@ -311,7 +311,7 @@ void DFHack::Job::disconnectJobItem(df::job *job, df::job_item_ref *ref) {
         auto ref = item->specific_refs[refIndex];
 
         if (ref->type == df::specific_ref_type::JOB) {
-            if (ref->data.JOB == job) {
+            if (ref->data.job == job) {
                 vector_erase_at(item->specific_refs, refIndex);
                 delete ref;
             } else {
@@ -579,7 +579,7 @@ bool DFHack::Job::attachJobItem(df::job *job, df::item *item,
 
     auto item_link = new df::specific_ref();
     item_link->type = specific_ref_type::JOB;
-    item_link->data.JOB = job;
+    item_link->data.job = job;
     item->specific_refs.push_back(item_link);
 
     auto job_link = new df::job_item_ref();
diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp
index fa7007574..313d6ee9f 100644
--- a/library/modules/Units.cpp
+++ b/library/modules/Units.cpp
@@ -204,13 +204,13 @@ void Units::setNickname(df::unit *unit, std::string nick)
             df::historical_figure *id_hfig = NULL;
 
             switch (identity->type) {
-            case df::identity_type::Hiding_Curse:
+            case df::identity_type::HidingCurse:
             case df::identity_type::Identity:
-            case df::identity_type::False_Identity:
+            case df::identity_type::FalseIdentity:
                 break;  //  We want the nickname to end up in the identity
 
             case df::identity_type::Unk_1:  // Guess, but that's how it worked in the past
-            case df::identity_type::True_Name:
+            case df::identity_type::TrueName:
             case df::identity_type::Unk_4:  // Pure guess, as this is a new case, still unseen
                 id_hfig = df::historical_figure::find(identity->histfig_nemesis_id);
                 break;
@@ -258,7 +258,7 @@ bool Units::isHidingCurse(df::unit *unit)
     if (!unit->job.hunt_target)
     {
         auto identity = Units::getIdentity(unit);
-        if (identity && identity->type == df::identity_type::Hiding_Curse)
+        if (identity && identity->type == df::identity_type::HidingCurse)
             return true;
     }
 
diff --git a/plugins/orders.cpp b/plugins/orders.cpp
index f600b0cd0..045c07a1f 100644
--- a/plugins/orders.cpp
+++ b/plugins/orders.cpp
@@ -798,13 +798,13 @@ static command_result orders_clear_command(color_ostream & out)
         {
             delete condition;
         }
-        if (order->anon_1)
+        if (order->items)
         {
-            for (auto anon_1 : *order->anon_1)
+            for (auto anon_1 : *order->items)
             {
                 delete anon_1;
             }
-            delete order->anon_1;
+            delete order->items;
         }
 
         delete order;
diff --git a/plugins/stocks.cpp b/plugins/stocks.cpp
index d9ec97c0d..af49dcb2a 100644
--- a/plugins/stocks.cpp
+++ b/plugins/stocks.cpp
@@ -179,8 +179,8 @@ static map<df::item *, bool> items_in_cages;
 static df::job *get_item_job(df::item *item)
 {
     auto ref = Items::getSpecificRef(item, specific_ref_type::JOB);
-    if (ref && ref->data.JOB)
-        return ref->data.JOB;
+    if (ref && ref->data.job)
+        return ref->data.job;
 
     return nullptr;
 }
@@ -1008,12 +1008,12 @@ private:
             if (item->flags.bits.in_job)
             {
                 auto ref = Items::getSpecificRef(item, specific_ref_type::JOB);
-                if (ref && ref->data.JOB)
+                if (ref && ref->data.job)
                 {
-                    if (ref->data.JOB->job_type == job_type::Eat || ref->data.JOB->job_type == job_type::Drink)
+                    if (ref->data.job->job_type == job_type::Eat || ref->data.job->job_type == job_type::Drink)
                         return pos;
 
-                    auto unit = Job::getWorker(ref->data.JOB);
+                    auto unit = Job::getWorker(ref->data.job);
                     if (unit)
                         return unit->pos;
                 }
diff --git a/plugins/workflow.cpp b/plugins/workflow.cpp
index 3e31d14ab..600a8bef1 100644
--- a/plugins/workflow.cpp
+++ b/plugins/workflow.cpp
@@ -1151,10 +1151,10 @@ static bool itemInRealJob(df::item *item)
         return false;
 
     auto ref = Items::getSpecificRef(item, specific_ref_type::JOB);
-    if (!ref || !ref->data.JOB)
+    if (!ref || !ref->data.job)
         return true;
 
-    return ENUM_ATTR(job_type, type, ref->data.JOB->job_type)
+    return ENUM_ATTR(job_type, type, ref->data.job->job_type)
                != job_type_class::Hauling;
 }
 

From b5c6fd26e2632286a8d9dc8a4fb3cdea33f10be6 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 15 Apr 2020 17:33:58 -0400
Subject: [PATCH 042/547] Update changelog (#1531)

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 11734d9f7..47f891cb5 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -45,6 +45,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `tweak` embark-profile-name: fixed handling of the native shift+space key
 
 ## Misc Improvements
+- ``dfhack.init-example``: enabled `autodump`
 - `manipulator`: added intrigue to displayed skills
 - `search`: added support for the fortress mode justice screen
 

From 253b15aeb98581b7cc61013be88db464f3c5a3d7 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Wed, 15 Apr 2020 19:03:40 -0500
Subject: [PATCH 043/547] update structures

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index f185d0b22..96a8df43d 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit f185d0b22acb1daf36b3a017f7a30b48994ee42c
+Subproject commit 96a8df43d1c4508800c209701ce39ca972579e3b

From 8427f518c941f8e5734e98f2ff56648522f1281b Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Wed, 15 Apr 2020 20:05:15 -0500
Subject: [PATCH 044/547] match capitalization changes I made to df-structures
 in specific_ref

---
 library/modules/Items.cpp |  2 +-
 library/modules/Job.cpp   |  4 ++--
 plugins/orders.cpp        |  8 ++++----
 plugins/stocks.cpp        | 10 +++++-----
 plugins/workflow.cpp      |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/library/modules/Items.cpp b/library/modules/Items.cpp
index 4939aa9dd..4b6010718 100644
--- a/library/modules/Items.cpp
+++ b/library/modules/Items.cpp
@@ -658,7 +658,7 @@ df::coord Items::getPosition(df::item *item)
             switch (ref->type)
             {
             case specific_ref_type::VERMIN_ESCAPED_PET:
-                return ref->data.VERMIN_ESCAPED_PET->pos;
+                return ref->data.vermin->pos;
 
             default:
                 break;
diff --git a/library/modules/Job.cpp b/library/modules/Job.cpp
index d0487941f..0aa01af95 100644
--- a/library/modules/Job.cpp
+++ b/library/modules/Job.cpp
@@ -311,7 +311,7 @@ void DFHack::Job::disconnectJobItem(df::job *job, df::job_item_ref *ref) {
         auto ref = item->specific_refs[refIndex];
 
         if (ref->type == df::specific_ref_type::JOB) {
-            if (ref->data.JOB == job) {
+            if (ref->data.job == job) {
                 vector_erase_at(item->specific_refs, refIndex);
                 delete ref;
             } else {
@@ -579,7 +579,7 @@ bool DFHack::Job::attachJobItem(df::job *job, df::item *item,
 
     auto item_link = new df::specific_ref();
     item_link->type = specific_ref_type::JOB;
-    item_link->data.JOB = job;
+    item_link->data.job = job;
     item->specific_refs.push_back(item_link);
 
     auto job_link = new df::job_item_ref();
diff --git a/plugins/orders.cpp b/plugins/orders.cpp
index f600b0cd0..6c6888c0e 100644
--- a/plugins/orders.cpp
+++ b/plugins/orders.cpp
@@ -798,13 +798,13 @@ static command_result orders_clear_command(color_ostream & out)
         {
             delete condition;
         }
-        if (order->anon_1)
+        if (order->items)
         {
-            for (auto anon_1 : *order->anon_1)
+            for (auto item : *order->items)
             {
-                delete anon_1;
+                delete item;
             }
-            delete order->anon_1;
+            delete order->items;
         }
 
         delete order;
diff --git a/plugins/stocks.cpp b/plugins/stocks.cpp
index d9ec97c0d..af49dcb2a 100644
--- a/plugins/stocks.cpp
+++ b/plugins/stocks.cpp
@@ -179,8 +179,8 @@ static map<df::item *, bool> items_in_cages;
 static df::job *get_item_job(df::item *item)
 {
     auto ref = Items::getSpecificRef(item, specific_ref_type::JOB);
-    if (ref && ref->data.JOB)
-        return ref->data.JOB;
+    if (ref && ref->data.job)
+        return ref->data.job;
 
     return nullptr;
 }
@@ -1008,12 +1008,12 @@ private:
             if (item->flags.bits.in_job)
             {
                 auto ref = Items::getSpecificRef(item, specific_ref_type::JOB);
-                if (ref && ref->data.JOB)
+                if (ref && ref->data.job)
                 {
-                    if (ref->data.JOB->job_type == job_type::Eat || ref->data.JOB->job_type == job_type::Drink)
+                    if (ref->data.job->job_type == job_type::Eat || ref->data.job->job_type == job_type::Drink)
                         return pos;
 
-                    auto unit = Job::getWorker(ref->data.JOB);
+                    auto unit = Job::getWorker(ref->data.job);
                     if (unit)
                         return unit->pos;
                 }
diff --git a/plugins/workflow.cpp b/plugins/workflow.cpp
index 3e31d14ab..600a8bef1 100644
--- a/plugins/workflow.cpp
+++ b/plugins/workflow.cpp
@@ -1151,10 +1151,10 @@ static bool itemInRealJob(df::item *item)
         return false;
 
     auto ref = Items::getSpecificRef(item, specific_ref_type::JOB);
-    if (!ref || !ref->data.JOB)
+    if (!ref || !ref->data.job)
         return true;
 
-    return ENUM_ATTR(job_type, type, ref->data.JOB->job_type)
+    return ENUM_ATTR(job_type, type, ref->data.job->job_type)
                != job_type_class::Hauling;
 }
 

From c8ff8d0d8efa7a7c69658a30d18255a73c2955c8 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Fri, 17 Apr 2020 11:52:16 -0500
Subject: [PATCH 045/547] update scripts and structures

---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index 96a8df43d..816497911 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 96a8df43d1c4508800c209701ce39ca972579e3b
+Subproject commit 81649791116754a789aae85222797c4df3945b08
diff --git a/scripts b/scripts
index b3ce8fa65..c6bb439ad 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit b3ce8fa650f86c7a1dbd5329d72c3d73dd76d05d
+Subproject commit c6bb439ad18455fff85cdfab480689a1c94f56fe

From 54d4b68f3cdef054b55849a248a8bcdaac8033df Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Sat, 18 Apr 2020 20:39:57 -0500
Subject: [PATCH 046/547] don't crash if the path to an instance-vector
 contains a null pointer

---
 library/DataStatics.cpp | 5 +++--
 library/xml             | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/library/DataStatics.cpp b/library/DataStatics.cpp
index 61b7b6378..275cae584 100644
--- a/library/DataStatics.cpp
+++ b/library/DataStatics.cpp
@@ -12,10 +12,11 @@
 
 namespace {
     template<class T>
-    inline T &_toref(T &r) { return r; }
+    inline T *_toptr(T &r) { return &r; }
     template<class T>
-    inline T &_toref(T *&p) { return *p; }
+    inline T *_toptr(T *&p) { return p; }
 }
+#define _fieldptr(ptr, fn) (ptr) ? _toptr((ptr)->fn) : NULL
 
 #define INIT_GLOBAL_FUNCTION_PREFIX \
     DFHack::VersionInfo *global_table_ = DFHack::Core::getInstance().vinfo.get(); \
diff --git a/library/xml b/library/xml
index 816497911..d9a31fa45 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 81649791116754a789aae85222797c4df3945b08
+Subproject commit d9a31fa45228a7507b975dbbddbf00c7905644ea

From d3a007489c5248b758627d019d1a6c4f4a53fd34 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 19 Apr 2020 12:16:48 -0400
Subject: [PATCH 047/547] Fix ZLIB_ROOT in newer CMake versions

---
 CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e40c932a0..f8dd5dc86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,12 @@ if("${CMAKE_GENERATOR}" STREQUAL Ninja)
     endif()
 endif()
 
+if(NOT("${CMAKE_VERSION}" VERSION_LESS 3.12))
+    # make ZLIB_ROOT work in CMake >= 3.12
+    # https://cmake.org/cmake/help/git-stage/policy/CMP0074.html
+    cmake_policy(SET CMP0074 NEW)
+endif()
+
 # Set up build types
 if(CMAKE_CONFIGURATION_TYPES)
     set(CMAKE_CONFIGURATION_TYPES "Release;RelWithDebInfo" CACHE STRING "List of supported configuration types" FORCE)

From 2f1e057bc7efc215702cf14d0448dfaeaf1574e0 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Sun, 19 Apr 2020 22:03:03 -0500
Subject: [PATCH 048/547] check-structures-sanity: report known void* types
 with a better message

---
 plugins/devel/check-structures-sanity/dispatch.cpp | 5 +++++
 plugins/devel/check-structures-sanity/types.cpp    | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/devel/check-structures-sanity/dispatch.cpp b/plugins/devel/check-structures-sanity/dispatch.cpp
index fcc6b0b8e..f6342d03c 100644
--- a/plugins/devel/check-structures-sanity/dispatch.cpp
+++ b/plugins/devel/check-structures-sanity/dispatch.cpp
@@ -67,6 +67,11 @@ bool Checker::queue_item(const QueueItem & item, CheckedStructure cs)
         auto offset = uintptr_t(item.ptr) - uintptr_t(prev->first);
         if (!prev->second.second.has_type_at_offset(cs, offset))
         {
+            if (offset == 0 && cs.identity == df::identity_traits<void *>::get())
+            {
+                FAIL("unknown pointer is " << prev->second.second.identity->getFullName() << ", previously seen at " << prev->second.first);
+                return false;
+            }
             // TODO
             FAIL("TODO: handle merging structures: " << item.path << " overlaps " << prev->second.first << " (backward)");
             return false;
diff --git a/plugins/devel/check-structures-sanity/types.cpp b/plugins/devel/check-structures-sanity/types.cpp
index 9e565215a..86d691f1d 100644
--- a/plugins/devel/check-structures-sanity/types.cpp
+++ b/plugins/devel/check-structures-sanity/types.cpp
@@ -129,7 +129,6 @@ bool CheckedStructure::has_type_at_offset(const CheckedStructure & type, size_t
     auto st = dynamic_cast<struct_identity *>(identity);
     if (!st)
     {
-        UNEXPECTED;
         return false;
     }
 

From 66314806b137a86a0ff7627b08251ab9ce4d0d6f Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Sun, 19 Apr 2020 22:03:13 -0500
Subject: [PATCH 049/547] update structures

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index d9a31fa45..ce91eb750 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit d9a31fa45228a7507b975dbbddbf00c7905644ea
+Subproject commit ce91eb750026e97b0044e88043f36fe4ff5218c0

From 9a10ea9fe5cec8b84a68f0846012f4cf4fca470a Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 22 Apr 2020 02:13:24 -0400
Subject: [PATCH 050/547] Update submodules

---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index ce91eb750..353caa341 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit ce91eb750026e97b0044e88043f36fe4ff5218c0
+Subproject commit 353caa3413f728938821c8aaccebb389a322bfef
diff --git a/scripts b/scripts
index c6bb439ad..1468a773e 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit c6bb439ad18455fff85cdfab480689a1c94f56fe
+Subproject commit 1468a773e4b56716d94c28cc90a6988739d0c561

From f371ae6da86e3bf770b2a2412f10e12eccf99c63 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Wed, 22 Apr 2020 12:38:37 +0200
Subject: [PATCH 051/547] adapted to histfig_nemesis_id->union

---
 library/modules/Units.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp
index 313d6ee9f..dc76c6802 100644
--- a/library/modules/Units.cpp
+++ b/library/modules/Units.cpp
@@ -212,7 +212,7 @@ void Units::setNickname(df::unit *unit, std::string nick)
             case df::identity_type::Unk_1:  // Guess, but that's how it worked in the past
             case df::identity_type::TrueName:
             case df::identity_type::Unk_4:  // Pure guess, as this is a new case, still unseen
-                id_hfig = df::historical_figure::find(identity->histfig_nemesis_id);
+                id_hfig = df::historical_figure::find(identity->figure.historical);
                 break;
             }
 

From 21be5cf061c65ef9d0ec7e9e8c1ab99adc97fa77 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Wed, 22 Apr 2020 15:32:49 +0200
Subject: [PATCH 052/547] adapted to structures

---
 library/modules/Units.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp
index dc76c6802..c4b9e60fa 100644
--- a/library/modules/Units.cpp
+++ b/library/modules/Units.cpp
@@ -212,7 +212,7 @@ void Units::setNickname(df::unit *unit, std::string nick)
             case df::identity_type::Unk_1:  // Guess, but that's how it worked in the past
             case df::identity_type::TrueName:
             case df::identity_type::Unk_4:  // Pure guess, as this is a new case, still unseen
-                id_hfig = df::historical_figure::find(identity->figure.historical);
+                id_hfig = df::historical_figure::find(identity->histfig_id);
                 break;
             }
 

From 75c8bf1a59e49f8f64371b11a528eb086edfd685 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 22 Apr 2020 22:05:48 -0400
Subject: [PATCH 053/547] Indent more

---
 plugins/remotefortressreader/remotefortressreader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp
index 686c32211..e94c3f832 100644
--- a/plugins/remotefortressreader/remotefortressreader.cpp
+++ b/plugins/remotefortressreader/remotefortressreader.cpp
@@ -1693,7 +1693,7 @@ static command_result GetUnitListInside(color_ostream &stream, const BlockReques
         using df::global::cur_year;
         using df::global::cur_year_tick;
 
-       send_unit->set_age(Units::getAge(unit, false));
+        send_unit->set_age(Units::getAge(unit, false));
 
         ConvertDfColor(Units::getProfessionColor(unit), send_unit->mutable_profession_color());
         send_unit->set_flags1(unit->flags1.whole);

From 0272fd57f8cf662537f1896beca31e2c0041bba8 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 22 Apr 2020 22:16:24 -0400
Subject: [PATCH 054/547] Update submodules

---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index 353caa341..eb99251b8 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 353caa3413f728938821c8aaccebb389a322bfef
+Subproject commit eb99251b8f5e0a07788e1a3704bc9859323fdbc4
diff --git a/scripts b/scripts
index 1468a773e..068ae1342 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 1468a773e4b56716d94c28cc90a6988739d0c561
+Subproject commit 068ae13427c7bad0c084c21a1ac83eec91395efa

From c5513c3ca1fa194b459b103bae2bd4d103c31454 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 23 Apr 2020 01:11:29 -0400
Subject: [PATCH 055/547] Update xml

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index eb99251b8..3e83ae5fc 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit eb99251b8f5e0a07788e1a3704bc9859323fdbc4
+Subproject commit 3e83ae5fc53ae6ff2e4e76ac0fa83af39cd6794d

From 84f13b643b38c87f77b9c3c9ed0599e30c1b442a Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Thu, 23 Apr 2020 15:34:26 -0500
Subject: [PATCH 056/547] update structures

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index 3e83ae5fc..275f5c519 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 3e83ae5fc53ae6ff2e4e76ac0fa83af39cd6794d
+Subproject commit 275f5c5199cc4f6293dac1cfeb17ffdebee4312a

From 27e42ed25dd426182237eaa242291d1d4df89368 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 23 Apr 2020 23:10:30 -0400
Subject: [PATCH 057/547] Update xml

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index 275f5c519..a106b5e98 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 275f5c5199cc4f6293dac1cfeb17ffdebee4312a
+Subproject commit a106b5e98381184004fa9dfff44072239755e554

From c6ed0a24584c2c279828e26cb89c7082b2483660 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 24 Apr 2020 21:15:04 -0400
Subject: [PATCH 058/547] Update xml, scripts, authors

---
 docs/Authors.rst | 1 +
 library/xml      | 2 +-
 scripts          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/Authors.rst b/docs/Authors.rst
index 72d61de06..6821a84b0 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -117,6 +117,7 @@ Priit Laes              plaes
 Putnam                  Putnam3145
 Quietust                quietust                _Q
 Raidau                  Raidau
+Ralph Bisschops         ralpha
 Ramblurr                Ramblurr
 rampaging-poet
 Raoul van Putten
diff --git a/library/xml b/library/xml
index a106b5e98..3a1e2159a 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit a106b5e98381184004fa9dfff44072239755e554
+Subproject commit 3a1e2159a55ea46622b8bcfab35333b3674405fd
diff --git a/scripts b/scripts
index 068ae1342..73f89fe3d 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 068ae13427c7bad0c084c21a1ac83eec91395efa
+Subproject commit 73f89fe3d48e52d9d860462df02d488b73de0953

From 7bdf958518d2892ee89a7173224a069c4a2190d8 Mon Sep 17 00:00:00 2001
From: Ben Rosser <rosser.bjr@gmail.com>
Date: Fri, 24 Apr 2020 21:18:46 -0400
Subject: [PATCH 059/547] Fix protobuf compilation with GCC 10 on Fedora

Fixes #1506
---
 depends/protobuf/google/protobuf/message.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/depends/protobuf/google/protobuf/message.cc b/depends/protobuf/google/protobuf/message.cc
index 91e6878e8..37db6a485 100644
--- a/depends/protobuf/google/protobuf/message.cc
+++ b/depends/protobuf/google/protobuf/message.cc
@@ -32,6 +32,7 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
+#include <fstream>
 #include <stack>
 #include <google/protobuf/stubs/hash.h>
 

From 55a82e43c6838849417723780be4f09f048d6b0b Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 24 Apr 2020 23:50:35 -0400
Subject: [PATCH 060/547] Update xml, fix stockpiles build

---
 library/xml                                | 2 +-
 plugins/stockpiles/StockpileSerializer.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index 3a1e2159a..e42376086 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 3a1e2159a55ea46622b8bcfab35333b3674405fd
+Subproject commit e42376086e04fe6db338eadefb00511dcccf1d7b
diff --git a/plugins/stockpiles/StockpileSerializer.cpp b/plugins/stockpiles/StockpileSerializer.cpp
index cdeced990..e5873988f 100644
--- a/plugins/stockpiles/StockpileSerializer.cpp
+++ b/plugins/stockpiles/StockpileSerializer.cpp
@@ -417,7 +417,7 @@ void StockpileSerializer::serialize_list_itemdef ( FuncWriteExport add_value,  s
         {
             const df::itemdef *a = items.at ( i );
             // skip procedurally generated items
-            if ( a->base_flags.is_set ( 0 ) ) continue;
+            if ( a->base_flags.is_set ( df::itemdef_flags::GENERATED ) ) continue;
             ItemTypeInfo ii;
             if ( !ii.decode ( type,  i ) ) continue;
             add_value ( ii.getToken() );

From 405af5a20b131f8bc0a098c56b02fca6cd2811f1 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 25 Apr 2020 02:01:21 -0400
Subject: [PATCH 061/547] Update structures

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index e42376086..a7dae6083 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit e42376086e04fe6db338eadefb00511dcccf1d7b
+Subproject commit a7dae6083d295821afe2ba91073d9b7547395b45

From 1546d9ec1a3c5673dfa49795bb8a956bf17c3b2d Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 25 Apr 2020 02:41:27 -0400
Subject: [PATCH 062/547] Tweak docs from #1484

---
 docs/Plugins.rst      | 4 ++--
 plugins/getplants.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index 9e8911db1..421e5e81b 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -2322,9 +2322,9 @@ restricting the list to trees, shrubs, and farmable shrubs, respectively.
     designation). See :issue:`1479` for details.
 
     The implementation another known deficiency: it's incapable of detecting that
-    RAW definitions that specify a seed extraction reaction for the structural part
+    raw definitions that specify a seed extraction reaction for the structural part
     but has no other use for it cannot actually yield any seeds, as the part is
-    never used (parts of bug tracker report 6940, e.g. Red Spinach), even though DF
+    never used (parts of :bug:`6940`, e.g. Red Spinach), even though DF
     collects it, unless there's a workshop reaction to do it (which there isn't
     in vanilla).
 
diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp
index 11717b36b..d678a63b0 100644
--- a/plugins/getplants.cpp
+++ b/plugins/getplants.cpp
@@ -64,7 +64,7 @@ enum class selectability {
 //  Both Red Spinach and Elephant-Head Amaranth have the seed extraction reaction
 //  explicitly specified for the structural part, but no other use for it. This causes
 //  these parts to be collected (a valid reaction is defined), but remain unusable. This
-//  is one ofthe issues in bug 9640 on the bug tracker (the others cases are detected and
+//  is one of the issues in bug 9640 on the bug tracker (the others cases are detected and
 //  result in the plants not being usable for farming or even collectable at all).
 
 //selectability selectablePlant(color_ostream &out, const df::plant_raw *plant, bool farming)

From f008da32f8ef555cb048e76a31434c7b5214c869 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 25 Apr 2020 17:58:09 -0400
Subject: [PATCH 063/547] Update submodules

---
 library/xml           | 2 +-
 plugins/getplants.cpp | 2 +-
 scripts               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/xml b/library/xml
index a7dae6083..08d81cea7 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit a7dae6083d295821afe2ba91073d9b7547395b45
+Subproject commit 08d81cea7c32fee3fd55deb434d9f43e3b228497
diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp
index d678a63b0..d1ee79a04 100644
--- a/plugins/getplants.cpp
+++ b/plugins/getplants.cpp
@@ -64,7 +64,7 @@ enum class selectability {
 //  Both Red Spinach and Elephant-Head Amaranth have the seed extraction reaction
 //  explicitly specified for the structural part, but no other use for it. This causes
 //  these parts to be collected (a valid reaction is defined), but remain unusable. This
-//  is one of the issues in bug 9640 on the bug tracker (the others cases are detected and
+//  is one of the issues in bug 6940 on the bug tracker (the others cases are detected and
 //  result in the plants not being usable for farming or even collectable at all).
 
 //selectability selectablePlant(color_ostream &out, const df::plant_raw *plant, bool farming)
diff --git a/scripts b/scripts
index 73f89fe3d..b5ea085b5 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 73f89fe3d48e52d9d860462df02d488b73de0953
+Subproject commit b5ea085b5cfc9411d7374257db245a0ebefed380

From 02c118335f3f399ea41f9c0129cd13e840abc7c7 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 25 Apr 2020 17:59:50 -0400
Subject: [PATCH 064/547] Restore build-lua.sh for build-env

---
 travis/build-lua.sh | 54 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 travis/build-lua.sh

diff --git a/travis/build-lua.sh b/travis/build-lua.sh
new file mode 100644
index 000000000..e29d7ce87
--- /dev/null
+++ b/travis/build-lua.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+set -e
+
+LUA_ROOT="$HOME/lua53"
+LUA_URL="http://www.lua.org/ftp/lua-5.3.3.tar.gz"
+LUA_TAR=$(basename "$LUA_URL")
+LUA_DIR="$LUA_ROOT/${LUA_TAR%.tar.*}"
+LUA_SHA1="a0341bc3d1415b814cc738b2ec01ae56045d64ef"
+
+echo LUA_ROOT $LUA_ROOT
+echo LUA_TAR $LUA_TAR
+echo LUA_DIR $LUA_DIR
+
+sha1() {
+    python -c 'import hashlib, sys; print(hashlib.sha1(open(sys.argv[1],"rb").read()).hexdigest())' "$1"
+}
+
+download() {
+    echo "Downloading $LUA_URL"
+    wget -O "$LUA_ROOT/$LUA_TAR" "$LUA_URL"
+    tar xvf "$LUA_ROOT/$LUA_TAR"
+}
+
+build() {
+    cd "$LUA_DIR/src"
+    make generic
+}
+
+main() {
+    mkdir -p "$LUA_ROOT"
+    cd "$LUA_ROOT"
+    mkdir -p bin
+
+    if [ "$(sha1 "$LUA_ROOT/$LUA_TAR" 2>/dev/null)" != "$LUA_SHA1" ]; then
+        download
+        build
+    else
+        echo "Already downloaded"
+
+        if [ -x "$LUA_DIR/src/luac" ]; then
+            echo "Already built"
+        else
+            build
+        fi
+    fi
+
+    echo "Linking"
+    ln -sf "$LUA_DIR/src/lua" "$LUA_ROOT/bin/lua5.3"
+    ln -sf "$LUA_DIR/src/luac" "$LUA_ROOT/bin/luac5.3"
+    echo "Done"
+}
+
+main

From 3380f9ccf49e47e551168cfa48b947a4d00f9ded Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 25 Apr 2020 21:03:32 -0400
Subject: [PATCH 065/547] Update changelog

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 6ce9f69fd..3a20e1766 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -41,6 +41,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Fixes
 - Fixed translation of certain types of in-game names
+- Fixed a crash in ``find()`` for some types when no world is loaded
 - `autogems`: fixed an issue with binned gems being ignored in linked stockpiles
 - `tweak` embark-profile-name: fixed handling of the native shift+space key
 

From 7a2ef4ff608df930c5cdf7d70e8367330a96997d Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 25 Apr 2020 21:14:27 -0400
Subject: [PATCH 066/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index b5ea085b5..b3c2e1402 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit b5ea085b5cfc9411d7374257db245a0ebefed380
+Subproject commit b3c2e14029ebc544ea677738e3d155eaf732ef4c

From f76b890cc8434f077285e83ca7ca147c245f0140 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 25 Apr 2020 21:18:33 -0400
Subject: [PATCH 067/547] Ensure that dev changelogs are also sorted, since
 they are pulled in from multiple files now

---
 docs/gen_changelog.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/gen_changelog.py b/docs/gen_changelog.py
index cd27d99d2..8b1a6771e 100644
--- a/docs/gen_changelog.py
+++ b/docs/gen_changelog.py
@@ -235,6 +235,7 @@ def generate_changelog(all=False):
         dev_entries[entry.dev_version][entry.section].append(entry)
 
     consolidate_changelog(stable_entries)
+    consolidate_changelog(dev_entries)
 
     print_changelog(versions, stable_entries, 'docs/_auto/news.rst')
     print_changelog(versions, dev_entries, 'docs/_auto/news-dev.rst')

From 6bdbf5b0ddaa045a8fc6ff91e91dc30cb3d21e3f Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 25 Apr 2020 21:33:02 -0400
Subject: [PATCH 068/547] Update to 0.47.04-r1, update xml, scripts, changelog
 version

---
 CMakeLists.txt     | 4 ++--
 docs/changelog.txt | 2 ++
 library/xml        | 2 +-
 scripts            | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8dd5dc86..5a5e8312b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,8 +180,8 @@ endif()
 
 # set up versioning.
 set(DF_VERSION "0.47.04")
-set(DFHACK_RELEASE "beta1")
-set(DFHACK_PRERELEASE TRUE)
+set(DFHACK_RELEASE "r1")
+set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
 
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 16105efc2..d3ed3e51c 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -39,6 +39,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 # Future
 
+# 0.47.04-r1
+
 ## Fixes
 - Fixed translation of certain types of in-game names
 - Fixed a crash in ``find()`` for some types when no world is loaded
diff --git a/library/xml b/library/xml
index 08d81cea7..0792fc020 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 08d81cea7c32fee3fd55deb434d9f43e3b228497
+Subproject commit 0792fc0202fb6a04bfdaa262bc36a3b14c8581e5
diff --git a/scripts b/scripts
index b3c2e1402..2079b9fb6 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit b3c2e14029ebc544ea677738e3d155eaf732ef4c
+Subproject commit 2079b9fb69b8b4db48aa35ec54a96f5cca7cc8ef

From 2108c2363dd22adc5bd24cea48217ca61834b04c Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 28 Apr 2020 01:21:11 -0400
Subject: [PATCH 069/547] Use strcmp

---
 library/LuaTypes.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/LuaTypes.cpp b/library/LuaTypes.cpp
index 4e90265ce..ebc33b477 100644
--- a/library/LuaTypes.cpp
+++ b/library/LuaTypes.cpp
@@ -708,7 +708,7 @@ static type_identity *find_primitive_field(lua_State *state, int field, const ch
 static int meta_primitive_index(lua_State *state)
 {
     const char *attr = lua_tostring(state, -1);
-    if (attr == std::string("ref_target")) {
+    if (strcmp(attr, "ref_target") == 0) {
         const struct_field_info *field_info = get_object_ref_header(state, 1)->field_info;
         if (field_info && field_info->extra && field_info->extra->ref_target) {
             LookupInTable(state, field_info->extra->ref_target, &DFHACK_TYPEID_TABLE_TOKEN);
@@ -717,6 +717,7 @@ static int meta_primitive_index(lua_State *state)
         }
         return 1;
     }
+
     uint8_t *ptr = get_object_addr(state, 1, 2, "read");
     auto type = find_primitive_field(state, 2, "read", &ptr);
     if (!type)

From 24cebbda5813450b0196253cc7c26aa773f23622 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 28 Apr 2020 21:38:47 -0400
Subject: [PATCH 070/547] Fix segfault when setting DFHACK_HEADLESS but not
 PRINT_MODE:TEXT

endwin() is unhappy if initscr() wasn't called
---
 library/Core.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/library/Core.cpp b/library/Core.cpp
index c0a1155c7..a9fe9a69a 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -1692,14 +1692,21 @@ bool Core::Init()
     if (is_headless)
     {
 #ifdef LINUX_BUILD
-        auto endwin = (int(*)(void))dlsym(RTLD_DEFAULT, "endwin");
-        if (endwin)
+        if (is_text_mode)
         {
-            endwin();
+            auto endwin = (int(*)(void))dlsym(RTLD_DEFAULT, "endwin");
+            if (endwin)
+            {
+                endwin();
+            }
+            else
+            {
+                cerr << "endwin(): bind failed" << endl;
+            }
         }
         else
         {
-            cerr << "endwin(): bind failed" << endl;
+            cerr << "Headless mode requires PRINT_MODE:TEXT" << endl;
         }
 #else
         cerr << "Headless mode not supported on Windows" << endl;

From 1dc59d377275f893d568bc5782107ef3ff609806 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 1 May 2020 22:50:02 -0400
Subject: [PATCH 071/547] Ruby: use core methods for finding selected item and
 building

Similar to c3d566332, the core methods have become more complicated (and are also checked at compile-time). This will give a more consistent experience across scripts.

Fixes #1563
---
 plugins/ruby/building.rb | 11 +----------
 plugins/ruby/item.rb     | 36 +-----------------------------------
 plugins/ruby/ruby.cpp    | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 45 deletions(-)

diff --git a/plugins/ruby/building.rb b/plugins/ruby/building.rb
index 7a85e9314..dae1d455b 100644
--- a/plugins/ruby/building.rb
+++ b/plugins/ruby/building.rb
@@ -2,16 +2,7 @@ module DFHack
     class << self
         def building_find(what=:selected, y=nil, z=nil)
             if what == :selected
-                case ui.main.mode
-                when :LookAround
-                    k = ui_look_list.items[ui_look_cursor]
-                    k.building if k.type == :Building
-                when :BuildingItems, :QueryBuilding
-                    world.selected_building
-                when :Zones, :ZonesPenInfo, :ZonesPitInfo, :ZonesHospitalInfo
-                    ui_sidebar_menus.zone.selected
-                end
-
+                return world.buildings.all.binsearch(df.get_selected_building_id)
             elsif what.kind_of?(Integer)
                 # search by building.id
                 return world.buildings.all.binsearch(what) if not z
diff --git a/plugins/ruby/item.rb b/plugins/ruby/item.rb
index 394e545c6..59477c382 100644
--- a/plugins/ruby/item.rb
+++ b/plugins/ruby/item.rb
@@ -4,41 +4,7 @@ module DFHack
         # arg similar to unit.rb/unit_find; no arg = 'k' menu
         def item_find(what=:selected, y=nil, z=nil)
             if what == :selected
-                case curview._rtti_classname
-                when :viewscreen_itemst
-                    if ref = curview.entry_ref[curview.cursor_pos]
-                        ref.item_tg if ref.kind_of?(GeneralRefItem)
-                    else
-                        # not a container
-                        curview.item
-                    end
-                when :viewscreen_storesst   # z/stocks
-                    if curview.in_group_mode == 0 and curview.in_right_list == 1
-                        curview.items[curview.item_cursor]
-                    end
-                else
-                    case ui.main.mode
-                    when :LookAround
-                        k = ui_look_list.items[ui_look_cursor]
-                        case k.type
-                        when :Item
-                            k.item
-                        when :Building
-                            # hilight a constructed bed/coffer
-                            mats = k.building.contained_items.find_all { |i| i.use_mode == 2 }
-                            mats[0].item if mats.length == 1
-                        end
-                    when :BuildingItems
-                        bld = world.selected_building
-                        bld.contained_items[ui_building_item_cursor].item if bld
-                    when :ViewUnits
-                        u = world.units.active[ui_selected_unit]
-                        u.inventory[ui_look_cursor].item if u and u.pos.z == cursor.z and
-                                ui_unit_view_mode.value == :Inventory and u.inventory[ui_look_cursor]
-                    else
-                        ui.follow_item_tg if ui.follow_item != -1
-                    end
-                end
+                return world.items.all.binsearch(df.get_selected_item_id)
             elsif what.kind_of?(Integer)
                 # search by id
                 return world.items.all.binsearch(what) if not z
diff --git a/plugins/ruby/ruby.cpp b/plugins/ruby/ruby.cpp
index 240a67cb2..0209806d1 100644
--- a/plugins/ruby/ruby.cpp
+++ b/plugins/ruby/ruby.cpp
@@ -9,6 +9,8 @@
 
 #include "modules/Gui.h"
 #include "df/global_objects.h"
+#include "df/building.h"
+#include "df/item.h"
 #include "df/unit.h"
 
 #include "tinythread.h"
@@ -630,6 +632,18 @@ static VALUE rb_dfget_vtable_ptr(VALUE self, VALUE objptr)
     return rb_uint2inum(*(uintptr_t*)rb_num2ulong(objptr));
 }
 
+static VALUE rb_dfget_selected_building_id(VALUE self)
+{
+    df::building *b = Gui::getAnyBuilding(Core::getTopViewscreen());
+    return rb_int2inum(b ? b->id : -1);
+}
+
+static VALUE rb_dfget_selected_item_id(VALUE self)
+{
+    df::item *i = Gui::getAnyItem(Core::getTopViewscreen());
+    return rb_int2inum(i ? i->id : -1);
+}
+
 static VALUE rb_dfget_selected_unit_id(VALUE self)
 {
     df::unit *u = Gui::getAnyUnit(Core::getTopViewscreen());
@@ -1147,6 +1161,8 @@ static void ruby_bind_dfhack(void) {
     rb_define_singleton_method(rb_cDFHack, "get_vtable", RUBY_METHOD_FUNC(rb_dfget_vtable), 1);
     rb_define_singleton_method(rb_cDFHack, "get_rtti_classname", RUBY_METHOD_FUNC(rb_dfget_rtti_classname), 1);
     rb_define_singleton_method(rb_cDFHack, "get_vtable_ptr", RUBY_METHOD_FUNC(rb_dfget_vtable_ptr), 1);
+    rb_define_singleton_method(rb_cDFHack, "get_selected_building_id", RUBY_METHOD_FUNC(rb_dfget_selected_building_id), 0);
+    rb_define_singleton_method(rb_cDFHack, "get_selected_item_id", RUBY_METHOD_FUNC(rb_dfget_selected_item_id), 0);
     rb_define_singleton_method(rb_cDFHack, "get_selected_unit_id", RUBY_METHOD_FUNC(rb_dfget_selected_unit_id), 0);
     rb_define_singleton_method(rb_cDFHack, "dfhack_run", RUBY_METHOD_FUNC(rb_dfhack_run), 1);
     rb_define_singleton_method(rb_cDFHack, "print_str", RUBY_METHOD_FUNC(rb_dfprint_str), 1);

From 217535decbc38709cb0870530cf796a9e438b52f Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 1 May 2020 22:52:35 -0400
Subject: [PATCH 072/547] Update xml

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index 0792fc020..7941e0ffa 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 0792fc0202fb6a04bfdaa262bc36a3b14c8581e5
+Subproject commit 7941e0ffa7e355cd2363367cdfbb3e085ac4a941

From 947d0db182832c931e26b30eb13daba94219a1cc Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Sat, 2 May 2020 01:54:38 -0500
Subject: [PATCH 073/547] update structures

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index 7941e0ffa..0231cce29 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 7941e0ffa7e355cd2363367cdfbb3e085ac4a941
+Subproject commit 0231cce29e6014367c0af122aed4f7ba21292b2b

From 1c57aa7bb4f103b482c3dabba9bcfcb0bdb47e90 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Sat, 2 May 2020 02:01:32 -0500
Subject: [PATCH 074/547] update structures

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index 0231cce29..b4dfab6d0 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 0231cce29e6014367c0af122aed4f7ba21292b2b
+Subproject commit b4dfab6d08635da8b01504a289e8cf4e62c859c5

From ec7f97bb7a85a1d317c5fdba602e8bbc43eb44cd Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Sat, 2 May 2020 17:37:10 +0200
Subject: [PATCH 075/547] adapted to enum value name change

---
 library/modules/Units.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp
index c4b9e60fa..43eb9026c 100644
--- a/library/modules/Units.cpp
+++ b/library/modules/Units.cpp
@@ -209,7 +209,7 @@ void Units::setNickname(df::unit *unit, std::string nick)
             case df::identity_type::FalseIdentity:
                 break;  //  We want the nickname to end up in the identity
 
-            case df::identity_type::Unk_1:  // Guess, but that's how it worked in the past
+            case df::identity_type::Impersonating:
             case df::identity_type::TrueName:
             case df::identity_type::Unk_4:  // Pure guess, as this is a new case, still unseen
                 id_hfig = df::historical_figure::find(identity->histfig_id);

From fcc49620520bcc48662ed363130c17d662d324e6 Mon Sep 17 00:00:00 2001
From: JapaMala <japa.mala.illo@gmail.com>
Date: Sat, 2 May 2020 10:58:07 -0700
Subject: [PATCH 076/547] Update stonesense to not crash.

---
 plugins/stonesense | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/stonesense b/plugins/stonesense
index b9fc28836..5b7e7743a 160000
--- a/plugins/stonesense
+++ b/plugins/stonesense
@@ -1 +1 @@
-Subproject commit b9fc28836f34f7ce1be64de94afd90184a341c7d
+Subproject commit 5b7e7743a1372b929acb2ccb75080e139ac11691

From 60853a543df9e5a90f71f9b315e7169211a126b2 Mon Sep 17 00:00:00 2001
From: JapaMala <japa.mala.illo@gmail.com>
Date: Sat, 2 May 2020 13:28:28 -0700
Subject: [PATCH 077/547] Remove the site realization building type from the
 remote reader spec. It has no business being there.

---
 plugins/proto/RemoteFortressReader.proto      | 29 +------------------
 .../remotefortressreader.cpp                  |  2 +-
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/plugins/proto/RemoteFortressReader.proto b/plugins/proto/RemoteFortressReader.proto
index a54a0397f..864cdba1a 100644
--- a/plugins/proto/RemoteFortressReader.proto
+++ b/plugins/proto/RemoteFortressReader.proto
@@ -642,33 +642,6 @@ message WorldMap
     repeated RegionTile region_tiles = 25;
 }
 
-enum SiteRealizationBuildingType
-{
-    cottage_plot = 0;
-    castle_wall = 1;
-    castle_tower = 2;
-    castle_courtyard = 3;
-    house = 4;
-    temple = 5;
-    tomb = 6;
-    shop_house = 7;
-    warehouse = 8;
-    market_square = 9;
-    pasture = 10;
-    waste = 11;
-    courtyard = 12;
-    well = 13;
-    vault = 14;
-    great_tower = 15;
-    trenches = 16;
-    tree_house = 17;
-    hillock_house = 18;
-    mead_hall = 19;
-    fortress_entrance = 20;
-    library = 21;
-    tavern = 22;
-}
-
 message SiteRealizationBuildingWall
 {
     optional int32 start_x = 1;
@@ -702,7 +675,6 @@ message SiteRealizationBuildingTrenches
 message SiteRealizationBuilding
 {
     optional int32 id = 1;
-    optional SiteRealizationBuildingType type = 2;
     optional int32 min_x = 3;
     optional int32 min_y = 4;
     optional int32 max_x = 5;
@@ -711,6 +683,7 @@ message SiteRealizationBuilding
     optional SiteRealizationBuildingWall wall_info = 8;
     optional SiteRealizationBuildingTower tower_info = 9;
     optional SiteRealizationBuildingTrenches trench_info = 10;
+    optional int32 type = 11;
 }
 
 message RegionTile
diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp
index e94c3f832..7e654c727 100644
--- a/plugins/remotefortressreader/remotefortressreader.cpp
+++ b/plugins/remotefortressreader/remotefortressreader.cpp
@@ -2541,7 +2541,7 @@ static void CopyLocalMap(df::world_data * worldData, df::world_region_details* w
 
                     out_building->set_id(in_building->id);
 #if DF_VERSION_INT > 34011
-                    out_building->set_type((SiteRealizationBuildingType)in_building->type);
+                    out_building->set_type(in_building->type);
 #endif
                     out_building->set_min_x(in_building->min_x - (site_x * 48));
                     out_building->set_min_y(in_building->min_y - (site_y * 48));

From 63c7b69b5b5a9503b378185bf56b768e1c740d51 Mon Sep 17 00:00:00 2001
From: JapaMala <japa.mala.illo@gmail.com>
Date: Sat, 2 May 2020 14:38:55 -0700
Subject: [PATCH 078/547] Change item improvement type to bare ints.

---
 plugins/proto/RemoteFortressReader.proto     | 19 +------------------
 plugins/remotefortressreader/item_reader.cpp |  2 +-
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/plugins/proto/RemoteFortressReader.proto b/plugins/proto/RemoteFortressReader.proto
index 864cdba1a..8255f91cd 100644
--- a/plugins/proto/RemoteFortressReader.proto
+++ b/plugins/proto/RemoteFortressReader.proto
@@ -963,30 +963,13 @@ message Language
     repeated ShapeDescriptior shapes = 1;
 }
 
-enum ImprovementType
-{
-    ART_IMAGE = 0;
-    COVERED = 1;
-    RINGS_HANGING = 2;
-    BANDS = 3;
-    SPIKES = 4;
-    ITEMSPECIFIC = 5;
-    THREAD = 6;
-    CLOTH = 7;
-    SEWN_IMAGE = 8;
-    PAGES = 9;
-    ILLUSTRATION = 10;
-    INSTRUMENT_PIECE = 11;
-    WRITING = 12;
-}
-
 message ItemImprovement
 {
     optional MatPair material = 1;
-    optional ImprovementType type = 2;
     optional int32 shape = 3;
     optional int32 specific_type= 4;
     optional ArtImage image = 5;
+    optional int32 type = 6;
 }
 
 enum ArtImageElementType
diff --git a/plugins/remotefortressreader/item_reader.cpp b/plugins/remotefortressreader/item_reader.cpp
index 620e06310..56ec9019b 100644
--- a/plugins/remotefortressreader/item_reader.cpp
+++ b/plugins/remotefortressreader/item_reader.cpp
@@ -450,7 +450,7 @@ void CopyItem(RemoteFortressReader::Item * NetItem, df::item * DfItem)
 
             auto netImp = NetItem->add_improvements();
 
-            netImp->set_type((ImprovementType)impType);
+            netImp->set_type(impType);
 
             auto mat = netImp->mutable_material();
             mat->set_mat_type(improvement->mat_type);

From 866660169e89599141264ec3f03691bd4597dc79 Mon Sep 17 00:00:00 2001
From: Kelly Kinkade <kelly.lynn.martin@gmail.com>
Date: Sun, 3 May 2020 17:53:32 -0500
Subject: [PATCH 079/547] Update joblabormapper.cpp

Add no-labor mappings for new jobs 241 through 243.
---
 plugins/labormanager/joblabormapper.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/labormanager/joblabormapper.cpp b/plugins/labormanager/joblabormapper.cpp
index 7c4f80fb7..7b4e77553 100644
--- a/plugins/labormanager/joblabormapper.cpp
+++ b/plugins/labormanager/joblabormapper.cpp
@@ -896,6 +896,10 @@ JobLaborMapper::JobLaborMapper()
     job_to_labor_table[df::job_type::PutItemOnDisplay] = jlf_const(df::unit_labor::HAUL_ITEM);
 
     job_to_labor_table[df::job_type::StoreItemInLocation] = jlf_no_labor; // StoreItemInLocation
+
+    job_to_labor_table[df::job_type::unk_fake_no_job] = jlf_no_labor; // added for 47.04 - see #1561
+    job_to_labor_table[df::job_type::InterrogateSubject] = jlf_no_labor; // added for 47.04 - see #1561
+    job_to_labor_table[df::job_type::unk_fake_no_activity] = jlf_no_labor; // added for 47.04 - see #1561
 };
 
 df::unit_labor JobLaborMapper::find_job_labor(df::job* j)

From 319354f6cd34ad7a68bbbcc90b3c28948322e063 Mon Sep 17 00:00:00 2001
From: Kelly Kinkade <kelly.lynn.martin@gmail.com>
Date: Sun, 3 May 2020 18:16:31 -0500
Subject: [PATCH 080/547] Update labormanager.cpp

Add entries for jobs 241-243 to the `dwarf_states` vector as well, derp.
---
 plugins/labormanager/labormanager.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/labormanager/labormanager.cpp b/plugins/labormanager/labormanager.cpp
index e416dcf63..accb74b38 100644
--- a/plugins/labormanager/labormanager.cpp
+++ b/plugins/labormanager/labormanager.cpp
@@ -385,6 +385,9 @@ static const dwarf_state dwarf_states[] = {
     BUSY /* MakeBracelet */,
     BUSY /* MakeGem */,
     BUSY /* PutItemOnDisplay */,
+    BUSY /* unk_fake_no_job */,
+    BUSY /* InterrogateSubject */,
+    BUSY /* unk_fake_no_activity */,
 };
 
 struct labor_info

From 2dfd7ea0d0399b603b5461b4fee34c21079bd651 Mon Sep 17 00:00:00 2001
From: Kelly Kinkade <kelly.lynn.martin@gmail.com>
Date: Sun, 3 May 2020 18:19:49 -0500
Subject: [PATCH 081/547] Update labormanager.cpp again

These should probably be OTHER rather than BUSY.
---
 plugins/labormanager/labormanager.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/labormanager/labormanager.cpp b/plugins/labormanager/labormanager.cpp
index accb74b38..fad421104 100644
--- a/plugins/labormanager/labormanager.cpp
+++ b/plugins/labormanager/labormanager.cpp
@@ -385,9 +385,9 @@ static const dwarf_state dwarf_states[] = {
     BUSY /* MakeBracelet */,
     BUSY /* MakeGem */,
     BUSY /* PutItemOnDisplay */,
-    BUSY /* unk_fake_no_job */,
-    BUSY /* InterrogateSubject */,
-    BUSY /* unk_fake_no_activity */,
+    OTHER /* unk_fake_no_job */,
+    OTHER /* InterrogateSubject */,
+    OTHER /* unk_fake_no_activity */,
 };
 
 struct labor_info

From af33f71aa220a5b42dd640a3233f4ae57d75789b Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 3 May 2020 22:54:43 -0400
Subject: [PATCH 082/547] Update changelog

Includes #1561/#1566
---
 docs/changelog.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index d3ed3e51c..1aa7f916e 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -39,6 +39,13 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 # Future
 
+## Fixes
+- Fixed a segfault when attempting to start a headless session with a graphical PRINT_MODE setting
+- `labormanager`: fixed handling of new jobs in 0.47
+
+## Ruby
+- Updated ``item_find`` and ``building_find`` to use centralized logic that works on more screens
+
 # 0.47.04-r1
 
 ## Fixes

From be517370a69ab6d8b35ffff58c6c5fc5068257ec Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 4 May 2020 18:38:54 -0400
Subject: [PATCH 083/547] rendermax: move to std::mutex

fast_mutex can deadlock on Linux with optimization enabled
---
 plugins/rendermax/renderer_light.cpp  |  4 ++--
 plugins/rendermax/renderer_light.hpp  | 24 +++++++++++++-----------
 plugins/rendermax/renderer_opengl.hpp | 22 ++++++++++------------
 plugins/rendermax/rendermax.cpp       | 24 ++++++++++--------------
 4 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/plugins/rendermax/renderer_light.cpp b/plugins/rendermax/renderer_light.cpp
index dda928afa..d76889220 100644
--- a/plugins/rendermax/renderer_light.cpp
+++ b/plugins/rendermax/renderer_light.cpp
@@ -270,7 +270,7 @@ rgbf blend(const rgbf& a,const rgbf& b)
 void lightingEngineViewscreen::clear()
 {
     lightMap.assign(lightMap.size(),rgbf(1,1,1));
-    tthread::lock_guard<tthread::fast_mutex> guard(myRenderer->dataMutex);
+    std::lock_guard<std::mutex> guard{myRenderer->dataMutex};
     if(lightMap.size()==myRenderer->lightGrid.size())
     {
         std::swap(myRenderer->lightGrid,lightMap);
@@ -299,7 +299,7 @@ void lightingEngineViewscreen::calculate()
 }
 void lightingEngineViewscreen::updateWindow()
 {
-    tthread::lock_guard<tthread::fast_mutex> guard(myRenderer->dataMutex);
+    std::lock_guard<std::mutex> guard{myRenderer->dataMutex};
     if(lightMap.size()!=myRenderer->lightGrid.size())
     {
         reinit();
diff --git a/plugins/rendermax/renderer_light.hpp b/plugins/rendermax/renderer_light.hpp
index b0fb8c5d5..4e779f3fa 100644
--- a/plugins/rendermax/renderer_light.hpp
+++ b/plugins/rendermax/renderer_light.hpp
@@ -1,11 +1,14 @@
-#ifndef RENDERER_LIGHT_INCLUDED
-#define RENDERER_LIGHT_INCLUDED
-#include "renderer_opengl.hpp"
-#include "Types.h"
-#include <tuple>
-#include <stack>
+#pragma once
+
 #include <memory>
+#include <mutex>
+#include <stack>
+#include <tuple>
 #include <unordered_map>
+
+#include "renderer_opengl.hpp"
+#include "Types.h"
+
 // we are not using boost so let's cheat:
 template <class T>
 inline void hash_combine(std::size_t & seed, const T & v)
@@ -91,7 +94,7 @@ private:
     }
     void reinitLightGrid(int w,int h)
     {
-        tthread::lock_guard<tthread::fast_mutex> guard(dataMutex);
+        std::lock_guard<std::mutex> guard{dataMutex};
         lightGrid.resize(w*h,rgbf(1,1,1));
     }
     void reinitLightGrid()
@@ -100,7 +103,7 @@ private:
     }
 
 public:
-    tthread::fast_mutex dataMutex;
+    std::mutex dataMutex;
     std::vector<rgbf> lightGrid;
     renderer_light(renderer* parent):renderer_wrap(parent),light_adaptation(1)
     {
@@ -108,12 +111,12 @@ public:
     }
     virtual void update_tile(int32_t x, int32_t y) {
         renderer_wrap::update_tile(x,y);
-        tthread::lock_guard<tthread::fast_mutex> guard(dataMutex);
+        std::lock_guard<std::mutex> guard{dataMutex};
         colorizeTile(x,y);
     };
     virtual void update_all() {
         renderer_wrap::update_all();
-        tthread::lock_guard<tthread::fast_mutex> guard(dataMutex);
+        std::lock_guard<std::mutex> guard{dataMutex};
         for (int x = 0; x < df::global::gps->dimx; x++)
             for (int y = 0; y < df::global::gps->dimy; y++)
                 colorizeTile(x,y);
@@ -374,4 +377,3 @@ private:
 };
 rgbf blend(const rgbf& a,const rgbf& b);
 rgbf blendMax(const rgbf& a,const rgbf& b);
-#endif
diff --git a/plugins/rendermax/renderer_opengl.hpp b/plugins/rendermax/renderer_opengl.hpp
index 76a45918c..a0a920e69 100644
--- a/plugins/rendermax/renderer_opengl.hpp
+++ b/plugins/rendermax/renderer_opengl.hpp
@@ -1,9 +1,7 @@
 //original file from https://github.com/Baughn/Dwarf-Fortress--libgraphics-
-#ifndef RENDERER_OPENGL_INCLUDED
-#define RENDERER_OPENGL_INCLUDED
+#pragma once
 
 #include "tinythread.h"
-#include "fast_mutex.h"
 
 #include "Core.h"
 #include <VTableInterpose.h>
@@ -15,6 +13,7 @@
 #include "df/graphic.h"
 #include <math.h>
 #include <cmath>
+#include <mutex>
 
 using df::renderer;
 using df::init;
@@ -281,7 +280,7 @@ private:
     }
     void reinitLightGrid(int w,int h)
     {
-        tthread::lock_guard<tthread::fast_mutex> guard(dataMutex);
+        std::lock_guard<std::mutex> guard{dataMutex};
         lightGrid.resize(w*h);
     }
     void reinitLightGrid()
@@ -289,7 +288,7 @@ private:
         reinitLightGrid(df::global::gps->dimy,df::global::gps->dimx);
     }
 public:
-    tthread::fast_mutex dataMutex;
+    std::mutex dataMutex;
     std::vector<rgbf> lightGrid;
     renderer_test(renderer* parent):renderer_wrap(parent)
     {
@@ -297,14 +296,14 @@ public:
     }
     virtual void update_tile(int32_t x, int32_t y) {
         renderer_wrap::update_tile(x,y);
-        tthread::lock_guard<tthread::fast_mutex> guard(dataMutex);
+        std::lock_guard<std::mutex> guard{dataMutex};
         colorizeTile(x,y);
         //some sort of mutex or sth?
         //and then map read
     };
     virtual void update_all() {
         renderer_wrap::update_all();
-        tthread::lock_guard<tthread::fast_mutex> guard(dataMutex);
+        std::lock_guard<std::mutex> guard{dataMutex};
         for (int x = 0; x < df::global::gps->dimx; x++)
             for (int y = 0; y < df::global::gps->dimy; y++)
                 colorizeTile(x,y);
@@ -366,7 +365,7 @@ private:
     }
     void reinitGrids(int w,int h)
     {
-        tthread::lock_guard<tthread::fast_mutex> guard(dataMutex);
+        std::lock_guard<std::mutex> guard{dataMutex};
         foreOffset.resize(w*h);
         foreMult.resize(w*h);
         backOffset.resize(w*h);
@@ -377,7 +376,7 @@ private:
         reinitGrids(df::global::gps->dimy,df::global::gps->dimx);
     }
 public:
-    tthread::fast_mutex dataMutex;
+    std::mutex dataMutex;
     std::vector<rgbf> foreOffset,foreMult;
     std::vector<rgbf> backOffset,backMult;
     inline int xyToTile(int x, int y)
@@ -390,14 +389,14 @@ public:
     }
     virtual void update_tile(int32_t x, int32_t y) {
         renderer_wrap::update_tile(x,y);
-        tthread::lock_guard<tthread::fast_mutex> guard(dataMutex);
+        std::lock_guard<std::mutex> guard{dataMutex};
         overwriteTile(x,y);
         //some sort of mutex or sth?
         //and then map read
     };
     virtual void update_all() {
         renderer_wrap::update_all();
-        tthread::lock_guard<tthread::fast_mutex> guard(dataMutex);
+        std::lock_guard<std::mutex> guard{dataMutex};
         for (int x = 0; x < df::global::gps->dimx; x++)
             for (int y = 0; y < df::global::gps->dimy; y++)
                 overwriteTile(x,y);
@@ -414,4 +413,3 @@ public:
         reinitGrids(w,h);
     }
 };
-#endif
\ No newline at end of file
diff --git a/plugins/rendermax/rendermax.cpp b/plugins/rendermax/rendermax.cpp
index be8be07ba..17fd6fa95 100644
--- a/plugins/rendermax/rendermax.cpp
+++ b/plugins/rendermax/rendermax.cpp
@@ -1,27 +1,23 @@
-#include <vector>
+#include <mutex>
+#include <sstream>
 #include <string>
+#include <vector>
 
-#include <LuaTools.h>
-
-#include <VTableInterpose.h>
-
-#include "Core.h"
 #include "Console.h"
+#include "Core.h"
 #include "Export.h"
+#include "LuaTools.h"
 #include "PluginManager.h"
+#include "VTableInterpose.h"
 
-#include <VTableInterpose.h>
-#include "df/renderer.h"
 #include "df/enabler.h"
+#include "df/renderer.h"
+#include "df/viewscreen_dungeonmodest.h"
+#include "df/viewscreen_dwarfmodest.h"
 
 #include "renderer_opengl.hpp"
 #include "renderer_light.hpp"
 
-#include "df/viewscreen_dwarfmodest.h"
-#include "df/viewscreen_dungeonmodest.h"
-
-#include <sstream>
-
 using df::viewscreen_dungeonmodest;
 using df::viewscreen_dwarfmodest;
 
@@ -367,7 +363,7 @@ static command_result rendermax(color_ostream &out, vector <string> & parameters
                 cur=blue;
 
             renderer_test* r=reinterpret_cast<renderer_test*>(enabler->renderer);
-            tthread::lock_guard<tthread::fast_mutex> guard(r->dataMutex);
+            std::lock_guard<std::mutex> guard{r->dataMutex};
             int h=gps->dimy;
             int w=gps->dimx;
             int cx=w/2;

From 1dc2d4b6aafd948518c37709a4979a6458674be3 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 4 May 2020 18:41:59 -0400
Subject: [PATCH 084/547] Remove tthread::fast_mutex entirely

This can deadlock on Linux, per be517370a69ab6d8b35ffff58c6c5fc5068257ec, and rendermax was the only tool that used it
---
 depends/tthread/fast_mutex.h | 249 -----------------------------------
 depends/tthread/tinythread.h |   1 -
 2 files changed, 250 deletions(-)
 delete mode 100644 depends/tthread/fast_mutex.h

diff --git a/depends/tthread/fast_mutex.h b/depends/tthread/fast_mutex.h
deleted file mode 100644
index a381b2c75..000000000
--- a/depends/tthread/fast_mutex.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/* -*- mode: c++; tab-width: 2; indent-tabs-mode: nil; -*-
-Copyright (c) 2010-2012 Marcus Geelnard
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-    1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
-
-    2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
-
-    3. This notice may not be removed or altered from any source
-    distribution.
-*/
-
-#ifndef _FAST_MUTEX_H_
-#define _FAST_MUTEX_H_
-
-/// @file
-
-// Which platform are we on?
-#if !defined(_TTHREAD_PLATFORM_DEFINED_)
-  #if defined(_WIN32) || defined(__WIN32__) || defined(__WINDOWS__)
-    #define _TTHREAD_WIN32_
-  #else
-    #define _TTHREAD_POSIX_
-  #endif
-  #define _TTHREAD_PLATFORM_DEFINED_
-#endif
-
-// Check if we can support the assembly language level implementation (otherwise
-// revert to the system API)
-#if (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))) || \
-    (defined(_MSC_VER) && (defined(_M_IX86) /*|| defined(_M_X64)*/)) || \
-    (defined(__GNUC__) && (defined(__ppc__)))
-  #define _FAST_MUTEX_ASM_
-#else
-  #define _FAST_MUTEX_SYS_
-#endif
-
-#if defined(_TTHREAD_WIN32_)
-  #define NOMINMAX
-  #ifndef WIN32_LEAN_AND_MEAN
-    #define WIN32_LEAN_AND_MEAN
-    #define __UNDEF_LEAN_AND_MEAN
-  #endif
-  #include <windows.h>
-  #ifdef __UNDEF_LEAN_AND_MEAN
-    #undef WIN32_LEAN_AND_MEAN
-    #undef __UNDEF_LEAN_AND_MEAN
-  #endif
-#else
-  #ifdef _FAST_MUTEX_ASM_
-    #include <sched.h>
-  #else
-    #include <pthread.h>
-  #endif
-#endif
-
-namespace tthread {
-
-/// Fast mutex class.
-/// This is a mutual exclusion object for synchronizing access to shared
-/// memory areas for several threads. It is similar to the tthread::mutex class,
-/// but instead of using system level functions, it is implemented as an atomic
-/// spin lock with very low CPU overhead.
-///
-/// The \c fast_mutex class is NOT compatible with the \c condition_variable
-/// class (however, it IS compatible with the \c lock_guard class). It should
-/// also be noted that the \c fast_mutex class typically does not provide
-/// as accurate thread scheduling as a the standard \c mutex class does.
-///
-/// Because of the limitations of the class, it should only be used in
-/// situations where the mutex needs to be locked/unlocked very frequently.
-///
-/// @note The "fast" version of this class relies on inline assembler language,
-/// which is currently only supported for 32/64-bit Intel x86/AMD64 and
-/// PowerPC architectures on a limited number of compilers (GNU g++ and MS
-/// Visual C++).
-/// For other architectures/compilers, system functions are used instead.
-class fast_mutex {
-  public:
-    /// Constructor.
-#if defined(_FAST_MUTEX_ASM_)
-    fast_mutex() : mLock(0) {}
-#else
-    fast_mutex()
-    {
-  #if defined(_TTHREAD_WIN32_)
-      InitializeCriticalSection(&mHandle);
-  #elif defined(_TTHREAD_POSIX_)
-      pthread_mutex_init(&mHandle, NULL);
-  #endif
-    }
-#endif
-
-#if !defined(_FAST_MUTEX_ASM_)
-    /// Destructor.
-    ~fast_mutex()
-    {
-  #if defined(_TTHREAD_WIN32_)
-      DeleteCriticalSection(&mHandle);
-  #elif defined(_TTHREAD_POSIX_)
-      pthread_mutex_destroy(&mHandle);
-  #endif
-    }
-#endif
-
-    /// Lock the mutex.
-    /// The method will block the calling thread until a lock on the mutex can
-    /// be obtained. The mutex remains locked until \c unlock() is called.
-    /// @see lock_guard
-    inline void lock()
-    {
-#if defined(_FAST_MUTEX_ASM_)
-      bool gotLock;
-      do {
-        gotLock = try_lock();
-        if(!gotLock)
-        {
-  #if defined(_TTHREAD_WIN32_)
-          Sleep(0);
-  #elif defined(_TTHREAD_POSIX_)
-          sched_yield();
-  #endif
-        }
-      } while(!gotLock);
-#else
-  #if defined(_TTHREAD_WIN32_)
-      EnterCriticalSection(&mHandle);
-  #elif defined(_TTHREAD_POSIX_)
-      pthread_mutex_lock(&mHandle);
-  #endif
-#endif
-    }
-
-    /// Try to lock the mutex.
-    /// The method will try to lock the mutex. If it fails, the function will
-    /// return immediately (non-blocking).
-    /// @return \c true if the lock was acquired, or \c false if the lock could
-    /// not be acquired.
-    inline bool try_lock()
-    {
-#if defined(_FAST_MUTEX_ASM_)
-      int oldLock;
-  #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-      asm volatile (
-        "movl $1,%%eax\n\t"
-        "xchg %%eax,%0\n\t"
-        "movl %%eax,%1\n\t"
-        : "=m" (mLock), "=m" (oldLock)
-        :
-        : "%eax", "memory"
-      );
-  #elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
-      int *ptrLock = &mLock;
-      __asm {
-        mov eax,1
-        mov ecx,ptrLock
-        xchg eax,[ecx]
-        mov oldLock,eax
-      }
-  #elif defined(__GNUC__) && (defined(__ppc__))
-      int newLock = 1;
-      asm volatile (
-        "\n1:\n\t"
-        "lwarx  %0,0,%1\n\t"
-        "cmpwi  0,%0,0\n\t"
-        "bne-   2f\n\t"
-        "stwcx. %2,0,%1\n\t"
-        "bne-   1b\n\t"
-        "isync\n"
-        "2:\n\t"
-        : "=&r" (oldLock)
-        : "r" (&mLock), "r" (newLock)
-        : "cr0", "memory"
-      );
-  #endif
-      return (oldLock == 0);
-#else
-  #if defined(_TTHREAD_WIN32_)
-      return TryEnterCriticalSection(&mHandle) ? true : false;
-  #elif defined(_TTHREAD_POSIX_)
-      return (pthread_mutex_trylock(&mHandle) == 0) ? true : false;
-  #endif
-#endif
-    }
-
-    /// Unlock the mutex.
-    /// If any threads are waiting for the lock on this mutex, one of them will
-    /// be unblocked.
-    inline void unlock()
-    {
-#if defined(_FAST_MUTEX_ASM_)
-  #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-      asm volatile (
-        "movl $0,%%eax\n\t"
-        "xchg %%eax,%0\n\t"
-        : "=m" (mLock)
-        :
-        : "%eax", "memory"
-      );
-  #elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
-      int *ptrLock = &mLock;
-      __asm {
-        mov eax,0
-        mov ecx,ptrLock
-        xchg eax,[ecx]
-      }
-  #elif defined(__GNUC__) && (defined(__ppc__))
-      asm volatile (
-        "sync\n\t"  // Replace with lwsync where possible?
-        : : : "memory"
-      );
-      mLock = 0;
-  #endif
-#else
-  #if defined(_TTHREAD_WIN32_)
-      LeaveCriticalSection(&mHandle);
-  #elif defined(_TTHREAD_POSIX_)
-      pthread_mutex_unlock(&mHandle);
-  #endif
-#endif
-    }
-
-  private:
-#if defined(_FAST_MUTEX_ASM_)
-    int mLock;
-#else
-  #if defined(_TTHREAD_WIN32_)
-    CRITICAL_SECTION mHandle;
-  #elif defined(_TTHREAD_POSIX_)
-    pthread_mutex_t mHandle;
-  #endif
-#endif
-};
-
-}
-
-#endif // _FAST_MUTEX_H_
-
diff --git a/depends/tthread/tinythread.h b/depends/tthread/tinythread.h
index d575bae33..b5ff2f077 100644
--- a/depends/tthread/tinythread.h
+++ b/depends/tthread/tinythread.h
@@ -46,7 +46,6 @@ freely, subject to the following restrictions:
 /// @li tthread::recursive_mutex
 /// @li tthread::condition_variable
 /// @li tthread::lock_guard
-/// @li tthread::fast_mutex
 ///
 /// @section misc_sec Miscellaneous
 /// The following special keywords are available: #thread_local.

From f3b3cb1b3316dee9f960c3670f94494ead27fb29 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 4 May 2020 19:26:49 -0400
Subject: [PATCH 085/547] Remove fast_mutex from CMakeLists

---
 depends/tthread/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/tthread/CMakeLists.txt b/depends/tthread/CMakeLists.txt
index 9e0e85dc5..dfb1d9901 100644
--- a/depends/tthread/CMakeLists.txt
+++ b/depends/tthread/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(dfhack-tinythread)
-add_library(dfhack-tinythread STATIC EXCLUDE_FROM_ALL tinythread.cpp tinythread.h fast_mutex.h)
+add_library(dfhack-tinythread STATIC EXCLUDE_FROM_ALL tinythread.cpp tinythread.h)
 if(UNIX)
     target_link_libraries(dfhack-tinythread pthread)
 endif()

From d0c030c3da62b88d97a05c417fce3d86e80fa7de Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 4 May 2020 19:27:17 -0400
Subject: [PATCH 086/547] Update xml (changelog only)

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index b4dfab6d0..0686cfdfc 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit b4dfab6d08635da8b01504a289e8cf4e62c859c5
+Subproject commit 0686cfdfc18e9f606f2c296b617d5b3ab6b83889

From 31d984e9348f23287f89b50ec661bdb542400f4d Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Tue, 5 May 2020 10:21:56 +0200
Subject: [PATCH 087/547] Fixed 2 incursion handling bugs

---
 docs/changelog.txt                  | 1 +
 plugins/embark-assistant/survey.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 1aa7f916e..5b83825e1 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -42,6 +42,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Fixes
 - Fixed a segfault when attempting to start a headless session with a graphical PRINT_MODE setting
 - `labormanager`: fixed handling of new jobs in 0.47
+- `embark-assistant`: fixed a couple of incursion handling bugs.
 
 ## Ruby
 - Updated ``item_find`` and ``building_find`` to use centralized logic that works on more screens
diff --git a/plugins/embark-assistant/survey.cpp b/plugins/embark-assistant/survey.cpp
index 79c66e4df..20dd9d539 100644
--- a/plugins/embark-assistant/survey.cpp
+++ b/plugins/embark-assistant/survey.cpp
@@ -2424,7 +2424,7 @@ void embark_assist::survey::survey_embark(embark_assist::defs::mid_level_tiles *
         }
         else {
             process_embark_incursion_mid_level_tile
-            (translate_ns_edge(survey_results,
+            (translate_ew_edge(survey_results,
                 true,
                 x,
                 y,
@@ -2481,7 +2481,7 @@ void embark_assist::survey::survey_embark(embark_assist::defs::mid_level_tiles *
         }
         else {
             process_embark_incursion_mid_level_tile
-            (translate_ns_edge(survey_results,
+            (translate_ew_edge(survey_results,
                 false,
                 x,
                 y,

From 1058e40cb0f42820ba1364477537bc9c668fb85f Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Tue, 28 Apr 2020 18:18:28 -0500
Subject: [PATCH 088/547] Enable /bigobj globally on MSVC.

This changes the intermediate format used for compiled files from one
that can hold up to 65279 (slightly less than 2^16) addressable sections
to one that can hold 4294967296 (2^32).

Code that uses templates, such as... C++ code... can easily run up
against the smaller limit. This does not affect the finished executable,
only the intermediate object files.
---
 CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a5e8312b..de0c858af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,6 +89,10 @@ if(MSVC)
     # a smaller type, and most of the time this is just conversion from 64 to 32 bits
     # for things like vector sizes, which are never that big anyway.
     add_definitions("/wd4267")
+
+    # MSVC panics if an object file contains more than 65,279 sections. this
+    # happens quite frequently with code that uses templates, such as vectors.
+    add_definitions("/bigobj")
 endif()
 
 # Automatically detect architecture based on Visual Studio generator

From 0ffafbde298cc84003ebec0de75013d6baa547e9 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Sat, 9 May 2020 18:28:19 -0500
Subject: [PATCH 089/547] update structures

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index 0686cfdfc..efc5c2610 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 0686cfdfc18e9f606f2c296b617d5b3ab6b83889
+Subproject commit efc5c2610bd0345e9102279be0a9f154e5862050

From fc10ed3df63f610fa4c3756ae121201f3c7a79f4 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Mon, 27 Apr 2020 18:26:31 -0500
Subject: [PATCH 090/547] Implementation for df-other-vectors-type in C++.
 Still needs Lua and Ruby support.

---
 library/include/BitArray.h | 10 ++++++++++
 library/include/DataDefs.h |  1 +
 2 files changed, 11 insertions(+)

diff --git a/library/include/BitArray.h b/library/include/BitArray.h
index cfb859bd0..dfd187363 100644
--- a/library/include/BitArray.h
+++ b/library/include/BitArray.h
@@ -568,4 +568,14 @@ namespace DFHack
             root->next = link;
         }
     };
+
+    template<typename T, typename O, typename I>
+    struct DfOtherVectors
+    {
+        std::vector<I *> & operator[](O other_id)
+        {
+            auto vectors = reinterpret_cast<std::vector<I *> *>(this);
+            return vectors[other_id];
+        }
+    };
 }
diff --git a/library/include/DataDefs.h b/library/include/DataDefs.h
index fd70b7ba8..3b961df20 100644
--- a/library/include/DataDefs.h
+++ b/library/include/DataDefs.h
@@ -474,6 +474,7 @@ namespace df
     using DFHack::BitArray;
     using DFHack::DfArray;
     using DFHack::DfLinkedList;
+    using DFHack::DfOtherVectors;
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"

From 7cf9624de9d25383ba548d49fa180f28409c8202 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Mon, 27 Apr 2020 18:56:48 -0500
Subject: [PATCH 091/547] add assert to make sure other_id array index is in
 bounds

---
 library/include/BitArray.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/library/include/BitArray.h b/library/include/BitArray.h
index dfd187363..5858897a3 100644
--- a/library/include/BitArray.h
+++ b/library/include/BitArray.h
@@ -574,6 +574,8 @@ namespace DFHack
     {
         std::vector<I *> & operator[](O other_id)
         {
+            CHECK_INVALID_ARGUMENT(size_t(other_id) < sizeof(*this) / sizeof(std::vector<I *>));
+
             auto vectors = reinterpret_cast<std::vector<I *> *>(this);
             return vectors[other_id];
         }

From 6c20fe4c804fa97018bb1a4374c0d86470d5e26f Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Tue, 28 Apr 2020 13:55:34 -0500
Subject: [PATCH 092/547] implement df-other-vectors-type for lua

---
 library/LuaTypes.cpp       | 22 ++++++++++++++++++++++
 library/include/DataDefs.h | 18 ++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/library/LuaTypes.cpp b/library/LuaTypes.cpp
index 306538f51..c46d7ce05 100644
--- a/library/LuaTypes.cpp
+++ b/library/LuaTypes.cpp
@@ -1422,6 +1422,28 @@ void struct_identity::build_metatable(lua_State *state)
     SetPtrMethods(state, base+1, base+2);
 }
 
+void other_vectors_identity::build_metatable(lua_State *state)
+{
+    int base = lua_gettop(state);
+    MakeFieldMetatable(state, this, meta_struct_index, meta_struct_newindex);
+
+    EnableMetaField(state, base+2, "_enum");
+
+    LookupInTable(state, index_enum, &DFHACK_TYPEID_TABLE_TOKEN);
+    lua_setfield(state, base+1, "_enum");
+
+    auto keys = &index_enum->getKeys()[-index_enum->getFirstItem()];
+
+    for (int64_t i = 0; i < index_enum->getLastItem(); i++)
+    {
+        lua_getfield(state, base+2, keys[i]);
+        lua_rawseti(state, base+2, int(i));
+    }
+
+    SetStructMethod(state, base+1, base+2, meta_struct_field_reference, "_field");
+    SetPtrMethods(state, base+1, base+2);
+}
+
 void global_identity::build_metatable(lua_State *state)
 {
     int base = lua_gettop(state);
diff --git a/library/include/DataDefs.h b/library/include/DataDefs.h
index 3b961df20..f4eff8510 100644
--- a/library/include/DataDefs.h
+++ b/library/include/DataDefs.h
@@ -334,6 +334,23 @@ namespace DFHack
         virtual identity_type type() { return IDTYPE_UNION; }
     };
 
+    class DFHACK_EXPORT other_vectors_identity : public struct_identity {
+        enum_identity *index_enum;
+
+    public:
+        other_vectors_identity(size_t size, TAllocateFn alloc,
+                compound_identity *scope_parent, const char *dfhack_name,
+                struct_identity *parent, const struct_field_info *fields,
+                enum_identity *index_enum) :
+            struct_identity(size, alloc, scope_parent, dfhack_name, parent, fields),
+            index_enum(index_enum)
+        {}
+
+        enum_identity *getIndexEnum() { return index_enum; }
+
+        virtual void build_metatable(lua_State *state);
+    };
+
 #ifdef _MSC_VER
     typedef void *virtual_ptr;
 #else
@@ -465,6 +482,7 @@ namespace df
     using DFHack::global_identity;
     using DFHack::struct_identity;
     using DFHack::union_identity;
+    using DFHack::other_vectors_identity;
     using DFHack::struct_field_info;
     using DFHack::struct_field_info_extra;
     using DFHack::bitfield_item_info;

From 28c34217d86a77b6eafe26aca1c3ff371cb65ecb Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Tue, 28 Apr 2020 14:26:33 -0500
Subject: [PATCH 093/547] Ruby implementation of df-other-vectors-type

---
 plugins/ruby/codegen.pl           |  8 ++++++++
 plugins/ruby/ruby-autogen-defs.rb | 16 ++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/plugins/ruby/codegen.pl b/plugins/ruby/codegen.pl
index 2a12a1bea..535a49694 100755
--- a/plugins/ruby/codegen.pl
+++ b/plugins/ruby/codegen.pl
@@ -240,6 +240,12 @@ sub render_global_class {
     }
 
     my $rbparent = ($parent ? rb_ucase($parent) : 'MemHack::Compound');
+    my $ienum;
+    if (($type->getAttribute('ld:subtype') or '') eq 'df-other-vectors-type')
+    {
+        $rbparent = 'MemHack::OtherVectors';
+        $ienum = rb_ucase($type->getAttribute('index-enum'));
+    }
     push @lines_rb, "class $rbname < $rbparent";
     indent_rb {
         my $sz = sizeof($type);
@@ -249,6 +255,8 @@ sub render_global_class {
 
         push @lines_rb, "rtti_classname :$rtti_name\n" if $rtti_name;
 
+        push @lines_rb, "ienum $ienum\n" if $ienum;
+
         render_struct_fields($type);
 
         my $vms = $type->findnodes('child::virtual-methods')->[0];
diff --git a/plugins/ruby/ruby-autogen-defs.rb b/plugins/ruby/ruby-autogen-defs.rb
index 10727894d..c72ffeb2b 100644
--- a/plugins/ruby/ruby-autogen-defs.rb
+++ b/plugins/ruby/ruby-autogen-defs.rb
@@ -205,6 +205,22 @@ module DFHack
             end
         end
 
+        class OtherVectors < Compound
+            class << self
+                attr_accessor :_enum
+                def ienum(enum)
+                    @_enum = enum
+                end
+            end
+
+            def [](i)
+                self.send(self.class._enum.sym(i))
+            end
+            def []=(i, v)
+                self.send((self.class._enum.sym(i).to_s + "=").to_sym, v)
+            end
+        end
+
         class Enum
             # number -> symbol
             def self.enum

From 94d7f3b3475a6b1ff1c773e81395acb88f660ff7 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 13 May 2020 22:25:42 -0400
Subject: [PATCH 094/547] Update docs on cloning and git stuff

---
 docs/Compile.rst      | 106 ++++++++++++++++++++++++++++--------------
 docs/Introduction.rst |   1 +
 2 files changed, 71 insertions(+), 36 deletions(-)

diff --git a/docs/Compile.rst b/docs/Compile.rst
index f30775a03..3e7f9701e 100644
--- a/docs/Compile.rst
+++ b/docs/Compile.rst
@@ -2,10 +2,16 @@
 Compiling DFHack
 ################
 
-You don't need to compile DFHack unless you're developing plugins or working on the core.
+DFHack builds are available for all supported platforms; see `installing` for
+installation instructions. If you are a DFHack end-user, modder, or plan on
+writing scripts (not plugins), it is generally recommended (and easier) to use
+these builds instead of compiling DFHack from source.
 
-For users, modders, and authors of scripts it's better to download
-and `install the latest release instead <installing>`.
+However, if you are looking to develop plugins, work on the DFHack core, make
+complex changes to DF-structures, or anything else that requires compiling
+DFHack from source, this document will walk you through the build process. Note
+that some steps may be unconventional compared to other projects, so be sure to
+pay close attention if this is your first time compiling DFHack.
 
 .. contents::
    :depth: 2
@@ -14,35 +20,60 @@ and `install the latest release instead <installing>`.
 
 How to get the code
 ===================
-DFHack doesn't have any kind of system of code snapshots in place, so you will have to
-get code from the GitHub repository using Git.  How to get Git is described under
-the instructions for each platform.
-
-To get the latest release code (master branch)::
+DFHack uses Git for source control; instructions for installing Git can be found
+in the platform-specific sections below. The code is hosted on
+`GitHub <https://github.com/DFHack/dfhack>`_, and can be downloaded with::
 
     git clone --recursive https://github.com/DFHack/dfhack
     cd dfhack
 
-If your version of Git does not support the ``--recursive`` flag, you will need to omit it and run
-``git submodule update --init`` after entering the dfhack directory.
+If your version of Git does not support the ``--recursive`` flag, you will need
+to omit it and run ``git submodule update --init`` after entering the dfhack
+directory.
 
-To get the latest development code (develop branch), clone as above and then::
+This will check out the code on the default branch of the GitHub repo, currently
+``develop``, which may be unstable. If you want code for the latest stable
+release, you can check out the ``master`` branch instead::
 
-  git checkout develop
+  git checkout master
   git submodule update
 
-Generally, you should only need to clone DFHack once.
-
-**Important note regarding submodule update after pulling or changing branches**:
-
-You must run ``git submodule update`` every time you change branches, such as
-when switching between the master and develop branches or vice versa. You also
-must run it after pulling any changes to submodules from the DFHack repo. If a
-submodule only exists on the newer branch, or if a commit you just pulled
-contains a new submodule, you need to run ``git submodule update --init``.
-Failure to do this may result in a variety of errors, including ``fatal: <path>
-does not exist`` when using Git, errors when building DFHack, and ``not a known
-DF version`` when starting DF.
+In general, a single DFHack clone is suitable for development - most Git
+operations such as switching branches can be done on an existing clone. If you
+find yourself cloning DFHack frequently as part of your development process, or
+getting stuck on anything else Git-related, feel free to reach out to us for
+assistance.
+
+.. admonition:: A note on submodules
+
+  DFHack uses submodules extensively to manage its subprojects (including the
+  ``scripts`` folder and DF-structures in ``library/xml``). Failing to keep
+  submodules in sync when switching between branches can result in build errors
+  or scripts that don't work. In general, you should always update submodules
+  whenever you switch between branches in the main DFHack repo with
+  ``git submodule update``. (If you are working on bleeding-edge DFHack and
+  have checked out the master branch of some submodules, running ``git pull``
+  in those submodules is also an option.)
+
+  Rarely, we add or remove submodules. If there are any changes to the existence
+  of submodules when you switch between branches, you should run
+  ``git submodule update --init`` instead (adding ``--init`` to the above
+  command).
+
+  Some common errors that can arise when failing to update submodules include:
+
+  * ``fatal: <some path> does not exist`` when performing Git operations
+  * Build errors, particularly referring to structures in the ``df::`` namespace
+    or the ``library/include/df`` folder
+  * ``Not a known DF version`` when starting DF
+  * ``Run 'git submodule update --init'`` when running CMake
+
+  Submodules are a particularly confusing feature of Git. The
+  `Git Book <https://git-scm.com/book/en/v2/Git-Tools-Submodules>`_ has a
+  thorough explanation of them (as well as of many other aspects of Git) and
+  is a recommended resource if you run into any issues. Other DFHack developers
+  are also able to help with any submodule-related (or Git-related) issues
+  you may encounter.
 
 **More notes**:
 
@@ -51,18 +82,21 @@ DF version`` when starting DF.
 
 Contributing to DFHack
 ======================
-If you want to get involved with the development, create an account on
-GitHub, make a clone there and then use that as your remote repository instead.
-
-We'd love that; join us on IRC_ (#dfhack channel on freenode) for discussion,
-and whenever you need help.
-
-.. _IRC: https://webchat.freenode.net/?channels=dfhack
-
-(Note: for submodule issues, please see the above instructions first!)
-
-For lots more details on contributing to DFHack, including pull requests, code format,
-and more, please see `contributing-code`.
+To contribute to DFHack on GitHub, you will need a GitHub account. Only some
+DFHack developers can push directly to the DFHack repositories; we recommend
+making a fork of whatever repos you are interested in contributing to, making
+changes there, and submitting pull requests.  `GitHub's pull request tutorial
+<https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/proposing-changes-to-your-work-with-pull-requests>`_
+is a good resource for getting started with pull requests (some things to note:
+our work mainly happens on the ``develop`` branch, and you will need to use
+your own fork, assuming that you don't have write access to the DFHack repos).
+
+Most development-related discussion happens on IRC or in individual GitHub
+issues and pull requests, but there are also other ways to reach out - see
+`support` for details.
+
+For more details on contributing to DFHack, including pull requests, code
+format, and more, please see `contributing-code`.
 
 
 Build settings
diff --git a/docs/Introduction.rst b/docs/Introduction.rst
index 3a36aa538..09e38e52f 100644
--- a/docs/Introduction.rst
+++ b/docs/Introduction.rst
@@ -87,6 +87,7 @@ the console.
 
 
 .. _troubleshooting:
+.. _support:
 
 Troubleshooting
 ===============

From df06f31137cfc931dcd37e81263e6a55f8586acf Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 13 May 2020 22:25:56 -0400
Subject: [PATCH 095/547] Update forum thread link

---
 docs/Introduction.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Introduction.rst b/docs/Introduction.rst
index 09e38e52f..22033d528 100644
--- a/docs/Introduction.rst
+++ b/docs/Introduction.rst
@@ -102,7 +102,7 @@ If  the search function in this documentation isn't enough and
 :wiki:`the DF Wiki <>` hasn't helped, try asking in:
 
 - the `#dfhack IRC channel on freenode <https://webchat.freenode.net/?channels=dfhack>`_
-- the :forums:`Bay12 DFHack thread <139553>`
+- the `Bay12 DFHack thread <https://dfhack.org/bay12>`_
 - the `/r/dwarffortress <https://dwarffortress.reddit.com>`_ questions thread
 - the thread for the mod or Starter Pack you're using (if any)
 

From 7a9be264c6464a482418b92a8578d158c1789a0d Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 13 May 2020 22:46:09 -0400
Subject: [PATCH 096/547] Update Linux GCC docs and some ninja notes

---
 docs/Compile.rst | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/docs/Compile.rst b/docs/Compile.rst
index 3e7f9701e..f61d89e2e 100644
--- a/docs/Compile.rst
+++ b/docs/Compile.rst
@@ -112,7 +112,8 @@ Generator
 The ``Ninja`` CMake build generator is the prefered build method on Linux and
 macOS, instead of ``Unix Makefiles``, which is the default. You can select Ninja
 by passing ``-G Ninja`` to CMake. Incremental builds using Unix Makefiles can be
-much slower than Ninja builds.
+much slower than Ninja builds. Note that you will probably need to install
+Ninja; see the platform-specific sections for details.
 
 ::
 
@@ -178,13 +179,18 @@ DFHack is meant to be installed into an existing DF folder, so get one ready.
 We assume that any Linux platform will have ``git`` available (though it may
 need to be installed with your package manager.)
 
-To build DFHack you need GCC version 4.8 or later. GCC 4.8 is easiest to work
-with due to avoiding libstdc++ issues (see below), but any version from 4.8
-onwards (including 5.x) will work.
+To build DFHack, you need GCC 4.8 or newer. GCC 4.8 has the benefit of avoiding
+`libstdc++ compatibility issues <linux-incompatible-libstdcxx>`, but can be hard
+to obtain on modern distributions, and working around these issues is done
+automatically by the ``dfhack`` launcher script. As long as your system-provided
+GCC is new enough, it should work. Note that extremely new GCC versions may not
+have been used to build DFHack yet, so if you run into issues with these, please
+let us know (e.g. by opening a GitHub issue).
 
 Before you can build anything, you'll also need ``cmake``. It is advisable to
 also get ``ccmake`` on distributions that split the cmake package into multiple
-parts.
+parts. As mentioned above, ``ninja`` is recommended (many distributions call
+this package ``ninja-build``).
 
 You will need pthread; most systems should have this already. Note that older
 CMake versions may have trouble detecting pthread, so if you run into
@@ -260,29 +266,32 @@ This will show a curses-based interface that lets you set all of the
 extra options. You can also use a cmake-friendly IDE like KDevelop 4
 or the cmake-gui program.
 
+.. _linux-incompatible-libstdcxx:
+
 Incompatible libstdc++
 ~~~~~~~~~~~~~~~~~~~~~~
-When compiling dfhack yourself, it builds against your system libstdc++. When
-Dwarf Fortress runs, it uses a libstdc++ shipped with the binary, which comes
-from GCC 4.8 and is incompatible with code compiled with newer GCC versions. If
-you compile DFHack with a GCC version newer than 4.8, you will see an error
-message such as::
+When compiling DFHack yourself, it builds against your system libstdc++. When
+Dwarf Fortress runs, it uses a libstdc++ shipped in the ``libs`` folder, which
+comes from GCC 4.8 and is incompatible with code compiled with newer GCC
+versions. As of DFHack 0.42.05-alpha1, the ``dfhack`` launcher script attempts
+to fix this by automatically removing the DF-provided libstdc++ on startup.
+In rare cases, this may fail and cause errors such as::
 
    ./libs/Dwarf_Fortress: /pathToDF/libs/libstdc++.so.6: version
        `GLIBCXX_3.4.18' not found (required by ./hack/libdfhack.so)
 
-To fix this you can compile with GCC 4.8 or remove the libstdc++ shipped with
+The easiest way to fix this is generally removing the libstdc++ shipped with
 DF, which causes DF to use your system libstdc++ instead::
 
     cd /path/to/DF/
     rm libs/libstdc++.so.6
 
-Note that distributing binaries compiled with newer GCC versions requires end-
-users to delete libstdc++ themselves and have a libstdc++ on their system from
-the same GCC version or newer. For this reason, distributing anything compiled
-with GCC versions newer than 4.8 is discouraged. In the future we may start
-bundling a later libstdc++ as part of the DFHack package, so as to enable
-compilation-for-distribution with a GCC newer than 4.8.
+Note that distributing binaries compiled with newer GCC versions may result in
+the opposite compatibily issue: users with *older* GCC versions may encounter
+similar errors. This is why DFHack distributes both GCC 4.8 and GCC 7 builds. If
+you are planning on distributing binaries to other users, we recommend using an
+older GCC (but still at least 4.8) version if possible.
+
 
 Mac OS X
 ========

From d189b91f4997b35fa691dcf2e809ee0860fcba9e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 13 May 2020 22:58:32 -0400
Subject: [PATCH 097/547] Update macOS -> OS X, tweak a bit and add more
 anchors

---
 docs/Compile.rst | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/docs/Compile.rst b/docs/Compile.rst
index f61d89e2e..6ebaa8c1f 100644
--- a/docs/Compile.rst
+++ b/docs/Compile.rst
@@ -168,6 +168,9 @@ your build folder or by running ``ccmake`` (or another CMake GUI). Most
 DFHack-specific settings begin with ``BUILD_`` and control which parts of DFHack
 are built.
 
+
+.. _compile-linux:
+
 Linux
 =====
 On Linux, DFHack acts as a library that shadows parts of the SDL API using LD_PRELOAD.
@@ -293,13 +296,15 @@ you are planning on distributing binaries to other users, we recommend using an
 older GCC (but still at least 4.8) version if possible.
 
 
-Mac OS X
-========
-DFHack functions similarly on OS X and Linux, and the majority of the
-information above regarding the build process (cmake and ninja) applies here
+.. _compile-macos:
+
+macOS
+=====
+DFHack functions similarly on macOS and Linux, and the majority of the
+information above regarding the build process (CMake and Ninja) applies here
 as well.
 
-DFHack can officially be built on OS X with GCC 4.8 or 7. Anything newer than 7
+DFHack can officially be built on macOS only with GCC 4.8 or 7. Anything newer than 7
 will require you to perform extra steps to get DFHack to run (see `osx-new-gcc-notes`),
 and your build will likely not be redistributable.
 
@@ -352,7 +357,7 @@ Dependencies and system set-up
     cleaner, quicker, and smarter. For example, installing MacPort's GCC will
     install more than twice as many dependencies as Homebrew's will, and all in
     both 32-bit and 64-bit variants. Homebrew also doesn't require constant use
-    of sudo.
+    of ``sudo``.
 
     Using `Homebrew <http://brew.sh/>`_ (recommended)::
 
@@ -421,9 +426,9 @@ Building
     export CC=gcc-7
     export CXX=g++-7
 
-  etc.
+  (adjust as needed for different GCC installations)
 
-* Build dfhack::
+* Build DFHack::
 
     mkdir build-osx
     cd build-osx
@@ -433,6 +438,7 @@ Building
   <path to DF> should be a path to a copy of Dwarf Fortress, of the appropriate
   version for the DFHack you are building.
 
+
 .. _compile-windows:
 
 Windows
@@ -725,9 +731,9 @@ It may be installed in a directory such as ``~/.local/bin/``, so after pip
 install, find ``sphinx-build`` and ensure its directory is in your local ``$PATH``.
 
 
-Mac OS X
---------
-OS X has Python 2.7 installed by default, but it does not have the pip package manager.
+macOS
+-----
+macOS has Python 2.7 installed by default, but it does not have the pip package manager.
 
 You can install Homebrew's Python 3, which includes pip, and then install the
 latest Sphinx using pip::
@@ -739,11 +745,11 @@ Alternatively, you can simply install Sphinx 1.3.x directly from Homebrew::
 
   brew install sphinx-doc
 
-This will install Sphinx for OS X's system Python 2.7, without needing pip.
+This will install Sphinx for macOS's system Python 2.7, without needing pip.
 
 Either method works; if you plan to use Python for other purposes, it might best
 to install Homebrew's Python 3 so that you have the latest Python as well as pip.
-If not, just installing sphinx-doc for OS X's system Python 2.7 is fine.
+If not, just installing sphinx-doc for macOS's system Python 2.7 is fine.
 
 
 Windows
@@ -810,7 +816,7 @@ files alphabetically, so all the files you need should be next to each other.
 It is recommended that you create a build folder and run CMake to verify that
 you have downloaded everything at this point, assuming your download machine has
 CMake installed. This involves running a "generate" batch script on Windows, or
-a command starting with ``cmake .. -G Ninja`` on Linux and OS X, following the
+a command starting with ``cmake .. -G Ninja`` on Linux and macOS, following the
 instructions in the sections above. CMake should automatically locate files that
 you placed in ``CMake/downloads``, and use them instead of attempting to
 download them.

From 7dd4b6d9685cbbbb9dda44129967e34b9b5970e8 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Thu, 14 May 2020 13:07:11 -0500
Subject: [PATCH 098/547] update structures

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index efc5c2610..cbeed8b52 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit efc5c2610bd0345e9102279be0a9f154e5862050
+Subproject commit cbeed8b52482ce749fc2ff13a9db9733931e7da0

From f20446534bb7f39425e102bd70daec46e328004f Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Thu, 14 May 2020 14:01:05 -0500
Subject: [PATCH 099/547] fix DfOtherVectors computed size

---
 library/include/BitArray.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/include/BitArray.h b/library/include/BitArray.h
index 5858897a3..1f558221a 100644
--- a/library/include/BitArray.h
+++ b/library/include/BitArray.h
@@ -574,7 +574,7 @@ namespace DFHack
     {
         std::vector<I *> & operator[](O other_id)
         {
-            CHECK_INVALID_ARGUMENT(size_t(other_id) < sizeof(*this) / sizeof(std::vector<I *>));
+            CHECK_INVALID_ARGUMENT(size_t(other_id) < sizeof(T) / sizeof(std::vector<I *>));
 
             auto vectors = reinterpret_cast<std::vector<I *> *>(this);
             return vectors[other_id];

From 3db490ee9e31c7a0f950f242b8c338a161a63fcc Mon Sep 17 00:00:00 2001
From: Rose <japa.mala.illo@gmail.com>
Date: Fri, 22 May 2020 08:01:34 -0700
Subject: [PATCH 100/547] Fix a problem where the block coordinates would
 sometimes not get copied.

---
 plugins/remotefortressreader/remotefortressreader.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp
index e94c3f832..8e9ac8d45 100644
--- a/plugins/remotefortressreader/remotefortressreader.cpp
+++ b/plugins/remotefortressreader/remotefortressreader.cpp
@@ -949,9 +949,6 @@ static command_result GetGrowthList(color_ostream &stream, const EmptyMessage *i
 
 void CopyBlock(df::map_block * DfBlock, RemoteFortressReader::MapBlock * NetBlock, MapExtras::MapCache * MC, DFCoord pos)
 {
-    NetBlock->set_map_x(DfBlock->map_pos.x);
-    NetBlock->set_map_y(DfBlock->map_pos.y);
-    NetBlock->set_map_z(DfBlock->map_pos.z);
 
     MapExtras::Block * block = MC->BlockAtTile(DfBlock->map_pos);
 
@@ -1465,7 +1462,12 @@ static command_result GetBlockList(color_ostream &stream, const BlockRequest *in
                         bool flows = block->flows.size() > 0;
                         RemoteFortressReader::MapBlock *net_block = nullptr;
                         if (tileChanged || desChanged || spatterChanged || firstBlock || itemsChanged || flows)
+                        {
                             net_block = out->add_map_blocks();
+                            net_block->set_map_x(block->map_pos.x);
+                            net_block->set_map_y(block->map_pos.y);
+                            net_block->set_map_z(block->map_pos.z);
+                        }
                         if (tileChanged)
                         {
                             CopyBlock(block, net_block, &MC, pos);

From ad3735421186f56e2097e8324610b9aa77969722 Mon Sep 17 00:00:00 2001
From: Rose <japa.mala.illo@gmail.com>
Date: Sun, 24 May 2020 15:42:59 -0700
Subject: [PATCH 101/547] Bump version number to make sure the updater works.

---
 plugins/remotefortressreader/remotefortressreader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp
index 4ab540a5e..5a8957ddf 100644
--- a/plugins/remotefortressreader/remotefortressreader.cpp
+++ b/plugins/remotefortressreader/remotefortressreader.cpp
@@ -1,5 +1,5 @@
 #include "df_version_int.h"
-#define RFR_VERSION "0.20.3"
+#define RFR_VERSION "0.21.0"
 
 #include <cstdio>
 #include <time.h>

From 2fc7fa7ac2e56bffa5775e33fc3a3a8cafd6f364 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 28 May 2020 23:11:08 -0400
Subject: [PATCH 102/547] Update xml, scripts

See #1576
---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index cbeed8b52..995caf761 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit cbeed8b52482ce749fc2ff13a9db9733931e7da0
+Subproject commit 995caf76159ae84046f723ebb4547f9a9eae372c
diff --git a/scripts b/scripts
index 2079b9fb6..47d9b3c93 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 2079b9fb69b8b4db48aa35ec54a96f5cca7cc8ef
+Subproject commit 47d9b3c9390d21ecc49ddaba477b16071884ee87

From 5d05cfc7ccadbad5dceab045f8e66bb064a2c43c Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Tue, 2 Jun 2020 01:15:33 -0500
Subject: [PATCH 103/547] Fix several functions in the Units module ignoring
 unit caste.

Fixes #1583.
---
 docs/changelog.txt        |  1 +
 library/modules/Units.cpp | 52 +++++++++++----------------------------
 2 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 1aa7f916e..90492cdfc 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -42,6 +42,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Fixes
 - Fixed a segfault when attempting to start a headless session with a graphical PRINT_MODE setting
 - `labormanager`: fixed handling of new jobs in 0.47
+- Fixed ``Units::isEggLayer``, ``Units::isGrazer``, ``Units::isMilkable``, ``Units::isTrainableHunting``, ``Units::isTrainableWar``, and ``Units::isTamable`` ignoring the unit's caste
 
 ## Ruby
 - Updated ``item_find`` and ``building_find`` to use centralized logic that works on more screens
diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp
index c4b9e60fa..422060803 100644
--- a/library/modules/Units.cpp
+++ b/library/modules/Units.cpp
@@ -636,74 +636,50 @@ bool Units::isEggLayer(df::unit* unit)
 {
     CHECK_NULL_POINTER(unit);
     df::creature_raw *raw = world->raws.creatures.all[unit->race];
-    for (auto caste = raw->caste.begin(); caste != raw->caste.end(); ++caste)
-    {
-        if ((*caste)->flags.is_set(caste_raw_flags::LAYS_EGGS)
-                || (*caste)->flags.is_set(caste_raw_flags::LAYS_UNUSUAL_EGGS))
-            return true;
-    }
-    return false;
+    df::caste_raw *caste = raw->caste.at(unit->caste);
+    return caste->flags.is_set(caste_raw_flags::LAYS_EGGS)
+        || caste->flags.is_set(caste_raw_flags::LAYS_UNUSUAL_EGGS);
 }
 
 bool Units::isGrazer(df::unit* unit)
 {
     CHECK_NULL_POINTER(unit);
     df::creature_raw *raw = world->raws.creatures.all[unit->race];
-    for (auto caste = raw->caste.begin(); caste != raw->caste.end(); ++caste)
-    {
-        if((*caste)->flags.is_set(caste_raw_flags::GRAZER))
-            return true;
-    }
-    return false;
+    df::caste_raw *caste = raw->caste.at(unit->caste);
+    return caste->flags.is_set(caste_raw_flags::GRAZER);
 }
 
 bool Units::isMilkable(df::unit* unit)
 {
     CHECK_NULL_POINTER(unit);
     df::creature_raw *raw = world->raws.creatures.all[unit->race];
-    for (auto caste = raw->caste.begin(); caste != raw->caste.end(); ++caste)
-    {
-        if((*caste)->flags.is_set(caste_raw_flags::MILKABLE))
-            return true;
-    }
-    return false;
+    df::caste_raw *caste = raw->caste.at(unit->caste);
+    return caste->flags.is_set(caste_raw_flags::MILKABLE);
 }
 
 bool Units::isTrainableWar(df::unit* unit)
 {
     CHECK_NULL_POINTER(unit);
     df::creature_raw *raw = world->raws.creatures.all[unit->race];
-    for (auto caste = raw->caste.begin(); caste != raw->caste.end(); ++caste)
-    {
-        if((*caste)->flags.is_set(caste_raw_flags::TRAINABLE_WAR))
-            return true;
-    }
-    return false;
+    df::caste_raw *caste = raw->caste.at(unit->caste);
+    return caste->flags.is_set(caste_raw_flags::TRAINABLE_WAR);
 }
 
 bool Units::isTrainableHunting(df::unit* unit)
 {
     CHECK_NULL_POINTER(unit);
     df::creature_raw *raw = world->raws.creatures.all[unit->race];
-    for (auto caste = raw->caste.begin(); caste != raw->caste.end(); ++caste)
-    {
-        if((*caste)->flags.is_set(caste_raw_flags::TRAINABLE_HUNTING))
-            return true;
-    }
-    return false;
+    df::caste_raw *caste = raw->caste.at(unit->caste);
+    return caste->flags.is_set(caste_raw_flags::TRAINABLE_HUNTING);
 }
 
 bool Units::isTamable(df::unit* unit)
 {
     CHECK_NULL_POINTER(unit);
     df::creature_raw *raw = world->raws.creatures.all[unit->race];
-    for (auto caste = raw->caste.begin(); caste != raw->caste.end(); ++caste)
-    {
-        if((*caste)->flags.is_set(caste_raw_flags::PET) ||
-                (*caste)->flags.is_set(caste_raw_flags::PET_EXOTIC))
-            return true;
-    }
-    return false;
+    df::caste_raw *caste = raw->caste.at(unit->caste);
+    return caste->flags.is_set(caste_raw_flags::PET)
+        || caste->flags.is_set(caste_raw_flags::PET_EXOTIC);
 }
 
 bool Units::isMale(df::unit* unit)

From d5b5b81450fca0394e378420c13be64a02828f78 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Tue, 2 Jun 2020 15:03:59 +0200
Subject: [PATCH 104/547] changes

---
 library/modules/Units.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp
index 43eb9026c..458a09ea3 100644
--- a/library/modules/Units.cpp
+++ b/library/modules/Units.cpp
@@ -204,14 +204,15 @@ void Units::setNickname(df::unit *unit, std::string nick)
             df::historical_figure *id_hfig = NULL;
 
             switch (identity->type) {
+            case df::identity_type::None:
             case df::identity_type::HidingCurse:
-            case df::identity_type::Identity:
             case df::identity_type::FalseIdentity:
+            case df::identity_type::InfiltrationIdentity:
+            case df::identity_type::Identity:
                 break;  //  We want the nickname to end up in the identity
 
             case df::identity_type::Impersonating:
             case df::identity_type::TrueName:
-            case df::identity_type::Unk_4:  // Pure guess, as this is a new case, still unseen
                 id_hfig = df::historical_figure::find(identity->histfig_id);
                 break;
             }

From 4a48c356a9b5c2a283a5ba19d068a488ae94861a Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Tue, 2 Jun 2020 15:58:46 +0200
Subject: [PATCH 105/547] fixed bug with incursion handling along world tile
 edges

---
 plugins/embark-assistant/defs.h     |  2 ++
 plugins/embark-assistant/survey.cpp | 25 +++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/plugins/embark-assistant/defs.h b/plugins/embark-assistant/defs.h
index 29c5a063c..13494b91e 100644
--- a/plugins/embark-assistant/defs.h
+++ b/plugins/embark-assistant/defs.h
@@ -119,6 +119,8 @@ namespace embark_assist {
             df::world_region_type region_type[16][16];  //  Required for incursion override detection. We could store only the
                                                 //  edges, but storing it for every tile allows for a unified fetching
                                                 //  logic.
+            int8_t north_row_biome_x[16];    //  "biome_x" data cached for the northern row for access from the north.
+            int8_t west_column_biome_y[16];  //  "biome_y" data cached for the western row for access from the west.
         };
 
         struct geo_datum {
diff --git a/plugins/embark-assistant/survey.cpp b/plugins/embark-assistant/survey.cpp
index 20dd9d539..01ed9ba31 100644
--- a/plugins/embark-assistant/survey.cpp
+++ b/plugins/embark-assistant/survey.cpp
@@ -1470,6 +1470,8 @@ void embark_assist::survey::survey_mid_level_tile(embark_assist::defs::geo_data
 
         tile->north_corner_selection[i] = world_data->region_details[0]->edges.biome_corner[i][0];
         tile->west_corner_selection[i] = world_data->region_details[0]->edges.biome_corner[0][i];
+        tile->north_row_biome_x[i] = world_data->region_details[0]->edges.biome_x[i][0];
+        tile->west_column_biome_y[i] = world_data->region_details[0]->edges.biome_y[0][i];
     }
 
     for (uint8_t i = 0; i < 16; i++) {
@@ -1919,7 +1921,17 @@ uint8_t embark_assist::survey::translate_ns_edge(embark_assist::defs::world_tile
         north_region_type = embark_assist::survey::region_type_of(survey_results, x, y, i, k - 1);
     }
     else {
-        effective_edge = world_data->region_details[0]->edges.biome_x[i][k + 1];
+        if (k < 15) {  //  We're still within the same world tile
+            effective_edge = world_data->region_details[0]->edges.biome_x[i][k + 1];
+        }
+        else {  //  Getting the data from the world tile to the south
+            if (y + 1 == world_data->world_height) {
+                return 4;  //  There's nothing to the south, so we fall back on our own tile.
+            }
+
+            effective_edge = survey_results->at(x).at(y + 1).north_row_biome_x[i];
+        }
+
         north_region_type = embark_assist::survey::region_type_of(survey_results, x, y, i, k);
         south_region_type = embark_assist::survey::region_type_of(survey_results, x, y, i, k + 1);
     }
@@ -1993,7 +2005,16 @@ uint8_t embark_assist::survey::translate_ew_edge(embark_assist::defs::world_tile
         west_region_type = embark_assist::survey::region_type_of(survey_results, x, y, i - 1, k);
     }
     else {
-        effective_edge = world_data->region_details[0]->edges.biome_y[i + 1][k];
+        if (i < 15) {  //  We're still within the same world tile
+            effective_edge = world_data->region_details[0]->edges.biome_y[i + 1][k];
+        }
+        else {  //  Getting the data from the world tile to the east
+            if (x + 1 == world_data->world_width) {
+                return 4;  //  There's nothing to the east, so we fall back on our own tile.
+            }
+
+            effective_edge = survey_results->at(x + 1).at(y).west_column_biome_y[k];
+        }
         west_region_type = embark_assist::survey::region_type_of(survey_results, x, y, i, k);
         east_region_type = embark_assist::survey::region_type_of(survey_results, x, y, i + 1, k);
     }

From d5a491e85238931786e737c82854d0bc53bc8f6a Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Sun, 7 Jun 2020 08:38:12 +0200
Subject: [PATCH 106/547] fixed parameter bugs

---
 plugins/embark-assistant/survey.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/embark-assistant/survey.cpp b/plugins/embark-assistant/survey.cpp
index 01ed9ba31..2d5dca04d 100644
--- a/plugins/embark-assistant/survey.cpp
+++ b/plugins/embark-assistant/survey.cpp
@@ -1603,7 +1603,7 @@ df::world_region_type embark_assist::survey::region_type_of(embark_assist::defs:
     int16_t effective_y = y;
     int8_t effective_i = i;
     int8_t effective_k = k;
-    adjust_coordinates(&effective_x, &effective_y, &effective_i, &effective_i);
+    adjust_coordinates(&effective_x, &effective_y, &effective_i, &effective_k);
 
     if (effective_x < 0 ||
         effective_x >= world_data->world_width ||
@@ -1659,7 +1659,7 @@ uint8_t  embark_assist::survey::translate_corner(embark_assist::defs::world_tile
         effective_k = k + 1;
     }
 
-    adjust_coordinates(&effective_x, &effective_y, &effective_i, &effective_i);
+    adjust_coordinates(&effective_x, &effective_y, &effective_i, &effective_k);
 
     if (effective_x == world_data->world_width) {
         if (effective_y == world_data->world_height) {  //  Only the SE corner of the SE most tile of the world can reference this.

From bd216dbc117bdb197fe12febaf1285f5a67c57d7 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Mon, 15 Jun 2020 23:47:35 -0500
Subject: [PATCH 107/547] update structures

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index 995caf761..b80a661f1 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 995caf76159ae84046f723ebb4547f9a9eae372c
+Subproject commit b80a661f1139eb8535e6f76f8a07b697eeb9c9de

From 97a20acf1b3bcb83e84e85e0ced0eeb4e33f2269 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 17 Jun 2020 20:32:30 -0400
Subject: [PATCH 108/547] Add current year to docs copyright message

---
 conf.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf.py b/conf.py
index 2f47d5644..c36e4f8aa 100644
--- a/conf.py
+++ b/conf.py
@@ -15,6 +15,7 @@ serve to show the default.
 
 # pylint:disable=redefined-builtin
 
+import datetime
 from io import open
 import os
 import re
@@ -222,7 +223,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'DFHack'
-copyright = '2015, The DFHack Team'
+copyright = '2015-%d, The DFHack Team' % datetime.datetime.now().year
 author = 'The DFHack Team'
 
 # The version info for the project you're documenting, acts as replacement for

From 861c8c81482e87e7bc07c4faaaa103505f8876f0 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 17 Jun 2020 20:36:07 -0400
Subject: [PATCH 109/547] Remove -q from docs/build.sh to make -v work

---
 docs/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/build.sh b/docs/build.sh
index 6745db4d5..48e1bfd4a 100755
--- a/docs/build.sh
+++ b/docs/build.sh
@@ -17,4 +17,4 @@ if [ -z "$JOBS" ]; then
     JOBS=2
 fi
 
-"$sphinx" -a -E -q -b html . ./docs/html -w ./docs/_sphinx-warnings.txt -j "$JOBS" "$@"
+"$sphinx" -a -E -b html . ./docs/html -w ./docs/_sphinx-warnings.txt -j "$JOBS" "$@"

From 5073bd31c4545e91f78623d7c28b0a61fa813d4a Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Fri, 19 Jun 2020 19:37:44 -0500
Subject: [PATCH 110/547] update structures

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index b80a661f1..bc42fe311 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit b80a661f1139eb8535e6f76f8a07b697eeb9c9de
+Subproject commit bc42fe3114a7943850b32231559adf54bb1d0c60

From aee4fcd1a6fd708f706e03bee01d4287e0d656f9 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 20 Jun 2020 12:02:13 -0400
Subject: [PATCH 111/547] Add confirmation for convicting dwarves of crimes

Closes #1593
---
 docs/changelog.txt      |  3 +++
 plugins/confirm.cpp     |  2 ++
 plugins/lua/confirm.lua | 15 +++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 90492cdfc..c165ff855 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -44,6 +44,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `labormanager`: fixed handling of new jobs in 0.47
 - Fixed ``Units::isEggLayer``, ``Units::isGrazer``, ``Units::isMilkable``, ``Units::isTrainableHunting``, ``Units::isTrainableWar``, and ``Units::isTamable`` ignoring the unit's caste
 
+## Misc Improvements
+- `confirm`: added a confirmation dialog for convicting dwarves of crimes
+
 ## Ruby
 - Updated ``item_find`` and ``building_find`` to use centralized logic that works on more screens
 
diff --git a/plugins/confirm.cpp b/plugins/confirm.cpp
index c616ac493..07aee4640 100644
--- a/plugins/confirm.cpp
+++ b/plugins/confirm.cpp
@@ -18,6 +18,7 @@
 #include "df/general_ref.h"
 #include "df/general_ref_contained_in_itemst.h"
 #include "df/viewscreen_dwarfmodest.h"
+#include "df/viewscreen_justicest.h"
 #include "df/viewscreen_layer_militaryst.h"
 #include "df/viewscreen_locationsst.h"
 #include "df/viewscreen_tradegoodsst.h"
@@ -479,6 +480,7 @@ DEFINE_CONFIRMATION(uniform_delete,     viewscreen_layer_militaryst);
 DEFINE_CONFIRMATION(note_delete,        viewscreen_dwarfmodest);
 DEFINE_CONFIRMATION(route_delete,       viewscreen_dwarfmodest);
 DEFINE_CONFIRMATION(location_retire,    viewscreen_locationsst);
+DEFINE_CONFIRMATION(convict,            viewscreen_justicest);
 
 DFhackCExport command_result plugin_init (color_ostream &out, vector <PluginCommand> &commands)
 {
diff --git a/plugins/lua/confirm.lua b/plugins/lua/confirm.lua
index 4312ab4be..b8a815662 100644
--- a/plugins/lua/confirm.lua
+++ b/plugins/lua/confirm.lua
@@ -204,6 +204,21 @@ end
 location_retire.title = "Retire location"
 location_retire.message = "Are you sure you want to retire this location?"
 
+convict = defconf('convict')
+convict.title = "Confirm conviction"
+function convict.intercept_key(key)
+    return key == keys.SELECT and
+        screen.cur_column == df.viewscreen_justicest.T_cur_column.ConvictChoices
+end
+function convict.get_message()
+    name = dfhack.TranslateName(screen.convict_choices[screen.cursor_right].name)
+    if name == "" then
+        name = "this creature"
+    end
+    return "Are you sure you want to convict " .. name .. "?\n" ..
+        "This action is irreversible."
+end
+
 -- End of confirmation definitions
 
 function check()

From 7ddc3bb9187f7c9c74859a17ce977467f4151eb6 Mon Sep 17 00:00:00 2001
From: Kelly Kinkade <kelly.lynn.martin@gmail.com>
Date: Sat, 20 Jun 2020 23:05:55 -0500
Subject: [PATCH 112/547] fix labor inferences for custom furnaces

Also clean up how paved roads are handled (the way it was was stupid)
---
 plugins/labormanager/joblabormapper.cpp | 40 ++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/plugins/labormanager/joblabormapper.cpp b/plugins/labormanager/joblabormapper.cpp
index 7b4e77553..54ef9cceb 100644
--- a/plugins/labormanager/joblabormapper.cpp
+++ b/plugins/labormanager/joblabormapper.cpp
@@ -200,8 +200,6 @@ static df::building* get_building_from_job(df::job* j)
 
 static df::unit_labor construction_build_labor(df::building_actual* b)
 {
-    if (b->getType() == df::building_type::RoadPaved)
-        return df::unit_labor::BUILD_ROAD;
     // Find last item in building with use mode appropriate to the building's constructions state
     // For screw pumps contained_items[0] = pipe, 1 corkscrew, 2 block
     // For wells 0 mechanism, 1 rope, 2 bucket, 3 block
@@ -313,14 +311,27 @@ public:
                 return workshop_build_labor[ws->type];
         }
         break;
+        case df::building_type::Furnace:
+        {
+            df::building_furnacest* frn = (df::building_furnacest*) bld;
+            if (frn->design && !frn->design->flags.bits.designed)
+                return df::unit_labor::ARCHITECT;
+            if (frn->type == df::furnace_type::Custom)
+            {
+                df::building_def* def = df::building_def::find(frn->custom_type);
+                return def->build_labors[0];
+            }
+            else
+                // cast to building_actual should be safe here because at this point the building has been designed
+                return construction_build_labor((df::building_actual*)bld);
+        }
+        break;
         case df::building_type::Construction:
             return df::unit_labor::BUILD_CONSTRUCTION;
-        case df::building_type::Furnace:
         case df::building_type::TradeDepot:
         case df::building_type::Bridge:
         case df::building_type::ArcheryTarget:
         case df::building_type::WaterWheel:
-        case df::building_type::RoadPaved:
         case df::building_type::Well:
         case df::building_type::ScrewPump:
         case df::building_type::Wagon:
@@ -334,6 +345,8 @@ public:
             return construction_build_labor(b);
         }
         break;
+        case df::building_type::RoadPaved:
+            return df::unit_labor::BUILD_ROAD;
         case df::building_type::FarmPlot:
             return df::unit_labor::PLANT;
         case df::building_type::Chair:
@@ -418,15 +431,26 @@ public:
                 return workshop_build_labor[ws->type];
         }
         break;
+        case df::building_type::Furnace:
+        {
+            df::building_furnacest* frn = (df::building_furnacest*) bld;
+            if (frn->type == df::furnace_type::Custom)
+            {
+                df::building_def* def = df::building_def::find(frn->custom_type);
+                return def->build_labors[0];
+            }
+            else
+                // can't destroy a building if doesn't actually exist
+                return construction_build_labor((df::building_actual*)bld);
+        }
+        break;
         case df::building_type::Construction:
             return df::unit_labor::REMOVE_CONSTRUCTION;
-        case df::building_type::Furnace:
         case df::building_type::TradeDepot:
         case df::building_type::Wagon:
         case df::building_type::Bridge:
         case df::building_type::ScrewPump:
         case df::building_type::ArcheryTarget:
-        case df::building_type::RoadPaved:
         case df::building_type::Shop:
         case df::building_type::Support:
         case df::building_type::WaterWheel:
@@ -436,7 +460,9 @@ public:
             auto b = (df::building_actual*) bld;
             return construction_build_labor(b);
         }
-        break;
+        break;        
+        case df::building_type::RoadPaved:
+            return df::unit_labor::BUILD_ROAD;
         case df::building_type::FarmPlot:
             return df::unit_labor::PLANT;
         case df::building_type::Trap:

From 7b4ae9b6a3b0cd289dfcea61ef34b5d3e9eae57b Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Sat, 20 Jun 2020 23:08:55 -0500
Subject: [PATCH 113/547] update structures

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index bc42fe311..cd0e5ec3c 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit bc42fe3114a7943850b32231559adf54bb1d0c60
+Subproject commit cd0e5ec3c4588310e5d20c6f28ee1deed2cd33f6

From 61a00f78090adbfe7145907ce8817119acdb7940 Mon Sep 17 00:00:00 2001
From: Kelly Kinkade <kelly.lynn.martin@gmail.com>
Date: Sat, 20 Jun 2020 23:10:44 -0500
Subject: [PATCH 114/547] stupid whitespace

---
 plugins/labormanager/joblabormapper.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/labormanager/joblabormapper.cpp b/plugins/labormanager/joblabormapper.cpp
index 54ef9cceb..4a71b40bf 100644
--- a/plugins/labormanager/joblabormapper.cpp
+++ b/plugins/labormanager/joblabormapper.cpp
@@ -460,7 +460,7 @@ public:
             auto b = (df::building_actual*) bld;
             return construction_build_labor(b);
         }
-        break;        
+        break;
         case df::building_type::RoadPaved:
             return df::unit_labor::BUILD_ROAD;
         case df::building_type::FarmPlot:

From 85855a2d88ed7ee1bd4457084ea0b617006f0663 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Sun, 21 Jun 2020 16:16:16 -0500
Subject: [PATCH 115/547] update structures

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index cd0e5ec3c..6f7f33ceb 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit cd0e5ec3c4588310e5d20c6f28ee1deed2cd33f6
+Subproject commit 6f7f33cebbbefefa7c6f920b2fc197b56a3e8d1c

From e2301ecae7d7c76778430545c32e0e5e452eebe1 Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Tue, 23 Jun 2020 13:31:27 -0600
Subject: [PATCH 116/547] Update structures, fix reaction_productst::produce()
 parms

---
 library/modules/Items.cpp             | 4 ++--
 library/xml                           | 2 +-
 plugins/add-spatter.cpp               | 4 ++--
 plugins/createitem.cpp                | 4 ++--
 plugins/diggingInvaders/assignJob.cpp | 4 ++--
 plugins/eventful.cpp                  | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/library/modules/Items.cpp b/library/modules/Items.cpp
index 05f174ddf..0e02043dc 100644
--- a/library/modules/Items.cpp
+++ b/library/modules/Items.cpp
@@ -1477,9 +1477,9 @@ int32_t Items::createItem(df::item_type item_type, int16_t item_subtype, int16_t
 
     df::enums::game_type::game_type type = *df::global::gametype;
     prod->produce(unit, &out_products, &out_items, &in_reag, &in_items, 1, job_skill::NONE,
-            df::historical_entity::find(unit->civ_id), 0,
+            0, df::historical_entity::find(unit->civ_id),
             ((type == df::enums::game_type::DWARF_MAIN) || (type == df::enums::game_type::DWARF_RECLAIM)) ? df::world_site::find(df::global::ui->site_id) : NULL,
-            0);
+            NULL);
     if ( out_items.size() != 1 )
         return -1;
 
diff --git a/library/xml b/library/xml
index 6f7f33ceb..542d1bd28 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 6f7f33cebbbefefa7c6f920b2fc197b56a3e8d1c
+Subproject commit 542d1bd283051186b2d4943c9acb546af1cc7b8b
diff --git a/plugins/add-spatter.cpp b/plugins/add-spatter.cpp
index 3d2d89dd1..459e28f25 100644
--- a/plugins/add-spatter.cpp
+++ b/plugins/add-spatter.cpp
@@ -249,7 +249,7 @@ struct product_hook : improvement_product {
          std::vector<df::reaction_reagent*> *in_reag,
          std::vector<df::item*> *in_items,
          int32_t quantity, df::job_skill skill,
-         df::historical_entity *entity, int32_t unk, df::world_site *site, void* unk2)
+         int32_t quality, df::historical_entity *entity, df::world_site *site, std::vector<void *> *unk2)
     ) {
         if (auto product = products[this])
         {
@@ -295,7 +295,7 @@ struct product_hook : improvement_product {
             return;
         }
 
-        INTERPOSE_NEXT(produce)(unit, out_products, out_items, in_reag, in_items, quantity, skill, entity, unk, site, unk2);
+        INTERPOSE_NEXT(produce)(unit, out_products, out_items, in_reag, in_items, quantity, skill, quality, entity, site, unk2);
     }
 };
 
diff --git a/plugins/createitem.cpp b/plugins/createitem.cpp
index 939afebc2..4ef1c853c 100644
--- a/plugins/createitem.cpp
+++ b/plugins/createitem.cpp
@@ -86,8 +86,8 @@ bool makeItem (df::reaction_product_itemst *prod, df::unit *unit, bool second_it
         building = df::building::find(dest_building);
 
     prod->produce(unit, &out_products, &out_items, &in_reag, &in_items, 1, job_skill::NONE,
-        df::historical_entity::find(unit->civ_id), 0,
-        (World::isFortressMode()) ? df::world_site::find(ui->site_id) : NULL, 0);
+        0, df::historical_entity::find(unit->civ_id),
+        (World::isFortressMode()) ? df::world_site::find(ui->site_id) : NULL, NULL);
     if (!out_items.size())
         return false;
     // if we asked to make shoes and we got twice as many as we asked, then we're okay
diff --git a/plugins/diggingInvaders/assignJob.cpp b/plugins/diggingInvaders/assignJob.cpp
index b253e7833..7e3dfaf8c 100644
--- a/plugins/diggingInvaders/assignJob.cpp
+++ b/plugins/diggingInvaders/assignJob.cpp
@@ -256,8 +256,8 @@ int32_t assignJob(color_ostream& out, Edge firstImportantEdge, unordered_map<df:
             vector<df::reaction_reagent*> in_reag;
             vector<df::item*> in_items;
             prod->produce(firstInvader, &out_products, &out_items, &in_reag, &in_items, 1, df::job_skill::NONE,
-                df::historical_entity::find(firstInvader->civ_id), 0,
-                df::world_site::find(df::global::ui->site_id), 0);
+                0, df::historical_entity::find(firstInvader->civ_id),
+                df::world_site::find(df::global::ui->site_id), NULL);
 
             if ( out_items.size() != 1 ) {
                 out.print("%s, %d: wrong size: %zu.\n", __FILE__, __LINE__, out_items.size());
diff --git a/plugins/eventful.cpp b/plugins/eventful.cpp
index 5d8dfdb59..42cfbdf69 100644
--- a/plugins/eventful.cpp
+++ b/plugins/eventful.cpp
@@ -287,12 +287,12 @@ struct product_hook : item_product {
          std::vector<df::reaction_reagent*> *in_reag,
          std::vector<df::item*> *in_items,
          int32_t quantity, df::job_skill skill,
-         df::historical_entity *entity,  int32_t unk, df::world_site *site, void* unk2)
+         int32_t quality, df::historical_entity *entity,  df::world_site *site, std::vector<void *> *unk2)
     ) {
         color_ostream_proxy out(Core::getInstance().getConsole());
         auto product = products[this];
         if ( !product ) {
-            INTERPOSE_NEXT(produce)(unit, out_products, out_items, in_reag, in_items, quantity, skill, entity, unk, site, unk2);
+            INTERPOSE_NEXT(produce)(unit, out_products, out_items, in_reag, in_items, quantity, skill, quality, entity, site, unk2);
             return;
         }
         df::reaction* this_reaction=product->react;
@@ -304,7 +304,7 @@ struct product_hook : item_product {
 
         size_t out_item_count = out_items->size();
 
-        INTERPOSE_NEXT(produce)(unit, out_products, out_items, in_reag, in_items, quantity, skill, entity, unk, site, unk2);
+        INTERPOSE_NEXT(produce)(unit, out_products, out_items, in_reag, in_items, quantity, skill, quality, entity, site, unk2);
         if ( out_items->size() == out_item_count )
             return;
         //if it produced something, call the scripts

From 2597aeab0e4dd2a3ab4ba8f368e59e713669d09a Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Tue, 2 Jun 2020 09:10:25 -0600
Subject: [PATCH 117/547] Add a new tweak, "reaction-gloves"

When enabled, custom reactions will begin to produce gloves in sets, based
on the number of hands the job performer's race has, and set the
Handedness flags accordingly.

The "createitem" plugin already contains a simpler workaround (which
doesn't check body plan but instead just produces pairs), but it shouldn't
trigger when this tweak is enabled (unless you use it on a creature which
has been modded to only have "neutral" hands).
---
 plugins/tweak/tweak.cpp                |  6 +++
 plugins/tweak/tweaks/reaction-gloves.h | 75 ++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 plugins/tweak/tweaks/reaction-gloves.h

diff --git a/plugins/tweak/tweak.cpp b/plugins/tweak/tweak.cpp
index 49d96cc74..13e08f174 100644
--- a/plugins/tweak/tweak.cpp
+++ b/plugins/tweak/tweak.cpp
@@ -59,6 +59,7 @@
 #include "df/reaction.h"
 #include "df/reaction_reagent_itemst.h"
 #include "df/reaction_reagent_flags.h"
+#include "df/reaction_product_itemst.h"
 #include "df/viewscreen_setupdwarfgamest.h"
 #include "df/viewscreen_layer_assigntradest.h"
 #include "df/viewscreen_tradegoodsst.h"
@@ -106,6 +107,7 @@
 #include "tweaks/stone-status-all.h"
 #include "tweaks/title-start-rename.h"
 #include "tweaks/tradereq-pet-gender.h"
+#include "tweaks/reaction-gloves.h"
 
 using std::set;
 using std::vector;
@@ -250,6 +252,8 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
         "    Adds a safe rename option to the title screen \"Start Playing\" menu\n"
         "  tweak tradereq-pet-gender [disable]\n"
         "    Displays the gender of pets in the trade request list\n"
+        "  tweak reaction-gloves [disable]\n"
+        "    Changes custom reactions to produce gloves in sets with correct handedness\n"
 //        "  tweak military-training [disable]\n"
 //        "    Speed up melee squad training, removing inverse dependency on unit count.\n"
     ));
@@ -332,6 +336,8 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
 
     TWEAK_HOOK("tradereq-pet-gender", pet_gender_hook, render);
 
+    TWEAK_HOOK("reaction-gloves", reaction_gloves_hook, produce);
+
     return CR_OK;
 }
 
diff --git a/plugins/tweak/tweaks/reaction-gloves.h b/plugins/tweak/tweaks/reaction-gloves.h
new file mode 100644
index 000000000..6ef3c6ccf
--- /dev/null
+++ b/plugins/tweak/tweaks/reaction-gloves.h
@@ -0,0 +1,75 @@
+// Workaround for DF bug #6273 - adjust all custom reactions to produce GLOVES items in sets with correct handedness
+// It also analyzes the body plan of the unit performing the reaction, so Antmen will get 4 gloves instead of 2
+
+// If a reaction tries to produce either 1 glove or 2 gloves, it will produce a single set
+// Otherwise, it will multiply the number of products by the number of hands
+
+struct reaction_gloves_hook : df::reaction_product_itemst {
+    typedef df::reaction_product_itemst interpose_base;
+
+    DEFINE_VMETHOD_INTERPOSE(void, produce, (df::unit *unit, std::vector<df::reaction_product*> *out_products, std::vector<df::item*> *out_items, std::vector<df::reaction_reagent*> *in_reag, std::vector<df::item*> *in_items, int32_t quantity, df::job_skill skill, df::historical_entity *entity, int32_t unk_1, df::world_site *site, void *unk_2))
+    {
+        if (item_type != df::item_type::GLOVES)
+        {
+            INTERPOSE_NEXT(produce)(unit, out_products, out_items, in_reag, in_items, quantity, skill, entity, unk_1, site, unk_2);
+            return;
+        }
+
+        // Examine creator unit's body plan, see how many hands it has
+        // Count left hands and right hands, as well as "neutral" hands for compatibility
+        int num_hands = 0, num_left = 0, num_right = 0;
+        for (int i = 0; i < unit->body.body_plan->body_parts.size(); i++)
+        {
+            df::body_part_raw *part = unit->body.body_plan->body_parts[i];
+            if (part->flags.is_set(df::body_part_raw_flags::GRASP))
+            {
+                num_hands++;
+                if (part->flags.is_set(df::body_part_raw_flags::LEFT))
+                    num_left++;
+                if (part->flags.is_set(df::body_part_raw_flags::RIGHT))
+                    num_right++;
+            }
+        }
+
+        std::vector<df::item*> out_items_temp;
+        int old_count = count;
+
+        // If the reaction product's count is set to 1 or 2, set it to the number of hands
+        // Otherwise, *multiply* it by the number of hands (and multiply the left/right counts accordingly)
+        if (count <= 2)
+            count = num_hands;
+        else
+        {
+            num_left *= count;
+            num_right *= count;
+            count *= num_hands;
+        }
+
+        INTERPOSE_NEXT(produce)(unit, out_products, &out_items_temp, in_reag, in_items, quantity, skill, entity, unk_1, site, unk_2);
+        count = old_count;
+
+        // If the reaction was somehow asked to produce multiple sets (due to excess inputs), multiply the outputs too
+        num_left *= quantity;
+        num_right *= quantity;
+
+        // Iterate across the output gloves, set their handedness, then append them to the actual out_items list for DF
+        for (int i = 0; i < out_items_temp.size(); i++)
+        {
+            // Do left gloves first, then right gloves, then "neutral" ones last
+            // This is important for the "createitem" plugin, which contains similar workaround logic
+            if (num_left > 0)
+            {
+                out_items_temp[i]->setGloveHandedness(1);
+                --num_left;
+            }
+            else if (num_right > 0)
+            {
+                out_items_temp[i]->setGloveHandedness(2);
+                --num_right;
+            }
+            out_items->push_back(out_items_temp[i]);
+        }
+    }
+};
+
+IMPLEMENT_VMETHOD_INTERPOSE(reaction_gloves_hook, produce);
\ No newline at end of file

From c2776c20b97db44b0d18662627d88b69b252c1ed Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Tue, 2 Jun 2020 09:56:42 -0600
Subject: [PATCH 118/547] Update changelog

---
 docs/Plugins.rst   | 1 +
 docs/changelog.txt | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index 421e5e81b..37e568167 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -332,6 +332,7 @@ Subcommands that persist until disabled or DF quits:
 :stone-status-all:      Adds an option to toggle the economic status of all stones
 :title-start-rename:    Adds a safe rename option to the title screen "Start Playing" menu
 :tradereq-pet-gender:   Displays pet genders on the trade request screen
+:reaction-gloves:       Fixes reactions to produce gloves in sets with correct handedness
 
 .. _fix-armory:
 
diff --git a/docs/changelog.txt b/docs/changelog.txt
index c165ff855..c0e9b5440 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -39,6 +39,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 # Future
 
+## New Tweaks
+- `tweak` reaction-gloves: adds an option to make reactions produce gloves in sets with correct handedness
+
 ## Fixes
 - Fixed a segfault when attempting to start a headless session with a graphical PRINT_MODE setting
 - `labormanager`: fixed handling of new jobs in 0.47

From 3dcde1554a1a93b860eb972e60d898e84b24818d Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Tue, 23 Jun 2020 13:36:00 -0600
Subject: [PATCH 119/547] Update xml, fix reaction_product::produce() parms

---
 plugins/tweak/tweaks/reaction-gloves.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/tweak/tweaks/reaction-gloves.h b/plugins/tweak/tweaks/reaction-gloves.h
index 6ef3c6ccf..82890239c 100644
--- a/plugins/tweak/tweaks/reaction-gloves.h
+++ b/plugins/tweak/tweaks/reaction-gloves.h
@@ -7,11 +7,15 @@
 struct reaction_gloves_hook : df::reaction_product_itemst {
     typedef df::reaction_product_itemst interpose_base;
 
-    DEFINE_VMETHOD_INTERPOSE(void, produce, (df::unit *unit, std::vector<df::reaction_product*> *out_products, std::vector<df::item*> *out_items, std::vector<df::reaction_reagent*> *in_reag, std::vector<df::item*> *in_items, int32_t quantity, df::job_skill skill, df::historical_entity *entity, int32_t unk_1, df::world_site *site, void *unk_2))
+    DEFINE_VMETHOD_INTERPOSE(void, produce, (df::unit *unit,
+        std::vector<df::reaction_product*> *out_products, std::vector<df::item*> *out_items,
+        std::vector<df::reaction_reagent*> *in_reag, std::vector<df::item*> *in_items,
+        int32_t quantity, df::job_skill skill, int32_t quality,
+        df::historical_entity *entity, df::world_site *site, std::vector<void *> *unk_2))
     {
         if (item_type != df::item_type::GLOVES)
         {
-            INTERPOSE_NEXT(produce)(unit, out_products, out_items, in_reag, in_items, quantity, skill, entity, unk_1, site, unk_2);
+            INTERPOSE_NEXT(produce)(unit, out_products, out_items, in_reag, in_items, quantity, skill, quality, entity, site, unk_2);
             return;
         }
 
@@ -45,7 +49,7 @@ struct reaction_gloves_hook : df::reaction_product_itemst {
             count *= num_hands;
         }
 
-        INTERPOSE_NEXT(produce)(unit, out_products, &out_items_temp, in_reag, in_items, quantity, skill, entity, unk_1, site, unk_2);
+        INTERPOSE_NEXT(produce)(unit, out_products, &out_items_temp, in_reag, in_items, quantity, skill, quality, entity, site, unk_2);
         count = old_count;
 
         // If the reaction was somehow asked to produce multiple sets (due to excess inputs), multiply the outputs too

From ce3cc24228258afd76c8b7193b605eb32bc5db54 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 24 Jun 2020 00:11:54 -0400
Subject: [PATCH 120/547] Split docs on documentation into a separate file and
 reorganize/expand a bit

---
 docs/Compile.rst       | 125 +--------------------------
 docs/Documentation.rst | 191 +++++++++++++++++++++++++++++++++++++++++
 docs/changelog.txt     |  12 +--
 index.rst              |   1 +
 4 files changed, 197 insertions(+), 132 deletions(-)
 create mode 100644 docs/Documentation.rst

diff --git a/docs/Compile.rst b/docs/Compile.rst
index 6ebaa8c1f..650e762e3 100644
--- a/docs/Compile.rst
+++ b/docs/Compile.rst
@@ -656,129 +656,8 @@ Then build the ``INSTALL`` target listed under ``CMakePredefinedTargets``.
 Building the documentation
 ==========================
 
-DFHack documentation, like the file you are reading now, is created as .rst files,
-which are in `reStructuredText (reST) <http://sphinx-doc.org/rest.html>`_ format.
-This is a documenation format that has come from the Python community. It is very
-similar in concept - and in syntax - to Markdown, as found on GitHub and many other
-places. However it is more advanced than Markdown, with more features available when
-compiled to HTML, such as automatic tables of contents, cross-linking, special
-external links (forum, wiki, etc) and more. The documentation is compiled by a
-Python tool, `Sphinx <http://sphinx-doc.org>`_.
-
-The DFHack build process will compile the documentation but this has been disabled
-by default. You only need to build the docs if you're changing them, or perhaps
-if you want a local HTML copy; otherwise, read them easily online at
-`ReadTheDoc's DFHack hosted documentation <https://dfhack.readthedocs.org>`_.
-
-(Note that even if you do want a local copy, it is certainly not necesesary to
-compile the documentation in order to read it. Like Markdown, reST documents are
-designed to be just as readable in a plain-text editor as they are in HTML format.
-The main thing you lose in plain text format is hyperlinking.)
-
-
-Enabling documentation building
--------------------------------
-First, make sure you have followed all the necessary steps for your platform as
-outlined in the rest of this document.
-
-To compile documentation with DFHack, add the following flag to your ``cmake`` command::
-
-  -DBUILD_DOCS:bool=ON
-
-For example::
-
-  cmake .. -DCMAKE_BUILD_TYPE:string=Release -DBUILD_DOCS:bool=ON -DCMAKE_INSTALL_PREFIX=<path to DF>
-
-Alternatively you can use the CMake GUI which allows options to be changed easily.
-
-On Windows you should either use ``generate-msvc-gui.bat`` and set the option
-through the GUI, or else if you want to use an alternate file, such as
-``generate-msvc-all.bat``, you will need to edit it to add the flag.
-Or you could just run ``cmake`` on the command line like in other platforms.
-
-Required dependencies
----------------------
-In order to build the documentation, you must have Python with Sphinx
-version 1.3.1 or later. Both Python 2.x and 3.x are supported.
-
-When installing Sphinx from OS package managers, be aware that there is
-another program called Sphinx, completely unrelated to documentation management.
-Be sure you are installing the right Sphinx; it may be called ``python-sphinx``,
-for example. To avoid doubt, ``pip`` can be used instead as detailed below.
-
-
-Linux
------
-Most Linux distributions will include Python as standard.
-
-Check your package manager to see if Sphinx 1.3.1 or later is available,
-but at the time of writing Ubuntu for example only has 1.2.x.
-
-You can instead install Sphinx with the pip package manager. This may need
-to be installed from your OS package manager; this is the case on Ubuntu.
-On Ubuntu/Debian, use the following to first install pip::
-
-  sudo apt-get install python-pip
-
-Once pip is available, you can then install the Python Sphinx module with::
-
-  pip install sphinx
-
-If you run this as a normal user it will install a local copy for your user only.
-Run it with sudo if you want a system-wide install. Either is fine for DFHack,
-however if installing locally do check that ``sphinx-build`` is in your path.
-It may be installed in a directory such as ``~/.local/bin/``, so after pip
-install, find ``sphinx-build`` and ensure its directory is in your local ``$PATH``.
-
-
-macOS
------
-macOS has Python 2.7 installed by default, but it does not have the pip package manager.
-
-You can install Homebrew's Python 3, which includes pip, and then install the
-latest Sphinx using pip::
-
-  brew install python3
-  pip3 install sphinx
-
-Alternatively, you can simply install Sphinx 1.3.x directly from Homebrew::
-
-  brew install sphinx-doc
-
-This will install Sphinx for macOS's system Python 2.7, without needing pip.
-
-Either method works; if you plan to use Python for other purposes, it might best
-to install Homebrew's Python 3 so that you have the latest Python as well as pip.
-If not, just installing sphinx-doc for macOS's system Python 2.7 is fine.
-
-
-Windows
--------
-Use the Chocolatey package manager to install Python and pip,
-then use pip to install Sphinx.
-
-Run the following commands from an elevated (Admin) ``cmd.exe``, after installing
-Chocolatey as outlined in the `Windows section <compile-windows>`::
-
-  choco install python pip -y
-
-Then close that Admin ``cmd.exe``, re-open another Admin ``cmd.exe``, and run::
-
-  pip install sphinx
-
-.. _build-changelog:
-
-Building the changelogs
------------------------
-If you have Python installed, but do not want to build all of the documentation,
-you can build the changelogs with the ``docs/gen_changelog.py`` script.
-
-All changes should be listed in ``changelog.txt``. A description of this file's
-format follows:
-
-.. include:: /docs/changelog.txt
-   :start-after: ===help
-   :end-before: ===end
+The steps above will not build DFHack's documentation by default. If you are
+editing documentation, see `documentation` for details on how to build it.
 
 Misc. Notes
 ===========
diff --git a/docs/Documentation.rst b/docs/Documentation.rst
new file mode 100644
index 000000000..f7cb9ef92
--- /dev/null
+++ b/docs/Documentation.rst
@@ -0,0 +1,191 @@
+.. _documentation:
+
+####################
+DFHack Documentation
+####################
+
+
+DFHack documentation, like the file you are reading now, is created as ``.rst`` files,
+which are in `reStructuredText (reST) <http://sphinx-doc.org/rest.html>`_ format.
+This is a documentation format common in the Python community. It is very
+similar in concept - and in syntax - to Markdown, as found on GitHub and many other
+places. However it is more advanced than Markdown, with more features available when
+compiled to HTML, such as automatic tables of contents, cross-linking, special
+external links (forum, wiki, etc) and more. The documentation is compiled by a
+Python tool, `Sphinx <http://sphinx-doc.org>`_.
+
+The DFHack build process will compile the documentation, but this is disabled
+by default due to the additional Python and Sphinx requirements. You typically
+only need to build the docs if you're changing them, or perhaps
+if you want a local HTML copy; otherwise, you can read an
+`online version hosted by ReadTheDocs <https://dfhack.readthedocs.org>`_.
+
+(Note that even if you do want a local copy, it is certainly not necessary to
+compile the documentation in order to read it. Like Markdown, reST documents are
+designed to be just as readable in a plain-text editor as they are in HTML format.
+The main thing you lose in plain text format is hyperlinking.)
+
+.. contents::
+
+
+Required dependencies
+=====================
+In order to build the documentation, you must have Python with Sphinx
+version 1.3.1 or later. Both Python 2.x and 3.x are supported.
+
+When installing Sphinx from OS package managers, be aware that there is
+another program called Sphinx, completely unrelated to documentation management.
+Be sure you are installing the right Sphinx; it may be called ``python-sphinx``,
+for example. To avoid doubt, ``pip`` can be used instead as detailed below.
+
+For more detailed platform-specific instructions, see the sections below:
+
+
+Linux
+-----
+Most Linux distributions will include Python as standard.
+
+Check your package manager to see if Sphinx 1.3.1 or later is available,
+but at the time of writing Ubuntu for example only has 1.2.x.
+
+You can instead install Sphinx with the pip package manager. This may need
+to be installed from your OS package manager; this is the case on Ubuntu.
+On Ubuntu/Debian, use the following to first install pip::
+
+  sudo apt-get install python-pip
+
+Once pip is available, you can then install the Python Sphinx module with::
+
+  pip install sphinx
+
+If you run this as a normal user it will install a local copy for your user only.
+Run it with sudo if you want a system-wide install. Either is fine for DFHack,
+however if installing locally do check that ``sphinx-build`` is in your path.
+It may be installed in a directory such as ``~/.local/bin/``, so after pip
+install, find ``sphinx-build`` and ensure its directory is in your local ``$PATH``.
+
+
+macOS
+-----
+macOS has Python 2.7 installed by default, but it does not have the pip package manager.
+
+You can install Homebrew's Python 3, which includes pip, and then install the
+latest Sphinx using pip::
+
+  brew install python3
+  pip3 install sphinx
+
+Alternatively, you can simply install Sphinx 1.3.x directly from Homebrew::
+
+  brew install sphinx-doc
+
+This will install Sphinx for macOS's system Python 2.7, without needing pip.
+
+Either method works; if you plan to use Python for other purposes, it might best
+to install Homebrew's Python 3 so that you have the latest Python as well as pip.
+If not, just installing sphinx-doc for macOS's system Python 2.7 is fine.
+
+
+Windows
+-------
+Python for Windows can be downloaded `from python.org <https://www.python.org/downloads/>`_.
+The latest version of Python 3 is recommended, as it includes pip already.
+
+You can also install Python and pip through the Chocolatey package manager.
+After installing Chocolatey as outlined in the `Windows compilation instructions <compile-windows>`,
+run the following command from an elevated (admin) command prompt (e.g. ``cmd.exe``)::
+
+  choco install python pip -y
+
+Once you have pip available, you can install Sphinx with the following command::
+
+  pip install sphinx
+
+Note that this may require opening a new (admin) command prompt if you just
+installed pip from the same command prompt.
+
+
+Building the documentation
+==========================
+
+Once you have installed Sphinx, ``sphinx-build --version`` should report the
+version of Sphinx that you have installed. If this works, CMake should also be
+able to find Sphinx.
+
+Using CMake
+-----------
+
+Enabling the ``BUILD_DOCS`` CMake option will cause the documentation to be built
+whenever it changes as part of the normal DFHack build process. There are several
+ways to do this:
+
+* When initially running CMake, add ``-DBUILD_DOCS:bool=ON`` to your ``cmake``
+  command. For example::
+
+    cmake .. -DCMAKE_BUILD_TYPE:string=Release -DBUILD_DOCS:bool=ON -DCMAKE_INSTALL_PREFIX=<path to DF>
+
+* If you have already run CMake, you can simply run it again from your build
+  folder to update your configuration::
+
+    cmake .. -DBUILD_DOCS:bool=ON
+
+* You can edit the ``BUILD_DOCS`` setting in CMakeCache.txt directly
+
+* You can use the CMake GUI to change ``BUILD_DOCS``
+
+* On Windows, if you prefer to use the batch scripts, you can run
+  ``generate-msvc-gui.bat`` and set ``BUILD_DOCS`` through the GUI. If you are
+  running another file, such as ``generate-msvc-all.bat``, you will need to edit
+  it to add the flag. You can also run ``cmake`` on the command line, similar to
+  other platforms.
+
+Running Sphinx manually
+-----------------------
+
+You can also build the documentation without going through CMake, which may be
+faster. There is a ``docs/build.sh`` script available for Linux and macOS that
+will run essentially the same command that CMake runs - see the script for
+options.
+
+To build the documentation with default options, run the following command from
+the root DFHack folder::
+
+    sphinx-build . docs/html
+
+Sphinx has many options to enable clean builds, parallel builds, logging, and
+more - run ``sphinx-build --help`` for details.
+
+.. _build-changelog:
+
+Building the changelogs
+=======================
+If you have Python installed, but do not want to build all of the documentation,
+you can build the changelogs with the ``docs/gen_changelog.py`` script. This
+script provides additional options, including one to build individual changelogs
+for all DFHack versions - run ``python docs/gen_changelog.py --help`` for details.
+
+Changelog entries are obtained from ``changelog.txt`` files in multiple repos.
+This allows changes to be listed in the same repo where they were made. These
+changelogs are combined as part of the changelog build process:
+
+* ``docs/changelog.txt`` for changes in the main ``dfhack`` repo
+* ``scripts/changelog.txt`` for changes made to scripts in the ``scripts`` repo
+* ``library/xml/changelog.txt`` for changes made in the ``df-structures`` repo
+
+Building the changelogs generates two files: ``docs/_auto/news.rst`` and
+``docs/_auto/news-dev.rst``. These correspond to `changelog` and `dev-changelog`
+and contain changes organized by stable and development DFHack releases,
+respectively. For example, an entry listed under "0.44.05-alpha1" in
+changelog.txt will be listed under that version in the development changelog as
+well, but under "0.44.05-r1" in the stable changelog (assuming that is the
+closest stable release after 0.44.05-alpha1). An entry listed under a stable
+release like "0.44.05-r1" in changelog.txt will be listed under that release in
+both the stable changelog and the development changelog.
+
+
+Changelog syntax
+----------------
+
+.. include:: /docs/changelog.txt
+   :start-after: ===help
+   :end-before: ===end
diff --git a/docs/changelog.txt b/docs/changelog.txt
index c165ff855..7201bfd23 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -1,16 +1,10 @@
 === Scroll down for changes
 
 ===[[[
-===help
+The text below is included in docs/Documentation.rst - see that file for more details on the changelog setup.
+This is kept in this file as a quick syntax reference.
 
-Entries in docs/NEWS.rst and docs/NEWS-dev.rst are generated from
-docs/changelog.txt. NEWS.rst groups entries by stable releases, and NEWS-dev.rst
-groups them by all releases (stable and development). For example, an entry
-listed under "0.44.05-alpha1" in changelog.txt will be listed under that in
-NEWS-dev.rst as well, but under "0.44.05-r1" in NEWS.rst (assuming that is the
-closest stable release after 0.44.05-alpha1). An entry listed under a stable
-release in changelog.txt will be listed under that release in both NEWS.rst and
-NEWS-dev.rst.
+===help
 
 changelog.txt uses a syntax similar to RST, with a few special sequences:
 
diff --git a/index.rst b/index.rst
index d4bd223c5..855b31a73 100644
--- a/index.rst
+++ b/index.rst
@@ -62,6 +62,7 @@ For Developers
    /docs/Compile
    /docs/NEWS-dev
    /docs/Lua API
+   /docs/Documentation
    /library/xml/SYNTAX
    /library/xml/how-to-update
    /docs/Binpatches

From 8a7e8f4facf50757f54a049fb18f67b8b81a3837 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 25 Jun 2020 01:12:18 -0400
Subject: [PATCH 121/547] Update xml

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index 542d1bd28..2ed5fae13 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 542d1bd283051186b2d4943c9acb546af1cc7b8b
+Subproject commit 2ed5fae13f721b73b71bc31a062fb66abd1f3920

From ee56d8157f62e5161f6248d9329d30e0c0ab314e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 27 Jun 2020 00:15:48 -0400
Subject: [PATCH 122/547] Update xml

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index 2ed5fae13..97084e556 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 2ed5fae13f721b73b71bc31a062fb66abd1f3920
+Subproject commit 97084e556119ce4445c3745151180467338a746a

From a9f219baf9dda6d8cc300251fc040420e84bbc49 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Mon, 29 Jun 2020 16:16:44 -0500
Subject: [PATCH 123/547] update for
 DFHack/df-structures#7dfea1f1d4e453b97d5529785701db46360596ce

---
 library/modules/Kitchen.cpp   |  4 ++--
 library/modules/MapCache.cpp  |  8 ++++----
 library/modules/Materials.cpp |  2 +-
 library/xml                   |  2 +-
 plugins/autochop.cpp          |  2 +-
 plugins/getplants.cpp         | 10 +++++-----
 plugins/stonesense            |  2 +-
 scripts                       |  2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/library/modules/Kitchen.cpp b/library/modules/Kitchen.cpp
index 63372d564..fa4d1dea7 100644
--- a/library/modules/Kitchen.cpp
+++ b/library/modules/Kitchen.cpp
@@ -95,7 +95,7 @@ void Kitchen::denyPlantSeedCookery(t_materialIndex materialIndex)
     {
         ui->kitchen.item_types.push_back(item_type::SEEDS);
         ui->kitchen.item_subtypes.push_back(organicSubtype);
-        ui->kitchen.mat_types.push_back(type->material_defs.type_seed);
+        ui->kitchen.mat_types.push_back(type->material_defs.type[plant_material_def::seed]);
         ui->kitchen.mat_indices.push_back(materialIndex);
         ui->kitchen.exc_types.push_back(df::kitchen_exc_type::Cook);
     }
@@ -103,7 +103,7 @@ void Kitchen::denyPlantSeedCookery(t_materialIndex materialIndex)
     {
         ui->kitchen.item_types.push_back(item_type::PLANT);
         ui->kitchen.item_subtypes.push_back(organicSubtype);
-        ui->kitchen.mat_types.push_back(type->material_defs.type_basic_mat);
+        ui->kitchen.mat_types.push_back(type->material_defs.type[plant_material_def::basic_mat]);
         ui->kitchen.mat_indices.push_back(materialIndex);
         ui->kitchen.exc_types.push_back(df::kitchen_exc_type::Cook);
     }
diff --git a/library/modules/MapCache.cpp b/library/modules/MapCache.cpp
index b61ba375e..ce3039ecf 100644
--- a/library/modules/MapCache.cpp
+++ b/library/modules/MapCache.cpp
@@ -899,8 +899,8 @@ t_matpair MapExtras::BlockInfo::getBaseMaterial(df::tiletype tt, df::coord2d pos
         {
             if (auto raw = df::plant_raw::find(plant->material))
             {
-                rv.mat_type = raw->material_defs.type_basic_mat;
-                rv.mat_index = raw->material_defs.idx_basic_mat;
+                rv.mat_type = raw->material_defs.type[plant_material_def::basic_mat];
+                rv.mat_index = raw->material_defs.idx[plant_material_def::basic_mat];
             }
         }
         break;
@@ -912,8 +912,8 @@ t_matpair MapExtras::BlockInfo::getBaseMaterial(df::tiletype tt, df::coord2d pos
         rv.mat_type = MaterialInfo::PLANT_BASE;
         if (auto raw = df::plant_raw::find(grass[x][y]))
         {
-            rv.mat_type = raw->material_defs.type_basic_mat;
-            rv.mat_index = raw->material_defs.idx_basic_mat;
+            rv.mat_type = raw->material_defs.type[plant_material_def::basic_mat];
+            rv.mat_index = raw->material_defs.idx[plant_material_def::basic_mat];
         }
         break;
 
diff --git a/library/modules/Materials.cpp b/library/modules/Materials.cpp
index 51d717d05..c341ea99e 100644
--- a/library/modules/Materials.cpp
+++ b/library/modules/Materials.cpp
@@ -261,7 +261,7 @@ bool MaterialInfo::findPlant(const std::string &token, const std::string &subtok
 
         // As a special exception, return the structural material with empty subtoken
         if (subtoken.empty())
-            return decode(p->material_defs.type_basic_mat, p->material_defs.idx_basic_mat);
+            return decode(p->material_defs.type[plant_material_def::basic_mat], p->material_defs.idx[plant_material_def::basic_mat]);
 
         for (size_t j = 0; j < p->material.size(); j++)
             if (p->material[j]->id == subtoken)
diff --git a/library/xml b/library/xml
index 97084e556..7dfea1f1d 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 97084e556119ce4445c3745151180467338a746a
+Subproject commit 7dfea1f1d4e453b97d5529785701db46360596ce
diff --git a/plugins/autochop.cpp b/plugins/autochop.cpp
index e7f3874d3..8f2225f72 100644
--- a/plugins/autochop.cpp
+++ b/plugins/autochop.cpp
@@ -258,7 +258,7 @@ static bool skip_plant(const df::plant * plant, bool *restricted)
     const df::plant_raw *plant_raw = df::plant_raw::find(plant->material);
 
     // Skip fruit trees if set.
-    if (skip.fruit_trees && plant_raw->material_defs.type_drink != -1)
+    if (skip.fruit_trees && plant_raw->material_defs.type[plant_material_def::drink] != -1)
     {
         if (restricted)
             *restricted = true;
diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp
index d1ee79a04..b4b7a493b 100644
--- a/plugins/getplants.cpp
+++ b/plugins/getplants.cpp
@@ -70,7 +70,7 @@ enum class selectability {
 //selectability selectablePlant(color_ostream &out, const df::plant_raw *plant, bool farming)
 selectability selectablePlant(const df::plant_raw *plant, bool farming)
 {
-    const DFHack::MaterialInfo basic_mat = DFHack::MaterialInfo(plant->material_defs.type_basic_mat, plant->material_defs.idx_basic_mat);
+    const DFHack::MaterialInfo basic_mat = DFHack::MaterialInfo(plant->material_defs.type[plant_material_def::basic_mat], plant->material_defs.idx[plant_material_def::basic_mat]);
     bool outOfSeason = false;
     selectability result = selectability::Nonselectable;
 
@@ -92,7 +92,7 @@ selectability selectablePlant(const df::plant_raw *plant, bool farming)
         return selectability::Grass;
     }
 
-    if (farming && plant->material_defs.type_seed == -1)
+    if (farming && plant->material_defs.type[plant_material_def::seed] == -1)
     {
         return selectability::Nonselectable;
     }
@@ -163,8 +163,8 @@ selectability selectablePlant(const df::plant_raw *plant, bool farming)
                 {
                     for (size_t k = 0; growth_mat.material->reaction_product.material.mat_type.size(); k++)
                     {
-                        if (growth_mat.material->reaction_product.material.mat_type[k] == plant->material_defs.type_seed &&
-                            growth_mat.material->reaction_product.material.mat_index[k] == plant->material_defs.idx_seed)
+                        if (growth_mat.material->reaction_product.material.mat_type[k] == plant->material_defs.type[plant_material_def::seed] &&
+                            growth_mat.material->reaction_product.material.mat_index[k] == plant->material_defs.idx[plant_material_def::seed])
                         {
                             seedSource = true;
                             break;
@@ -193,7 +193,7 @@ selectability selectablePlant(const df::plant_raw *plant, bool farming)
         }
 /*            else if (plant->growths[i]->behavior.bits.has_seed)  //  This code designates beans, etc. when DF doesn't, but plant gatherers still fail to collect anything, so it's useless: bug #0006940.
             {
-                const DFHack::MaterialInfo seed_mat = DFHack::MaterialInfo(plant->material_defs.type_seed, plant->material_defs.idx_seed);
+                const DFHack::MaterialInfo seed_mat = DFHack::MaterialInfo(plant->material_defs.type[plant_material_def::seed], plant->material_defs.idx[plant_material_def::seed]);
 
                 if (seed_mat.material->flags.is_set(material_flags::EDIBLE_RAW) ||
                     seed_mat.material->flags.is_set(material_flags::EDIBLE_COOKED))
diff --git a/plugins/stonesense b/plugins/stonesense
index 5b7e7743a..bdab71c99 160000
--- a/plugins/stonesense
+++ b/plugins/stonesense
@@ -1 +1 @@
-Subproject commit 5b7e7743a1372b929acb2ccb75080e139ac11691
+Subproject commit bdab71c99a0a7cc268ca517a0cd3f0a5fb41042a
diff --git a/scripts b/scripts
index 47d9b3c93..792ae44ab 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 47d9b3c9390d21ecc49ddaba477b16071884ee87
+Subproject commit 792ae44ab14afd3a2b3e850a6fcb463d714b0a44

From d13e5a3f3157b02fd552a90c2722046745626791 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Mon, 29 Jun 2020 20:20:37 -0500
Subject: [PATCH 124/547] update structures

handle renaming of caste_raw::gender
---
 library/xml                                           | 2 +-
 plugins/remotefortressreader/remotefortressreader.cpp | 2 +-
 plugins/tweak/tweaks/tradereq-pet-gender.h            | 2 +-
 scripts                                               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/xml b/library/xml
index 7dfea1f1d..b11433eea 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 7dfea1f1d4e453b97d5529785701db46360596ce
+Subproject commit b11433eea0a1117edc2a4a51f7a30b01594cb52b
diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp
index e94c3f832..1a0d045dc 100644
--- a/plugins/remotefortressreader/remotefortressreader.cpp
+++ b/plugins/remotefortressreader/remotefortressreader.cpp
@@ -2685,7 +2685,7 @@ static command_result GetPartialCreatureRaws(color_ostream &stream, const ListRe
 
             send_caste->add_child_name(orig_caste->child_name[0]);
             send_caste->add_child_name(orig_caste->child_name[1]);
-            send_caste->set_gender(orig_caste->gender);
+            send_caste->set_gender(orig_caste->sex);
 
             for (size_t partIndex = 0; partIndex < orig_caste->body_info.body_parts.size(); partIndex++)
             {
diff --git a/plugins/tweak/tweaks/tradereq-pet-gender.h b/plugins/tweak/tweaks/tradereq-pet-gender.h
index ca786bef2..c62a56f67 100644
--- a/plugins/tweak/tweaks/tradereq-pet-gender.h
+++ b/plugins/tweak/tweaks/tradereq-pet-gender.h
@@ -20,7 +20,7 @@ struct pet_gender_hook : df::viewscreen_topicmeeting_takerequestsst {
             vector<int16_t>& castes = entity->resources.animals.pet_castes;
             for (int i = (good_idx / 17) * 17, y = 4; i < (good_idx / 17) * 17 + 17 && size_t(i) < races.size(); i++, y++) {
                 int x = 30 + 1 + world->raws.creatures.all[races[i]]->caste[castes[i]]->caste_name[0].size();
-                bool male = (bool)world->raws.creatures.all[races[i]]->caste[castes[i]]->gender;
+                bool male = world->raws.creatures.all[races[i]]->caste[castes[i]]->sex == pronoun_type::he;
                 OutputString((i == good_idx) ? COLOR_WHITE : COLOR_GREY,
                     x, y, male ? "\013" : "\014");
             }
diff --git a/scripts b/scripts
index 792ae44ab..91060d6d2 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 792ae44ab14afd3a2b3e850a6fcb463d714b0a44
+Subproject commit 91060d6d2c79196f6b332b9b88492eb0e7ef32da

From 0f58d95ea890a7333131547bba95a43e582a3f78 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 29 Jun 2020 22:02:53 -0400
Subject: [PATCH 125/547] Use workflow commands to set up environment variables

https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
---
 .github/workflows/build.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 17af62cb1..7da428d32 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,11 +25,11 @@ jobs:
         submodules: true
     - name: Set up environment
       run: |
-        echo export DF_VERSION="$(sh travis/get-df-version.sh)" >> "$HOME/.df-env"
-        echo export DF_FOLDER="$HOME/DF/$DF_VERSION/df_linux" >> "$HOME/.df-env"
+        DF_VERSION="$(sh travis/get-df-version.sh)"
+        echo "::set-env name=DF_VERSION::${DF_VERSION}"
+        echo "::set-env name=DF_FOLDER::${HOME}/DF/${DF_VERSION}/df_linux"
     - name: Download DF
       run: |
-        source "$HOME/.df-env"
         sh travis/download-df.sh
     - name: Build docs
       run: |
@@ -41,7 +41,6 @@ jobs:
         path: docs/html
     - name: Build DFHack
       run: |
-        source "$HOME/.df-env"
         cmake \
           -S . \
           -B build-ci \
@@ -53,7 +52,6 @@ jobs:
         ninja -C build-ci install
     - name: Run tests
       run: |
-        source "$HOME/.df-env"
         export TERM=dumb
         mv "$DF_FOLDER"/dfhack.init-example "$DF_FOLDER"/dfhack.init
         script -qe -c "python travis/run-tests.py --headless --keep-status \"$DF_FOLDER\""

From c6283ea262f401845c2d0f6e645a7dc18fff79c3 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 29 Jun 2020 22:04:33 -0400
Subject: [PATCH 126/547] Make download-df.sh fail sooner

---
 travis/download-df.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/travis/download-df.sh b/travis/download-df.sh
index 834aa4da7..6918a596a 100755
--- a/travis/download-df.sh
+++ b/travis/download-df.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 tardest="df.tar.bz2"
 
 which md5sum && alias md5=md5sum

From 9def098ef914a9c8e0f7121889b17cf550e879a8 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Mon, 29 Jun 2020 21:30:22 -0500
Subject: [PATCH 127/547] add enum-attrs to pronoun_type

---
 library/xml             | 2 +-
 plugins/manipulator.cpp | 4 +++-
 scripts                 | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/library/xml b/library/xml
index b11433eea..b67b3fa4b 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit b11433eea0a1117edc2a4a51f7a30b01594cb52b
+Subproject commit b67b3fa4b02f834dc76a2e1eae21136e0be089f7
diff --git a/plugins/manipulator.cpp b/plugins/manipulator.cpp
index e9206dc0f..a013df335 100644
--- a/plugins/manipulator.cpp
+++ b/plugins/manipulator.cpp
@@ -2032,7 +2032,9 @@ void viewscreen_unitlaborsst::render()
         int x = 1, y = 3 + num_rows + 2;
         Screen::Pen white_pen(' ', 15, 0);
 
-        Screen::paintString(white_pen, x, y, (cur->unit && cur->unit->sex) ? "\x0b" : "\x0c");
+        auto symbol = cur->unit ? ENUM_ATTR(pronoun_type, symbol, cur->unit->sex) : nullptr;
+        if (symbol)
+            Screen::paintString(white_pen, x, y, symbol);
         x += 2;
         Screen::paintString(white_pen, x, y, cur->transname);
         x += cur->transname.length();
diff --git a/scripts b/scripts
index 91060d6d2..3987d0314 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 91060d6d2c79196f6b332b9b88492eb0e7ef32da
+Subproject commit 3987d031469420d64aff23097d9548676f1ab752

From b4a55110e3a9572b32df10c841e7b4d06ad0a9da Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 29 Jun 2020 22:35:23 -0400
Subject: [PATCH 128/547] Also try downloading DF from files.dfhack.org

---
 travis/download-df.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/travis/download-df.sh b/travis/download-df.sh
index 6918a596a..49dcedea7 100755
--- a/travis/download-df.sh
+++ b/travis/download-df.sh
@@ -4,7 +4,6 @@ set -e
 
 tardest="df.tar.bz2"
 
-which md5sum && alias md5=md5sum
 selfmd5=$(openssl md5 < "$0")
 echo $selfmd5
 
@@ -30,7 +29,20 @@ if [ ! -f receipt ]; then
     patch=$(echo "$DF_VERSION" | cut -d. -f3)
     url="http://www.bay12games.com/dwarves/df_${minor}_${patch}_linux.tar.bz2"
     echo Downloading
-    wget "$url" -O "$tardest"
+    while read url; do
+        echo "Attempting download: ${url}"
+        if wget -v "$url" -O "$tardest"; then
+            break
+        fi
+    done <<URLS
+    https://www.bay12games.com/dwarves/df_${minor}_${patch}_linux.tar.bz2
+    https://files.dfhack.org/DF/0.${minor}.${patch}/df_${minor}_${patch}_linux.tar.bz2
+URLS
+    echo $tardest
+    if ! test -f "$tardest"; then
+        echo "DF failed to download: $tardest not found"
+        exit 1
+    fi
 fi
 
 rm -rf df_linux

From 3c702ccf5269ee5cfb135592494a7e946d0a0036 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 29 Jun 2020 22:35:36 -0400
Subject: [PATCH 129/547] Attempt to cache DF

---
 .github/workflows/build.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7da428d32..6ad88dc27 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,6 +28,11 @@ jobs:
         DF_VERSION="$(sh travis/get-df-version.sh)"
         echo "::set-env name=DF_VERSION::${DF_VERSION}"
         echo "::set-env name=DF_FOLDER::${HOME}/DF/${DF_VERSION}/df_linux"
+    - name: Fetch DF cache
+      uses: actions/cache@v2
+      with:
+        path: ~/DF
+        key: ${DF_VERSION}
     - name: Download DF
       run: |
         sh travis/download-df.sh

From e33a3ffff9f68a61aa39597bb8339d211e5574c6 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 29 Jun 2020 22:40:58 -0400
Subject: [PATCH 130/547] Fix cache key

---
 .github/workflows/build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6ad88dc27..fdea2180e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,15 +24,17 @@ jobs:
       with:
         submodules: true
     - name: Set up environment
+      id: env_setup
       run: |
         DF_VERSION="$(sh travis/get-df-version.sh)"
         echo "::set-env name=DF_VERSION::${DF_VERSION}"
+        echo "::set-output name=df_version::${DF_VERSION}"
         echo "::set-env name=DF_FOLDER::${HOME}/DF/${DF_VERSION}/df_linux"
     - name: Fetch DF cache
       uses: actions/cache@v2
       with:
         path: ~/DF
-        key: ${DF_VERSION}
+        key: ${{ steps.env_setup.outputs.df_version }}
     - name: Download DF
       run: |
         sh travis/download-df.sh

From e26a091b7d02eacb3b0d4855ded6151ebff0fc01 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 29 Jun 2020 22:52:44 -0400
Subject: [PATCH 131/547] Clean up cached DF

---
 .github/workflows/build.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fdea2180e..aadb1a15f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,6 +71,12 @@ jobs:
       with:
         name: test-artifacts
         path: artifacts
+    - name: Clean up DF folder
+      # to prevent DFHack-generated files from ending up in the cache
+      # (download-df.sh also removes them, this is just to save cache space)
+      if: success() || failure()
+      run: |
+        rm -rf "$DF_FOLDER"
   lint:
     runs-on: ubuntu-18.04
     steps:

From c4aebfdf65acf63293648316144f7da2f11c5f58 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 29 Jun 2020 22:53:05 -0400
Subject: [PATCH 132/547] Use setup-python

---
 .github/workflows/build.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aadb1a15f..4205e5e2a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,6 +6,10 @@ jobs:
   build:
     runs-on: ubuntu-18.04
     steps:
+    - name: Set up Python 3
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3
     - name: Install dependencies
       run: |
         sudo apt-get update
@@ -18,7 +22,7 @@ jobs:
             lua5.3 \
             ninja-build \
             zlib1g-dev
-        sudo pip3 install --system sphinx
+        pip install sphinx
     - name: Clone DFHack
       uses: actions/checkout@v1
       with:

From 6b2887d31b0e84b29b1121fabab96b5610e9678e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 29 Jun 2020 23:00:20 -0400
Subject: [PATCH 133/547] Upgrade to checkout@v2

---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4205e5e2a..612302397 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,8 +24,9 @@ jobs:
             zlib1g-dev
         pip install sphinx
     - name: Clone DFHack
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
       with:
+        fetch-depth: 0  # unlimited - we need past tags
         submodules: true
     - name: Set up environment
       id: env_setup

From e39150ac36934e54b5cdbdbdcb5c17e4f5faacf1 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 29 Jun 2020 23:05:03 -0400
Subject: [PATCH 134/547] Update authors (dfhack/scripts#157)

---
 docs/Authors.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Authors.rst b/docs/Authors.rst
index 6821a84b0..e816389cd 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -25,6 +25,7 @@ belal                   jimhester
 Ben Lubar               BenLubar
 Ben Rosser              TC01
 billw2012               billw2012
+BrickViking             brickviking
 brndd                   brndd                   burneddi
 Bumber                  Bumber64
 Caldfir                 caldfir

From e95edc095c395d4fca41dd3838dba5fccc8013a5 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 29 Jun 2020 23:58:47 -0400
Subject: [PATCH 135/547] Use workflow commands to annotate linter errors

---
 travis/lint.py | 83 ++++++++++++++++++++++++++++++++------------------
 1 file changed, 53 insertions(+), 30 deletions(-)

diff --git a/travis/lint.py b/travis/lint.py
index 7d8df7246..53abc4cbc 100644
--- a/travis/lint.py
+++ b/travis/lint.py
@@ -18,12 +18,49 @@ def valid_file(filename):
         not len(list(filter(lambda path: path.replace('\\', '/') in filename.replace('\\', '/'), path_blacklist)))
 
 success = True
-def error(msg):
+def error(msg=None):
     global success
     success = False
-    sys.stderr.write(msg + '\n')
+    if msg:
+        sys.stderr.write(msg + '\n')
 
-class LinterError(Exception): pass
+def format_lines(lines, total):
+    if len(lines) == total - 1:
+        return 'entire file'
+    if not len(lines):
+        # should never happen
+        return 'nowhere'
+    if len(lines) == 1:
+        return 'line %i' % lines[0]
+    s = 'lines '
+    range_start = range_end = lines[0]
+    for i, line in enumerate(lines):
+        if line > range_end + 1:
+            if range_start == range_end:
+                s += ('%i, ' % range_end)
+            else:
+                s += ('%i-%i, ' % (range_start, range_end))
+            range_start = range_end = line
+            if i == len(lines) - 1:
+                s += ('%i' % line)
+        else:
+            range_end = line
+            if i == len(lines) - 1:
+                s += ('%i-%i, ' % (range_start, range_end))
+    return s.rstrip(' ').rstrip(',')
+
+class LinterError(Exception):
+    def __init__(self, message, lines, total_lines):
+        self.message = message
+        self.lines = lines
+        self.total_lines = total_lines
+
+    def __str__(self):
+        return '%s: %s' % (self.message, format_lines(self.lines, self.total_lines))
+
+    def github_actions_workflow_command(self, filename):
+        first_line = self.lines[0] if self.lines else 1
+        return '::error file=%s,line=%i::%s' % (filename, first_line, self)
 
 class Linter(object):
     ignore = False
@@ -33,36 +70,12 @@ class Linter(object):
             if not self.check_line(line):
                 failures.append(i + 1)
         if len(failures):
-            raise LinterError('%s: %s' % (self.msg, self.display_lines(failures, len(lines))))
+            raise LinterError(self.msg, failures, len(lines))
 
     def fix(self, lines):
         for i in range(len(lines)):
             lines[i] = self.fix_line(lines[i])
 
-    def display_lines(self, lines, total):
-        if len(lines) == total - 1:
-            return 'entire file'
-        if not len(lines):
-            # should never happen
-            return 'nowhere'
-        if len(lines) == 1:
-            return 'line %i' % lines[0]
-        s = 'lines '
-        range_start = range_end = lines[0]
-        for i, line in enumerate(lines):
-            if line > range_end + 1:
-                if range_start == range_end:
-                    s += ('%i, ' % range_end)
-                else:
-                    s += ('%i-%i, ' % (range_start, range_end))
-                range_start = range_end = line
-                if i == len(lines) - 1:
-                    s += ('%i' % line)
-            else:
-                range_end = line
-                if i == len(lines) - 1:
-                    s += ('%i-%i, ' % (range_start, range_end))
-        return s.rstrip(' ').rstrip(',')
 
 class NewlineLinter(Linter):
     msg = 'Contains DOS-style newlines'
@@ -91,6 +104,7 @@ class TabLinter(Linter):
 linters = [cls() for cls in Linter.__subclasses__() if not cls.ignore]
 
 def main():
+    is_github_actions = os.environ.get('GITHUB_ACTIONS')
     root_path = os.path.abspath(sys.argv[1] if len(sys.argv) > 1 else '.')
     if not os.path.exists(root_path):
         print('Nonexistent path: %s' % root_path)
@@ -112,13 +126,22 @@ def main():
                     try:
                         lines[i] = line.decode('utf-8')
                     except UnicodeDecodeError:
-                        error('%s:%i: Invalid UTF-8 (other errors will be ignored)' % (rel_path, i + 1))
+                        msg_params = (rel_path, i + 1, 'Invalid UTF-8 (other errors will be ignored)')
+                        if is_github_actions:
+                            error()
+                            print('::error file=%s,line=%i::%s' % msg_params)
+                        else:
+                            error('%s:%i: %s' % msg_params)
                         lines[i] = ''
             for linter in linters:
                 try:
                     linter.check(lines)
                 except LinterError as e:
-                    error('%s: %s' % (rel_path, e))
+                    if is_github_actions:
+                        error()
+                        print(e.github_actions_workflow_command(rel_path))
+                    else:
+                        error('%s: %s' % (rel_path, e))
                     if fix:
                         linter.fix(lines)
                         contents = '\n'.join(lines)

From fedf68cc7ccd0787ad7231085a9695c29844445d Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 30 Jun 2020 00:24:03 -0400
Subject: [PATCH 136/547] Annotate script syntax errors

---
 .github/workflows/build.yml |  4 ++--
 travis/script-syntax.py     | 28 +++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 612302397..d60a428bf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -106,10 +106,10 @@ jobs:
         python travis/script-docs.py
     - name: Check Lua syntax
       run: |
-        python travis/script-syntax.py --ext=lua --cmd="luac5.3 -p"
+        python travis/script-syntax.py --ext=lua --cmd="luac5.3 -p" --github-actions
     - name: Check Ruby syntax
       run: |
-        python travis/script-syntax.py --ext=rb --cmd="ruby -c"
+        python travis/script-syntax.py --ext=rb --cmd="ruby -c" --github-actions
   check-pr:
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request'
diff --git a/travis/script-syntax.py b/travis/script-syntax.py
index b3a264f04..e33a11f1d 100644
--- a/travis/script-syntax.py
+++ b/travis/script-syntax.py
@@ -3,6 +3,24 @@ import os
 import subprocess
 import sys
 
+
+def print_stderr(stderr, args):
+    if not args.github_actions:
+        sys.stderr.write(stderr + '\n')
+        return
+
+    for line in stderr.split('\n'):
+        parts = list(map(str.strip, line.split(':')))
+        # e.g. luac prints "luac:" in front of messages, so find the first part
+        # containing the actual filename
+        for i in range(len(parts) - 1):
+            if parts[i].endswith('.' + args.ext) and parts[i + 1].isdigit():
+                print('::error file=%s,line=%s::%s' % (parts[i], parts[i + 1], ':'.join(parts[i + 2:])))
+                break
+        else:
+            print(line)
+
+
 def main(args):
     root_path = os.path.abspath(args.path)
     cmd = args.cmd.split(' ')
@@ -19,7 +37,13 @@ def main(args):
                 continue
             full_path = os.path.join(cur, filename)
             try:
-                subprocess.check_output(cmd + [full_path])
+                p = subprocess.Popen(cmd + [full_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                _, stderr = p.communicate()
+                stderr = stderr.decode('utf-8', errors='ignore')
+                if stderr:
+                    print_stderr(stderr, args)
+                if p.returncode != 0:
+                    err = True
             except subprocess.CalledProcessError:
                 err = True
             except IOError:
@@ -34,5 +58,7 @@ if __name__ == '__main__':
     parser.add_argument('--path', default='.', help='Root directory')
     parser.add_argument('--ext', help='Script extension', required=True)
     parser.add_argument('--cmd', help='Command', required=True)
+    parser.add_argument('--github-actions', action='store_true',
+        help='Enable GitHub Actions workflow command output')
     args = parser.parse_args()
     main(args)

From c333059316c2455416dbfacd1edf60477eb27a36 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 30 Jun 2020 00:29:30 -0400
Subject: [PATCH 137/547] Switch CI scripts to Python 3

---
 .github/workflows/build.yml | 5 +++++
 travis/all.py               | 1 +
 travis/authors-rst.py       | 1 +
 travis/check-rpc.py         | 1 +
 travis/lint.py              | 1 +
 travis/run-tests.py         | 1 +
 travis/script-docs.py       | 1 +
 travis/script-syntax.py     | 1 +
 8 files changed, 12 insertions(+)
 mode change 100644 => 100755 travis/all.py
 mode change 100644 => 100755 travis/authors-rst.py
 mode change 100644 => 100755 travis/check-rpc.py
 mode change 100644 => 100755 travis/lint.py
 mode change 100644 => 100755 travis/run-tests.py
 mode change 100644 => 100755 travis/script-docs.py
 mode change 100644 => 100755 travis/script-syntax.py

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d60a428bf..37a306abd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -82,9 +82,14 @@ jobs:
       if: success() || failure()
       run: |
         rm -rf "$DF_FOLDER"
+
   lint:
     runs-on: ubuntu-18.04
     steps:
+    - name: Set up Python 3
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3
     - name: Install dependencies
       run: |
         sudo apt-get update
diff --git a/travis/all.py b/travis/all.py
old mode 100644
new mode 100755
index 281911e7a..edd2eee18
--- a/travis/all.py
+++ b/travis/all.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 import argparse, os, sys, time
 
 parser = argparse.ArgumentParser()
diff --git a/travis/authors-rst.py b/travis/authors-rst.py
old mode 100644
new mode 100755
index 2d7274219..e8db817f6
--- a/travis/authors-rst.py
+++ b/travis/authors-rst.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 """ Overly-complicated script to check formatting/sorting in Authors.rst """
 
 import re, sys
diff --git a/travis/check-rpc.py b/travis/check-rpc.py
old mode 100644
new mode 100755
index ecddafa9f..aba3e3811
--- a/travis/check-rpc.py
+++ b/travis/check-rpc.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 import glob
 import sys
 
diff --git a/travis/lint.py b/travis/lint.py
old mode 100644
new mode 100755
index 53abc4cbc..51117201c
--- a/travis/lint.py
+++ b/travis/lint.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 import re, os, sys
 
 valid_extensions = ['c', 'cpp', 'h', 'hpp', 'mm', 'lua', 'rb', 'proto',
diff --git a/travis/run-tests.py b/travis/run-tests.py
old mode 100644
new mode 100755
index 70ab6cf20..f4c173af2
--- a/travis/run-tests.py
+++ b/travis/run-tests.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 import argparse
 import enum
 import json
diff --git a/travis/script-docs.py b/travis/script-docs.py
old mode 100644
new mode 100755
index 33b2818c8..04728e101
--- a/travis/script-docs.py
+++ b/travis/script-docs.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 from __future__ import print_function
 from io import open
 import os
diff --git a/travis/script-syntax.py b/travis/script-syntax.py
old mode 100644
new mode 100755
index e33a11f1d..1f6eca2eb
--- a/travis/script-syntax.py
+++ b/travis/script-syntax.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 import argparse
 import os
 import subprocess

From 324bc515408fec1b9d0ca848329e88ac956b51a9 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 30 Jun 2020 00:34:40 -0400
Subject: [PATCH 138/547] Upgrade to checkout@v2

---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 37a306abd..829ab1c14 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -97,9 +97,10 @@ jobs:
           lua5.3 \
           ruby
     - name: Clone DFHack
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
       with:
         submodules: true
+        # don't need tags here
     - name: Check whitespace
       run: |
         python travis/lint.py

From 504d2ec65b0d3a5823789519535ed7eb792153f0 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 30 Jun 2020 00:35:01 -0400
Subject: [PATCH 139/547] Stop linter steps from stopping each other

---
 .github/workflows/build.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 829ab1c14..3533bd1ee 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -105,17 +105,22 @@ jobs:
       run: |
         python travis/lint.py
     - name: Check Authors.rst
+      if: success() || failure()
       run: |
         python travis/authors-rst.py
     - name: Check for missing documentation
+      if: success() || failure()
       run: |
         python travis/script-docs.py
     - name: Check Lua syntax
+      if: success() || failure()
       run: |
         python travis/script-syntax.py --ext=lua --cmd="luac5.3 -p" --github-actions
     - name: Check Ruby syntax
+      if: success() || failure()
       run: |
         python travis/script-syntax.py --ext=rb --cmd="ruby -c" --github-actions
+
   check-pr:
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request'

From 1df7c0be122f1751b858b5c78a9992e86bdf16be Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 30 Jun 2020 00:41:02 -0400
Subject: [PATCH 140/547] Upgrade Ruby

---
 .github/workflows/build.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3533bd1ee..fb98bfa0b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -90,12 +90,14 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 3
-    - name: Install dependencies
+    - name: Set up Ruby 2.7
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - name: Install Lua
       run: |
         sudo apt-get update
-        sudo apt-get install \
-          lua5.3 \
-          ruby
+        sudo apt-get install lua5.3
     - name: Clone DFHack
       uses: actions/checkout@v2
       with:

From 13f411d9fa650cc4ca443f606d2c7119fc5d59bf Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 30 Jun 2020 00:44:27 -0400
Subject: [PATCH 141/547] Always print error lines to make GitHub logs more
 readable

---
 travis/script-syntax.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/travis/script-syntax.py b/travis/script-syntax.py
index 1f6eca2eb..53891f762 100755
--- a/travis/script-syntax.py
+++ b/travis/script-syntax.py
@@ -18,8 +18,7 @@ def print_stderr(stderr, args):
             if parts[i].endswith('.' + args.ext) and parts[i + 1].isdigit():
                 print('::error file=%s,line=%s::%s' % (parts[i], parts[i + 1], ':'.join(parts[i + 2:])))
                 break
-        else:
-            print(line)
+        print(line)
 
 
 def main(args):

From 20993f9a429a2011d1d696d504b8ea1e6fac0375 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 30 Jun 2020 14:03:05 -0400
Subject: [PATCH 142/547] script-docs.py: add support for printing errors in
 GitHub actions format

---
 travis/lint.py        |  2 +-
 travis/script-docs.py | 40 +++++++++++++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/travis/lint.py b/travis/lint.py
index 51117201c..e1db140c2 100755
--- a/travis/lint.py
+++ b/travis/lint.py
@@ -105,7 +105,7 @@ class TabLinter(Linter):
 linters = [cls() for cls in Linter.__subclasses__() if not cls.ignore]
 
 def main():
-    is_github_actions = os.environ.get('GITHUB_ACTIONS')
+    is_github_actions = bool(os.environ.get('GITHUB_ACTIONS'))
     root_path = os.path.abspath(sys.argv[1] if len(sys.argv) > 1 else '.')
     if not os.path.exists(root_path):
         print('Nonexistent path: %s' % root_path)
diff --git a/travis/script-docs.py b/travis/script-docs.py
index 04728e101..b2c8063bf 100755
--- a/travis/script-docs.py
+++ b/travis/script-docs.py
@@ -1,11 +1,10 @@
 #!/usr/bin/env python3
-from __future__ import print_function
-from io import open
 import os
 from os.path import basename, dirname, join, splitext
 import sys
 
 SCRIPT_PATH = sys.argv[1] if len(sys.argv) > 1 else 'scripts'
+IS_GITHUB_ACTIONS = bool(os.environ.get('GITHUB_ACTIONS'))
 
 def expected_cmd(path):
     """Get the command from the name of a script."""
@@ -20,42 +19,61 @@ def check_ls(fname, line):
     line = line.strip()
     comment = '--' if fname.endswith('.lua') else '#'
     if '[====[' in line or not line.startswith(comment):
-        print('Error: no leading comment in ' + fname)
+        print_error('missing leading comment (requred for `ls`)', fname)
         return 1
     return 0
 
 
+def print_error(message, filename, line=None):
+    if not isinstance(line, int):
+        line = 1
+    print('Error: %s:%i: %s' % (filename, line, message))
+    if IS_GITHUB_ACTIONS:
+        print('::error file=%s,line=%i::%s' % (filename, line, message))
+
+
 def check_file(fname):
     errors, doclines = 0, []
     tok1, tok2 = ('=begin', '=end') if fname.endswith('.rb') else \
         ('[====[', ']====]')
+    doc_start_line = None
     with open(fname, errors='ignore') as f:
         lines = f.readlines()
+        if not lines:
+            print_error('empty file', fname)
+            return 1
         errors += check_ls(fname, lines[0])
-        for l in lines:
+        for i, l in enumerate(lines):
             if doclines or l.strip().endswith(tok1):
+                if not doclines:
+                    doc_start_line = i + 1
                 doclines.append(l.rstrip())
             if l.startswith(tok2):
                 break
         else:
             if doclines:
-                print('Error: docs start but not end: ' + fname)
+                print_error('docs start but do not end', fname, doc_start_line)
             else:
-                print('Error: no documentation in: ' + fname)
+                print_error('no documentation found', fname)
             return 1
 
     if not doclines:
-        print('Error: missing or malformed documentation in: ' + fname)
+        print_error('missing or malformed documentation', fname)
         return 1
 
     title, underline = [d for d in doclines
                         if d and '=begin' not in d and '[====[' not in d][:2]
-    if underline != '=' * len(title):
-        print('Error: title/underline mismatch:', fname, title, underline)
+    title_line = doc_start_line + doclines.index(title)
+    expected_underline = '=' * len(title)
+    if underline != expected_underline:
+        print_error('title/underline mismatch: expected {!r}, got {!r}'.format(
+                expected_underline, underline),
+            fname, title_line + 1)
         errors += 1
     if title != expected_cmd(fname):
-        print('Warning: expected script title {}, got {}'.format(
-              expected_cmd(fname), title))
+        print_error('expected script title {!r}, got {!r}'.format(
+                expected_cmd(fname), title),
+            fname, title_line)
         errors += 1
     return errors
 

From 142a7aa287daba0b1c652d67b94a6d4577d602de Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 1 Jul 2020 21:58:54 -0400
Subject: [PATCH 143/547] authors-rst.py: add support for printing errors in
 GitHub actions format

---
 travis/authors-rst.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/travis/authors-rst.py b/travis/authors-rst.py
index e8db817f6..076f7f226 100755
--- a/travis/authors-rst.py
+++ b/travis/authors-rst.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """ Overly-complicated script to check formatting/sorting in Authors.rst """
 
-import re, sys
+import os, re, sys
 
 def main():
     success = [True]
@@ -10,6 +10,8 @@ def main():
         for k in kwargs:
             info += ' %s %s:' % (k, kwargs[k])
         print('line %i:%s %s' % (line, info, msg))
+        if os.environ.get('GITHUB_ACTIONS'):
+            print('::error file=docs/Authors.rst,line=%i::%s %s' % (line, info.lstrip(), msg))
         success[0] = False
     with open('docs/Authors.rst', 'rb') as f:
         lines = list(map(lambda line: line.decode('utf8').replace('\n', ''), f.readlines()))

From ae0f57f0e061d769e1189e58a54b4471ff4eb865 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 1 Jul 2020 23:54:31 -0400
Subject: [PATCH 144/547] Update submodules

---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index b67b3fa4b..ec0f06754 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit b67b3fa4b02f834dc76a2e1eae21136e0be089f7
+Subproject commit ec0f06754f0e03655611fe29d388f0a3ffad21e4
diff --git a/scripts b/scripts
index 3987d0314..e4b5898ac 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 3987d031469420d64aff23097d9548676f1ab752
+Subproject commit e4b5898acb9cae806ef99416e1f9265df3abeeae

From 27ee6a30d491773a423693cf4622590cd1c627dc Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 1 Jul 2020 23:56:41 -0400
Subject: [PATCH 145/547] Add additional path to strawberry perl docs

From http://www.bay12forums.com/smf/index.php?topic=164123.msg8141934#msg8141934
---
 docs/Compile.rst | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/Compile.rst b/docs/Compile.rst
index 650e762e3..5bb51a01f 100644
--- a/docs/Compile.rst
+++ b/docs/Compile.rst
@@ -545,23 +545,25 @@ to your binary search PATH so the tool can be later run from anywhere.
 
 Perl / Strawberry Perl
 ^^^^^^^^^^^^^^^^^^^^^^
-For the code generation parts you'll need Perl 5 with XML::LibXML and XML::LibXSLT.
-`Strawberry Perl <http://strawberryperl.com>`_ is recommended as it includes
-all of the required packages in a single, easy install.
+For the code generation stage of the build process, you'll need Perl 5 with
+XML::LibXML and XML::LibXSLT. `Strawberry Perl <http://strawberryperl.com>`_ is
+recommended as it includes all of the required packages in a single, easy
+install.
 
 After install, ensure Perl is in your user's PATH. This can be edited from
 ``Control Panel -> System -> Advanced System Settings -> Environment Variables``.
 
-The following three directories must be in PATH, in this order:
+The following directories must be in your PATH, in this order:
 
 * ``<path to perl>\c\bin``
 * ``<path to perl>\perl\site\bin``
 * ``<path to perl>\perl\bin``
+* ``<path to perl>\perl\vendor\lib\auto\XML\LibXML`` (may only be required on some systems)
 
 Be sure to close and re-open any existing ``cmd.exe`` windows after updating
 your PATH.
 
-If you already have a different version of Perl (for example the one from Cygwin),
+If you already have a different version of Perl installed (for example, from Cygwin),
 you can run into some trouble. Either remove the other Perl install from PATH, or
 install XML::LibXML and XML::LibXSLT for it using CPAN.
 

From 72ce52e0044263e851dc59cca09dcd22e0324d8a Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Wed, 1 Jul 2020 23:10:13 -0500
Subject: [PATCH 146/547] update structures

---
 library/modules/Translation.cpp | 11 +----------
 library/xml                     |  2 +-
 plugins/strangemood.cpp         |  8 ++++----
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/library/modules/Translation.cpp b/library/modules/Translation.cpp
index e05154b44..282039c02 100644
--- a/library/modules/Translation.cpp
+++ b/library/modules/Translation.cpp
@@ -69,16 +69,7 @@ bool Translation::copyName(df::language_name * source, df::language_name * targe
     if (source == target)
         return true;
 
-    target->first_name = source->first_name;
-    target->nickname = source->nickname;
-    for (int i = 0; i < 7; i++)
-    {
-        target->words[i] = source->words[i];
-        target->parts_of_speech[i] = source->parts_of_speech[i];
-    }
-    target->language = source->language;
-    target->unknown = source->unknown;
-    target->has_name = source->has_name;
+    *target = *source;
     return true;
 }
 
diff --git a/library/xml b/library/xml
index ec0f06754..b439f2287 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit ec0f06754f0e03655611fe29d388f0a3ffad21e4
+Subproject commit b439f22876634725f246703e3ac8a7a0b1a01d63
diff --git a/plugins/strangemood.cpp b/plugins/strangemood.cpp
index e8a1046df..f37400cbb 100644
--- a/plugins/strangemood.cpp
+++ b/plugins/strangemood.cpp
@@ -153,7 +153,7 @@ void selectWord (const df::language_word_table &table, int32_t &word, df::part_o
     }
 }
 
-void generateName(df::language_name &output, int language, int mode, const df::language_word_table &table1, const df::language_word_table &table2)
+void generateName(df::language_name &output, int language, df::language_name_type mode, const df::language_word_table &table1, const df::language_word_table &table2)
 {
     for (int i = 0; i < 100; i++)
     {
@@ -162,7 +162,7 @@ void generateName(df::language_name &output, int language, int mode, const df::l
             output = df::language_name();
             if (language == -1)
                 language = rng.df_trandom(world->raws.language.translations.size());
-            output.unknown = mode;
+            output.type = mode;
             output.language = language;
         }
         output.has_name = 1;
@@ -1316,10 +1316,10 @@ command_result df_strangemood (color_ostream &out, vector <string> & parameters)
 
     // Generate the artifact's name
     if (type == mood_type::Fell || type == mood_type::Macabre)
-        generateName(unit->status.artifact_name, unit->name.language, 1, world->raws.language.word_table[0][2], world->raws.language.word_table[1][2]);
+        generateName(unit->status.artifact_name, unit->name.language, language_name_type::Artifact, world->raws.language.word_table[0][2], world->raws.language.word_table[1][2]);
     else
     {
-        generateName(unit->status.artifact_name, unit->name.language, 1, world->raws.language.word_table[0][1], world->raws.language.word_table[1][1]);
+        generateName(unit->status.artifact_name, unit->name.language, language_name_type::Artifact, world->raws.language.word_table[0][1], world->raws.language.word_table[1][1]);
         if (!rng.df_trandom(100))
             unit->status.artifact_name = unit->name;
     }

From 25f1b14a8882ee7cabaaccb31ca8bfe903972543 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Wed, 1 Jul 2020 23:12:45 -0500
Subject: [PATCH 147/547] update structures

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index b439f2287..2d67b03a1 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit b439f22876634725f246703e3ac8a7a0b1a01d63
+Subproject commit 2d67b03a1c5c701e65fb483b9d6c1d3067f990cb

From a04c609980ae5205dc11c7c4748b1b71a0ae4c40 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Fri, 3 Jul 2020 13:46:32 +0200
Subject: [PATCH 148/547] fixed getplants, issue #1479

---
 plugins/getplants.cpp | 109 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 108 insertions(+), 1 deletion(-)

diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp
index d1ee79a04..b722776c0 100644
--- a/plugins/getplants.cpp
+++ b/plugins/getplants.cpp
@@ -9,11 +9,16 @@
 #include "TileTypes.h"
 
 #include "df/map_block.h"
+#include "df/map_block_column.h"
 #include "df/plant.h"
 #include "df/plant_growth.h"
 #include "df/plant_raw.h"
 #include "df/tile_dig_designation.h"
+#include "df/ui.h"
 #include "df/world.h"
+#include "df/world_data.h"
+#include "df/world_object_data.h"
+#include "df/world_site.h"
 
 #include "modules/Designations.h"
 #include "modules/Maps.h"
@@ -27,7 +32,9 @@ using namespace DFHack;
 using namespace df::enums;
 
 DFHACK_PLUGIN("getplants");
+REQUIRE_GLOBAL(ui);
 REQUIRE_GLOBAL(world);
+REQUIRE_GLOBAL(cur_year);
 REQUIRE_GLOBAL(cur_year_tick);
 
 enum class selectability {
@@ -224,6 +231,106 @@ selectability selectablePlant(const df::plant_raw *plant, bool farming)
     }
 }
 
+//  Formula for determination of the variance in plant growth maturation time, determined via disassembly.
+//  The x and y parameters are in tiles relative to the embark.
+bool ripe(int32_t x, int32_t y, int32_t start, int32_t end) {
+    int32_t time = ((435522653 - (((y + 3) * x + 5) * ((y + 7) * y * 400181475 + 289700012))) & 0x3FFFFFFF) % 2000 + (*cur_year_tick % 403200);
+
+    return time >= start && (end == -1 || time <= end);
+}
+
+//  Looks in the picked growths vector to see if a matching growth has been marked as picked.
+bool picked(const df::plant *plant, int32_t growth_subtype) {
+    df::world_data *world_data = world->world_data;
+    df::world_site *site = df::world_site::find(ui->site_id);
+    int32_t pos_x = site->global_min_x + plant->pos.x / 48;
+    int32_t pos_y = site->global_min_y + plant->pos.y / 48;
+    size_t id = pos_x + pos_y * 16 * world_data->world_width;
+    df::world_object_data *object_data = df::world_object_data::find(id);
+    df::map_block_column *column = world->map.map_block_columns[(plant->pos.x / 16) * world->map.x_count_block + (plant->pos.y / 16)];
+
+    for (size_t i = 0; i < object_data->picked_growths.x.size(); i++) {
+        if (object_data->picked_growths.x[i] == plant->pos.x &&
+            object_data->picked_growths.y[i] == plant->pos.y &&
+            object_data->picked_growths.z[i] - column->z_base == plant->pos.z &&
+            object_data->picked_growths.subtype[i] == growth_subtype &&
+            object_data->picked_growths.year[i] == *cur_year) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool designate(const df::plant *plant, bool farming) {
+    df::plant_raw *plant_raw = world->raws.plants.all[plant->material];
+    const DFHack::MaterialInfo basic_mat = DFHack::MaterialInfo(plant_raw->material_defs.type_basic_mat, plant_raw->material_defs.idx_basic_mat);
+
+    if (basic_mat.material->flags.is_set(material_flags::EDIBLE_RAW) ||
+        basic_mat.material->flags.is_set(material_flags::EDIBLE_COOKED))
+    {
+        return Designations::markPlant(plant);
+    }
+
+    if (plant_raw->flags.is_set(plant_raw_flags::THREAD) ||
+        plant_raw->flags.is_set(plant_raw_flags::MILL) ||
+        plant_raw->flags.is_set(plant_raw_flags::EXTRACT_VIAL) ||
+        plant_raw->flags.is_set(plant_raw_flags::EXTRACT_BARREL) ||
+        plant_raw->flags.is_set(plant_raw_flags::EXTRACT_STILL_VIAL))
+    {
+        if (!farming) {
+            return Designations::markPlant(plant);
+        }
+    }
+
+    if (basic_mat.material->reaction_product.id.size() > 0 ||
+        basic_mat.material->reaction_class.size() > 0)
+    {
+        if (!farming) {
+            return Designations::markPlant(plant);
+        }
+    }
+
+    for (size_t i = 0; i < plant_raw->growths.size(); i++)
+    {
+        if (plant_raw->growths[i]->item_type == df::item_type::SEEDS ||  //  Only trees have seed growths in vanilla, but raws can be modded...
+            plant_raw->growths[i]->item_type == df::item_type::PLANT_GROWTH)
+        {
+            const DFHack::MaterialInfo growth_mat = DFHack::MaterialInfo(plant_raw->growths[i]->mat_type, plant_raw->growths[i]->mat_index);
+            if ((plant_raw->growths[i]->item_type == df::item_type::SEEDS &&
+                (growth_mat.material->flags.is_set(material_flags::EDIBLE_COOKED) ||
+                    growth_mat.material->flags.is_set(material_flags::EDIBLE_RAW))) ||
+                    (plant_raw->growths[i]->item_type == df::item_type::PLANT_GROWTH &&
+                        growth_mat.material->flags.is_set(material_flags::LEAF_MAT)))  //  Will change name to STOCKPILE_PLANT_GROWTH any day now...
+            {
+                bool seedSource = plant_raw->growths[i]->item_type == df::item_type::SEEDS;
+
+                if (plant_raw->growths[i]->item_type == df::item_type::PLANT_GROWTH)
+                {
+                    for (size_t k = 0; growth_mat.material->reaction_product.material.mat_type.size(); k++)
+                    {
+                        if (growth_mat.material->reaction_product.material.mat_type[k] == plant_raw->material_defs.type_seed &&
+                            growth_mat.material->reaction_product.material.mat_index[k] == plant_raw->material_defs.idx_seed)
+                        {
+                            seedSource = true;
+                            break;
+                        }
+                    }
+                }
+
+                if ((!farming || seedSource) &&
+                    ripe(plant->pos.x, plant->pos.y, plant_raw->growths[i]->timing_1, plant_raw->growths[i]->timing_2) &&
+                    !picked(plant, i))
+                {
+                    return Designations::markPlant(plant);
+                }
+            }
+        }
+    }
+
+    return false;
+}
+
 command_result df_getplants (color_ostream &out, vector <string> & parameters)
 {
     string plantMatStr = "";
@@ -448,7 +555,7 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
             collectionCount[plant->material]++;
             ++count;
         }
-        if (!deselect && Designations::markPlant(plant))
+        if (!deselect && designate(plant, farming))
         {
 //            out.print("Designated %s at (%i, %i, %i), %d\n", world->raws.plants.all[plant->material]->id.c_str(), plant->pos.x, plant->pos.y, plant->pos.z, (int)i);
             collectionCount[plant->material]++;

From 0a2a16d29c401a7fbf606b9cf842385104c0cb30 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Fri, 3 Jul 2020 15:50:18 +0200
Subject: [PATCH 149/547] corrected ripeness calculation

---
 plugins/getplants.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp
index b722776c0..db283d808 100644
--- a/plugins/getplants.cpp
+++ b/plugins/getplants.cpp
@@ -234,7 +234,7 @@ selectability selectablePlant(const df::plant_raw *plant, bool farming)
 //  Formula for determination of the variance in plant growth maturation time, determined via disassembly.
 //  The x and y parameters are in tiles relative to the embark.
 bool ripe(int32_t x, int32_t y, int32_t start, int32_t end) {
-    int32_t time = ((435522653 - (((y + 3) * x + 5) * ((y + 7) * y * 400181475 + 289700012))) & 0x3FFFFFFF) % 2000 + (*cur_year_tick % 403200);
+    int32_t time = (((435522653 - (((y + 3) * x + 5) * ((y + 7) * y * 400181475 + 289700012))) & 0x3FFFFFFF) % 2000 + *cur_year_tick) % 403200;
 
     return time >= start && (end == -1 || time <= end);
 }

From 30c8db811dc2c5ee99b857200460b52afaadd8c5 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 3 Jul 2020 16:50:52 -0400
Subject: [PATCH 150/547] Add note referring to gui/liquids, update scripts
 (docs)

---
 docs/Plugins.rst | 6 +++++-
 scripts          | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index 421e5e81b..5c855ddd3 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -2356,11 +2356,15 @@ dfhack command line and can't be used from a hotkey. Settings will be remembered
 as long as dfhack runs. Intended for use in combination with the command
 ``liquids-here`` (which can be bound to a hotkey).  See also :issue:`80`.
 
-.. note::
+.. warning::
 
     Spawning and deleting liquids can mess up pathing data and
     temperatures (creating heat traps). You've been warned.
 
+.. note::
+
+    `gui/liquids` is an in-game UI for this script.
+
 Settings will be remembered until you quit DF. You can call `liquids-here` to execute
 the last configured action, which is useful in combination with keybindings.
 
diff --git a/scripts b/scripts
index e4b5898ac..d265de74d 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit e4b5898acb9cae806ef99416e1f9265df3abeeae
+Subproject commit d265de74d4c28460961f8e646b1b574997756ea2

From 9a3747d307e48f053e246c6bf8f23d00a0da1b67 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 3 Jul 2020 20:42:23 -0400
Subject: [PATCH 151/547] Make sidebar fixed

---
 conf.py                | 1 +
 docs/styles/dfhack.css | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/conf.py b/conf.py
index c36e4f8aa..9f497fb57 100644
--- a/conf.py
+++ b/conf.py
@@ -297,6 +297,7 @@ html_theme_options = {
     'github_repo': 'dfhack',
     'github_button': False,
     'travis_button': False,
+    'fixed_sidebar': True,
 }
 
 # The name for this set of Sphinx documents.  If None, it defaults to
diff --git a/docs/styles/dfhack.css b/docs/styles/dfhack.css
index d12348c31..bfe37720d 100644
--- a/docs/styles/dfhack.css
+++ b/docs/styles/dfhack.css
@@ -46,3 +46,12 @@ div.body p, div.body dd, div.body li, div.body blockquote {
     -webkit-hyphens: manual;
     hyphens: manual;
 }
+
+div.sphinxsidebar {
+    max-height: 100%;
+    overflow-y: auto;
+}
+
+div.sphinxsidebar h3 > a {
+    border-bottom: 1px dotted #999;
+}

From fa910cd74f45f3fd1838dc3c5c8c11b3b3b0a8c3 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 3 Jul 2020 22:43:21 -0400
Subject: [PATCH 152/547] Include custom CSS separately instead of overriding
 theme CSS

May help with https://github.com/DFHack/dfhack/issues/1578#issuecomment-635512324
---
 conf.py                | 7 +++++--
 docs/styles/dfhack.css | 3 ---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/conf.py b/conf.py
index 9f497fb57..b3f2b5848 100644
--- a/conf.py
+++ b/conf.py
@@ -187,7 +187,7 @@ all_keybinds_documented()
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-needs_sphinx = '1.3'
+needs_sphinx = '1.8'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
@@ -286,7 +286,6 @@ todo_include_todos = False
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 html_theme = 'alabaster'
-html_style = 'dfhack.css'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -337,6 +336,10 @@ html_domain_indices = False
 # If false, no index is generated.
 html_use_index = False
 
+html_css_files = [
+    'dfhack.css',
+]
+
 # -- Options for LaTeX output ---------------------------------------------
 
 # Grouping the document tree into LaTeX files. List of tuples
diff --git a/docs/styles/dfhack.css b/docs/styles/dfhack.css
index bfe37720d..e7a608460 100644
--- a/docs/styles/dfhack.css
+++ b/docs/styles/dfhack.css
@@ -1,6 +1,3 @@
-/* make sure to sync this with the base theme's css filename */
-@import url("alabaster.css");
-
 /* Keybinding CSS from the DF wiki; applies to :kbd:`` directives.
  * Use this directive for all keypresses, to make them look like keys.
  */

From f32757fa0910c178bf3174c1d9daf03de3a86c49 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 3 Jul 2020 22:49:48 -0400
Subject: [PATCH 153/547] Update scripts

---
 plugins/buildingplan-lib.cpp | 1 -
 scripts                      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/buildingplan-lib.cpp b/plugins/buildingplan-lib.cpp
index 4e7cfd3fd..0c29284db 100644
--- a/plugins/buildingplan-lib.cpp
+++ b/plugins/buildingplan-lib.cpp
@@ -9,7 +9,6 @@ void debug(const string &msg)
     color_ostream_proxy out(Core::getInstance().getConsole());
     out << "DEBUG (" << PLUGIN_VERSION << "): " << msg << endl;
 }
-#define dbg Core::getInstance().getConsole()
 
 void enable_quickfort_fn(pair<const df::building_type, bool>& pair) { pair.second = true; }
 
diff --git a/scripts b/scripts
index d265de74d..e8de92efb 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit d265de74d4c28460961f8e646b1b574997756ea2
+Subproject commit e8de92efb73d5ef4d0b52df000d60d3350f07a37

From f81f77352cbca122cf72c589b2f5d160e0db660a Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 4 Jul 2020 02:15:05 -0400
Subject: [PATCH 154/547] Restructure changelog generation as a Sphinx
 extension

---
 conf.py                                            | 10 ++++++----
 docs/sphinx_extensions/dfhack/__init__.py          |  0
 .../dfhack/changelog.py}                           | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 docs/sphinx_extensions/dfhack/__init__.py
 rename docs/{gen_changelog.py => sphinx_extensions/dfhack/changelog.py} (97%)

diff --git a/conf.py b/conf.py
index b3f2b5848..47d1c0c58 100644
--- a/conf.py
+++ b/conf.py
@@ -22,8 +22,6 @@ import re
 import shlex  # pylint:disable=unused-import
 import sys
 
-sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'docs'))
-from gen_changelog import generate_changelog
 
 # -- Support :dfhack-keybind:`command` ------------------------------------
 # this is a custom directive that pulls info from dfhack.init-example
@@ -180,19 +178,23 @@ def all_keybinds_documented():
 
 
 # Actually call the docs generator and run test
-generate_changelog()
 write_script_docs()
 all_keybinds_documented()
 
 # -- General configuration ------------------------------------------------
 
+sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'docs', 'sphinx_extensions'))
+
 # If your documentation needs a minimal Sphinx version, state it here.
 needs_sphinx = '1.8'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['sphinx.ext.extlinks']
+extensions = [
+    'sphinx.ext.extlinks',
+    'dfhack.changelog',
+]
 
 # This config value must be a dictionary of external sites, mapping unique
 # short alias names to a base URL and a prefix.
diff --git a/docs/sphinx_extensions/dfhack/__init__.py b/docs/sphinx_extensions/dfhack/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/docs/gen_changelog.py b/docs/sphinx_extensions/dfhack/changelog.py
similarity index 97%
rename from docs/gen_changelog.py
rename to docs/sphinx_extensions/dfhack/changelog.py
index 8b1a6771e..4c0f30427 100644
--- a/docs/gen_changelog.py
+++ b/docs/sphinx_extensions/dfhack/changelog.py
@@ -283,3 +283,17 @@ if __name__ == '__main__':
                     print('stable missing: ' + description)
                 if description not in content_dev:
                     print('dev missing: ' + description)
+
+
+def sphinx_entrypoint(app, config):
+    generate_changelog()
+
+
+def setup(app):
+    app.connect('config-inited', sphinx_entrypoint)
+
+    return {
+        'version': '0.1',
+        'parallel_read_safe': True,
+        'parallel_write_safe': True,
+    }

From b0fe96f6c7c81c800e7cf2e9df148637feeb6392 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 4 Jul 2020 02:35:55 -0400
Subject: [PATCH 155/547] Add gen_changelog.py compatibility shim, fix paths
 when run under cmake

---
 docs/gen_changelog.py                      |  5 +++++
 docs/sphinx_extensions/dfhack/changelog.py | 19 ++++++++++---------
 docs/sphinx_extensions/dfhack/util.py      |  7 +++++++
 3 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 docs/gen_changelog.py
 create mode 100644 docs/sphinx_extensions/dfhack/util.py

diff --git a/docs/gen_changelog.py b/docs/gen_changelog.py
new file mode 100644
index 000000000..3b4452f62
--- /dev/null
+++ b/docs/gen_changelog.py
@@ -0,0 +1,5 @@
+import os, sys
+sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'sphinx_extensions'))
+
+from dfhack.changelog import cli_entrypoint
+cli_entrypoint()
diff --git a/docs/sphinx_extensions/dfhack/changelog.py b/docs/sphinx_extensions/dfhack/changelog.py
index 4c0f30427..99f0ea299 100644
--- a/docs/sphinx_extensions/dfhack/changelog.py
+++ b/docs/sphinx_extensions/dfhack/changelog.py
@@ -4,11 +4,14 @@ import itertools
 import os
 import sys
 
+from dfhack.util import DFHACK_ROOT, DOCS_ROOT
+
 CHANGELOG_PATHS = (
     'docs/changelog.txt',
     'scripts/changelog.txt',
     'library/xml/changelog.txt',
 )
+CHANGELOG_PATHS = (os.path.join(DFHACK_ROOT, p) for p in CHANGELOG_PATHS)
 
 CHANGELOG_SECTIONS = [
     'New Plugins',
@@ -237,8 +240,8 @@ def generate_changelog(all=False):
     consolidate_changelog(stable_entries)
     consolidate_changelog(dev_entries)
 
-    print_changelog(versions, stable_entries, 'docs/_auto/news.rst')
-    print_changelog(versions, dev_entries, 'docs/_auto/news-dev.rst')
+    print_changelog(versions, stable_entries, os.path.join(DOCS_ROOT, '_auto/news.rst'))
+    print_changelog(versions, dev_entries, os.path.join(DOCS_ROOT, '_auto/news-dev.rst'))
 
     if all:
         for version in versions:
@@ -250,16 +253,16 @@ def generate_changelog(all=False):
             else:
                 version_entries = {version: dev_entries[version]}
             print_changelog([version], version_entries,
-                'docs/_changelogs/%s-github.txt' % version,
+                os.path.join(DOCS_ROOT, '_changelogs/%s-github.txt' % version),
                 replace=False)
             print_changelog([version], version_entries,
-                'docs/_changelogs/%s-reddit.txt' % version,
+                os.path.join(DOCS_ROOT, '_changelogs/%s-reddit.txt' % version),
                 replace=False,
                 prefix='> ')
 
     return entries
 
-if __name__ == '__main__':
+def cli_entrypoint():
     import argparse
     parser = argparse.ArgumentParser()
     parser.add_argument('-a', '--all', action='store_true',
@@ -268,14 +271,12 @@ if __name__ == '__main__':
         help='Check that all entries are printed')
     args = parser.parse_args()
 
-    os.chdir(os.path.abspath(os.path.dirname(__file__)))
-    os.chdir('..')
     entries = generate_changelog(all=args.all)
 
     if args.check:
-        with open('docs/_auto/news.rst') as f:
+        with open(os.path.join(DOCS_ROOT, '_auto/news.rst')) as f:
             content_stable = f.read()
-        with open('docs/_auto/news-dev.rst') as f:
+        with open(os.path.join(DOCS_ROOT, '_auto/news-dev.rst')) as f:
             content_dev = f.read()
         for entry in entries:
             for description in entry.children:
diff --git a/docs/sphinx_extensions/dfhack/util.py b/docs/sphinx_extensions/dfhack/util.py
new file mode 100644
index 000000000..71a432da4
--- /dev/null
+++ b/docs/sphinx_extensions/dfhack/util.py
@@ -0,0 +1,7 @@
+import os
+
+DFHACK_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+DOCS_ROOT = os.path.join(DFHACK_ROOT, 'docs')
+
+if not os.path.isdir(DOCS_ROOT):
+    raise ReferenceError('docs root not found: %s' % DOCS_ROOT)

From b122870b6a0e5b43d962c6c9be810139e0a9aa60 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 7 Jul 2020 01:54:59 -0400
Subject: [PATCH 156/547] Move documentation standards to Documentation.rst

---
 Contributing.rst       |  89 +------------------------------
 docs/Documentation.rst | 115 ++++++++++++++++++++++++++++++++++++-----
 2 files changed, 104 insertions(+), 100 deletions(-)

diff --git a/Contributing.rst b/Contributing.rst
index e358e66b3..cb9e87a0e 100644
--- a/Contributing.rst
+++ b/Contributing.rst
@@ -32,6 +32,7 @@ How to get new code into DFHack
   (i.e. not the master or develop branch of your fork).
 * If possible, compile on multiple platforms when changing anything that compiles
 * It must pass CI - run ``python travis/all.py`` to check this.
+* Update documentation when applicable - see `docs-standards` for details.
 * Update ``changelog.txt`` and ``docs/Authors.rst`` when applicable. See
   `build-changelog` for more information on the changelog format.
 * Create a GitHub pull request once finished
@@ -126,94 +127,6 @@ know what exactly is most useful.  `remotefortressreader` provides a fairly
 comprehensive interface for visualisers such as :forums:`Armok Vision <146473>`.
 
 
-Documentation Standards
-=======================
-DFHack documentation is built with Sphinx_, and configured automatically
-through CMake.  If you want to build the docs *only*, use this command::
-
-    sphinx-build . docs/html
-
-Whether you're adding new code or just fixing old documentation (and there's plenty),
-there are a few important standards for completeness and consistent style.  Treat
-this section as a guide rather than iron law, match the surrounding text, and you'll
-be fine.
-
-Each command should have a short (~54 character) help string, which is shown
-by the `ls` command.  For scripts, this is a comment on the first line
-(the comment marker and whitespace is stripped).  For plugins it's the second
-argument to ``PluginCommand``.  Please make this brief but descriptive!
-
-Everything should be documented!  If it's not clear *where* a particular
-thing should be documented, ask on IRC or in the DFHack thread on Bay12 -
-as well as getting help, you'll be providing valuable feedback that
-makes it easier for future readers!
-
-Scripts can use a custom autodoc function, based on the Sphinx ``include``
-directive - anything between the tokens is copied into the appropriate scripts
-documentation page.  For Ruby, we follow the built-in docstring convention
-(``=begin`` and ``=end``).  For Lua, the tokens are ``[====[`` and ``]====]``
-- ordinary multi-line strings.  It is highly encouraged to reuse this string
-as the in-console documentation by (eg.) printing it when a ``-help`` argument
-is given.
-
-The docs **must** have a heading which exactly matches the command, underlined
-with ``=====`` to the same length.  For example, a lua file would have::
-
-    local helpstr = [====[
-
-    add-thought
-    ===========
-    Adds a thought or emotion to the selected unit.  Can be used by other scripts,
-    or the gui invoked by running ``add-thought gui`` with a unit selected.
-
-    ]====]
-
-
-Where the heading for a section is also the name of a command, the spelling
-and case should exactly match the command to enter in the DFHack command line.
-
-Try to keep lines within 80-100 characters, so it's readable in plain text
-in the terminal - Sphinx (our documentation system) will make sure
-paragraphs flow.
-
-If there aren't many options or examples to show, they can go in a paragraph of
-text.  Use double-backticks to put commands in monospaced font, like this::
-
-    You can use ``cleanowned scattered x`` to dump tattered or abandoned items.
-
-If the command takes more than three arguments, format the list as a table
-called Usage.  The table *only* lists arguments, not full commands.
-Input values are specified in angle brackets.  Example::
-
-    Usage:
-
-    :arg1:          A simple argument.
-    :arg2 <input>:  Does something based on the input value.
-    :Very long argument:
-                    Is very specific.
-
-To demonstrate usage - useful mainly when the syntax is complicated, list the
-full command with arguments in monospaced font, then indent the next line and
-describe the effect::
-
-    ``resume all``
-            Resumes all suspended constructions.
-
-If it would be helpful to mention another DFHack command, don't just type the
-name - add a hyperlink!  Specify the link target in backticks, and it will be
-replaced with the corresponding title and linked:  eg ```autolabor```
-=> `autolabor`.  Link targets should be equivalent to the command
-described (without file extension), and placed above the heading of that
-section like this::
-
-    .. _autolabor:
-
-    autolabor
-    =========
-
-Add link targets if you need them, but otherwise plain headings are preferred.
-Scripts have link targets created automatically.
-
 Other ways to help
 ==================
 DFHack is a software project, but there's a lot more to it than programming.
diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index f7cb9ef92..2fa32e16c 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -28,21 +28,118 @@ The main thing you lose in plain text format is hyperlinking.)
 .. contents::
 
 
+.. _docs-standards:
+
+Documentation standards
+=======================
+
+Whether you're adding new code or just fixing old documentation (and there's plenty),
+there are a few important standards for completeness and consistent style.  Treat
+this section as a guide rather than iron law, match the surrounding text, and you'll
+be fine.
+
+Each command should have a short (~54 character) help string, which is shown
+by the `ls` command.  For scripts, this is a comment on the first line
+(the comment marker and whitespace is stripped).  For plugins it's the second
+argument to ``PluginCommand``.  Please make this brief but descriptive!
+
+Everything should be documented!  If it's not clear *where* a particular
+thing should be documented, ask on IRC or in the DFHack thread on Bay12 -
+as well as getting help, you'll be providing valuable feedback that
+makes it easier for future readers!
+
+Scripts can use a custom autodoc function, based on the Sphinx ``include``
+directive - anything between the tokens is copied into the appropriate scripts
+documentation page.  For Ruby, we follow the built-in docstring convention
+(``=begin`` and ``=end``).  For Lua, the tokens are ``[====[`` and ``]====]``
+- ordinary multi-line strings.  It is highly encouraged to reuse this string
+as the in-console documentation by (eg.) printing it when a ``-help`` argument
+is given.
+
+The docs **must** have a heading which exactly matches the command, underlined
+with ``=====`` to the same length.  For example, a lua file would have::
+
+    local helpstr = [====[
+
+    add-thought
+    ===========
+    Adds a thought or emotion to the selected unit.  Can be used by other scripts,
+    or the gui invoked by running ``add-thought gui`` with a unit selected.
+
+    ]====]
+
+
+Where the heading for a section is also the name of a command, the spelling
+and case should exactly match the command to enter in the DFHack command line.
+
+Try to keep lines within 80-100 characters, so it's readable in plain text
+in the terminal - Sphinx (our documentation system) will make sure
+paragraphs flow.
+
+If there aren't many options or examples to show, they can go in a paragraph of
+text.  Use double-backticks to put commands in monospaced font, like this::
+
+    You can use ``cleanowned scattered x`` to dump tattered or abandoned items.
+
+If the command takes more than three arguments, format the list as a table
+called Usage.  The table *only* lists arguments, not full commands.
+Input values are specified in angle brackets.  Example::
+
+    Usage:
+
+    :arg1:          A simple argument.
+    :arg2 <input>:  Does something based on the input value.
+    :Very long argument:
+                    Is very specific.
+
+To demonstrate usage - useful mainly when the syntax is complicated, list the
+full command with arguments in monospaced font, then indent the next line and
+describe the effect::
+
+    ``resume all``
+            Resumes all suspended constructions.
+
+If it would be helpful to mention another DFHack command, don't just type the
+name - add a hyperlink!  Specify the link target in backticks, and it will be
+replaced with the corresponding title and linked:  eg ```autolabor```
+=> `autolabor`.  Link targets should be equivalent to the command
+described (without file extension), and placed above the heading of that
+section like this::
+
+    .. _autolabor:
+
+    autolabor
+    =========
+
+Add link targets if you need them, but otherwise plain headings are preferred.
+Scripts have link targets created automatically.
+
+
+Building the documentation
+==========================
+
 Required dependencies
-=====================
+---------------------
 In order to build the documentation, you must have Python with Sphinx
-version 1.3.1 or later. Both Python 2.x and 3.x are supported.
+version 1.8 or later. Both Python 2.x and 3.x are supported.
 
 When installing Sphinx from OS package managers, be aware that there is
 another program called Sphinx, completely unrelated to documentation management.
 Be sure you are installing the right Sphinx; it may be called ``python-sphinx``,
 for example. To avoid doubt, ``pip`` can be used instead as detailed below.
 
+Once you have installed Sphinx, ``sphinx-build --version`` should report the
+version of Sphinx that you have installed. If this works, CMake should also be
+able to find Sphinx.
+
 For more detailed platform-specific instructions, see the sections below:
 
+.. contents::
+  :local:
+
 
 Linux
------
+~~~~~
 Most Linux distributions will include Python as standard.
 
 Check your package manager to see if Sphinx 1.3.1 or later is available,
@@ -66,7 +163,7 @@ install, find ``sphinx-build`` and ensure its directory is in your local ``$PATH
 
 
 macOS
------
+~~~~~
 macOS has Python 2.7 installed by default, but it does not have the pip package manager.
 
 You can install Homebrew's Python 3, which includes pip, and then install the
@@ -87,7 +184,7 @@ If not, just installing sphinx-doc for macOS's system Python 2.7 is fine.
 
 
 Windows
--------
+~~~~~~~
 Python for Windows can be downloaded `from python.org <https://www.python.org/downloads/>`_.
 The latest version of Python 3 is recommended, as it includes pip already.
 
@@ -105,13 +202,6 @@ Note that this may require opening a new (admin) command prompt if you just
 installed pip from the same command prompt.
 
 
-Building the documentation
-==========================
-
-Once you have installed Sphinx, ``sphinx-build --version`` should report the
-version of Sphinx that you have installed. If this works, CMake should also be
-able to find Sphinx.
-
 Using CMake
 -----------
 
@@ -155,6 +245,7 @@ the root DFHack folder::
 Sphinx has many options to enable clean builds, parallel builds, logging, and
 more - run ``sphinx-build --help`` for details.
 
+
 .. _build-changelog:
 
 Building the changelogs

From 512f425c65cd5394a7e36f7c49b048249ecd450e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 7 Jul 2020 23:49:28 -0400
Subject: [PATCH 157/547] Move Contributing.rst to docs/, add GitHub-specific
 version in .github/

---
 .github/CONTRIBUTING.md                   | 6 ++++++
 Contributing.rst => docs/Contributing.rst | 0
 index.rst                                 | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .github/CONTRIBUTING.md
 rename Contributing.rst => docs/Contributing.rst (100%)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
new file mode 100644
index 000000000..2367db678
--- /dev/null
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1,6 @@
+Thank you for your interest in contributing to DFHack! If you're reading this
+document, you're probably viewing it on GitHub. The DFHack docs are hosted
+on [ReadTheDocs](https://dfhack.readthedocs.io/) - in particular, contributing
+guidelines are [here](https://docs.dfhack.org/en/latest/docs/Contributing.html).
+Double-checking the style guidelines before submitting a pull request is
+always appreciated.
diff --git a/Contributing.rst b/docs/Contributing.rst
similarity index 100%
rename from Contributing.rst
rename to docs/Contributing.rst
diff --git a/index.rst b/index.rst
index 855b31a73..8c1e9d86d 100644
--- a/index.rst
+++ b/index.rst
@@ -58,7 +58,7 @@ For Developers
 .. toctree::
    :maxdepth: 1
 
-   /Contributing
+   /docs/Contributing
    /docs/Compile
    /docs/NEWS-dev
    /docs/Lua API

From 7f56faa64a63c043be96c572d8792624cb982807 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 8 Jul 2020 00:08:47 -0400
Subject: [PATCH 158/547] Tweak Documentation.rst TOC

---
 docs/Documentation.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index 2fa32e16c..cbbf8e153 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -1,8 +1,8 @@
 .. _documentation:
 
-####################
-DFHack Documentation
-####################
+###########################
+DFHack Documentation System
+###########################
 
 
 DFHack documentation, like the file you are reading now, is created as ``.rst`` files,
@@ -136,6 +136,7 @@ For more detailed platform-specific instructions, see the sections below:
 
 .. contents::
   :local:
+  :backlinks: none
 
 
 Linux

From aff2944f28418bb71095daf57159d7146d9e4f62 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 8 Jul 2020 00:12:05 -0400
Subject: [PATCH 159/547] Add "scripts-" prefix to generated scripts subpage
 anchors

---
 conf.py               | 2 +-
 docs/Core.rst         | 2 +-
 docs/Introduction.rst | 2 +-
 index.rst             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf.py b/conf.py
index 47d1c0c58..1c5ef9853 100644
--- a/conf.py
+++ b/conf.py
@@ -151,7 +151,7 @@ def write_script_docs():
         'gui': 'GUI Scripts',
         'modtools': 'Scripts for Modders'}
     for k in head:
-        title = ('.. _{k}:\n\n{l}\n{t}\n{l}\n\n'
+        title = ('.. _scripts-{k}:\n\n{l}\n{t}\n{l}\n\n'
                  '.. include:: /scripts/{a}about.txt\n\n'
                  '.. contents::\n\n').format(
                      k=k, t=head[k],
diff --git a/docs/Core.rst b/docs/Core.rst
index 4e65f4dda..9cad075f4 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -408,7 +408,7 @@ All matching init files will be executed in alphebetical order.
 A world being loaded can mean a fortress, an adventurer, or legends mode.
 
 These files are best used for non-persistent commands, such as setting
-a `fix <fix>` script to run on `repeat`.
+a `fix <scripts-fix>` script to run on `repeat`.
 
 
 .. _onUnload.init:
diff --git a/docs/Introduction.rst b/docs/Introduction.rst
index 22033d528..52675d364 100644
--- a/docs/Introduction.rst
+++ b/docs/Introduction.rst
@@ -20,7 +20,7 @@ enhancements by default, and more can be enabled.  There are also many tools
 You can even add third-party scripts and plugins to do almost anything!
 
 For modders, DFHack makes many things possible.  Custom reactions, new
-interactions, magic creature abilities, and more can be set through `modtools`
+interactions, magic creature abilities, and more can be set through `scripts-modtools`
 and custom raws.  Non-standard DFHack scripts and inits can be stored in the
 raw directory, making raws or saves fully self-contained for distribution -
 or for coexistence in a single DF install, even with incompatible components.
diff --git a/index.rst b/index.rst
index 8c1e9d86d..b3498d432 100644
--- a/index.rst
+++ b/index.rst
@@ -20,7 +20,7 @@ enhancements by default, and more can be enabled.  There are also many tools
 You can even add third-party scripts and plugins to do almost anything!
 
 For modders, DFHack makes many things possible.  Custom reactions, new
-interactions, magic creature abilities, and more can be set through `modtools`
+interactions, magic creature abilities, and more can be set through `scripts-modtools`
 and custom raws.  Non-standard DFHack scripts and inits can be stored in the
 raw directory, making raws or saves fully self-contained for distribution -
 or for coexistence in a single DF install, even with incompatible components.

From 85003a40c2f89693faed8af9185571e0b9a8194f Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 8 Jul 2020 01:03:58 -0400
Subject: [PATCH 160/547] Split memory research into separate doc and expand

---
 docs/Binpatches.rst      |   2 +-
 docs/Compile.rst         |   2 +
 docs/Contributing.rst    |  20 ------
 docs/Memory-research.rst | 149 +++++++++++++++++++++++++++++++++++++++
 index.rst                |   1 +
 5 files changed, 153 insertions(+), 21 deletions(-)
 create mode 100644 docs/Memory-research.rst

diff --git a/docs/Binpatches.rst b/docs/Binpatches.rst
index a0fcc6630..40ae8af32 100644
--- a/docs/Binpatches.rst
+++ b/docs/Binpatches.rst
@@ -24,7 +24,7 @@ There are no binary patches available for Dwarf Fortress versions after 0.34.11.
 
 This system is kept for the chance that someone will find it useful, so some
 hints on how to write your own follow.  This will require disassembly and
-decent skill in `memory research <contributing-memory-research>`.
+decent skill in `memory research <memory-research>`.
 
 * The patches are expected to be encoded in text format used by IDA.
 
diff --git a/docs/Compile.rst b/docs/Compile.rst
index 5bb51a01f..c8c51e88c 100644
--- a/docs/Compile.rst
+++ b/docs/Compile.rst
@@ -161,6 +161,8 @@ in any case.
 Note that the scripts in the "build" folder on Windows will set the architecture
 automatically.
 
+.. _compile-build-options:
+
 Other settings
 --------------
 There are a variety of other settings which you can find in CMakeCache.txt in
diff --git a/docs/Contributing.rst b/docs/Contributing.rst
index cb9e87a0e..6231b6f04 100644
--- a/docs/Contributing.rst
+++ b/docs/Contributing.rst
@@ -41,26 +41,6 @@ How to get new code into DFHack
 * Work on :issue:`reported problems <?q=is:open+-label:idea>`
   will take priority over ideas or suggestions.
 
-.. _contributing-memory-research:
-
-Memory research
----------------
-If you want to do memory research, you'll need some tools and some knowledge.
-In general, you'll need a good memory viewer and optionally something
-to look at machine code without getting crazy :)
-Using publicly known information and analyzing the game's data is preferred.
-
-Good Windows tools include:
-
-* IDA Freeware 7.0 (for non-commercial use, supports 32-bit and 64-bit)
-* Cheat Engine
-
-Good Linux tools:
-
-* angavrilov's df-structures gui (32-bit only, visit us on IRC for details)
-* IDA Freeware 7.0 (see above)
-* edb (Evan's Debugger)
-* Some of the tools residing in the ``legacy`` dfhack branch.
 
 Using the library as a developer
 ================================
diff --git a/docs/Memory-research.rst b/docs/Memory-research.rst
new file mode 100644
index 000000000..08c0c9573
--- /dev/null
+++ b/docs/Memory-research.rst
@@ -0,0 +1,149 @@
+.. _memory-research:
+
+###############
+Memory research
+###############
+
+There are a variety of tools that can be used to analyze DF memory - some are
+listed here. Note that some of these may be old and unmaintained. If you aren't
+sure what tool would be best for your purposes, feel free to ask for advice (on
+IRC, Bay12, etc.).
+
+.. contents::
+    :local:
+
+
+Cross-platform tools
+====================
+
+Ghidra
+------
+
+Ghidra is a cross-platform reverse-engineering framework (written in Java)
+available at https://ghidra-sre.org. It supports analyzing both 32-bit and
+64-bit executables for all supported DF platforms. There are some custom DFHack
+Ghidra scripts available in the `df_misc`_ repo (look for ``.java`` files).
+
+
+IDA Freeware 7.0
+----------------
+
+Available from `Hex-Rays <https://www.hex-rays.com/products/ida/support/download_freeware/>`_.
+Supports analyzing both 32-bit and 64-bit executables for all supported DF platforms.
+Some ``.idc`` scripts for IDA are available in the `df_misc`_ repo.
+
+.. _df_misc: https://github.com/DFHack/df_misc
+
+
+Hopper
+------
+
+Runs on macOS and some Linux distributions; available from https://www.hopperapp.com/.
+`TWBT <https://github.com/mifki/df-twbt/blob/master/PATCHES.md>`_ uses this to produce some patches.
+
+
+DFHack tools
+------------
+
+Plugins
+~~~~~~~
+
+There are a few development plugins useful for low-level memory research. They
+are not built by default, but can be built by setting the ``BUILD_DEVEL``
+`CMake option <compile-build-options>`. These include:
+
+- ``check-structures-sanity``, which performs sanity checks on the given DF
+  object. Note that this will crash in several cases, some intentional, so using
+  this with `GDB <linux-gdb>` is recommended.
+- ``memview``, which produces a hex dump of a given memory range. It also
+  highlights valid pointers, and can be configured to work with `sizecheck`
+  to auto-detect object sizes.
+- ``vectors``, which can identify instances of ``std::vector`` in a given memory range.
+
+Scripts
+~~~~~~~
+
+Several `development scripts <scripts-devel>` can be useful for memory research.
+These include (but are not limited to):
+
+- `devel/dump-offsets`
+- `devel/find-offsets`
+- `devel/lsmem`
+- `devel/sc` (requires `sizecheck`)
+- `devel/visualize-structure`
+- Generally, any script starting with ``devel/find``
+
+.. _sizecheck:
+
+Sizecheck
+~~~~~~~~~
+
+Sizecheck is a custom tool that hooks into the memory allocator and inserts a
+header indicating the size of every object. The corresponding logic to check for
+this header when freeing memory usually works, but is inherently not foolproof.
+You should not count on DF being stable when using this.
+
+DFHack's implementation of sizecheck is currently only tested on Linux, although
+it probably also works on macOS. It can be built with the ``BUILD_SIZECHECK``
+`CMake option <compile-build-options>`, which produces a ``libsizecheck``
+library installed in the ``hack`` folder. You will need to preload this library
+manually, by setting ``PRELOAD_LIB`` on Linux (or ``LD_PRELOAD`` if editing
+the ``dfhack`` launcher script directly), or by editing the ``dfhack``
+launcher script and adding the library to ``DYLD_INSERT_LIBRARIES`` on macOS.
+
+There is also an older sizecheck implementation by Mifki available on
+`GitHub <https://github.com/mifki/df-sizecheck>`__ (``b.cpp`` is the main
+sizecheck library, and ``win_patch.cpp`` is used for Windows support). To use
+this with other DFHack tools, you will likely need to edit the header's
+magic number to match what is used in `devel/sc` (search for a hexadecimal
+constant starting with ``0x``).
+
+Legacy tools
+~~~~~~~~~~~~
+
+Some very old DFHack tools are available in the `legacy branch on GitHub <https://github.com/dfhack/dfhack/tree/legacy/tools>`_.
+No attempt is made to support these.
+
+
+Linux-specific tools
+====================
+
+.. _linux-gdb:
+
+GDB
+---
+
+`GDB <https://www.gnu.org/software/gdb/>`_ is technically cross-platform, but
+tends to work best on Linux, and DFHack currently only offers support for using
+GDB on 64-bit Linux. To start with GDB, pass ``-g`` to the DFHack launcher
+script::
+
+    ./dfhack -g
+
+Some basic GDB commands:
+
+- ``run``: starts DF from the GDB prompt. Any arguments will be passed as
+  command-line arguments to DF (e.g. `load-save` may be useful).
+- ``bt`` will produce a backtrace if DF crashes.
+
+See the `official GDB documentation <https://www.gnu.org/software/gdb/documentation/>`_
+for more details.
+
+
+df-structures GUI
+-----------------
+
+This is a tool written by Angavrilov and available on `GitHub <https://github.com/angavrilov/cl-linux-debug>`__.
+It only supports 32-bit DF. Some assistance may be available on IRC.
+
+
+EDB (Evan's debugger)
+---------------------
+
+Available on `GitHub <https://github.com/eteran/edb-debugger>`__.
+
+
+Windows-specific tools
+======================
+
+Some people have used `Cheat Engine <https://www.cheatengine.org/>`__ for research in the past.
diff --git a/index.rst b/index.rst
index b3498d432..4c5b2e6e4 100644
--- a/index.rst
+++ b/index.rst
@@ -65,4 +65,5 @@ For Developers
    /docs/Documentation
    /library/xml/SYNTAX
    /library/xml/how-to-update
+   /docs/Memory-research
    /docs/Binpatches

From 24d64175fb7f9c0c4e148841abee69fd905a09e7 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 8 Jul 2020 02:13:37 -0400
Subject: [PATCH 161/547] Remove top-level links from TOCs

---
 conf.py                  |  3 ++-
 docs/Binpatches.rst      |  3 ++-
 docs/Compile.rst         |  5 +++--
 docs/Contributing.rst    |  4 ++--
 docs/Core.rst            |  5 +++--
 docs/Documentation.rst   |  4 ++--
 docs/History.rst         | 19 +++++++++++--------
 docs/Introduction.rst    |  3 ++-
 docs/Lua API.rst         |  5 +++--
 docs/Memory-research.rst |  4 ++--
 docs/NEWS-dev.rst        |  5 +++--
 docs/NEWS.rst            |  9 +++++----
 docs/Plugins.rst         |  5 +++--
 docs/Scripts-removed.rst |  5 +++--
 library/xml              |  2 +-
 15 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/conf.py b/conf.py
index 1c5ef9853..aebe73bab 100644
--- a/conf.py
+++ b/conf.py
@@ -153,7 +153,8 @@ def write_script_docs():
     for k in head:
         title = ('.. _scripts-{k}:\n\n{l}\n{t}\n{l}\n\n'
                  '.. include:: /scripts/{a}about.txt\n\n'
-                 '.. contents::\n\n').format(
+                 '.. contents:: Contents\n'
+                 '  :local:\n\n').format(
                      k=k, t=head[k],
                      l=len(head[k])*'#',
                      a=('' if k == 'base' else k + '/')
diff --git a/docs/Binpatches.rst b/docs/Binpatches.rst
index 40ae8af32..b92190bc8 100644
--- a/docs/Binpatches.rst
+++ b/docs/Binpatches.rst
@@ -15,7 +15,8 @@ the `binpatch` command.
     at all possible - that way your work will work for many versions
     across multiple operating systems.
 
-.. contents::
+.. contents:: Contents
+  :local:
 
 
 Getting a patch
diff --git a/docs/Compile.rst b/docs/Compile.rst
index c8c51e88c..26f720076 100644
--- a/docs/Compile.rst
+++ b/docs/Compile.rst
@@ -13,8 +13,9 @@ DFHack from source, this document will walk you through the build process. Note
 that some steps may be unconventional compared to other projects, so be sure to
 pay close attention if this is your first time compiling DFHack.
 
-.. contents::
-   :depth: 2
+.. contents:: Contents
+  :local:
+  :depth: 1
 
 .. _compile-how-to-get-the-code:
 
diff --git a/docs/Contributing.rst b/docs/Contributing.rst
index 6231b6f04..28e4e6e95 100644
--- a/docs/Contributing.rst
+++ b/docs/Contributing.rst
@@ -2,8 +2,8 @@
 How to contribute to DFHack
 ###########################
 
-.. contents::
-
+.. contents:: Contents
+  :local:
 
 .. _contributing-code:
 
diff --git a/docs/Core.rst b/docs/Core.rst
index 9cad075f4..8f84c7b54 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -4,8 +4,9 @@
 DFHack Core
 ###########
 
-.. contents::
-   :depth: 2
+.. contents:: Contents
+  :local:
+  :depth: 2
 
 
 Command Implementation
diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index cbbf8e153..8a829c0a8 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -25,8 +25,8 @@ compile the documentation in order to read it. Like Markdown, reST documents are
 designed to be just as readable in a plain-text editor as they are in HTML format.
 The main thing you lose in plain text format is hyperlinking.)
 
-.. contents::
-
+.. contents:: Contents
+  :local:
 
 .. _docs-standards:
 
diff --git a/docs/History.rst b/docs/History.rst
index 8386c4cab..d382b351e 100644
--- a/docs/History.rst
+++ b/docs/History.rst
@@ -1,16 +1,19 @@
 :orphan:
 
-.. _HISTORY:
+.. _History:
 
-########################
-HISTORY - old changelogs
-########################
+#####################
+Historical changelogs
+#####################
 
-This file is where old changelogs live, so the current `changelog`
-in ``NEWS.rst`` doesn't get too long.
+This file is where old changelogs live, so the `current changelog <changelog>`
+doesn't get too long. Some of these changelogs are also formatted differently
+from current changelogs and would be difficult for the current `changelog
+generation system <build-changelog>` to handle.
 
-.. contents::
-   :depth: 2
+.. contents:: Contents
+  :local:
+  :depth: 1
 
 DFHack 0.43.05-r3
 =================
diff --git a/docs/Introduction.rst b/docs/Introduction.rst
index 52675d364..dc05c8725 100644
--- a/docs/Introduction.rst
+++ b/docs/Introduction.rst
@@ -30,7 +30,8 @@ allows easier development of new tools.  As an open-source project under
 `various copyleft licences <license>`, contributions are welcome.
 
 
-.. contents::
+.. contents:: Contents
+  :local:
 
 
 .. _installing:
diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index d7e94b92a..3e0f22116 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -24,8 +24,9 @@ implemented by Lua files located in :file:`hack/lua/*`
 (:file:`library/lua/*` in the git repo).
 
 
-.. contents::
-   :depth: 3
+.. contents:: Contents
+  :local:
+  :depth: 2
 
 
 =========================
diff --git a/docs/Memory-research.rst b/docs/Memory-research.rst
index 08c0c9573..41aa437c8 100644
--- a/docs/Memory-research.rst
+++ b/docs/Memory-research.rst
@@ -9,8 +9,8 @@ listed here. Note that some of these may be old and unmaintained. If you aren't
 sure what tool would be best for your purposes, feel free to ask for advice (on
 IRC, Bay12, etc.).
 
-.. contents::
-    :local:
+.. contents:: Contents
+  :local:
 
 
 Cross-platform tools
diff --git a/docs/NEWS-dev.rst b/docs/NEWS-dev.rst
index 7a9da7cb7..f0c47fe96 100644
--- a/docs/NEWS-dev.rst
+++ b/docs/NEWS-dev.rst
@@ -13,7 +13,8 @@ which they first appeared. See `build-changelog` for more information.
 
 See `changelog` for a list of changes grouped by stable releases.
 
-.. contents::
-   :depth: 2
+.. contents:: Contents
+  :local:
+  :depth: 1
 
 .. include:: /docs/_auto/news-dev.rst
diff --git a/docs/NEWS.rst b/docs/NEWS.rst
index 22f9881b9..1283b079a 100644
--- a/docs/NEWS.rst
+++ b/docs/NEWS.rst
@@ -13,14 +13,15 @@ appeared. See `build-changelog` for more information.
 
 See `dev-changelog` for a list of changes grouped by development releases.
 
-.. contents::
-   :depth: 2
+.. contents:: Contents
+  :local:
+  :depth: 1
 
 .. include:: /docs/_auto/news.rst
 
 
 Older Changelogs
 ================
-Are kept in a seperate file:  `HISTORY`
+Are kept in a seperate file:  `History`
 
-.. that's ``docs/history.rst``, if you're reading the raw text.
+.. that's ``docs/History.rst``, if you're reading the raw text.
diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index 5c855ddd3..0bd699e14 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -9,8 +9,9 @@ game subsystems or the entire renderer.
 Most commands offered by plugins are listed here,
 hopefully organised in a way you will find useful.
 
-.. contents::
-   :depth: 3
+.. contents:: Contents
+  :local:
+  :depth: 2
 
 ===============================
 Data inspection and visualizers
diff --git a/docs/Scripts-removed.rst b/docs/Scripts-removed.rst
index 4490110ba..5fa3d3ec4 100644
--- a/docs/Scripts-removed.rst
+++ b/docs/Scripts-removed.rst
@@ -4,8 +4,9 @@ Removed scripts
 
 The following scripts were removed for various reasons.
 
-.. contents::
-   :depth: 2
+.. contents:: Contents
+  :local:
+  :depth: 1
 
 .. _warn-stuck-trees:
 
diff --git a/library/xml b/library/xml
index 2d67b03a1..847ec0c2d 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 2d67b03a1c5c701e65fb483b9d6c1d3067f990cb
+Subproject commit 847ec0c2d4dc74a887e1f980eeed6f97345c195e

From 858e90e6c2d06b8e4b81201273699b18878b056e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 8 Jul 2020 21:04:23 -0400
Subject: [PATCH 162/547] Move Scripts-removed.rst to Removed.rst and update a
 bit

---
 docs/Removed.rst         | 17 +++++++++++++++++
 docs/Scripts-removed.rst | 15 ---------------
 index.rst                |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 docs/Removed.rst
 delete mode 100644 docs/Scripts-removed.rst

diff --git a/docs/Removed.rst b/docs/Removed.rst
new file mode 100644
index 000000000..f98915bdd
--- /dev/null
+++ b/docs/Removed.rst
@@ -0,0 +1,17 @@
+#############
+Removed tools
+#############
+
+This page lists tools (plugins or scripts) that were previously included in
+DFHack but have been removed. It exists primarily so that internal links still
+work (e.g. links from the `changelog`).
+
+.. contents:: Contents
+  :local:
+  :depth: 1
+
+.. _warn-stuck-trees:
+
+warn-stuck-trees
+================
+The corresponding DF bug, :bug:`9252` was fixed in DF 0.44.01.
diff --git a/docs/Scripts-removed.rst b/docs/Scripts-removed.rst
deleted file mode 100644
index 5fa3d3ec4..000000000
--- a/docs/Scripts-removed.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-###############
-Removed scripts
-###############
-
-The following scripts were removed for various reasons.
-
-.. contents:: Contents
-  :local:
-  :depth: 1
-
-.. _warn-stuck-trees:
-
-warn-stuck-trees
-================
-The corresponding DF bug, :bug:`9252` was fixed in DF 0.44.01.
diff --git a/index.rst b/index.rst
index 4c5b2e6e4..10424f5fe 100644
--- a/index.rst
+++ b/index.rst
@@ -50,7 +50,7 @@ Other Contents
    /docs/Authors
    /LICENSE
    /docs/NEWS
-   /docs/Scripts-removed
+   /docs/Removed
 
 For Developers
 ==============

From 87fd32d330a50b126ec8ea3a15145e982fbd0064 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 8 Jul 2020 22:52:20 -0400
Subject: [PATCH 163/547] Move general dev info to a separate doc (Dev-intro)

---
 docs/Contributing.rst | 65 ------------------------------------------
 docs/Dev-intro.rst    | 66 +++++++++++++++++++++++++++++++++++++++++++
 docs/index-dev.rst    | 20 +++++++++++++
 index.rst             | 17 +----------
 4 files changed, 87 insertions(+), 81 deletions(-)
 create mode 100644 docs/Dev-intro.rst
 create mode 100644 docs/index-dev.rst

diff --git a/docs/Contributing.rst b/docs/Contributing.rst
index 28e4e6e95..7ce092a8e 100644
--- a/docs/Contributing.rst
+++ b/docs/Contributing.rst
@@ -42,71 +42,6 @@ How to get new code into DFHack
   will take priority over ideas or suggestions.
 
 
-Using the library as a developer
-================================
-Currently, the most direct way to use the library is to write a script or plugin that can be loaded by it.
-All the plugins can be found in the 'plugins' folder. There's no in-depth documentation
-on how to write one yet, but it should be easy enough to copy one and just follow the pattern.
-``plugins/skeleton/skeleton.cpp`` is provided for this purpose.
-
-Other than through plugins, it is possible to use DFHack via remote access interface,
-or by writing scripts in Lua or Ruby.  There are plenty of examples in the scripts folder.
-The `lua-api` is quite well documented.
-
-The most important parts of DFHack are the Core, Console, Modules and Plugins.
-
-* Core acts as the centerpiece of DFHack - it acts as a filter between DF and
-  SDL and synchronizes the various plugins with DF.
-* Console is a thread-safe console that can be used to invoke commands exported by Plugins.
-* Modules actually describe the way to access information in DF's memory. You
-  can get them from the Core. Most modules are split into two parts: high-level
-  and low-level. High-level is mostly method calls, low-level publicly visible
-  pointers to DF's data structures.
-* Plugins are the tools that use all the other stuff to make things happen.
-  A plugin can have a list of commands that it exports and an onupdate function
-  that will be called each DF game tick.
-
-Rudimentary API documentation can be built using doxygen (see build options
-in ``CMakeCache.txt`` or with ``ccmake`` or ``cmake-gui``).  The full DFHack
-documentation is built with Sphinx_, which runs automatically at compile time.
-
-.. _Sphinx: http://www.sphinx-doc.org
-
-DFHack consists of variously licensed code, but invariably weak copyleft.
-The main license is zlib/libpng, some bits are MIT licensed, and some are
-BSD licensed.  See the `license` for more information.
-
-Feel free to add your own extensions and plugins. Contributing back to
-the DFHack repository is welcome and the right thing to do :)
-
-DF data structure definitions
------------------------------
-DFHack uses information about the game data structures, represented via xml files
-in the ``library/xml/`` submodule.
-
-See https://github.com/DFHack/df-structures, and the documentation linked in the index.
-
-Data structure layouts are described in files following the ``df.*.xml`` name pattern.
-This information is transformed by a perl script into C++ headers describing the
-structures, and associated metadata for the Lua wrapper. These headers and data
-are then compiled into the DFHack libraries, thus necessitating a compatibility
-break every time layouts change; in return it significantly boosts the efficiency
-and capabilities of DFHack code.
-
-Global object addresses are stored in :file:`symbols.xml`, which is copied to the dfhack
-release package and loaded as data at runtime.
-
-Remote access interface
------------------------
-DFHack supports remote access by exchanging Google protobuf messages via a TCP
-socket. Both the core and plugins can define remotely accessible methods. The
-``dfhack-run`` command uses this interface to invoke ordinary console commands.
-
-Currently the supported set of requests is limited, because the developers don't
-know what exactly is most useful.  `remotefortressreader` provides a fairly
-comprehensive interface for visualisers such as :forums:`Armok Vision <146473>`.
-
-
 Other ways to help
 ==================
 DFHack is a software project, but there's a lot more to it than programming.
diff --git a/docs/Dev-intro.rst b/docs/Dev-intro.rst
new file mode 100644
index 000000000..e43f03659
--- /dev/null
+++ b/docs/Dev-intro.rst
@@ -0,0 +1,66 @@
+===========================
+DFHack development overview
+===========================
+
+Currently, the most direct way to use the library is to write a script or plugin that can be loaded by it.
+All the plugins can be found in the 'plugins' folder. There's no in-depth documentation
+on how to write one yet, but it should be easy enough to copy one and just follow the pattern.
+``plugins/skeleton/skeleton.cpp`` is provided for this purpose.
+
+Other than through plugins, it is possible to use DFHack via remote access interface,
+or by writing scripts in Lua or Ruby.  There are plenty of examples in the scripts folder.
+The `lua-api` is quite well documented.
+
+The most important parts of DFHack are the Core, Console, Modules and Plugins.
+
+* Core acts as the centerpiece of DFHack - it acts as a filter between DF and
+  SDL and synchronizes the various plugins with DF.
+* Console is a thread-safe console that can be used to invoke commands exported by Plugins.
+* Modules actually describe the way to access information in DF's memory. You
+  can get them from the Core. Most modules are split into two parts: high-level
+  and low-level. High-level is mostly method calls, low-level publicly visible
+  pointers to DF's data structures.
+* Plugins are the tools that use all the other stuff to make things happen.
+  A plugin can have a list of commands that it exports and an onupdate function
+  that will be called each DF game tick.
+
+Rudimentary API documentation can be built using doxygen (see build options
+in ``CMakeCache.txt`` or with ``ccmake`` or ``cmake-gui``).  The full DFHack
+documentation is built with Sphinx_, which runs automatically at compile time.
+
+.. _Sphinx: http://www.sphinx-doc.org
+
+DFHack consists of variously licensed code, but invariably weak copyleft.
+The main license is zlib/libpng, some bits are MIT licensed, and some are
+BSD licensed.  See the `license` for more information.
+
+Feel free to add your own extensions and plugins. Contributing back to
+the DFHack repository is welcome and the right thing to do :)
+
+DF data structure definitions
+-----------------------------
+DFHack uses information about the game data structures, represented via xml files
+in the ``library/xml/`` submodule.
+
+See https://github.com/DFHack/df-structures, and the documentation linked in the index.
+
+Data structure layouts are described in files following the ``df.*.xml`` name pattern.
+This information is transformed by a perl script into C++ headers describing the
+structures, and associated metadata for the Lua wrapper. These headers and data
+are then compiled into the DFHack libraries, thus necessitating a compatibility
+break every time layouts change; in return it significantly boosts the efficiency
+and capabilities of DFHack code.
+
+Global object addresses are stored in :file:`symbols.xml`, which is copied to the dfhack
+release package and loaded as data at runtime.
+
+Remote access interface
+-----------------------
+DFHack supports remote access by exchanging Google protobuf messages via a TCP
+socket. Both the core and plugins can define remotely accessible methods. The
+``dfhack-run`` command uses this interface to invoke ordinary console commands.
+
+Currently the supported set of requests is limited, because the developers don't
+know what exactly is most useful.  `remotefortressreader` provides a fairly
+comprehensive interface for visualisers such as :forums:`Armok Vision <146473>`.
+
diff --git a/docs/index-dev.rst b/docs/index-dev.rst
new file mode 100644
index 000000000..9134ff6b5
--- /dev/null
+++ b/docs/index-dev.rst
@@ -0,0 +1,20 @@
+========================
+DFHack Development Guide
+========================
+
+These are pages relevant to people developing for DFHack.
+
+.. toctree::
+   :maxdepth: 1
+
+   /docs/Dev-intro
+   /docs/Contributing
+   /docs/Compile
+   /docs/NEWS-dev
+   /docs/Lua API
+   /docs/Documentation
+   /library/xml/SYNTAX
+   /library/xml/how-to-update
+   /docs/Memory-research
+   /docs/Binpatches
+
diff --git a/index.rst b/index.rst
index 10424f5fe..df28d0778 100644
--- a/index.rst
+++ b/index.rst
@@ -40,6 +40,7 @@ User Manual
    /docs/Core
    /docs/Plugins
    /docs/Scripts
+   /docs/index-dev
 
 Other Contents
 ==============
@@ -51,19 +52,3 @@ Other Contents
    /LICENSE
    /docs/NEWS
    /docs/Removed
-
-For Developers
-==============
-
-.. toctree::
-   :maxdepth: 1
-
-   /docs/Contributing
-   /docs/Compile
-   /docs/NEWS-dev
-   /docs/Lua API
-   /docs/Documentation
-   /library/xml/SYNTAX
-   /library/xml/how-to-update
-   /docs/Memory-research
-   /docs/Binpatches

From 108e100d2206cd7710d4c2a8074b42d8264a6a58 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 8 Jul 2020 23:10:55 -0400
Subject: [PATCH 164/547] Move structures overview to Structures-intro.rst and
 update/elaborate

---
 docs/Dev-intro.rst        | 16 ----------------
 docs/Structures-intro.rst | 34 ++++++++++++++++++++++++++++++++++
 docs/index-dev.rst        |  3 +--
 3 files changed, 35 insertions(+), 18 deletions(-)
 create mode 100644 docs/Structures-intro.rst

diff --git a/docs/Dev-intro.rst b/docs/Dev-intro.rst
index e43f03659..6983693e8 100644
--- a/docs/Dev-intro.rst
+++ b/docs/Dev-intro.rst
@@ -37,22 +37,6 @@ BSD licensed.  See the `license` for more information.
 Feel free to add your own extensions and plugins. Contributing back to
 the DFHack repository is welcome and the right thing to do :)
 
-DF data structure definitions
------------------------------
-DFHack uses information about the game data structures, represented via xml files
-in the ``library/xml/`` submodule.
-
-See https://github.com/DFHack/df-structures, and the documentation linked in the index.
-
-Data structure layouts are described in files following the ``df.*.xml`` name pattern.
-This information is transformed by a perl script into C++ headers describing the
-structures, and associated metadata for the Lua wrapper. These headers and data
-are then compiled into the DFHack libraries, thus necessitating a compatibility
-break every time layouts change; in return it significantly boosts the efficiency
-and capabilities of DFHack code.
-
-Global object addresses are stored in :file:`symbols.xml`, which is copied to the dfhack
-release package and loaded as data at runtime.
 
 Remote access interface
 -----------------------
diff --git a/docs/Structures-intro.rst b/docs/Structures-intro.rst
new file mode 100644
index 000000000..c45d03eaf
--- /dev/null
+++ b/docs/Structures-intro.rst
@@ -0,0 +1,34 @@
+===================================
+DF data definitions (DF-structures)
+===================================
+
+DFHack's information about DF's data structures is stored in XML files in the
+`df-structures repository <https://github.com/DFHack/df-structures>`_. If you
+have `obtained a local copy of the DFHack source <compile-how-to-get-the-code>`,
+DF-structures is included as a submodule in ``library/xml``.
+
+Data structure layouts are described in files named with the ``df.*.xml``
+pattern. This information is transformed by a Perl script (``codegen.pl``) into
+C++ headers, as well as metadata for the Lua wrapper. This ultimately allows
+DFHack code to access DF data directly, with the same speed and capabilities as
+DF itself, which is an  advantage over the older out-of-process approach (used
+by debuggers and utilities like Dwarf Therapist). The main disadvantage of this
+approach is that any compiled code relying on these layouts will break when DF's
+layout changes, and will need to be recompiled for every new DF version.
+
+Addresses of DF global objects and vtables are stored in a separate file,
+:file:`symbols.xml`. Since these are only absolute addresses, they do not need
+to be compiled in to DFHack code, and are instead loaded at runtime. This makes
+fixes and additions to global addresses possible without recompiling DFHack.
+In an installed copy of DFHack, this file can be found at the root of the
+``hack`` folder.
+
+The following pages contain more detailed information about various aspects
+of DF-structures:
+
+.. toctree::
+   :titlesonly:
+
+   /library/xml/SYNTAX
+   /library/xml/how-to-update
+
diff --git a/docs/index-dev.rst b/docs/index-dev.rst
index 9134ff6b5..617c0c0d7 100644
--- a/docs/index-dev.rst
+++ b/docs/index-dev.rst
@@ -13,8 +13,7 @@ These are pages relevant to people developing for DFHack.
    /docs/NEWS-dev
    /docs/Lua API
    /docs/Documentation
-   /library/xml/SYNTAX
-   /library/xml/how-to-update
+   /docs/Structures-intro
    /docs/Memory-research
    /docs/Binpatches
 

From 7e620b09a44b21f4a107925314a410c87262ba1b Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 8 Jul 2020 23:38:18 -0400
Subject: [PATCH 165/547] Update dev-intro

Doxygen was removed in 787c54d8a
---
 docs/Contributing.rst |  2 +
 docs/Dev-intro.rst    | 85 +++++++++++++++++++++++++++++--------------
 docs/Lua API.rst      |  2 +
 3 files changed, 62 insertions(+), 27 deletions(-)

diff --git a/docs/Contributing.rst b/docs/Contributing.rst
index 7ce092a8e..ab92d0571 100644
--- a/docs/Contributing.rst
+++ b/docs/Contributing.rst
@@ -1,3 +1,5 @@
+.. _contributing:
+
 ###########################
 How to contribute to DFHack
 ###########################
diff --git a/docs/Dev-intro.rst b/docs/Dev-intro.rst
index 6983693e8..b1961378c 100644
--- a/docs/Dev-intro.rst
+++ b/docs/Dev-intro.rst
@@ -2,41 +2,72 @@
 DFHack development overview
 ===========================
 
-Currently, the most direct way to use the library is to write a script or plugin that can be loaded by it.
-All the plugins can be found in the 'plugins' folder. There's no in-depth documentation
-on how to write one yet, but it should be easy enough to copy one and just follow the pattern.
-``plugins/skeleton/skeleton.cpp`` is provided for this purpose.
+DFHack has various components; this page provides an overview of some. If you
+are looking to develop a tool for DFHack, developing a script or plugin is
+likely the most straightforward choice.
 
-Other than through plugins, it is possible to use DFHack via remote access interface,
-or by writing scripts in Lua or Ruby.  There are plenty of examples in the scripts folder.
-The `lua-api` is quite well documented.
+Other pages that may be relevant include:
 
-The most important parts of DFHack are the Core, Console, Modules and Plugins.
+- `contributing`
+- `documentation`
+- `license`
 
-* Core acts as the centerpiece of DFHack - it acts as a filter between DF and
-  SDL and synchronizes the various plugins with DF.
-* Console is a thread-safe console that can be used to invoke commands exported by Plugins.
-* Modules actually describe the way to access information in DF's memory. You
-  can get them from the Core. Most modules are split into two parts: high-level
-  and low-level. High-level is mostly method calls, low-level publicly visible
-  pointers to DF's data structures.
-* Plugins are the tools that use all the other stuff to make things happen.
-  A plugin can have a list of commands that it exports and an onupdate function
-  that will be called each DF game tick.
 
-Rudimentary API documentation can be built using doxygen (see build options
-in ``CMakeCache.txt`` or with ``ccmake`` or ``cmake-gui``).  The full DFHack
-documentation is built with Sphinx_, which runs automatically at compile time.
+.. contents:: Contents
+    :local:
 
-.. _Sphinx: http://www.sphinx-doc.org
 
-DFHack consists of variously licensed code, but invariably weak copyleft.
-The main license is zlib/libpng, some bits are MIT licensed, and some are
-BSD licensed.  See the `license` for more information.
+Plugins
+-------
 
-Feel free to add your own extensions and plugins. Contributing back to
-the DFHack repository is welcome and the right thing to do :)
+DFHack plugins are written in C++ and located in the ``plugins`` folder.
+Currently, documentation on how to write plugins is somewhat sparse. There are
+templates that you can get use to get started in the ``plugins/skeleton``
+folder, and the source code of existing plugins can also be helpful.
 
+If you want to compile a plugin that you have just added, you will need to add a
+call to ``DFHACK_PLUGIN`` in ``plugins/CMakeLists.txt``.
+
+Plugins have the ability to make one or more commands available to users of the
+DFHack console. Examples include `3dveins` (which implements the ``3dveins``
+command) and `reveal` (which implements ``reveal``, ``unreveal``, and several
+other commands).
+
+Plugins can also register handlers to run on every tick, and can interface with
+the built-in `enable` and `disable` commands. For the full plugin API, see the
+skeleton plugins or ``PluginManager.cpp``.
+
+Scripts
+-------
+
+DFHack scripts can currently be written in Lua or Ruby. The `Lua API <lua-api>`
+is more complete and currently better-documented, however. Referring to existing
+scripts as well as the API documentation can be helpful when developing new
+scripts.
+
+DFHack scripts live in a separate `scripts repository <https://github.com/dfhack/scripts>`_.
+This can be found in the ``scripts`` submodule if you have
+`cloned DFHack <compile-how-to-get-the-code>`, or the ``hack/scripts`` folder
+of an installed copy of DFHack.
+
+Core
+----
+
+The DFHack core has a variety of low-level functions. It is responsible for
+hooking into DF (via SDL), providing a console, and providing an interface
+for plugins and scripts to interact with DF.
+
+Modules
+-------
+
+A lot of shared code to interact with DF in more complicated ways is exposed by
+**modules**. For example, the Units module contains functions for checking
+various traits of units, changing nicknames properly, and more. Generally,
+code that is useful to multiple plugins and scripts should go in the appropriate
+module, if there is one.
+
+Several modules are also `exposed to Lua <lua-cpp-func-wrappers>`, although
+some functions (and some entire modules) are currently only available in C++.
 
 Remote access interface
 -----------------------
diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 3e0f22116..4c7163623 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -802,6 +802,8 @@ Random number generation
   Dimension may be 1, 2 or 3 (default).
 
 
+.. _lua-cpp-func-wrappers:
+
 C++ function wrappers
 =====================
 

From ba0f8553ed5afde61ea9bec1360a089c7fcebcba Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 8 Jul 2020 23:46:38 -0400
Subject: [PATCH 166/547] Misc updates, links

---
 docs/Core.rst      | 12 +++++++++---
 docs/Dev-intro.rst | 22 ++++++++++++++--------
 docs/Plugins.rst   |  2 ++
 docs/Scripts.rst   |  2 ++
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/docs/Core.rst b/docs/Core.rst
index 8f84c7b54..6ef1d0575 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -166,10 +166,13 @@ right place to do it.
 Most such plugins or scripts support the built-in ``enable`` and ``disable``
 commands. Calling them at any time without arguments prints a list
 of enabled and disabled plugins, and shows whether that can be changed
-through the same commands.
+through the same commands. Passing plugin names to these commands will enable
+or disable the specified plugins. For example, to enable the `manipulator`
+plugin::
 
-To enable or disable plugins that support this, use their names as
-arguments for the command::
+  enable manipulator
+
+It is also possible to enable or disable multiple plugins at once::
 
   enable manipulator search
 
@@ -272,6 +275,9 @@ something.  Usage::
 
 Allows dealing with plugins individually by name, or all at once.
 
+Note that plugins do not maintain their enabled state if they are reloaded, so
+you may need to use `enable` to re-enable a plugin after reloading it.
+
 
 .. _ls:
 
diff --git a/docs/Dev-intro.rst b/docs/Dev-intro.rst
index b1961378c..9a08533c0 100644
--- a/docs/Dev-intro.rst
+++ b/docs/Dev-intro.rst
@@ -37,6 +37,12 @@ Plugins can also register handlers to run on every tick, and can interface with
 the built-in `enable` and `disable` commands. For the full plugin API, see the
 skeleton plugins or ``PluginManager.cpp``.
 
+Installed plugins live in the ``hack/plugins`` folder of a DFHack installation,
+and the `load` family of commands can be used to load a recompiled plugin
+without restarting DF.
+
+See `plugins-index` for a list of all plugins included in DFHack.
+
 Scripts
 -------
 
@@ -45,7 +51,7 @@ is more complete and currently better-documented, however. Referring to existing
 scripts as well as the API documentation can be helpful when developing new
 scripts.
 
-DFHack scripts live in a separate `scripts repository <https://github.com/dfhack/scripts>`_.
+`Scripts included in DFHack <scripts-index>` live in a separate `scripts repository <https://github.com/dfhack/scripts>`_.
 This can be found in the ``scripts`` submodule if you have
 `cloned DFHack <compile-how-to-get-the-code>`, or the ``hack/scripts`` folder
 of an installed copy of DFHack.
@@ -53,17 +59,17 @@ of an installed copy of DFHack.
 Core
 ----
 
-The DFHack core has a variety of low-level functions. It is responsible for
-hooking into DF (via SDL), providing a console, and providing an interface
-for plugins and scripts to interact with DF.
+The `DFHack core <dfhack-core>` has a variety of low-level functions. It is
+responsible for hooking into DF (via SDL), providing a console, and providing an
+interface for plugins and scripts to interact with DF.
 
 Modules
 -------
 
-A lot of shared code to interact with DF in more complicated ways is exposed by
-**modules**. For example, the Units module contains functions for checking
-various traits of units, changing nicknames properly, and more. Generally,
-code that is useful to multiple plugins and scripts should go in the appropriate
+A lot of shared code to interact with DF in more complicated ways is contained
+in **modules**. For example, the Units module contains functions for checking
+various traits of units, changing nicknames properly, and more. Generally, code
+that is useful to multiple plugins and scripts should go in the appropriate
 module, if there is one.
 
 Several modules are also `exposed to Lua <lua-cpp-func-wrappers>`, although
diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index 0bd699e14..0185dbee5 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -1,3 +1,5 @@
+.. _plugins-index:
+
 ##############
 DFHack Plugins
 ##############
diff --git a/docs/Scripts.rst b/docs/Scripts.rst
index 0e6ef415c..419385582 100644
--- a/docs/Scripts.rst
+++ b/docs/Scripts.rst
@@ -1,3 +1,5 @@
+.. _scripts-index:
+
 ##############
 DFHack Scripts
 ##############

From fdb4487a3632e11b37d82efb8caf78fe12631484 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 10 Jul 2020 02:11:03 -0400
Subject: [PATCH 167/547] Update Linux sphinx installation instructions, define
 substitution for minumum sphinx version

---
 conf.py                |  7 +++++++
 docs/Documentation.rst | 36 +++++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/conf.py b/conf.py
index aebe73bab..e70d836f1 100644
--- a/conf.py
+++ b/conf.py
@@ -283,6 +283,13 @@ pygments_style = 'sphinx'
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
 
+rst_prolog = """
+.. |sphinx_min_version| replace:: {sphinx_min_version}
+.. |dfhack_version| replace:: {dfhack_version}
+""".format(
+    sphinx_min_version=needs_sphinx,
+    dfhack_version=version,
+)
 
 # -- Options for HTML output ----------------------------------------------
 
diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index 8a829c0a8..462932b0f 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -121,7 +121,7 @@ Building the documentation
 Required dependencies
 ---------------------
 In order to build the documentation, you must have Python with Sphinx
-version 1.8 or later. Both Python 2.x and 3.x are supported.
+version |sphinx_min_version| or later. Both Python 2.x and 3.x are supported.
 
 When installing Sphinx from OS package managers, be aware that there is
 another program called Sphinx, completely unrelated to documentation management.
@@ -141,27 +141,29 @@ For more detailed platform-specific instructions, see the sections below:
 
 Linux
 ~~~~~
-Most Linux distributions will include Python as standard.
+Most Linux distributions will include Python by default. If not, start by
+installing Python (preferably Python 3). On Debian-based distros::
 
-Check your package manager to see if Sphinx 1.3.1 or later is available,
-but at the time of writing Ubuntu for example only has 1.2.x.
+  sudo apt install python3
 
-You can instead install Sphinx with the pip package manager. This may need
-to be installed from your OS package manager; this is the case on Ubuntu.
-On Ubuntu/Debian, use the following to first install pip::
+Check your package manager to see if Sphinx |sphinx_min_version| or later is
+available. On Debian-based distros, this package is named ``python3-sphinx``.
+If this package is new enough, you can install it directly. If not, or if you
+want to use a newer Sphinx version (which may result in faster builds), you
+can install Sphinx through the ``pip`` package manager instead. On Debian-based
+distros, you can install pip with::
 
-  sudo apt-get install python-pip
+  sudo apt install python3-pip
 
-Once pip is available, you can then install the Python Sphinx module with::
+Once pip is available, you can then install Sphinx with::
 
-  pip install sphinx
-
-If you run this as a normal user it will install a local copy for your user only.
-Run it with sudo if you want a system-wide install. Either is fine for DFHack,
-however if installing locally do check that ``sphinx-build`` is in your path.
-It may be installed in a directory such as ``~/.local/bin/``, so after pip
-install, find ``sphinx-build`` and ensure its directory is in your local ``$PATH``.
+  pip3 install sphinx
 
+If you run this as an unpriviliged user, it may install a local copy of Sphinx
+for your user only. The ``sphinx-build`` executable will typically end up in
+``~/.local/bin/`` in this case. Alternatively, you can install Sphinx
+system-wide by running pip with ``sudo``. In any case, you will need the folder
+containing ``sphinx-build`` to be in your ``$PATH``.
 
 macOS
 ~~~~~
@@ -173,7 +175,7 @@ latest Sphinx using pip::
   brew install python3
   pip3 install sphinx
 
-Alternatively, you can simply install Sphinx 1.3.x directly from Homebrew::
+Alternatively, you can simply install Sphinx directly from Homebrew::
 
   brew install sphinx-doc
 

From 9284daaf89c4bbeb9bede091820c2bd28fc947c4 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 10 Jul 2020 19:59:34 -0400
Subject: [PATCH 168/547] Unset content min-width to improve mobile layout

---
 docs/styles/dfhack.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/styles/dfhack.css b/docs/styles/dfhack.css
index e7a608460..43063cee2 100644
--- a/docs/styles/dfhack.css
+++ b/docs/styles/dfhack.css
@@ -52,3 +52,7 @@ div.sphinxsidebar {
 div.sphinxsidebar h3 > a {
     border-bottom: 1px dotted #999;
 }
+
+div.body {
+    min-width: unset;
+}

From c30d27cfbd6c560bd922ad01f7a8c94ce2d525f4 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Jul 2020 01:41:38 -0400
Subject: [PATCH 169/547] Silence strangemood warnings

---
 plugins/strangemood.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/strangemood.cpp b/plugins/strangemood.cpp
index f37400cbb..67ccbf719 100644
--- a/plugins/strangemood.cpp
+++ b/plugins/strangemood.cpp
@@ -314,6 +314,9 @@ void generateName(df::language_name &output, int language, df::language_name_typ
             if (rng.df_trandom(100))
                 selectWord(table2, output.words[4], output.parts_of_speech[4], 4);
             break;
+        default:
+            // not handled yet
+            break;
         }
         if (output.words[2] != -1 && output.words[3] != -1 &&
             world->raws.language.words[output.words[3]]->adj_dist < world->raws.language.words[output.words[2]]->adj_dist)

From 07a2b4a9d7cfa10ab533815c9d50fc5a10305066 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Jul 2020 02:05:38 -0400
Subject: [PATCH 170/547] Use language_name_type enum item names

---
 library/xml             |  2 +-
 plugins/strangemood.cpp | 48 ++++++++++++++++++++++++++++++++++-------
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/library/xml b/library/xml
index 847ec0c2d..b9028b0bb 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 847ec0c2d4dc74a887e1f980eeed6f97345c195e
+Subproject commit b9028b0bb9ad40d3ad4dc3f10934bb61aa16629b
diff --git a/plugins/strangemood.cpp b/plugins/strangemood.cpp
index 67ccbf719..b1b48f1a5 100644
--- a/plugins/strangemood.cpp
+++ b/plugins/strangemood.cpp
@@ -171,7 +171,9 @@ void generateName(df::language_name &output, int language, df::language_name_typ
         int r, r2, r3;
         switch (mode)
         {
-        case 0: case 9: case 10:
+        case language_name_type::Figure:
+        case language_name_type::FigureNoFirst:
+        case language_name_type::FigureFirstOnly:
             if (mode != 9)
             {
                 int32_t word; df::part_of_speech part;
@@ -182,7 +184,8 @@ void generateName(df::language_name &output, int language, df::language_name_typ
             }
             if (mode != 10)
             {
-        case 4: case 37: // this is not a typo
+        case language_name_type::Site:
+        case language_name_type::Unk37: // this is not a typo
                 if (rng.df_trandom(2))
                 {
                     selectWord(table2, output.words[0], output.parts_of_speech[0], 0);
@@ -196,7 +199,9 @@ void generateName(df::language_name &output, int language, df::language_name_typ
             }
             break;
 
-        case 1: case 13: case 20:
+        case language_name_type::Artifact:
+        case language_name_type::Unk13:
+        case language_name_type::River:
             r = rng.df_trandom(3);
             if (r == 0 || r == 1)
             {
@@ -213,7 +218,9 @@ void generateName(df::language_name &output, int language, df::language_name_typ
             }
             if (r == 1 || r == 2)
             {
-        case 3: case 8: case 11: // this is not a typo either
+        case language_name_type::Squad:
+        case language_name_type::LegendaryFigure:
+        case language_name_type::ArtImage: // this is not a typo either
                 r2 = rng.df_trandom(2);
                 if (r2)
                     selectWord(table1, output.words[5], output.parts_of_speech[5], 2);
@@ -256,9 +263,34 @@ void generateName(df::language_name &output, int language, df::language_name_typ
                 output.parts_of_speech[5] = part_of_speech::NounPlural;
             break;
 
-        case 2: case 5: case 6: case 12: case 14: case 15: case 16: case 17: case 18: case 19:
-        case 21: case 22: case 23: case 24: case 25: case 26: case 27: case 28: case 29: case 30:
-        case 31: case 32: case 33: case 34: case 35: case 36: case 38: case 39:
+        case language_name_type::Civilization:
+        case language_name_type::World:
+        case language_name_type::Region:
+        case language_name_type::AdventuringGroup:
+        case language_name_type::SiteGovernment:
+        case language_name_type::Unk15:
+        case language_name_type::Vessel:
+        case language_name_type::MilitaryUnit:
+        case language_name_type::Religion:
+        case language_name_type::MountainPeak:
+        case language_name_type::Temple:
+        case language_name_type::Keep:
+        case language_name_type::MeadHall:
+        case language_name_type::Unk24:
+        case language_name_type::Unk25:
+        case language_name_type::Unk26:
+        case language_name_type::Market:
+        case language_name_type::Tavern:
+        case language_name_type::War:
+        case language_name_type::Battle:
+        case language_name_type::Siege:
+        case language_name_type::Road:
+        case language_name_type::Wall:
+        case language_name_type::Bridge:
+        case language_name_type::Tunnel:
+        case language_name_type::PretentiousEntityPosition:
+        case language_name_type::Tomb:
+        case language_name_type::MigratingGroup:
             selectWord(table1, output.words[5], output.parts_of_speech[5], 2);
             r3 = rng.df_trandom(3);
             if (rng.df_trandom(50))
@@ -280,7 +312,7 @@ void generateName(df::language_name &output, int language, df::language_name_typ
                 selectWord(table2, output.words[4], output.parts_of_speech[4], 4);
             break;
 
-        case 7:
+        case language_name_type::Dungeon:
             r = rng.df_trandom(3);
             if (r == 0 || r == 1)
             {

From 1043a4e49b2f848d39f90a17b0c5d0a2b5b638db Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Jul 2020 23:50:51 -0400
Subject: [PATCH 171/547] Update intro, fix bay12 link, shorten index, add
 quick links section

---
 docs/Compile.rst      |  2 ++
 docs/Introduction.rst | 13 +++++++------
 index.rst             | 38 ++++++++++++++------------------------
 3 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/docs/Compile.rst b/docs/Compile.rst
index 26f720076..68187e7fa 100644
--- a/docs/Compile.rst
+++ b/docs/Compile.rst
@@ -1,3 +1,5 @@
+.. _compile:
+
 ################
 Compiling DFHack
 ################
diff --git a/docs/Introduction.rst b/docs/Introduction.rst
index dc05c8725..4490086f3 100644
--- a/docs/Introduction.rst
+++ b/docs/Introduction.rst
@@ -7,14 +7,15 @@ Introduction and Overview
 DFHack is a Dwarf Fortress memory access library, distributed with
 a wide variety of useful scripts and plugins.
 
-The project is currently hosted at https://www.github.com/DFHack/dfhack,
-and can be downloaded from `the releases page
-<http://github.com/DFHack/dfhack/releases>`_.
+The project is currently hosted `on GitHub <https://www.github.com/DFHack/dfhack>`_,
+and can be downloaded from `the releases page <http://github.com/DFHack/dfhack/releases>`_
+- see `installing` for installation instructions. This is also where the
+`DFHack bug tracker <https://www.github.com/DFHack/dfhack>`_ is hosted.
 
-All new releases are announced in :forums:`the bay12 forums thread <139553>`,
+All new releases are announced in `the Bay12 forums thread <https://dfhack.org/bay12>`_,
 which is also a good place for discussion and questions.
 
-For users, it provides a significant suite of bugfixes and interface
+For users, DFHack provides a significant suite of bugfixes and interface
 enhancements by default, and more can be enabled.  There are also many tools
 (such as `workflow` or `autodump`) which can make life easier.
 You can even add third-party scripts and plugins to do almost anything!
@@ -27,7 +28,7 @@ or for coexistence in a single DF install, even with incompatible components.
 
 For developers, DFHack unites the various ways tools access DF memory and
 allows easier development of new tools.  As an open-source project under
-`various copyleft licences <license>`, contributions are welcome.
+`various open-source licences <license>`, contributions are welcome.
 
 
 .. contents:: Contents
diff --git a/index.rst b/index.rst
index df28d0778..d5c7fbc10 100644
--- a/index.rst
+++ b/index.rst
@@ -2,33 +2,23 @@
 Welcome to DFHack's documentation!
 ##################################
 
-Introduction
-============
-DFHack is a Dwarf Fortress memory access library, distributed with
-a wide variety of useful scripts and plugins.
+DFHack is a memory editing library for `Dwarf Fortress <https://www.bay12games.com/dwarves/>`_
+that provides a unified, cross-platform environment where tools can be developed
+to extend the game. The default distribution contains a variety of tools, including
+bugfixes, interface improvements, automation tools, modding tools, and more.
+There are also a variety of third-party tools available.
 
-The project is currently hosted at https://www.github.com/DFHack/dfhack,
-and can be downloaded from `the releases page
-<http://github.com/DFHack/dfhack/releases>`_.
+.. _quick-links:
 
-All new releases are announced in :forums:`the bay12 forums thread <139553>`,
-which is also a good place for discussion and questions.
-
-For users, it provides a significant suite of bugfixes and interface
-enhancements by default, and more can be enabled.  There are also many tools
-(such as `workflow` or `autodump`) which can make life easier.
-You can even add third-party scripts and plugins to do almost anything!
-
-For modders, DFHack makes many things possible.  Custom reactions, new
-interactions, magic creature abilities, and more can be set through `scripts-modtools`
-and custom raws.  Non-standard DFHack scripts and inits can be stored in the
-raw directory, making raws or saves fully self-contained for distribution -
-or for coexistence in a single DF install, even with incompatible components.
-
-For developers, DFHack unites the various ways tools access DF memory and
-allows easier development of new tools.  As an open-source project under
-`various copyleft licences <license>`, contributions are welcome.
+Quick Links
+===========
 
+* `Downloads <https://www.github.com/DFHack/dfhack/releases>`_
+* `Installation guide <installing>`
+* `Source code <https://www.github.com/DFHack/dfhack>`_
+  (**important:** read `compile` before attempting to build from source)
+* `Bay 12 forums thread <https://dfhack.org/bay12>`_
+* `Bug tracker <https://www.github.com/DFHack/dfhack/issues>`_
 
 User Manual
 ===========

From 801961bf7853b2747a46ce553529fe73c03a422f Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Jul 2020 23:55:02 -0400
Subject: [PATCH 172/547] Move changelog, license, authors into main TOC tree

---
 docs/index-about.rst | 13 +++++++++++++
 index.rst            | 12 +-----------
 2 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 docs/index-about.rst

diff --git a/docs/index-about.rst b/docs/index-about.rst
new file mode 100644
index 000000000..3dba1e5f8
--- /dev/null
+++ b/docs/index-about.rst
@@ -0,0 +1,13 @@
+============
+About DFHack
+============
+
+These pages contain information about the general DFHack project.
+
+.. toctree::
+   :maxdepth: 1
+
+   /docs/NEWS
+   /docs/Authors
+   /LICENSE
+   /docs/Removed
diff --git a/index.rst b/index.rst
index d5c7fbc10..91c883b51 100644
--- a/index.rst
+++ b/index.rst
@@ -30,15 +30,5 @@ User Manual
    /docs/Core
    /docs/Plugins
    /docs/Scripts
+   /docs/index-about
    /docs/index-dev
-
-Other Contents
-==============
-
-.. toctree::
-   :maxdepth: 1
-
-   /docs/Authors
-   /LICENSE
-   /docs/NEWS
-   /docs/Removed

From 279d3e80f2f3691facae7cea3cc022b59251cd59 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 11 Jul 2020 23:56:15 -0400
Subject: [PATCH 173/547] Add kazimuth to authors

---
 docs/Authors.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Authors.rst b/docs/Authors.rst
index e816389cd..3111b17f0 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -57,6 +57,7 @@ Hayati Ayguen           hayguen
 Herwig Hochleitner      bendlas
 Ian S                   kremlin-
 IndigoFenix
+James Gilles            kazimuth
 James Logsdon           jlogsdon
 Japa                    JapaMala
 Jared Adams

From a8d34bb64ec6ef6e09c611de7a8bbb14b322f0c3 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 12 Jul 2020 00:30:28 -0400
Subject: [PATCH 174/547] Add explicit home link to sidebar

---
 conf.py                   | 2 +-
 docs/styles/dfhack.css    | 2 +-
 docs/templates/about.html | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 docs/templates/about.html

diff --git a/conf.py b/conf.py
index e70d836f1..a46039126 100644
--- a/conf.py
+++ b/conf.py
@@ -212,7 +212,7 @@ extlinks = {
 }
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = []
+templates_path = ["docs/templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
diff --git a/docs/styles/dfhack.css b/docs/styles/dfhack.css
index 43063cee2..daedd1120 100644
--- a/docs/styles/dfhack.css
+++ b/docs/styles/dfhack.css
@@ -49,7 +49,7 @@ div.sphinxsidebar {
     overflow-y: auto;
 }
 
-div.sphinxsidebar h3 > a {
+div.sphinxsidebar h3.logo-name a {
     border-bottom: 1px dotted #999;
 }
 
diff --git a/docs/templates/about.html b/docs/templates/about.html
new file mode 100644
index 000000000..48f98859f
--- /dev/null
+++ b/docs/templates/about.html
@@ -0,0 +1,6 @@
+<p class="logo">
+  <a href="{{ pathto(master_doc) }}">
+    <img class="logo" src="{{ pathto('_static/' ~ theme_logo, 1) }}" alt="Logo"/>
+    <h3 class="logo logo-name">Home</h3>
+  </a>
+</p>

From 1d2b0bb3a522cfeb92c4695d7d4ef5a6a0e9c13b Mon Sep 17 00:00:00 2001
From: Tommy R <tommy@users.noreply.github.com>
Date: Mon, 13 Jul 2020 10:04:09 -0700
Subject: [PATCH 175/547] Fix the unquarantine behavior on OSX.

- Using print0 but without the parenthesis, find only outputs one
filename.
- Also added the .framework files to the unquarantine list.
---
 package/darwin/dfhack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/darwin/dfhack b/package/darwin/dfhack
index 1c2c7a175..5241f1a67 100755
--- a/package/darwin/dfhack
+++ b/package/darwin/dfhack
@@ -13,7 +13,7 @@ fi
 
 # attempt to remove quarantine flag: https://github.com/DFHack/dfhack/issues/1465
 if ! test -f hack/quarantine-removed; then
-    find hack/ libs/ dwarfort.exe -name '*.dylib' -or -name '*.exe' -print0 | xargs -0 xattr -d com.apple.quarantine 2>&1 | grep -iv 'no such xattr'
+    find hack/ libs/ dwarfort.exe \( -name '*.dylib' -or -name '*.framework' -or -name '*.exe' \) -print0 | xargs -0 xattr -d com.apple.quarantine 2>&1 | grep -iv 'no such xattr'
     echo "quarantine flag removed on $(date); remove this file to re-run" > hack/quarantine-removed
 fi
 

From f33f9136c88031e59fbaee3105c8bac1250fe14c Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 13 Jul 2020 19:57:14 -0400
Subject: [PATCH 176/547] Update changelog + authors (#1606)

---
 docs/Authors.rst   | 1 +
 docs/changelog.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/Authors.rst b/docs/Authors.rst
index 3111b17f0..6701b67a0 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -161,6 +161,7 @@ Timothy Collett         danaris
 Timur Kelman            TymurGubayev
 Tom Jobbins             TheBloke
 Tom Prince
+Tommy R                 tommy
 TotallyGatsby           TotallyGatsby
 Travis Hoppe            thoppe                  orthographic-pedant
 txtsd                   txtsd
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 7201bfd23..c6fbe840a 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -35,6 +35,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Fixes
 - Fixed a segfault when attempting to start a headless session with a graphical PRINT_MODE setting
+- Fixed an issue with the macOS launcher failing to un-quarantine some files
 - `labormanager`: fixed handling of new jobs in 0.47
 - Fixed ``Units::isEggLayer``, ``Units::isGrazer``, ``Units::isMilkable``, ``Units::isTrainableHunting``, ``Units::isTrainableWar``, and ``Units::isTamable`` ignoring the unit's caste
 

From ced8f4a55164da36f7b1b7b458eb1f8c789f2e97 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 13 Jul 2020 20:05:08 -0400
Subject: [PATCH 177/547] Update changelog (#1565)

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index c6fbe840a..dfda78c0b 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -38,6 +38,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - Fixed an issue with the macOS launcher failing to un-quarantine some files
 - `labormanager`: fixed handling of new jobs in 0.47
 - Fixed ``Units::isEggLayer``, ``Units::isGrazer``, ``Units::isMilkable``, ``Units::isTrainableHunting``, ``Units::isTrainableWar``, and ``Units::isTamable`` ignoring the unit's caste
+- `RemoteFortressReader`: fixed a couple crashes that could result from decoding invalid enum items (``site_realization_building_type`` and ``improvement_type``)
 
 ## Misc Improvements
 - `confirm`: added a confirmation dialog for convicting dwarves of crimes

From 89283026ae917883f84da7a16179f207390bc540 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 13 Jul 2020 20:14:11 -0400
Subject: [PATCH 178/547] Improve changelog error handling a bit when called
 from sphinx

---
 docs/sphinx_extensions/dfhack/changelog.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/sphinx_extensions/dfhack/changelog.py b/docs/sphinx_extensions/dfhack/changelog.py
index 99f0ea299..6f444d36f 100644
--- a/docs/sphinx_extensions/dfhack/changelog.py
+++ b/docs/sphinx_extensions/dfhack/changelog.py
@@ -4,6 +4,8 @@ import itertools
 import os
 import sys
 
+from sphinx.errors import ExtensionError, SphinxError, SphinxWarning
+
 from dfhack.util import DFHACK_ROOT, DOCS_ROOT
 
 CHANGELOG_PATHS = (
@@ -214,7 +216,7 @@ def generate_changelog(all=False):
     # scan for unrecognized sections
     for entry in entries:
         if entry.section not in CHANGELOG_SECTIONS:
-            raise RuntimeWarning('Unknown section: ' + entry.section)
+            raise SphinxWarning('Unknown section: ' + entry.section)
 
     # ordered versions
     versions = ['future']
@@ -287,7 +289,12 @@ def cli_entrypoint():
 
 
 def sphinx_entrypoint(app, config):
-    generate_changelog()
+    try:
+        generate_changelog()
+    except SphinxError:
+        raise
+    except Exception as e:
+        raise ExtensionError(str(e), e)
 
 
 def setup(app):

From df6f3a04557525e5780fb423bf68b4caca4c2316 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 14 Jul 2020 02:31:18 -0400
Subject: [PATCH 179/547] Mark ref_target as a metafield so
 meta_primitive_newindex fails properly

unit:_field('hist_figure_id').ref_target = 4 now fails with "Cannot write field int32_t.ref_target: builtin property or method" instead of "not found"
---
 library/LuaTypes.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/library/LuaTypes.cpp b/library/LuaTypes.cpp
index 7f0711b20..845d273e3 100644
--- a/library/LuaTypes.cpp
+++ b/library/LuaTypes.cpp
@@ -1316,6 +1316,8 @@ static void MakePrimitiveMetatable(lua_State *state, type_identity *type)
     {
         EnableMetaField(state, base+2, "value", type);
         AssociateId(state, base+3, 1, "value");
+
+        EnableMetaField(state, base+2, "ref_target", NULL);
     }
 
     // Add the iteration metamethods

From 1f1bb5a055bbf121fbfe1a741200b7aeedac7cf1 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 14 Jul 2020 02:54:33 -0400
Subject: [PATCH 180/547] Update Lua API docs for ref_target field, add tests

---
 docs/Lua API.rst               |  4 +++-
 test/main.lua                  | 13 +++++++++++++
 test/structures/ref_target.lua | 35 ++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 test/structures/ref_target.lua

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 4c7163623..2cfaff350 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -158,7 +158,9 @@ that don't fit any of the other reference types. Such
 references can only appear as a value of a pointer field,
 or as a result of calling the ``_field()`` method.
 
-They behave as structs with one field ``value`` of the right type.
+They behave as structs with a ``value`` field of the right type. If the
+object's XML definition has a ``ref-target`` attribute, they will also have
+a read-only ``ref_target`` field set to the corresponding type object.
 
 To make working with numeric buffers easier, they also allow
 numeric indices. Note that other than excluding negative values
diff --git a/test/main.lua b/test/main.lua
index 46a91e1ca..83a35d165 100644
--- a/test/main.lua
+++ b/test/main.lua
@@ -69,6 +69,19 @@ function expect.error(func, ...)
         return true
     end
 end
+function expect.error_match(func, matcher, ...)
+    local ok, err = pcall(func, ...)
+    if ok then
+        return false, 'no error raised by function call'
+    elseif type(matcher) == 'string' then
+        if not tostring(err):match(matcher) then
+            return false, ('error "%s" did not match "%s"'):format(err, matcher)
+        end
+    elseif not matcher(err) then
+        return false, ('error "%s" did not satisfy matcher'):format(err)
+    end
+    return true
+end
 function expect.pairs_contains(table, key, comment)
     for k, v in pairs(table) do
         if k == key then
diff --git a/test/structures/ref_target.lua b/test/structures/ref_target.lua
new file mode 100644
index 000000000..05818ee06
--- /dev/null
+++ b/test/structures/ref_target.lua
@@ -0,0 +1,35 @@
+function test.get()
+    dfhack.with_temp_object(df.unit:new(), function(unit)
+        expect.eq(unit:_field('hist_figure_id').ref_target, df.historical_figure)
+    end)
+end
+
+function test.get_nil()
+    dfhack.with_temp_object(df.coord:new(), function(coord)
+        expect.nil_(coord:_field('x').ref_target)
+    end)
+end
+
+function test.get_non_primitive()
+    dfhack.with_temp_object(df.unit:new(), function(unit)
+        expect.error_match(function()
+            return unit:_field('status').ref_target
+        end, 'not found')
+    end)
+end
+
+function test.set()
+    dfhack.with_temp_object(df.unit:new(), function(unit)
+        expect.error_match(function()
+            unit:_field('hist_figure_id').ref_target = df.coord
+        end, 'builtin property or method')
+    end)
+end
+
+function test.set_non_primitive()
+    dfhack.with_temp_object(df.unit:new(), function(unit)
+        expect.error_match(function()
+            unit:_field('status').ref_target = df.coord
+        end, 'not found')
+    end)
+end

From 9b922c19655c73bdbb79e40c0ded95b335da9413 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 15 Jul 2020 00:05:36 -0400
Subject: [PATCH 181/547] Update scripts, changelog (#1543)

---
 docs/changelog.txt | 3 +++
 scripts            | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index dfda78c0b..9b935698e 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -43,6 +43,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Misc Improvements
 - `confirm`: added a confirmation dialog for convicting dwarves of crimes
 
+## Lua
+- Added a ``ref_target`` field to primitive field references, corresponding to the ``ref-target`` XML attribute
+
 ## Ruby
 - Updated ``item_find`` and ``building_find`` to use centralized logic that works on more screens
 
diff --git a/scripts b/scripts
index e8de92efb..7be22b0d0 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit e8de92efb73d5ef4d0b52df000d60d3350f07a37
+Subproject commit 7be22b0d0d133c6dbadf700126ddeb08b7aa0ac5

From e2334387a905f0dc5f75a25150a50605749b0225 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Wed, 15 Jul 2020 16:57:14 -0700
Subject: [PATCH 182/547] blueprint: write blueprints to blueprints/ subdir

to enable writing to a subdir that may not exist, blueprint now automatically
creates folder trees. E.g. ``blueprint 30 30 1 rooms/dining dig`` will create
the file ``blueprints/rooms/dining-dig.csv``). Previously it would fail if the
``blueprints/rooms/`` directory didn't already exist.
---
 docs/Authors.rst       |  1 +
 docs/changelog.txt     |  2 +
 plugins/CMakeLists.txt |  3 +-
 plugins/blueprint.cpp  | 87 ++++++++++++++++++++++++++++++------------
 4 files changed, 67 insertions(+), 26 deletions(-)

diff --git a/docs/Authors.rst b/docs/Authors.rst
index 6701b67a0..3c2777a7d 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -100,6 +100,7 @@ Milo Christiansen       milochristiansen
 MithrilTuxedo           MithrilTuxedo
 mizipzor                mizipzor
 moversti                moversti
+Myk Taylor              myk002
 napagokc                napagokc
 Neil Little             nmlittle
 Nick Rart               nickrart                comestible
diff --git a/docs/changelog.txt b/docs/changelog.txt
index dfda78c0b..e43abd188 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -41,6 +41,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `RemoteFortressReader`: fixed a couple crashes that could result from decoding invalid enum items (``site_realization_building_type`` and ``improvement_type``)
 
 ## Misc Improvements
+- `blueprint`: now writes blueprints to the ``blueprints/`` subfolder instead of the df root folder
+- `blueprint`: now automatically creates folder trees when organizing blueprints into subfolders (e.g. ``blueprint 30 30 1 rooms/dining dig`` will create the file ``blueprints/rooms/dining-dig.csv``); previously it would fail if the ``blueprints/rooms/`` directory didn't already exist
 - `confirm`: added a confirmation dialog for convicting dwarves of crimes
 
 ## Ruby
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 678b7eec2..3dc461ee9 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -93,7 +93,8 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(automaterial automaterial.cpp)
     dfhack_plugin(automelt automelt.cpp)
     dfhack_plugin(autotrade autotrade.cpp)
-    dfhack_plugin(blueprint blueprint.cpp LINK_LIBRARIES lua)
+    # stdc++fs required for std::experimental::filesystem; once we move to c++17 this can be removed since it's in the STL there
+    dfhack_plugin(blueprint blueprint.cpp LINK_LIBRARIES lua stdc++fs)
     dfhack_plugin(burrows burrows.cpp LINK_LIBRARIES lua)
     dfhack_plugin(building-hacks building-hacks.cpp LINK_LIBRARIES lua)
     dfhack_plugin(buildingplan buildingplan.cpp LINK_LIBRARIES buildingplan-lib)
diff --git a/plugins/blueprint.cpp b/plugins/blueprint.cpp
index 9742b16e7..d7ce19334 100644
--- a/plugins/blueprint.cpp
+++ b/plugins/blueprint.cpp
@@ -3,6 +3,8 @@
 //Translates a region of tiles specified by the cursor and arguments/prompts into a series of blueprint files suitable for digfort/buildingplan/quickfort
 
 #include <algorithm>
+#include <experimental/filesystem> // This is just <filesystem> in c++17, but we're currently compiling with c++11
+#include <sstream>
 
 #include <Console.h>
 #include <PluginManager.h>
@@ -33,6 +35,8 @@ using std::pair;
 using namespace DFHack;
 using namespace df::enums;
 
+namespace filesystem = std::experimental::filesystem;
+
 DFHACK_PLUGIN("blueprint");
 
 enum phase {DIG=1, BUILD=2, PLACE=4, QUERY=8};
@@ -62,9 +66,10 @@ command_result help(color_ostream &out)
         << " defaults to generating all blueprints" << endl
         << endl
         << "blueprint translates a portion of your fortress into blueprints suitable for" << endl
-        << " digfort/fortplan/quickfort. Blueprints are created in the DF folder with names" << endl
-        << " following a \"name-phase.csv\" pattern. Translation starts at the current" << endl
-        << " cursor location and includes all tiles in the range specified." << endl;
+        << " digfort/fortplan/quickfort. Blueprints are created in the \"blueprints\"" << endl
+        << " subdirectory of the DF folder with names following a \"name-phase.csv\" pattern." << endl
+        << " Translation starts at the current cursor location and includes all tiles in the" << endl
+        << " range specified." << endl;
     return CR_OK;
 }
 
@@ -557,32 +562,52 @@ string get_tile_query(df::building* b)
     return " ";
 }
 
-command_result do_transform(DFCoord start, DFCoord end, string name, uint32_t phases)
+void init_stream(ofstream &out, filesystem::path basename, std::string target)
+{
+    filesystem::path out_path(basename);
+    out_path += "-";
+    out_path += target;
+    out_path += ".csv";
+    out.open(out_path, ofstream::trunc);
+    out << "#" << target << endl;
+}
+
+command_result do_transform(DFCoord start, DFCoord end, string name, uint32_t phases, std::ostringstream &err)
 {
     ofstream dig, build, place, query;
+
+    filesystem::path basename = "blueprints";
+    basename /= name;
+    basename.make_preferred();
+
+    // create output directory if it doesn't already exist
+    std::error_code ec;
+    if (!filesystem::create_directories(basename.parent_path(), ec) && ec)
+    {
+        err << "could not create output directory: " << basename.parent_path()
+            << " (" << ec.message() << ")";
+        return CR_FAILURE;
+    }
+
     if (phases & QUERY)
     {
         //query = ofstream((name + "-query.csv").c_str(), ofstream::trunc);
-        query.open(name+"-query.csv", ofstream::trunc);
-        query << "#query" << endl;
+        init_stream(query, basename, "query");
     }
     if (phases & PLACE)
     {
         //place = ofstream(name + "-place.csv", ofstream::trunc);
-        place.open(name+"-place.csv", ofstream::trunc);
-        place << "#place" << endl;
+        init_stream(place, basename, "place");
     }
     if (phases & BUILD)
     {
         //build = ofstream(name + "-build.csv", ofstream::trunc);
-        build.open(name+"-build.csv", ofstream::trunc);
-        build << "#build" << endl;
+        init_stream(build, basename, "build");
     }
     if (phases & DIG)
     {
         //dig = ofstream(name + "-dig.csv", ofstream::trunc);
-        dig.open(name+"-dig.csv", ofstream::trunc);
-        dig << "#dig" << endl;
+        init_stream(dig, basename, "dig");
     }
     if (start.x > end.x)
     {
@@ -675,18 +700,27 @@ command_result blueprint(color_ostream &out, vector<string> &parameters)
     }
     DFCoord start (x, y, z);
     DFCoord end (x + stoi(parameters[0]), y + stoi(parameters[1]), z + stoi(parameters[2]));
-    if (parameters.size() == 4)
-        return do_transform(start, end, parameters[3], DIG | BUILD | PLACE | QUERY);
     uint32_t option = 0;
-    if (cmd_option_exists(parameters, "dig"))
-        option |= DIG;
-    if (cmd_option_exists(parameters, "build"))
-        option |= BUILD;
-    if (cmd_option_exists(parameters, "place"))
-        option |= PLACE;
-    if (cmd_option_exists(parameters, "query"))
-        option |= QUERY;
-    return do_transform(start, end, parameters[3], option);
+    if (parameters.size() == 4)
+    {
+        option = DIG | BUILD | PLACE | QUERY;
+    }
+    else
+    {
+        if (cmd_option_exists(parameters, "dig"))
+            option |= DIG;
+        if (cmd_option_exists(parameters, "build"))
+            option |= BUILD;
+        if (cmd_option_exists(parameters, "place"))
+            option |= PLACE;
+        if (cmd_option_exists(parameters, "query"))
+            option |= QUERY;
+    }
+    std::ostringstream err;
+    DFHack::command_result result = do_transform(start, end, parameters[3], option, err);
+    if (result != CR_OK)
+        out.printerr("%s\n", err.str().c_str());
+    return result;
 }
 
 static int create(lua_State *L, uint32_t options) {
@@ -701,9 +735,12 @@ static int create(lua_State *L, uint32_t options) {
         luaL_argerror(L, 2, "invalid end position");
     string filename(lua_tostring(L, 3));
 
-    lua_pushboolean(L, do_transform(start, end, filename, options));
+    std::ostringstream err;
+    DFHack::command_result result = do_transform(start, end, filename, options, err);
+    if (result != CR_OK)
+        luaL_error(L, "%s", err.str().c_str());
+    lua_pushboolean(L, result);
     return 1;
-
 }
 
 static int dig(lua_State *L) {

From b18847d9516d892bd7a08f3b96152295fa0a47b6 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 15 Jul 2020 21:08:47 -0400
Subject: [PATCH 183/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 7be22b0d0..4881acf99 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 7be22b0d0d133c6dbadf700126ddeb08b7aa0ac5
+Subproject commit 4881acf99db08455bb1bc5472c301668d578f4db

From bca76b8fc6b23c1ca13acbd50930d900a9641592 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 15 Jul 2020 21:15:07 -0400
Subject: [PATCH 184/547] Remove excess/inconsistent padding from lists
 containing other lists

---
 docs/styles/dfhack.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/styles/dfhack.css b/docs/styles/dfhack.css
index daedd1120..a25772871 100644
--- a/docs/styles/dfhack.css
+++ b/docs/styles/dfhack.css
@@ -56,3 +56,8 @@ div.sphinxsidebar h3.logo-name a {
 div.body {
     min-width: unset;
 }
+
+div.body li > p {
+    margin-top: 0;
+    margin-bottom: 0;
+}

From ef53cac05b270bd6d1cda39ce245cbe822d13b93 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 15 Jul 2020 21:19:37 -0400
Subject: [PATCH 185/547] Improve chapter levels in the PDF build

"Quick links" was "Chapter 1", and everything else was nested under Chapter 2. This changes e.g. "2.6.5 DFHack Lua API" to "6.5: DFHack Lua API"
---
 conf.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf.py b/conf.py
index a46039126..d6c40b0a7 100644
--- a/conf.py
+++ b/conf.py
@@ -359,3 +359,5 @@ latex_documents = [
     (master_doc, 'DFHack.tex', 'DFHack Documentation',
      'The DFHack Team', 'manual'),
 ]
+
+latex_toplevel_sectioning = 'part'

From 470456583c2b605f21e9be3c8b3fcc9e79dacab0 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 15 Jul 2020 21:42:43 -0400
Subject: [PATCH 186/547] Document PDF build process and add a script for it

---
 .gitignore             |  1 +
 docs/Documentation.rst | 17 +++++++++++++++--
 docs/build-pdf.sh      | 23 +++++++++++++++++++++++
 docs/build.sh          | 11 +++++++----
 4 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100755 docs/build-pdf.sh

diff --git a/.gitignore b/.gitignore
index db4ed747c..9ff16b94c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ build/VC2010
 # Sphinx generated documentation
 docs/_*
 docs/html/
+docs/pdf/
 
 # in-place build
 build/Makefile
diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index 462932b0f..37fcc6ee6 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -236,9 +236,9 @@ Running Sphinx manually
 -----------------------
 
 You can also build the documentation without going through CMake, which may be
-faster. There is a ``docs/build.sh`` script available for Linux and macOS that
+faster. There is a ``docs/build.sh`` script provided for Linux and macOS that
 will run essentially the same command that CMake runs - see the script for
-options.
+additional options.
 
 To build the documentation with default options, run the following command from
 the root DFHack folder::
@@ -248,6 +248,19 @@ the root DFHack folder::
 Sphinx has many options to enable clean builds, parallel builds, logging, and
 more - run ``sphinx-build --help`` for details.
 
+Building a PDF version
+----------------------
+
+ReadTheDocs automatically builds a PDF version of the documentation (available
+under the "Downloads" section when clicking on the release selector). If you
+want to build a PDF version locally, you will need ``pdflatex``, which is part
+of a TeX distribution. The following command will then build a PDF, located in
+``docs/pdf/latex/DFHack.pdf``, with default options::
+
+  sphinx-build -M latexpdf . ./docs/pdf
+
+There is a ``docs/build-pdf.sh`` script provided for Linux and macOS that runs
+this command for convenience - see the script for additional options.
 
 .. _build-changelog:
 
diff --git a/docs/build-pdf.sh b/docs/build-pdf.sh
new file mode 100755
index 000000000..76908b49b
--- /dev/null
+++ b/docs/build-pdf.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# usage:
+#   ./build-pdf.sh
+#   SPHINX=/path/to/sphinx-build ./build-pdf.sh
+#   JOBS=3 ./build-pdf.sh ...
+# all command-line arguments are passed directly to sphinx-build - run
+# ``sphinx-build --help`` for a list, or see
+# https://www.sphinx-doc.org/en/master/man/sphinx-build.html
+
+cd $(dirname "$0")
+cd ..
+
+sphinx=sphinx-build
+if [ -n "$SPHINX" ]; then
+    sphinx=$SPHINX
+fi
+
+if [ -z "$JOBS" ]; then
+    JOBS=2
+fi
+
+"$sphinx" -M latexpdf . ./docs/pdf -w ./docs/_sphinx-warnings.txt -j "$JOBS" "$@"
diff --git a/docs/build.sh b/docs/build.sh
index 48e1bfd4a..95a97e539 100755
--- a/docs/build.sh
+++ b/docs/build.sh
@@ -1,9 +1,12 @@
 #!/bin/sh
 
 # usage:
-# ./build.sh
-# ./build.sh sphinx-executable
-# JOBS=3 ./build.sh ...
+#   ./build.sh
+#   SPHINX=/path/to/sphinx-build ./build.sh
+#   JOBS=3 ./build.sh ...
+# all command-line arguments are passed directly to sphinx-build - run
+# ``sphinx-build --help`` for a list, or see
+# https://www.sphinx-doc.org/en/master/man/sphinx-build.html
 
 cd $(dirname "$0")
 cd ..
@@ -17,4 +20,4 @@ if [ -z "$JOBS" ]; then
     JOBS=2
 fi
 
-"$sphinx" -a -E -b html . ./docs/html -w ./docs/_sphinx-warnings.txt -j "$JOBS" "$@"
+"$sphinx" -a -b html . ./docs/html -w ./docs/_sphinx-warnings.txt -j "$JOBS" "$@"

From c19fc1f34903f15e915fa730af6d9ed53f5fc93c Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Wed, 15 Jul 2020 21:35:21 -0700
Subject: [PATCH 187/547] gcc-4.8 compatibility

---
 library/LuaApi.cpp                   |  1 +
 library/include/modules/Filesystem.h |  1 +
 library/modules/Filesystem.cpp       | 31 ++++++++++++++++++++++++++++
 plugins/CMakeLists.txt               |  3 +--
 plugins/blueprint.cpp                | 31 ++++++++++++++--------------
 5 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 1d127930e..b1dc3de0b 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -2365,6 +2365,7 @@ static const LuaWrapper::FunctionReg dfhack_filesystem_module[] = {
     WRAPM(Filesystem, getcwd),
     WRAPM(Filesystem, chdir),
     WRAPM(Filesystem, mkdir),
+    WRAPM(Filesystem, mkdir_recursive),
     WRAPM(Filesystem, rmdir),
     WRAPM(Filesystem, exists),
     WRAPM(Filesystem, isfile),
diff --git a/library/include/modules/Filesystem.h b/library/include/modules/Filesystem.h
index bc7a02337..bc0953d27 100644
--- a/library/include/modules/Filesystem.h
+++ b/library/include/modules/Filesystem.h
@@ -149,6 +149,7 @@ namespace DFHack {
         DFHACK_EXPORT bool chdir (std::string path);
         DFHACK_EXPORT std::string getcwd ();
         DFHACK_EXPORT bool mkdir (std::string path);
+        DFHACK_EXPORT bool mkdir_recursive (std::string path);
         DFHACK_EXPORT bool rmdir (std::string path);
         DFHACK_EXPORT bool stat (std::string path, STAT_STRUCT &info);
         DFHACK_EXPORT bool exists (std::string path);
diff --git a/library/modules/Filesystem.cpp b/library/modules/Filesystem.cpp
index 430e6351e..373b403c8 100644
--- a/library/modules/Filesystem.cpp
+++ b/library/modules/Filesystem.cpp
@@ -82,6 +82,37 @@ bool Filesystem::mkdir (std::string path)
     return fail == 0;
 }
 
+static bool mkdir_recursive_impl (std::string path)
+{
+    size_t last_slash = path.find_last_of("/");
+    if (last_slash != std::string::npos)
+    {
+        std::string parent_path = path.substr(0, last_slash);
+        bool parent_exists = mkdir_recursive_impl(parent_path);
+        if (!parent_exists)
+        {
+            return false;
+        }
+    }
+    return Filesystem::mkdir(path) || errno == EEXIST;
+}
+
+bool Filesystem::mkdir_recursive (std::string path)
+{
+#ifdef _WIN32
+    // normalize to forward slashes
+    std::replace(path.begin(), path.end(), '\\', '/');
+#endif
+
+    if (path.size() > PATH_MAX)
+    {
+        // path too long
+        return false;
+    }
+
+    return mkdir_recursive_impl(path);
+}
+
 bool Filesystem::rmdir (std::string path)
 {
     int fail;
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 3dc461ee9..678b7eec2 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -93,8 +93,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(automaterial automaterial.cpp)
     dfhack_plugin(automelt automelt.cpp)
     dfhack_plugin(autotrade autotrade.cpp)
-    # stdc++fs required for std::experimental::filesystem; once we move to c++17 this can be removed since it's in the STL there
-    dfhack_plugin(blueprint blueprint.cpp LINK_LIBRARIES lua stdc++fs)
+    dfhack_plugin(blueprint blueprint.cpp LINK_LIBRARIES lua)
     dfhack_plugin(burrows burrows.cpp LINK_LIBRARIES lua)
     dfhack_plugin(building-hacks building-hacks.cpp LINK_LIBRARIES lua)
     dfhack_plugin(buildingplan buildingplan.cpp LINK_LIBRARIES buildingplan-lib)
diff --git a/plugins/blueprint.cpp b/plugins/blueprint.cpp
index d7ce19334..4653b469c 100644
--- a/plugins/blueprint.cpp
+++ b/plugins/blueprint.cpp
@@ -3,7 +3,6 @@
 //Translates a region of tiles specified by the cursor and arguments/prompts into a series of blueprint files suitable for digfort/buildingplan/quickfort
 
 #include <algorithm>
-#include <experimental/filesystem> // This is just <filesystem> in c++17, but we're currently compiling with c++11
 #include <sstream>
 
 #include <Console.h>
@@ -11,6 +10,7 @@
 #include "LuaTools.h"
 
 #include "modules/Buildings.h"
+#include "modules/Filesystem.h"
 #include "modules/Gui.h"
 #include "modules/MapCache.h"
 
@@ -35,8 +35,6 @@ using std::pair;
 using namespace DFHack;
 using namespace df::enums;
 
-namespace filesystem = std::experimental::filesystem;
-
 DFHACK_PLUGIN("blueprint");
 
 enum phase {DIG=1, BUILD=2, PLACE=4, QUERY=8};
@@ -562,13 +560,11 @@ string get_tile_query(df::building* b)
     return " ";
 }
 
-void init_stream(ofstream &out, filesystem::path basename, std::string target)
+void init_stream(ofstream &out, std::string basename, std::string target)
 {
-    filesystem::path out_path(basename);
-    out_path += "-";
-    out_path += target;
-    out_path += ".csv";
-    out.open(out_path, ofstream::trunc);
+    std::ostringstream out_path;
+    out_path << basename << "-" << target << ".csv";
+    out.open(out_path.str(), ofstream::trunc);
     out << "#" << target << endl;
 }
 
@@ -576,16 +572,21 @@ command_result do_transform(DFCoord start, DFCoord end, string name, uint32_t ph
 {
     ofstream dig, build, place, query;
 
-    filesystem::path basename = "blueprints";
-    basename /= name;
-    basename.make_preferred();
+    std::string basename = "blueprints/" + name;
+
+#ifdef _WIN32
+    // normalize to forward slashes
+    std::replace(basename.begin(), basename.end(), '\\', '/');
+#endif
+
+    size_t last_slash = basename.find_last_of("/");
+    std::string parent_path = basename.substr(0, last_slash);
 
     // create output directory if it doesn't already exist
     std::error_code ec;
-    if (!filesystem::create_directories(basename.parent_path(), ec) && ec)
+    if (!Filesystem::mkdir_recursive(parent_path))
     {
-        err << "could not create output directory: " << basename.parent_path()
-            << " (" << ec.message() << ")";
+        err << "could not create output directory: '" << parent_path << "'";
         return CR_FAILURE;
     }
 

From 1ae341b637375432c94aa29cf828c41a47d0322c Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Wed, 15 Jul 2020 22:02:12 -0700
Subject: [PATCH 188/547] Check that we created a dir before we return true

---
 library/modules/Filesystem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/modules/Filesystem.cpp b/library/modules/Filesystem.cpp
index 373b403c8..87001f6dd 100644
--- a/library/modules/Filesystem.cpp
+++ b/library/modules/Filesystem.cpp
@@ -94,7 +94,7 @@ static bool mkdir_recursive_impl (std::string path)
             return false;
         }
     }
-    return Filesystem::mkdir(path) || errno == EEXIST;
+    return (Filesystem::mkdir(path) || errno == EEXIST) && Filesystem::isdir(path);
 }
 
 bool Filesystem::mkdir_recursive (std::string path)

From c0d10b9e448d62a5abab4d0b7be648d911e7fc0a Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 16 Jul 2020 01:49:16 -0400
Subject: [PATCH 189/547] Update submodules

---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index b9028b0bb..2c21bf250 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit b9028b0bb9ad40d3ad4dc3f10934bb61aa16629b
+Subproject commit 2c21bf2503751fae87cfd62e9608003b5f0dc1c5
diff --git a/scripts b/scripts
index 4881acf99..af749e708 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 4881acf99db08455bb1bc5472c301668d578f4db
+Subproject commit af749e7086739a058cd5095a6ee1a60d7e795a7c

From bb1fcff410a5af6964fc5d7c3fb2f69dc2bccbcb Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 16 Jul 2020 08:33:23 -0700
Subject: [PATCH 190/547] use FILENAME_MAX instead of PATH_MAX for compat

---
 library/modules/Filesystem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/modules/Filesystem.cpp b/library/modules/Filesystem.cpp
index 87001f6dd..227bb57b6 100644
--- a/library/modules/Filesystem.cpp
+++ b/library/modules/Filesystem.cpp
@@ -104,7 +104,7 @@ bool Filesystem::mkdir_recursive (std::string path)
     std::replace(path.begin(), path.end(), '\\', '/');
 #endif
 
-    if (path.size() > PATH_MAX)
+    if (path.size() > FILENAME_MAX)
     {
         // path too long
         return false;

From 0afbe9d9319c6026025dbdf0ddf86e350699dfbb Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 16 Jul 2020 08:42:39 -0700
Subject: [PATCH 191/547] include algorithm on windows for std::replace

---
 library/modules/Filesystem.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/modules/Filesystem.cpp b/library/modules/Filesystem.cpp
index 227bb57b6..ddc091525 100644
--- a/library/modules/Filesystem.cpp
+++ b/library/modules/Filesystem.cpp
@@ -45,6 +45,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#include <algorithm>
 #include <string>
 
 #include "modules/Filesystem.h"

From 6cafd230c5f12a0bb4d0ad0dd4d56ea4b72a270a Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 16 Jul 2020 22:42:36 -0400
Subject: [PATCH 192/547] Link to bug from docs (#1585)

---
 docs/Plugins.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index e3c9ec9c1..ee0aa074c 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -335,7 +335,7 @@ Subcommands that persist until disabled or DF quits:
 :stone-status-all:      Adds an option to toggle the economic status of all stones
 :title-start-rename:    Adds a safe rename option to the title screen "Start Playing" menu
 :tradereq-pet-gender:   Displays pet genders on the trade request screen
-:reaction-gloves:       Fixes reactions to produce gloves in sets with correct handedness
+:reaction-gloves:       Fixes reactions to produce gloves in sets with correct handedness (:bug:`6273`)
 
 .. _fix-armory:
 

From 56e43a0dde023c5a4595a22b29d800153b31e3c4 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 16 Jul 2020 23:19:38 -0400
Subject: [PATCH 193/547] Linux: make Process::getPath (and dfhack.getDFPath())
 not depend on cwd, for consistency with other platforms

---
 docs/changelog.txt        |  1 +
 library/Process-linux.cpp | 31 ++++++++++++++++++++++++-------
 test/core.lua             | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 7 deletions(-)
 create mode 100644 test/core.lua

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 2bc506565..15a4383ca 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -39,6 +39,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Fixes
 - Fixed a segfault when attempting to start a headless session with a graphical PRINT_MODE setting
 - Fixed an issue with the macOS launcher failing to un-quarantine some files
+- Linux: fixed ``dfhack.getDFPath()`` (Lua) and ``Process::getPath()`` (C++) to always return the DF root path, even if the working directory has changed
 - `labormanager`: fixed handling of new jobs in 0.47
 - `embark-assistant`: fixed a couple of incursion handling bugs.
 - Fixed ``Units::isEggLayer``, ``Units::isGrazer``, ``Units::isMilkable``, ``Units::isTrainableHunting``, ``Units::isTrainableWar``, and ``Units::isTamable`` ignoring the unit's caste
diff --git a/library/Process-linux.cpp b/library/Process-linux.cpp
index a7f09a7f6..45e655948 100644
--- a/library/Process-linux.cpp
+++ b/library/Process-linux.cpp
@@ -23,11 +23,12 @@ distribution.
 */
 
 #include "Internal.h"
+
 #include <dirent.h>
 #include <errno.h>
-#include <unistd.h>
 #include <sys/mman.h>
 #include <sys/time.h>
+#include <unistd.h>
 
 #include <string>
 #include <vector>
@@ -180,12 +181,28 @@ uint32_t Process::getTickCount()
 
 string Process::getPath()
 {
-    const char * cwd_name = "/proc/self/cwd";
-    char target_name[1024];
-    int target_result;
-    target_result = readlink(cwd_name, target_name, sizeof(target_name));
-    target_name[target_result] = '\0';
-    return(string(target_name));
+    static string cached_path;
+    if (cached_path.empty())
+    {
+        const char *exe_name = "/proc/self/exe";
+        char exe_path[1024];
+        int length = readlink(exe_name, exe_path, sizeof(exe_path));
+        if (length > 0)
+        {
+            exe_path[length] = '\0';
+            string path_string = exe_path;
+            // DF lives in libs, so move up a folder
+            cached_path = path_string.substr(0, path_string.find_last_of("/", path_string.find_last_of("/") - 1));
+        }
+        else
+        {
+            perror("readlink(/proc/self/exe) failed");
+            fprintf(stderr, "  length=%i\n", length);
+            cached_path = ".";
+        }
+        fprintf(stderr, "Resolved DF root to %s\n", cached_path.c_str());
+    }
+    return cached_path;
 }
 
 int Process::getPID()
diff --git a/test/core.lua b/test/core.lua
new file mode 100644
index 000000000..6cde334d4
--- /dev/null
+++ b/test/core.lua
@@ -0,0 +1,34 @@
+local function clean_path(p)
+    -- todo: replace with dfhack.filesystem call?
+    return p:gsub('\\', '/'):gsub('//', '/'):gsub('/$', '')
+end
+
+local fs = dfhack.filesystem
+local old_cwd = clean_path(fs.getcwd())
+local function restore_cwd()
+    fs.chdir(old_cwd)
+end
+
+function test.getDFPath()
+    expect.eq(clean_path(dfhack.getDFPath()), old_cwd)
+end
+
+function test.getDFPath_chdir()
+    dfhack.with_finalize(restore_cwd, function()
+        fs.chdir('data')
+        expect.eq(clean_path(dfhack.getDFPath()), old_cwd)
+        expect.ne(clean_path(dfhack.getDFPath()), clean_path(fs.getcwd()))
+    end)
+end
+
+function test.getHackPath()
+    expect.eq(clean_path(dfhack.getHackPath()), clean_path(dfhack.getDFPath() .. '/hack/'))
+end
+
+function test.getHackPath_chdir()
+    dfhack.with_finalize(restore_cwd, function()
+        fs.chdir('hack')
+        expect.eq(clean_path(dfhack.getHackPath()), clean_path(old_cwd .. '/hack/'))
+        expect.eq(clean_path(dfhack.getHackPath()), clean_path(fs.getcwd()))
+    end)
+end

From c858f33f61b44a1ee08a4adc2feb14fdaf6036d6 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 17 Jul 2020 00:00:57 -0400
Subject: [PATCH 194/547] reaction-gloves: fix warnings

---
 plugins/tweak/tweaks/reaction-gloves.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/tweak/tweaks/reaction-gloves.h b/plugins/tweak/tweaks/reaction-gloves.h
index 82890239c..4f55f77b7 100644
--- a/plugins/tweak/tweaks/reaction-gloves.h
+++ b/plugins/tweak/tweaks/reaction-gloves.h
@@ -22,7 +22,7 @@ struct reaction_gloves_hook : df::reaction_product_itemst {
         // Examine creator unit's body plan, see how many hands it has
         // Count left hands and right hands, as well as "neutral" hands for compatibility
         int num_hands = 0, num_left = 0, num_right = 0;
-        for (int i = 0; i < unit->body.body_plan->body_parts.size(); i++)
+        for (size_t i = 0; i < unit->body.body_plan->body_parts.size(); i++)
         {
             df::body_part_raw *part = unit->body.body_plan->body_parts[i];
             if (part->flags.is_set(df::body_part_raw_flags::GRASP))
@@ -57,7 +57,7 @@ struct reaction_gloves_hook : df::reaction_product_itemst {
         num_right *= quantity;
 
         // Iterate across the output gloves, set their handedness, then append them to the actual out_items list for DF
-        for (int i = 0; i < out_items_temp.size(); i++)
+        for (size_t i = 0; i < out_items_temp.size(); i++)
         {
             // Do left gloves first, then right gloves, then "neutral" ones last
             // This is important for the "createitem" plugin, which contains similar workaround logic
@@ -76,4 +76,4 @@ struct reaction_gloves_hook : df::reaction_product_itemst {
     }
 };
 
-IMPLEMENT_VMETHOD_INTERPOSE(reaction_gloves_hook, produce);
\ No newline at end of file
+IMPLEMENT_VMETHOD_INTERPOSE(reaction_gloves_hook, produce);

From 0cc6f40bd6bb936665edd4e8f6ca3fb507476796 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 17 Jul 2020 17:35:09 -0400
Subject: [PATCH 195/547] Update API docs (#1607)

---
 docs/Lua API.rst   | 5 +++++
 docs/changelog.txt | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 2cfaff350..c62d0f379 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -2093,6 +2093,11 @@ unless otherwise noted.
 
   Creates a new directory. Returns ``false`` if unsuccessful, including if ``path`` already exists.
 
+* ``dfhack.filesystem.mkdir_recursive(path)``
+
+  Creates a new directory, including any intermediate directories that don't exist yet.
+  Returns ``true`` if the folder was created or already existed, or ``false`` if unsuccessful.
+
 * ``dfhack.filesystem.rmdir(path)``
 
   Removes a directory. Only works if the directory is already empty.
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 6db43ad64..9d03b1f0a 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -50,6 +50,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `blueprint`: now automatically creates folder trees when organizing blueprints into subfolders (e.g. ``blueprint 30 30 1 rooms/dining dig`` will create the file ``blueprints/rooms/dining-dig.csv``); previously it would fail if the ``blueprints/rooms/`` directory didn't already exist
 - `confirm`: added a confirmation dialog for convicting dwarves of crimes
 
+## API
+- Added ``Filesystem::mkdir_recursive``
+
 ## Lua
 - Added a ``ref_target`` field to primitive field references, corresponding to the ``ref-target`` XML attribute
 

From a0c514b117d939a53d4ed9f0cc0f7bca5b4437e1 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 17 Jul 2020 17:35:33 -0400
Subject: [PATCH 196/547] Update xml

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index 2c21bf250..7822df15e 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 2c21bf2503751fae87cfd62e9608003b5f0dc1c5
+Subproject commit 7822df15ed44ca9e68d7270329ffd54dd7744977

From 128050c68435eb9633aac4af35070f57fd25e55c Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 18 Jul 2020 03:16:52 -0400
Subject: [PATCH 197/547] Move installation docs to a separate document and
 expand

---
 docs/Installing.rst   | 132 ++++++++++++++++++++++++++++++++++++++++++
 docs/Introduction.rst |  46 +++------------
 index.rst             |   1 +
 3 files changed, 142 insertions(+), 37 deletions(-)
 create mode 100644 docs/Installing.rst

diff --git a/docs/Installing.rst b/docs/Installing.rst
new file mode 100644
index 000000000..92e5cfa0a
--- /dev/null
+++ b/docs/Installing.rst
@@ -0,0 +1,132 @@
+.. _installing:
+
+=================
+Installing DFHack
+=================
+
+.. contents::
+    :local:
+
+
+Requirements
+============
+
+DFHack supports Windows, Linux, and macOS, and both 64-bit and 32-bit builds
+of Dwarf Fortress.
+
+.. _installing-df-version:
+
+DFHack releases generally only support the version of Dwarf Fortress that they
+are named after. For example, DFHack 0.40.24-r5 only supported DF 0.40.24.
+DFHack releases *never* support newer versions of DF, because DFHack requires
+data about DF that is only possible to obtain after DF has been released.
+Occasionally, DFHack releases will be able to maintain support for older
+versions of DF - for example, DFHack 0.34.11-r5 supported both DF 0.34.11 and
+0.34.10. For maximum stability, you should usually use the latest versions of
+both DF and DFHack.
+
+Windows
+-------
+
+* DFHack only supports the SDL version of Dwarf Fortress. The "legacy" version
+  will *not* work with DFHack (the "small" SDL version is acceptable, however).
+* Windows XP and older are *not* supported, due in part to a
+  `Visual C++ 2015 bug <https://stackoverflow.com/questions/32452777/visual-c-2015-express-stat-not-working-on-windows-xp>`_
+
+The Windows build of DFHack should work under Wine on other operating systems,
+although this is not tested very often. It is recommended to use the native
+build for your operating system instead.
+
+.. _installing-reqs-linux:
+
+Linux
+-----
+
+Generally, DFHack should work on any modern Linux distribution. There are
+multiple release binaries provided - as of DFHack 0.47.04-r1, there are built
+with GCC 7 and GCC 4.8 (as indicated by the ``gcc`` component of their
+filenames). Using the newest build that works on your system is recommended.
+The GCC 4.8 build is built on Ubuntu 14.04 and targets an older glibc, so it
+should work on older distributions.
+
+In the event that none of the provided binaries work on your distribution,
+you may need to `compile DFHack from source <compile>`.
+
+macOS
+-----
+
+OS X 10.6.8 or later is required.
+
+
+.. _downloading:
+
+Downloading DFHack
+==================
+
+Stable builds of DFHack are available on `GitHub <https://github.com/dfhack/dfhack/releases>`_.
+GitHub has been known to change their layout periodically, but as of July 2020,
+downloads are available at the bottom of the release notes for each release, under a section
+named "Assets" (which you may have to expand). The name of the file indicates
+which DF version, platform, and architecture the build supports - the platform
+and architecture (64-bit or 32-bit) **must** match your build of DF. The DF
+version should also match your DF version - see `above <installing-df-version>`
+for details. For example:
+
+* ``dfhack-0.47.04-r1-Windows-64bit.zip`` supports 64-bit DF on Windows
+* ``dfhack-0.47.04-r1-Linux-32bit-gcc-7.tar.bz2`` supports 32-bit DF on Linux
+  (see `installing-reqs-linux` for details on the GCC version indicator)
+
+The `DFHack website <https://dfhack.org/builds>`_ also provides links to
+unstable builds. These files have a different naming scheme, but the same
+restrictions apply (e.g. a file named ``Windows64`` is for 64-bit Windows DF).
+
+.. warning::
+
+    Do *not* download the source code from GitHub, either from the releases page
+    or by clicking "Download ZIP" on the repo homepage. This will give you an
+    incomplete copy of the DFHack source code, which will not work as-is. (If
+    you want to compile DFHack instead of using a pre-built release, see
+    `compile` for instructions.)
+
+Installing DFHack
+=================
+
+When you `download DFHack <downloading>`, you will end up with a release archive
+(a ``.zip`` file on Windows, or a ``.tar.bz2`` file on other platforms). Your
+operating system should have built-in utilities capable of extracting files from
+these archives.
+
+The release archives contain several files and folders, including a ``hack``
+folder, a ``dfhack-config`` folder, and a ``dfhack.init-example`` file. All
+files from the DFHack archive need to be copied into the root DF folder, which
+should already include a ``data`` folder and a ``raw`` folder, among other
+things. Some packs and other redistributions of Dwarf Fortress may place DF in
+another folder, so ensure that the ``hack`` folder ends up next to the ``data``
+folder.
+
+.. note::
+
+    On Windows, installing DFHack will overwrite ``SDL.dll``. This is
+    intentional and necessary for DFHack to work, so be sure to choose to
+    overwrite ``SDL.dll`` if prompted. (If you are not prompted, you may be
+    installing DFHack in the wrong place.)
+
+
+Uninstalling DFHack
+===================
+
+Uninstalling DFHack essentially involves reversing what you did to install
+DFHack. On Windows, replace ``SDL.dll`` with ``SDLreal.dll`` first. Then, you
+can remove any files that were part of the DFHack archive. DFHack does not
+currently maintain a list of these files, so if you want to completely remove
+them, you should consult the DFHack archive that you installed for a full list.
+Generally, any files left behind should not negatively affect DF.
+
+Pre-packaged DFHack installations
+=================================
+
+There are :wiki:`several packs available <Utility:Lazy_Newb_Pack>` that include
+DF, DFHack, and other utilities. If you are new to Dwarf Fortress and DFHack,
+these may be easier to set up. Note that these packs are not maintained by the
+DFHack team and vary in their release schedules and contents. Some may make
+significant configuration changes, and some may not include DFHack at all.
diff --git a/docs/Introduction.rst b/docs/Introduction.rst
index 4490086f3..7d510422f 100644
--- a/docs/Introduction.rst
+++ b/docs/Introduction.rst
@@ -35,47 +35,19 @@ allows easier development of new tools.  As an open-source project under
   :local:
 
 
-.. _installing:
-
-Installing DFHack
-=================
-DFHack is available for the SDL version of Dwarf Fortress on Windows,
-any modern Linux distribution, and Mac OS X (10.6.8 and later).
-It is possible to use Windows DF+DFHack under Wine on Linux or OS X.
-
-Most releases only support the version of DF mentioned in their title - for
-example, DFHack 0.40.24-r2 only supports DF 0.40.24 - but some releases
-support earlier DF versions as well.  Wherever possible, use the latest version
-of DFHack built for the target version of DF.
-
-Installing DFhack involves copying files from a release archive
-into your DF folder, so that:
-
-* On Windows, ``SDL.dll`` is replaced
-* On Linux or OS X, the ``dfhack`` script is placed in the same folder as the ``df`` script
-
-Uninstalling is basically the same, in reverse:
-
-* On Windows, replace ``SDL.dll`` with ``SDLreal.dll``, then remove the DFHack files.
-* On Linux or OS X, remove the DFHack files.
-
-New players may wish to :wiki:`get a pack <Utility:Lazy_Newb_Pack>`
-with DFHack preinstalled.
-
-
 Getting started
 ===============
-DFHack basically extends DF with something similar to the
-console found in many PC games.
+See `installing` for details on installing DFHack.
 
-If DFHack is installed correctly, it will automatically pop up a console
-window once DF is started as usual on Windows. Linux and Mac OS X require
-running the dfhack script from the terminal, and will use that terminal for
-the console.
+Once DFHack is installed, it extends DF with a console that can be used to run
+commands. On Windows, this console will open automatically when DF is started.
+On Linux and macOS, you will need to run the ``dfhack`` script from a terminal
+(instead of the ``df`` script included with DF), and that terminal will be
+used by the DFHack console.
 
-* Basic interaction with dfhack involves entering commands into the console.
-  To learn what commands are available, you can keep reading this documentation
-  or skip ahead and use the `ls` and `help` commands.
+* Basic interaction with DFHack involves entering commands into the console. To
+  learn what commands are available, you can keep reading this documentation or
+  skip ahead and use the `ls` and `help` commands.
 
 * Another way to interact with DFHack is to set in-game `keybindings <keybinding>`
   for certain commands.  Many of the newer and user-friendly tools are designed
diff --git a/index.rst b/index.rst
index 91c883b51..d0e90b741 100644
--- a/index.rst
+++ b/index.rst
@@ -27,6 +27,7 @@ User Manual
    :maxdepth: 2
 
    /docs/Introduction
+   /docs/Installing
    /docs/Core
    /docs/Plugins
    /docs/Scripts

From 88dffd6474a0dffe57fedd69f13736a76a3b146e Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 18 Jul 2020 08:54:24 -0700
Subject: [PATCH 198/547] quickfort files and docs

---
 .gitignore                             |   1 +
 CMakeLists.txt                         |   1 +
 data/CMakeLists.txt                    |   2 +
 data/blueprints/README.txt             |  14 +++
 data/blueprints/library/square-dig.csv |   4 +
 data/quickfort/aliases-common.txt      | 135 +++++++++++++++++++++++++
 data/quickfort/materials-common.txt    |   8 ++
 dfhack-config/quickfort/aliases.txt    |  30 ++++++
 dfhack-config/quickfort/materials.txt  |   9 ++
 dfhack-config/quickfort/quickfort.txt  |  20 ++++
 10 files changed, 224 insertions(+)
 create mode 100644 data/CMakeLists.txt
 create mode 100644 data/blueprints/README.txt
 create mode 100644 data/blueprints/library/square-dig.csv
 create mode 100644 data/quickfort/aliases-common.txt
 create mode 100644 data/quickfort/materials-common.txt
 create mode 100644 dfhack-config/quickfort/aliases.txt
 create mode 100644 dfhack-config/quickfort/materials.txt
 create mode 100644 dfhack-config/quickfort/quickfort.txt

diff --git a/.gitignore b/.gitignore
index 9ff16b94c..4b533ab20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ build/Makefile
 build/CMakeCache.txt
 build/cmake_install.cmake
 build/CMakeFiles
+build/data
 build/doc
 build/lua
 build/bin
diff --git a/CMakeLists.txt b/CMakeLists.txt
index de0c858af..44d6a02ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -429,6 +429,7 @@ if(BUILD_PLUGINS)
     add_subdirectory(plugins)
 endif()
 
+add_subdirectory(data)
 add_subdirectory(scripts)
 
 find_package(Sphinx QUIET)
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
new file mode 100644
index 000000000..19acb9261
--- /dev/null
+++ b/data/CMakeLists.txt
@@ -0,0 +1,2 @@
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/blueprints/ DESTINATION blueprints)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/quickfort/ DESTINATION "${DFHACK_DATA_DESTINATION}/data/quickfort")
diff --git a/data/blueprints/README.txt b/data/blueprints/README.txt
new file mode 100644
index 000000000..2096476c5
--- /dev/null
+++ b/data/blueprints/README.txt
@@ -0,0 +1,14 @@
+This directory is for quickfort blueprints. You can apply them to your fortress
+map with the DFHack quickfort plugin. See
+https://docs.dfhack.org/en/stable/docs/Scripts.html#quickfort for details.
+
+You can create blueprints by hand or by using any spreadsheet application,
+saving them as .xlsx or .csv files. You can also build your plan "for real" in
+Dwarf Fortress, and then export your map using the DFHack blueprint for later
+replay in a different fort. See
+https://docs.dfhack.org/en/stable/docs/Plugins.html#blueprint for more info.
+
+DFHack blueprints follow the original Quickfort 2.0 syntax. See
+https://github.com/joelpt/quickfort for joelpt's excellent documentation.
+
+There are many ready-to-use examples of blueprints in the library subfolder.
diff --git a/data/blueprints/library/square-dig.csv b/data/blueprints/library/square-dig.csv
new file mode 100644
index 000000000..328710ddb
--- /dev/null
+++ b/data/blueprints/library/square-dig.csv
@@ -0,0 +1,4 @@
+#dig start(2,2)
+d,d,d
+d, ,d
+d,d,d
diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt
new file mode 100644
index 000000000..b4e19c782
--- /dev/null
+++ b/data/quickfort/aliases-common.txt
@@ -0,0 +1,135 @@
+# quickfort aliases common baseline configuration file
+#
+# Defines custom keycode shortcuts for blueprints. Please DO NOT EDIT this file
+# directly. Instead, custom aliases should be added to
+# dfhack-config/quickfort/aliases.txt.
+#
+# Syntax:
+#   aliasname: keystrokes
+#
+# Special keys:
+#   {Right}, {Left}, {Up}, {Down}, >, < move the DF cursor
+#   {/}, {*}, {+}, {-} can be used to navigate some DF menus
+#   {Enter}, +{Enter}, {ExitMenu} - Enter, Shift+Enter, and Escape, respectively
+#   {Wait} pauses playback briefly
+#
+# Special keys can be repeated by adding a number inside the curly braces, for
+# example: {Down 5}
+#
+# Some shorthand:
+#   &   expands to {Enter}
+#   @   expands to +{Enter}
+#   ^   expands to {ExitMenu}
+#   %   expands to {Wait}
+#
+# The aliases in this file were tested in DF 0.47.04 on 2020 Jul 18.
+
+##################################
+# food stockpile adjustments
+##################################
+
+seeds: s{Down}deb{Right}{Down 9}p^
+noseeds: s{Down}dea{Right}{Down 9}f^
+booze: s{Down}deb{Right}{Down 5}p{Down}p^
+food: s{Down}dea{Right}{Down 5}f{Down}f{Down 3}f^
+plants: s{Down}deb{Right}{Down 4}p^
+
+##################################
+# refuse stockpile adjustments
+##################################
+
+corpses: s{Down 4}deb{Right 2}&{Down 2}&{Left}{Down}p{Down}p^
+bones: s{Down 4}deb{Right}{Down 3}p{Down}p^
+rawhides: s{Down 4}deb{Right 2}{Down}&^
+tannedhides: s{Down 4}deb{Right 2}{Down 53}&^
+
+##################################
+# stone stockpile adjustments
+##################################
+
+metal: s{Down 5}deb{Right}p^
+nometal: s{Down 5}dea{Right}f^
+bauxite: s{Down 5}deb{Right}{Down 2}{Right}{Down 42}&^
+
+# Only use nobauxite on stone piles that you want to accept all "Other Stone" on.
+# This alias works by permitting all "Other Stone",then forbidding just bauxite.
+# Thus you wouldn't want to use this on a metal-only pile, for example.
+nobauxite: s{Down 5}{Right}{Down 2}p{Right}{Down 42}&^
+
+##################################
+# misc stockpile adjustments
+##################################
+
+# Artifacts-only stockpile, usable on any type of existing pile.
+artifacts: sd{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down 4}deu{Right}{Up}f{Right}{Up}&{Left 2}{Down 4}e{Right}{Up}f{Right}{Up}&{Left 2}{Down 4}e{Right}{Up}f{Right}{Up}&{Left 2}{Down 4}e{Right}{Up}f{Right}{Up}&{Left 2}{Down}e{Right}{Up}f{Right}{Up}&{Left 2}^
+
+# Bans artifacts on any pile (or rather, allows items of any quality except Artifact quality).
+# This should be safe to run on any type of pile.
+noartifacts: sd{Down 2}{Right}{Up}fp{Right}{Up}&{Down 2}{Left 2}{Down 4}{Right}{Up}fp{Right}{Up}&{Down 2}{Left 2}{Down 4}{Right}{Up}fp{Right}{Up}&{Down 2}{Left 2}{Down 4}{Right}{Up}fp{Right}{Up}&{Down 2}{Left 2}{Down}{Right}{Up}fp{Right}{Up}&{Down 2}{Left 2}^
+
+# Set a finished goods stockpile to crappy low-quality trade goods only.
+# Position such a stockpile near fort entrances to (hopefully) let thieves steal low quality junk.
+junkgoods: s{Down 10}de{Right 2}&{Down 5}&{Down}&{Down}&{Down}&{Down 8}&{Down 2}&{Down}&{Down}&{Down}&{Down}&{Down}&{Left}{Down}f{Right}{Down}&{Down}&{Left}{Down}f{Down 2}f{Right}&{Down}&^
+
+##################################
+# farm plots
+##################################
+
+# Sets a farm plot to grow the LAST type of seed in the list of available seeds, for all 4 seasons.
+# The last seed is used because it's usually Plump helmet spawn, suitable for post-embark. If you
+# only have 1 seed type, that'll be grown.
+growlastcropall: a{/}&b{/}&c{/}&d{/}&
+
+# Like growlastcropall but grows the first one in the list instead.
+growfirstcropall: a&b&c&d&
+
+##################################
+# mining tracks
+##################################
+
+# The following aliases make it more convenient to build the various types of mine tracks.
+# For example, to build a north/south track 'Track (NS)', you would put trackNS in a cell(s).
+trackN: CT{Enter}
+trackS: CT{+ 1}{Enter}
+trackE: CT{+ 2}{Enter}
+trackW: CT{+ 3}{Enter}
+trackNS: CT{+ 4}{Enter}
+trackNE: CT{+ 5}{Enter}
+trackNW: CT{+ 6}{Enter}
+trackSE: CT{+ 7}{Enter}
+trackSW: CT{+ 8}{Enter}
+trackEW: CT{+ 9}{Enter}
+trackNSE: CT{+ 10}{Enter}
+trackNSW: CT{+ 11}{Enter}
+trackNEW: CT{+ 12}{Enter}
+trackSEW: CT{+ 13}{Enter}
+trackNSEW: CT{+ 14}{Enter}
+trackrampN: CT{+ 15}{Enter}
+trackrampS: CT{+ 15}{+ 1}{Enter}
+trackrampE: CT{+ 15}{+ 2}{Enter}
+trackrampW: CT{+ 15}{+ 3}{Enter}
+trackrampNS: CT{+ 15}{+ 4}{Enter}
+trackrampNE: CT{+ 15}{+ 5}{Enter}
+trackrampNW: CT{+ 15}{+ 6}{Enter}
+trackrampSE: CT{+ 15}{+ 7}{Enter}
+trackrampSW: CT{+ 15}{+ 8}{Enter}
+trackrampEW: CT{+ 15}{+ 9}{Enter}
+trackrampNSE: CT{+ 15}{+ 10}{Enter}
+trackrampNSW: CT{+ 15}{+ 11}{Enter}
+trackrampNEW: CT{+ 15}{+ 12}{Enter}
+trackrampSEW: CT{+ 15}{+ 13}{Enter}
+trackrampNSEW: CT{+ 15}{+ 14}{Enter}
+
+# Aliases for building track rollers; use e.g. rollerHqqq to make a low-speed horizontal roller
+rollerH: Mrs
+rollerV: Mr
+rollerNS: Mr
+rollerSN: Mrss
+rollerEW: Mrs
+rollerWE: Mrsss
+
+# Aliases for building track stops that dump in each of the four directions
+trackstopN: CSd
+trackstopS: CSdd
+trackstopE: CSddd
+trackstopW: CSdddd
diff --git a/data/quickfort/materials-common.txt b/data/quickfort/materials-common.txt
new file mode 100644
index 000000000..a9b388bdd
--- /dev/null
+++ b/data/quickfort/materials-common.txt
@@ -0,0 +1,8 @@
+# quickfort materials preference configuration file
+#
+# Defines forbidden materials and material preferences for build blueprints.
+# Please DO NOT EDIT this file directly. Instead, custom materials preferences
+# should be added to dfhack-config/quickfort/materials.txt.
+#
+# Syntax TBD
+
diff --git a/dfhack-config/quickfort/aliases.txt b/dfhack-config/quickfort/aliases.txt
new file mode 100644
index 000000000..52cdb2893
--- /dev/null
+++ b/dfhack-config/quickfort/aliases.txt
@@ -0,0 +1,30 @@
+# quickfort aliases configuration file
+#
+# Defines custom keycode shortcuts for blueprints. Definitions in this file take
+# precedence over any definitions in the baseline aliases configuration file at
+# hack/data/quickfort/aliases-common.txt. See that file for aliases that are
+# already defined.
+#
+# This file can be used to simplify repetitive tasks, such as building minecart
+# tracks or adjusting a food stockpile to accept seeds only. Making new aliases
+# is just a matter of mimicking the keys used to navigate through the menus and
+# select options.
+#
+# Syntax:
+#   aliasname: keystrokes
+#
+# Special keys:
+#   {Right}, {Left}, {Up}, {Down}, >, < move the DF cursor
+#   {/}, {*}, {+}, {-} can be used to navigate some DF menus
+#   {Enter}, +{Enter}, {ExitMenu} - Enter, Shift+Enter, and Escape, respectively
+#   {Wait} pauses playback briefly
+#
+# Special keys can be repeated by adding a number inside the curly braces, for
+# example: {Down 5}
+#
+# Some shorthand:
+#   &   expands to {Enter}
+#   @   expands to +{Enter}
+#   ^   expands to {ExitMenu}
+#   %   expands to {Wait}
+
diff --git a/dfhack-config/quickfort/materials.txt b/dfhack-config/quickfort/materials.txt
new file mode 100644
index 000000000..5938f16fe
--- /dev/null
+++ b/dfhack-config/quickfort/materials.txt
@@ -0,0 +1,9 @@
+# quickfort materials preference configuration file
+#
+# Defines forbidden materials and material preferences for build blueprints.
+# Settings in this file take precedence over any settings in the baseline
+# materials configuration file at hack/data/quickfort/materials-common.txt. See
+# that file to view the global defaults.
+#
+# Syntax TBD
+
diff --git a/dfhack-config/quickfort/quickfort.txt b/dfhack-config/quickfort/quickfort.txt
new file mode 100644
index 000000000..bac02b631
--- /dev/null
+++ b/dfhack-config/quickfort/quickfort.txt
@@ -0,0 +1,20 @@
+# quickfort main configuration file
+#
+# Set startup defaults for the quickfort script in this file. Settings can be
+# dynamically overridden in the active session with the `quickfort set` command.
+
+# Directory to search for blueprints. Can be set to an absolute or relative
+# path. If set to a relative path, resolves to a directory under the DF folder.
+blueprints-dir=blueprints
+
+# Set to "true" or "false". If true, will designate dig blueprints in marker
+# mode. If false, only cells with dig codes prefixed with ``m`` will be
+# designated in marker mode.
+force-marker-mode=false
+
+# Allows you to manually select building materials for each
+# building/construction when running (or creating orders for) build blueprints.
+# Materials in selection dialogs are ordered according to preferences in
+# materials.txt. If false, will only prompt for materials that have :labels.
+# See https://github.com/joelpt/quickfort#manual-material-selection for details.
+force-interactive-build=false

From fb3269eee4d4683228ff469c06a629b982863086 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 18 Jul 2020 09:11:33 -0700
Subject: [PATCH 199/547] note that the baseline config is a baseline config

---
 data/quickfort/materials-common.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/quickfort/materials-common.txt b/data/quickfort/materials-common.txt
index a9b388bdd..256d5deb8 100644
--- a/data/quickfort/materials-common.txt
+++ b/data/quickfort/materials-common.txt
@@ -1,4 +1,4 @@
-# quickfort materials preference configuration file
+# quickfort materials common baseline configuration file
 #
 # Defines forbidden materials and material preferences for build blueprints.
 # Please DO NOT EDIT this file directly. Instead, custom materials preferences

From 6921277e8104187d74d7a68be0f4df2b94ecc6ce Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 18 Jul 2020 12:35:04 -0400
Subject: [PATCH 200/547] Add upgrading instructions

---
 docs/Installing.rst | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/docs/Installing.rst b/docs/Installing.rst
index 92e5cfa0a..c0175b820 100644
--- a/docs/Installing.rst
+++ b/docs/Installing.rst
@@ -97,12 +97,12 @@ operating system should have built-in utilities capable of extracting files from
 these archives.
 
 The release archives contain several files and folders, including a ``hack``
-folder, a ``dfhack-config`` folder, and a ``dfhack.init-example`` file. All
-files from the DFHack archive need to be copied into the root DF folder, which
-should already include a ``data`` folder and a ``raw`` folder, among other
-things. Some packs and other redistributions of Dwarf Fortress may place DF in
-another folder, so ensure that the ``hack`` folder ends up next to the ``data``
-folder.
+folder, a ``dfhack-config`` folder, and a ``dfhack.init-example`` file. To
+install DFHack, copy all of the files from the DFHack archive into the root DF
+folder, which should already include a ``data`` folder and a ``raw`` folder,
+among other things. Some packs and other redistributions of Dwarf Fortress may
+place DF in another folder, so ensure that the ``hack`` folder ends up next to
+the ``data`` folder.
 
 .. note::
 
@@ -122,6 +122,26 @@ currently maintain a list of these files, so if you want to completely remove
 them, you should consult the DFHack archive that you installed for a full list.
 Generally, any files left behind should not negatively affect DF.
 
+
+Upgrading DFHack
+================
+
+The recommended approach to upgrade DFHack is to uninstall DFHack first, then
+install the new version. This will ensure that any files that are only part
+of the older DFHack installation do not affect the new DFHack installation
+(although this is unlikely to occur).
+
+It is also possible to overwrite an existing DFHack installation in-place.
+To do this, follow the installation instructions above, but overwrite all files
+that exist in the new DFHack archive (on Windows, this includes ``SDL.dll`` again).
+
+.. note::
+
+    You may wish to make a backup of your ``dfhack-config`` folder first if you
+    have made changes to it. Some archive managers (e.g. Archive Utility on macOS)
+    will overwrite the entire folder, removing any files that you have added.
+
+
 Pre-packaged DFHack installations
 =================================
 

From 044add214710434a6d0fddb30b48209d3ed0f017 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 18 Jul 2020 12:48:20 -0400
Subject: [PATCH 201/547] Reorder .proto comments

---
 plugins/proto/AdventureControl.proto     | 2 +-
 plugins/proto/DwarfControl.proto         | 2 +-
 plugins/proto/ItemdefInstrument.proto    | 2 +-
 plugins/proto/RemoteFortressReader.proto | 2 +-
 plugins/proto/isoworldremote.proto       | 2 +-
 plugins/proto/ui_sidebar_mode.proto      | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/proto/AdventureControl.proto b/plugins/proto/AdventureControl.proto
index 0bbcc8da8..840576c2b 100644
--- a/plugins/proto/AdventureControl.proto
+++ b/plugins/proto/AdventureControl.proto
@@ -1,6 +1,6 @@
+//Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 package AdventureControl;
 
-//Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 option optimize_for = LITE_RUNTIME;
 
 import "RemoteFortressReader.proto";
diff --git a/plugins/proto/DwarfControl.proto b/plugins/proto/DwarfControl.proto
index 9bd63b8d3..ee750f8bc 100644
--- a/plugins/proto/DwarfControl.proto
+++ b/plugins/proto/DwarfControl.proto
@@ -1,7 +1,7 @@
+//Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 syntax = "proto2";
 package DwarfControl;
 
-//Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 option optimize_for = LITE_RUNTIME;
 
 // Plugin: RemoteFortressReader
diff --git a/plugins/proto/ItemdefInstrument.proto b/plugins/proto/ItemdefInstrument.proto
index 02d4c7a90..0b64eb6d1 100644
--- a/plugins/proto/ItemdefInstrument.proto
+++ b/plugins/proto/ItemdefInstrument.proto
@@ -1,6 +1,6 @@
+//Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 package ItemdefInstrument;
 
-//Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 option optimize_for = LITE_RUNTIME;
 
 // Plugin: RemoteFortressReader
diff --git a/plugins/proto/RemoteFortressReader.proto b/plugins/proto/RemoteFortressReader.proto
index 8255f91cd..a128a162f 100644
--- a/plugins/proto/RemoteFortressReader.proto
+++ b/plugins/proto/RemoteFortressReader.proto
@@ -1,6 +1,6 @@
+//Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 package RemoteFortressReader;
 
-//Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 option optimize_for = LITE_RUNTIME;
 
 // Plugin: RemoteFortressReader
diff --git a/plugins/proto/isoworldremote.proto b/plugins/proto/isoworldremote.proto
index 23abdab73..c972e98a8 100644
--- a/plugins/proto/isoworldremote.proto
+++ b/plugins/proto/isoworldremote.proto
@@ -1,6 +1,6 @@
+//Describes a very basic material structure for the map embark
 package isoworldremote;
 
-//Describes a very basic material structure for the map embark
 option optimize_for = LITE_RUNTIME;
 
 // Plugin: isoworldremote
diff --git a/plugins/proto/ui_sidebar_mode.proto b/plugins/proto/ui_sidebar_mode.proto
index b07bb1baa..af9dbabd7 100644
--- a/plugins/proto/ui_sidebar_mode.proto
+++ b/plugins/proto/ui_sidebar_mode.proto
@@ -1,6 +1,6 @@
+//Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 package proto.enums.ui_sidebar_mode;
 
-//Attempts to provide a complete framework for reading everything from a fortress needed for vizualization
 option optimize_for = LITE_RUNTIME;
 
 enum ui_sidebar_mode
@@ -60,4 +60,4 @@ enum ui_sidebar_mode
     Hauling = 52;
     ArenaWeather = 53;
     ArenaTrees = 54;
-}
\ No newline at end of file
+}

From 2026c2b0c3dfc49f9bd01cf0eecef9d054c6d953 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 18 Jul 2020 20:04:22 -0700
Subject: [PATCH 202/547] change settings names to use underscored

since dash makes them invalid lua identifiers
---
 dfhack-config/quickfort/quickfort.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dfhack-config/quickfort/quickfort.txt b/dfhack-config/quickfort/quickfort.txt
index bac02b631..683c1da7d 100644
--- a/dfhack-config/quickfort/quickfort.txt
+++ b/dfhack-config/quickfort/quickfort.txt
@@ -5,16 +5,16 @@
 
 # Directory to search for blueprints. Can be set to an absolute or relative
 # path. If set to a relative path, resolves to a directory under the DF folder.
-blueprints-dir=blueprints
+blueprints_dir=blueprints
 
 # Set to "true" or "false". If true, will designate dig blueprints in marker
 # mode. If false, only cells with dig codes prefixed with ``m`` will be
 # designated in marker mode.
-force-marker-mode=false
+force_marker_mode=false
 
 # Allows you to manually select building materials for each
 # building/construction when running (or creating orders for) build blueprints.
 # Materials in selection dialogs are ordered according to preferences in
 # materials.txt. If false, will only prompt for materials that have :labels.
 # See https://github.com/joelpt/quickfort#manual-material-selection for details.
-force-interactive-build=false
+force_interactive_build=false

From 1e734938ae01f31acfbc8d2d235e54f432ef7fa1 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 19 Jul 2020 01:00:00 -0400
Subject: [PATCH 203/547] Add isoworldremote to Plugins.rst

---
 docs/Plugins.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index ee0aa074c..7c37ea78c 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -59,6 +59,11 @@ remotefortressreader
 An in-development plugin for realtime fortress visualisation.
 See :forums:`Armok Vision <146473>`.
 
+.. _isoworldremote:
+
+isoworldremote
+==============
+A plugin that implements a `remote API <remote>` used by Isoworld.
 
 .. _cursecheck:
 

From d88137b1d653f2efcd7407af10e3bd4907d7b86a Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 19 Jul 2020 01:13:43 -0400
Subject: [PATCH 204/547] Split remote API info into separate doc, add example
 tools and clients

---
 docs/Dev-intro.rst |  9 ++-------
 docs/Remote.rst    | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 docs/index-dev.rst |  1 +
 3 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 docs/Remote.rst

diff --git a/docs/Dev-intro.rst b/docs/Dev-intro.rst
index 9a08533c0..2a17313fe 100644
--- a/docs/Dev-intro.rst
+++ b/docs/Dev-intro.rst
@@ -77,11 +77,6 @@ some functions (and some entire modules) are currently only available in C++.
 
 Remote access interface
 -----------------------
-DFHack supports remote access by exchanging Google protobuf messages via a TCP
-socket. Both the core and plugins can define remotely accessible methods. The
-``dfhack-run`` command uses this interface to invoke ordinary console commands.
-
-Currently the supported set of requests is limited, because the developers don't
-know what exactly is most useful.  `remotefortressreader` provides a fairly
-comprehensive interface for visualisers such as :forums:`Armok Vision <146473>`.
 
+DFHack provides a remote access interface that external tools can connect to and
+use to interact with DF. See `remote` for more information.
diff --git a/docs/Remote.rst b/docs/Remote.rst
new file mode 100644
index 000000000..b7c65b032
--- /dev/null
+++ b/docs/Remote.rst
@@ -0,0 +1,47 @@
+.. _remote:
+
+=======================
+DFHack Remote Interface
+=======================
+
+DFHack provides a remote access interface that external tools can connect to and
+use to interact with DF. This is implemented with `Google protobuf`_ messages
+exchanged over a TCP socket (which only accepts connections from the local
+machine by default). Both the core and plugins can define remotely-accessible
+methods (often referred to as **RPC methods**). The RPC methods currently
+available are not comprehensive, but can be extended with plugins.
+
+.. _Google protobuf: https://developers.google.com/protocol-buffers
+
+.. contents::
+    :local:
+
+Examples
+========
+
+The `dfhack-run` command uses the RPC interface to invoke DFHack commands
+(or Lua functions) externally.
+
+Plugins that implement RPC methods include:
+
+- `rename`
+- `remotefortressreader`
+- `isoworldremote`
+
+Plugins that use the RPC API include:
+
+- `stonesense`
+
+Third-party tools that use the RPC API include:
+
+- `Armok Vision <https://github.com/RosaryMala/armok-vision>`_ (:forums:`Bay12 forums thread <146473>`)
+
+Client libraries
+================
+
+Some external libraries are available for interacting with the remote interface
+from other (non-C++) languages, including:
+
+- `RemoteClientDF-Net <https://github.com/RosaryMala/RemoteClientDF-Net>`_ for C#
+- `dfhackrpc <https://github.com/BenLubar/dfhackrpc>`_ for Go
+- `dfhack-remote <https://github.com/alexchandel/dfhack-remote>`_ for JavaScript
diff --git a/docs/index-dev.rst b/docs/index-dev.rst
index 617c0c0d7..560137609 100644
--- a/docs/index-dev.rst
+++ b/docs/index-dev.rst
@@ -15,5 +15,6 @@ These are pages relevant to people developing for DFHack.
    /docs/Documentation
    /docs/Structures-intro
    /docs/Memory-research
+   /docs/Remote
    /docs/Binpatches
 

From 16cfd34678a874b6cc2aa6ec9fdb251872d2f0d3 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 18 Jul 2020 22:22:37 -0700
Subject: [PATCH 205/547] recurs-ify default config copying logic

I refactored Filesystem::listdir_recursive to support removing the path
prefix from the returned files list. There are no current calls that
make use of the prefix parameter, so I converted it into a boolean.
Current usages will use the new default parameter and will not see any
changed behavior.
---
 data/blueprints/library/square-dig.csv |  2 +-
 library/Core.cpp                       | 29 ++++++++++++++++----
 library/include/modules/Filesystem.h   |  2 +-
 library/modules/Filesystem.cpp         | 38 +++++++++++++++++---------
 4 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/data/blueprints/library/square-dig.csv b/data/blueprints/library/square-dig.csv
index 328710ddb..548c5c3f2 100644
--- a/data/blueprints/library/square-dig.csv
+++ b/data/blueprints/library/square-dig.csv
@@ -1,4 +1,4 @@
-#dig start(2,2)
+#dig start(2;2) This is a library placeholder for use during quickfort development
 d,d,d
 d, ,d
 d,d,d
diff --git a/library/Core.cpp b/library/Core.cpp
index a9fe9a69a..20d9c994b 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -1737,18 +1737,35 @@ bool Core::Init()
     virtual_identity::Init(this);
 
     // copy over default config files if necessary
-    std::vector<std::string> config_files;
-    std::vector<std::string> default_config_files;
-    if (Filesystem::listdir("dfhack-config", config_files) != 0)
+    std::map<std::string, bool> config_files;
+    std::map<std::string, bool> default_config_files;
+    if (Filesystem::listdir_recursive("dfhack-config", config_files, 10, false) != 0)
         con.printerr("Failed to list directory: dfhack-config");
-    else if (Filesystem::listdir("dfhack-config/default", default_config_files) != 0)
+    else if (Filesystem::listdir_recursive("dfhack-config/default", default_config_files, 10, false) != 0)
         con.printerr("Failed to list directory: dfhack-config/default");
     else
     {
+        // ensure all config file directories exist before we start copying files
         for (auto it = default_config_files.begin(); it != default_config_files.end(); ++it)
         {
-            std::string filename = *it;
-            if (std::find(config_files.begin(), config_files.end(), filename) == config_files.end())
+            // skip over files
+            if (!it->second)
+                continue;
+            std::string dirname = "dfhack-config/" + it->first;
+            if (!Filesystem::mkdir_recursive(dirname))
+            {
+                con.printerr("Failed to create config directory: '%s'\n", dirname.c_str());
+            }
+        }
+
+        // copy files from the default tree that don't already exist in the config tree
+        for (auto it = default_config_files.begin(); it != default_config_files.end(); ++it)
+        {
+            // skip over directories
+            if (it->second)
+                continue;
+            std::string filename = it->first;
+            if (config_files.find(filename) == config_files.end())
             {
                 std::string src_file = std::string("dfhack-config/default/") + filename;
                 if (!Filesystem::isfile(src_file))
diff --git a/library/include/modules/Filesystem.h b/library/include/modules/Filesystem.h
index bc0953d27..3252be007 100644
--- a/library/include/modules/Filesystem.h
+++ b/library/include/modules/Filesystem.h
@@ -161,6 +161,6 @@ namespace DFHack {
         DFHACK_EXPORT int64_t mtime (std::string path);
         DFHACK_EXPORT int listdir (std::string dir, std::vector<std::string> &files);
         DFHACK_EXPORT int listdir_recursive (std::string dir, std::map<std::string, bool> &files,
-            int depth = 10, std::string prefix = "");
+            int depth = 10, bool include_prefix = true);
     }
 }
diff --git a/library/modules/Filesystem.cpp b/library/modules/Filesystem.cpp
index ddc091525..c0d0860ad 100644
--- a/library/modules/Filesystem.cpp
+++ b/library/modules/Filesystem.cpp
@@ -205,34 +205,46 @@ int Filesystem::listdir (std::string dir, std::vector<std::string> &files)
     return 0;
 }
 
-int Filesystem::listdir_recursive (std::string dir, std::map<std::string, bool> &files,
-    int depth /* = 10 */, std::string prefix /* = "" */)
+// prefix is the top-level dir where we started recursing
+// path is the relative path under the prefix; must be empty or end in a '/'
+// files is the output list of files and directories (bool == true for dir)
+// depth is the remaining dir depth to recurse into. function returns -1 if
+//   we haven't finished recursing when we run out of depth.
+// include_prefix controls whether the directory where we started recursing is
+//   included in the filenames returned in files.
+static int listdir_recursive_impl (std::string prefix, std::string path,
+    std::map<std::string, bool> &files, int depth, bool include_prefix)
 {
-    int err;
     if (depth < 0)
         return -1;
-    if (prefix == "")
-        prefix = dir;
-    std::vector<std::string> tmp;
-    err = listdir(dir, tmp);
+    std::string prefixed_path = prefix + "/" + path;
+    std::vector<std::string> curdir_files;
+    int err = Filesystem::listdir(prefixed_path, curdir_files);
     if (err)
         return err;
-    for (auto file = tmp.begin(); file != tmp.end(); ++file)
+    for (auto file = curdir_files.begin(); file != curdir_files.end(); ++file)
     {
         if (*file == "." || *file == "..")
             continue;
-        std::string rel_path = prefix + "/" + *file;
-        if (isdir(rel_path))
+        std::string prefixed_file = prefixed_path + *file;
+        std::string path_file = path + *file;
+        if (Filesystem::isdir(prefixed_file))
         {
-            files.insert(std::pair<std::string, bool>(rel_path, true));
-            err = listdir_recursive(dir + "/" + *file, files, depth - 1, rel_path);
+            files.insert(std::pair<std::string, bool>(include_prefix ? prefixed_file : path_file, true));
+            err = listdir_recursive_impl(prefix, path_file + "/", files, depth - 1, include_prefix);
             if (err)
                 return err;
         }
         else
         {
-            files.insert(std::pair<std::string, bool>(rel_path, false));
+            files.insert(std::pair<std::string, bool>(include_prefix ? prefixed_file : path_file, false));
         }
     }
     return 0;
 }
+
+int Filesystem::listdir_recursive (std::string dir, std::map<std::string, bool> &files,
+    int depth /* = 10 */, bool include_prefix /* = true */)
+{
+    return listdir_recursive_impl(dir, "", files, depth, include_prefix);
+}

From d0f8ba06a25ed63bc66f9e0fb02440039d20d0cf Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 19 Jul 2020 01:52:57 -0700
Subject: [PATCH 206/547] expose new include_prefix param to Lua

---
 library/LuaApi.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index b1dc3de0b..c20be4618 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -2406,8 +2406,11 @@ static int filesystem_listdir_recursive(lua_State *L)
     int depth = 10;
     if (lua_type(L, 2) == LUA_TNUMBER)
         depth = lua_tounsigned(L, 2);
+    bool include_prefix = true;
+    if (lua_type(L, 3) == LUA_TBOOLEAN)
+        include_prefix = lua_toboolean(L, 3);
     std::map<std::string, bool> files;
-    int err = DFHack::Filesystem::listdir_recursive(dir, files, depth);
+    int err = DFHack::Filesystem::listdir_recursive(dir, files, depth, include_prefix);
     if (err)
     {
         lua_pushnil(L);

From 6a851537d5ef022447525718fec21038f9c5efe4 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 19 Jul 2020 17:29:56 -0700
Subject: [PATCH 207/547] update changelog

---
 docs/changelog.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 9d03b1f0a..5f3510ed9 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -51,7 +51,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `confirm`: added a confirmation dialog for convicting dwarves of crimes
 
 ## API
-- Added ``Filesystem::mkdir_recursive``
+- Added ``Filesystem::mkdir_recursive`` (returns true if directories to create already exist)
+- Extended ``Filesystem::listdir_recursive`` to optionally make returned filenames relative to the start directory
 
 ## Lua
 - Added a ``ref_target`` field to primitive field references, corresponding to the ``ref-target`` XML attribute

From b2002199670ce2c2d0f3d55af603ee54190b9d67 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 20 Jul 2020 23:04:23 -0700
Subject: [PATCH 208/547] support for splitting lua scripts into parts

without polluting the output of #DFHack ls
---
 docs/changelog.txt | 1 +
 library/Core.cpp   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 5f3510ed9..c949115f1 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -56,6 +56,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Lua
 - Added a ``ref_target`` field to primitive field references, corresponding to the ``ref-target`` XML attribute
+- Support for splitting scripts into multiple files without polluting the output of '#DFHack ls'. Scripts that end in '-internal.lua' will not be listed, but but they can still be 'require'd from other scripts.
 
 ## Ruby
 - Updated ``item_find`` and ``building_find`` to use centralized logic that works on more screens
diff --git a/library/Core.cpp b/library/Core.cpp
index 20d9c994b..9192d5772 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -301,7 +301,7 @@ static void listScripts(PluginManager *plug_mgr, std::map<string,string> &pset,
     path += '/';
     for (size_t i = 0; i < files.size(); i++)
     {
-        if (hasEnding(files[i], ".lua"))
+        if (hasEnding(files[i], ".lua") && !hasEnding(files[i], "-internal.lua"))
         {
             string help = getScriptHelp(path + files[i], "--");
             string key = prefix + files[i].substr(0, files[i].size()-4);

From b34aa86d3c3dd606c22877d9cf95d25204e5d567 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 21 Jul 2020 21:39:37 -0400
Subject: [PATCH 209/547] Document remote server config

---
 docs/Core.rst   |  3 +++
 docs/Remote.rst | 25 ++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/docs/Core.rst b/docs/Core.rst
index 6ef1d0575..196b12918 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -442,6 +442,8 @@ Other init files
   directory, will be run when any world or that save is loaded.
 
 
+.. _env-vars:
+
 Environment variables
 =====================
 
@@ -453,6 +455,7 @@ on UNIX-like systems::
 - ``DFHACK_PORT``: the port to use for the RPC server (used by ``dfhack-run``
   and `remotefortressreader` among others) instead of the default ``5000``. As
   with the default, if this port cannot be used, the server is not started.
+  See `remote` for more details.
 
 - ``DFHACK_DISABLE_CONSOLE``: if set, the DFHack console is not set up. This is
   the default behavior if ``PRINT_MODE:TEXT`` is set in ``data/init/init.txt``.
diff --git a/docs/Remote.rst b/docs/Remote.rst
index b7c65b032..5fa556ef2 100644
--- a/docs/Remote.rst
+++ b/docs/Remote.rst
@@ -6,9 +6,8 @@ DFHack Remote Interface
 
 DFHack provides a remote access interface that external tools can connect to and
 use to interact with DF. This is implemented with `Google protobuf`_ messages
-exchanged over a TCP socket (which only accepts connections from the local
-machine by default). Both the core and plugins can define remotely-accessible
-methods (often referred to as **RPC methods**). The RPC methods currently
+exchanged over a TCP socket. Both the core and plugins can define
+remotely-accessible methods, or **RPC methods**. The RPC methods currently
 available are not comprehensive, but can be extended with plugins.
 
 .. _Google protobuf: https://developers.google.com/protocol-buffers
@@ -16,6 +15,26 @@ available are not comprehensive, but can be extended with plugins.
 .. contents::
     :local:
 
+
+Server configuration
+====================
+
+DFHack attempts to start a TCP server to listen for remote connections on
+startup. If this fails (due to the port being in use, for example), an error
+message will be logged to stderr.log.
+
+The server can be configured by setting options in ``dfhack-config/remote-server.json``:
+
+- ``allow_remote`` (default: ``false``): if true, allows connections from hosts
+  other than the local machine. This is insecure and may allow arbitrary code
+  execution on your machine, so it is disabled by default.
+- ``port`` (default: ``5000``): the port that the remote server listens on.
+  Overriding this will allow the server to work if you have multiple instances
+  of DF running, or if you have something else running on port 5000. Note that
+  the ``DFHACK_PORT`` `environment variable <env-vars>` takes precedence over
+  this setting and may be more useful for overriding the port temporarily.
+
+
 Examples
 ========
 

From dfc9f78fa4f2deeb576a7c334b8a75f69dfe01f4 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 21 Jul 2020 23:14:59 -0400
Subject: [PATCH 210/547] Refer to server config docs from dfhack-run

---
 docs/Core.rst   | 10 +++++++++-
 docs/Remote.rst |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/Core.rst b/docs/Core.rst
index 196b12918..c5d5670af 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -82,7 +82,7 @@ dfhack-run
 
 If DF and DFHack are already running, calling ``dfhack-run my command``
 in an external terminal is equivalent to calling ``my command`` in the
-DFHack console.  Direct use of the DFhack console is generally easier,
+DFHack console.  Direct use of the DFHack console is generally easier,
 but ``dfhack-run`` can be useful in a variety of circumstances:
 
 - if the console is unavailable
@@ -101,6 +101,14 @@ Examples::
 The first (\*nix) example `checks for vampires <cursecheck>`; the
 second (Windows) example uses `kill-lua` to stop a Lua script.
 
+.. note::
+
+  ``dfhack-run`` attempts to connect to a server on TCP port 5000. If DFHack
+  was unable to start this server, ``dfhack-run`` will not be able to connect.
+  This could happen if you have other software listening on port 5000, or if
+  you have multiple copies of DF running simultaneously. To assign a different
+  port, see `remote-server-config`.
+
 
 Built-in Commands
 =================
diff --git a/docs/Remote.rst b/docs/Remote.rst
index 5fa556ef2..24426c819 100644
--- a/docs/Remote.rst
+++ b/docs/Remote.rst
@@ -16,6 +16,8 @@ available are not comprehensive, but can be extended with plugins.
     :local:
 
 
+.. _remote-server-config:
+
 Server configuration
 ====================
 

From 4b6325eeabd6311ed30c38199f1e4111df519c19 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 22 Jul 2020 01:34:51 -0400
Subject: [PATCH 211/547] Add RPC protocol description to docs and reformat

From https://gist.github.com/BenLubar/1f51cf570b4c8dca275db9687fa6b9e3
Ref dfhack/dfhack#1574
---
 docs/Remote.rst | 166 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 164 insertions(+), 2 deletions(-)

diff --git a/docs/Remote.rst b/docs/Remote.rst
index 24426c819..689f9978b 100644
--- a/docs/Remote.rst
+++ b/docs/Remote.rst
@@ -37,8 +37,16 @@ The server can be configured by setting options in ``dfhack-config/remote-server
   this setting and may be more useful for overriding the port temporarily.
 
 
+Developing with the remote API
+==============================
+
+At a high level, the core and plugins define RPC methods, and external clients
+can call these methods. Each method is assigned an ID internally, which clients
+use to call it. These method IDs can be obtained using the special ``BindMethod``
+method, which has an ID of 0.
+
 Examples
-========
+--------
 
 The `dfhack-run` command uses the RPC interface to invoke DFHack commands
 (or Lua functions) externally.
@@ -58,7 +66,7 @@ Third-party tools that use the RPC API include:
 - `Armok Vision <https://github.com/RosaryMala/armok-vision>`_ (:forums:`Bay12 forums thread <146473>`)
 
 Client libraries
-================
+----------------
 
 Some external libraries are available for interacting with the remote interface
 from other (non-C++) languages, including:
@@ -66,3 +74,157 @@ from other (non-C++) languages, including:
 - `RemoteClientDF-Net <https://github.com/RosaryMala/RemoteClientDF-Net>`_ for C#
 - `dfhackrpc <https://github.com/BenLubar/dfhackrpc>`_ for Go
 - `dfhack-remote <https://github.com/alexchandel/dfhack-remote>`_ for JavaScript
+
+
+Protocol description
+====================
+
+This is a low-level description of the RPC protocol, which may be useful when
+developing custom clients.
+
+Built-in messages
+-----------------
+These messages have hardcoded IDs; all others must be obtained through ``BindMethod``.
+
+===  ============ =============================== =======================
+ID   Method       Input                           Output
+===  ============ =============================== =======================
+ 0   BindMethod   dfproto.CoreBindRequest         dfproto.CoreBindReply
+ 1   RunCommand   dfproto.CoreRunCommandRequest   dfproto.EmptyMessage
+===  ============ =============================== =======================
+
+
+
+Conversation flow
+-----------------
+
+* Client → Server: `handshake request`_
+* Server → Client: `handshake reply`_
+* Repeated 0 or more times:
+    * Client → Server: `request`_
+    * Server → Client: `text`_ (0 or more times)
+    * Server → Client: `result`_ or `failure`_
+* Client → Server: `quit`_
+
+Raw message types
+-----------------
+
+* All numbers are little-endian
+* All strings are ASCII
+* A payload size of greater than 64MiB is an error
+* See ``RemoteClient.h`` for definitions of constants starting with ``RPC``
+
+handshake request
+~~~~~~~~~~~~~~~~~
+
+.. csv-table::
+    :align: left
+    :header-rows: 1
+
+    Type,    Name,    Value
+    char[8], magic,   ``DFHack?\n``
+    int32_t, version, 1
+
+handshake reply
+~~~~~~~~~~~~~~~
+
+.. csv-table::
+    :align: left
+    :header-rows: 1
+
+    Type,    Name,    Value
+    char[8], magic,   ``DFHack!\n``
+    int32_t, version, 1
+
+header
+~~~~~~
+
+**Note:** the two fields of this message are sometimes repurposed. Uses of this
+message are represented as ``header(x, y)``, where ``x`` corresponds to the ``id``
+field and ``y`` corresponds to ``size``.
+
+.. csv-table::
+    :align: left
+    :header-rows: 1
+
+    Type,    Name
+    int16_t, id
+    int16_t, (padding - unused)
+    int32_t, size
+
+request
+~~~~~~~
+
+.. list-table::
+    :align: left
+    :header-rows: 1
+    :widths: 25 75
+
+    * - Type
+      - Description
+    * - `header`_
+      - ``header(id, size)``
+    * - buffer
+      - Protobuf-encoded payload of the input message type of the method specified by ``id``; length of ``size`` bytes
+
+text
+~~~~
+
+.. list-table::
+    :align: left
+    :header-rows: 1
+    :widths: 25 75
+
+    * - Type
+      - Description
+    * - `header`_
+      - ``header(RPC_REPLY_TEXT, size)``
+    * - buffer
+      - Protobuf-encoded payload of type ``dfproto.CoreTextNotification``; length of ``size`` bytes
+
+result
+~~~~~~
+
+.. list-table::
+    :align: left
+    :header-rows: 1
+    :widths: 25 75
+
+    * - Type
+      - Description
+    * - `header`_
+      - ``header(RPC_REPLY_RESULT, size)``
+    * - buffer
+      - Protobuf-encoded payload of the output message type of the oldest incomplete method call; when received,
+        that method call is considered completed. Length of ``size`` bytes.
+
+failure
+~~~~~~~
+
+.. list-table::
+    :align: left
+    :header-rows: 1
+    :widths: 25 75
+
+    * - Type
+      - Description
+    * - `header`_
+      - ``header(RPC_REPLY_FAIL, command_result)``
+    * - command_result
+      - return code of the command (a constant starting with ``CR_``; see ``RemoteClient.h``)
+
+quit
+~~~~
+
+**Note:** the server closes the connection after sending this message.
+
+.. list-table::
+    :align: left
+    :header-rows: 1
+    :widths: 25 75
+    :width: 100%
+
+    * - Type
+      - Description
+    * - `header`_
+      - ``header(RPC_REQUEST_QUIT, 0)``

From eb074b8a493fb971a98df156b95926dca1146dec Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 22 Jul 2020 02:04:02 -0400
Subject: [PATCH 212/547] Link to Wireshark script

---
 docs/Remote.rst | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/Remote.rst b/docs/Remote.rst
index 689f9978b..a40161fee 100644
--- a/docs/Remote.rst
+++ b/docs/Remote.rst
@@ -82,6 +82,10 @@ Protocol description
 This is a low-level description of the RPC protocol, which may be useful when
 developing custom clients.
 
+A WireShark dissector for this protocol is available in the
+`df_misc repo <https://github.com/DFHack/df_misc/blob/master/wireshark_dfhack_rpc.lua>`_.
+
+
 Built-in messages
 -----------------
 These messages have hardcoded IDs; all others must be obtained through ``BindMethod``.
@@ -216,7 +220,7 @@ failure
 quit
 ~~~~
 
-**Note:** the server closes the connection after sending this message.
+**Note:** the server closes the connection after receiving this message.
 
 .. list-table::
     :align: left

From 655b3632386f17f34ccaf5ddb223114e9184e623 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 22 Jul 2020 02:23:29 -0400
Subject: [PATCH 213/547] Fix some spelling errors

---
 docs/Compile.rst       |  2 +-
 docs/Core.rst          | 12 ++++++------
 docs/Documentation.rst |  6 +++---
 docs/Lua API.rst       |  8 ++++----
 docs/Plugins.rst       |  8 ++++----
 plugins/stonesense     |  2 +-
 scripts                |  2 +-
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/docs/Compile.rst b/docs/Compile.rst
index 68187e7fa..c98cb939a 100644
--- a/docs/Compile.rst
+++ b/docs/Compile.rst
@@ -112,7 +112,7 @@ in the platform-specific sections below first, then come back here.
 Generator
 ---------
 
-The ``Ninja`` CMake build generator is the prefered build method on Linux and
+The ``Ninja`` CMake build generator is the preferred build method on Linux and
 macOS, instead of ``Unix Makefiles``, which is the default. You can select Ninja
 by passing ``-G Ninja`` to CMake. Incremental builds using Unix Makefiles can be
 much slower than Ninja builds. Note that you will probably need to install
diff --git a/docs/Core.rst b/docs/Core.rst
index c5d5670af..5ef3e6a4d 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -15,12 +15,12 @@ DFHack commands can be implemented in three ways, all of which
 are used in the same way:
 
 :builtin:   commands are implemented by the core of DFHack. They manage
-            other DFhack tools, interpret commands, and control basic
+            other DFHack tools, interpret commands, and control basic
             aspects of DF (force pause or quit).
 
 :plugins:   are stored in ``hack/plugins/`` and must be compiled with the
             same version of DFHack.  They are less flexible than scripts,
-            but used for complex or ongoing tasks becasue they run faster.
+            but used for complex or ongoing tasks because they run faster.
 
 :scripts:   are Ruby or Lua scripts stored in ``hack/scripts/``.
             Because they don't need to be compiled, scripts are
@@ -88,7 +88,7 @@ but ``dfhack-run`` can be useful in a variety of circumstances:
 - if the console is unavailable
 
   - with the init setting ``PRINT_MODE:TEXT``
-  - while running an interactive command (eg. `liquids` or `tiletypes`)
+  - while running an interactive command (e.g. `liquids` or `tiletypes`)
 
 - from external programs or scripts
 - if DF or DFHack are not responding
@@ -113,7 +113,7 @@ second (Windows) example uses `kill-lua` to stop a Lua script.
 Built-in Commands
 =================
 The following commands are provided by the 'core' components
-of DFhack, rather than plugins or scripts.
+of DFHack, rather than plugins or scripts.
 
 .. contents::
    :local:
@@ -419,7 +419,7 @@ onLoad*.init
 When a world is loaded, DFHack looks for files of the form ``onLoad*.init``,
 where ``*`` can be any string, including the empty string.
 
-All matching init files will be executed in alphebetical order.
+All matching init files will be executed in alphabetical order.
 A world being loaded can mean a fortress, an adventurer, or legends mode.
 
 These files are best used for non-persistent commands, such as setting
@@ -444,7 +444,7 @@ Other init files
 
 * ``onMapLoad*.init`` and ``onMapUnload*.init`` are run when a map,
   distinct from a world, is loaded.  This is good for map-affecting
-  commands (eg `clean`), or avoiding issues in Legends mode.
+  commands (e.g. `clean`), or avoiding issues in Legends mode.
 
 * Any lua script named ``raw/init.d/*.lua``, in the save or main DF
   directory, will be run when any world or that save is loaded.
diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index 37fcc6ee6..067f6bf90 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -53,7 +53,7 @@ directive - anything between the tokens is copied into the appropriate scripts
 documentation page.  For Ruby, we follow the built-in docstring convention
 (``=begin`` and ``=end``).  For Lua, the tokens are ``[====[`` and ``]====]``
 - ordinary multi-line strings.  It is highly encouraged to reuse this string
-as the in-console documentation by (eg.) printing it when a ``-help`` argument
+as the in-console documentation by (e.g.) printing it when a ``-help`` argument
 is given.
 
 The docs **must** have a heading which exactly matches the command, underlined
@@ -101,7 +101,7 @@ describe the effect::
 
 If it would be helpful to mention another DFHack command, don't just type the
 name - add a hyperlink!  Specify the link target in backticks, and it will be
-replaced with the corresponding title and linked:  eg ```autolabor```
+replaced with the corresponding title and linked:  e.g. ```autolabor```
 => `autolabor`.  Link targets should be equivalent to the command
 described (without file extension), and placed above the heading of that
 section like this::
@@ -159,7 +159,7 @@ Once pip is available, you can then install Sphinx with::
 
   pip3 install sphinx
 
-If you run this as an unpriviliged user, it may install a local copy of Sphinx
+If you run this as an unprivileged user, it may install a local copy of Sphinx
 for your user only. The ``sphinx-build`` executable will typically end up in
 ``~/.local/bin/`` in this case. Alternatively, you can install Sphinx
 system-wide by running pip with ``sudo``. In any case, you will need the folder
diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index c62d0f379..e9392f9c4 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -42,11 +42,11 @@ to lua code as a tree of objects and functions under the ``df`` global, which
 also broadly maps to the ``df`` namespace in the headers generated for C++.
 
 .. warning::
-    The wrapper provides almost raw access to the memory
-    of the game, so mistakes in manipulating objects are as likely to
-    crash the game as equivalent plain C++ code would be.
 
-    eg. NULL pointer access is safely detected, but dangling pointers aren't.
+    The wrapper provides almost raw access to the memory of the game, so
+    mistakes in manipulating objects are as likely to crash the game as
+    equivalent plain C++ code would be - e.g. null pointer access is safely
+    detected, but dangling pointers aren't.
 
 Objects managed by the wrapper can be broadly classified into the following groups:
 
diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index 7c37ea78c..3a4133873 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -191,7 +191,7 @@ Usage and related commands:
 :revflood:      Hide everything, then reveal tiles with a path to the cursor
                 (useful to make walled-off rooms vanish)
 :revforget:     Discard info about what was visible before revealing the map.
-                Only useful where (eg) you abandoned with the fort revealed
+                Only useful where (e.g.) you abandoned with the fort revealed
                 and no longer want the data.
 
 .. _showmood:
@@ -737,7 +737,7 @@ by moving the view manually.
 
 mousequery
 ==========
-Adds mouse controls to the DF interface, eg click-and-drag designations.
+Adds mouse controls to the DF interface, e.g. click-and-drag designations.
 
 Options:
 
@@ -840,10 +840,10 @@ See `gui/stockpiles` for an in-game interface.
 
 :savestock:     Saves the currently highlighted stockpile's settings to a file in your Dwarf
                 Fortress folder. This file can be used to copy settings between game saves or
-                players.  eg:  ``savestock food_settings.dfstock``
+                players.  e.g.:  ``savestock food_settings.dfstock``
 
 :loadstock:     Loads a saved stockpile settings file and applies it to the currently selected
-                stockpile.  eg:  ``loadstock food_settings.dfstock``
+                stockpile.  e.g.:  ``loadstock food_settings.dfstock``
 
 To use savestock and loadstock, use the :kbd:`q` command to highlight a stockpile.
 Then run savestock giving it a descriptive filename. Then, in a different (or
diff --git a/plugins/stonesense b/plugins/stonesense
index bdab71c99..87e6cf02b 160000
--- a/plugins/stonesense
+++ b/plugins/stonesense
@@ -1 +1 @@
-Subproject commit bdab71c99a0a7cc268ca517a0cd3f0a5fb41042a
+Subproject commit 87e6cf02b914daf6f7811d967db6fadc7ca115fe
diff --git a/scripts b/scripts
index af749e708..a5e385bb2 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit af749e7086739a058cd5095a6ee1a60d7e795a7c
+Subproject commit a5e385bb2a3c72f878be614cb0cc004aafa17f79

From 8541db17cd660bb3a2e6745151be33d5338ac32d Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 22 Jul 2020 02:30:41 -0400
Subject: [PATCH 214/547] Remove :width: table directive (requires docutils
 0.15)

---
 docs/Remote.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/Remote.rst b/docs/Remote.rst
index a40161fee..a6f07ebc0 100644
--- a/docs/Remote.rst
+++ b/docs/Remote.rst
@@ -226,7 +226,6 @@ quit
     :align: left
     :header-rows: 1
     :widths: 25 75
-    :width: 100%
 
     * - Type
       - Description

From e17d49220359ca0bd1dfe757532cbb0fb161afb6 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 23 Jul 2020 21:55:05 -0700
Subject: [PATCH 215/547] address PR review comments on api docs

---
 docs/changelog.txt                   | 2 +-
 library/include/modules/Filesystem.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 5f3510ed9..58669e321 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -51,7 +51,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `confirm`: added a confirmation dialog for convicting dwarves of crimes
 
 ## API
-- Added ``Filesystem::mkdir_recursive`` (returns true if directories to create already exist)
+- Added ``Filesystem::mkdir_recursive``
 - Extended ``Filesystem::listdir_recursive`` to optionally make returned filenames relative to the start directory
 
 ## Lua
diff --git a/library/include/modules/Filesystem.h b/library/include/modules/Filesystem.h
index 3252be007..c9218ba33 100644
--- a/library/include/modules/Filesystem.h
+++ b/library/include/modules/Filesystem.h
@@ -149,6 +149,7 @@ namespace DFHack {
         DFHACK_EXPORT bool chdir (std::string path);
         DFHACK_EXPORT std::string getcwd ();
         DFHACK_EXPORT bool mkdir (std::string path);
+        // returns true on success or if directory already exists
         DFHACK_EXPORT bool mkdir_recursive (std::string path);
         DFHACK_EXPORT bool rmdir (std::string path);
         DFHACK_EXPORT bool stat (std::string path, STAT_STRUCT &info);
@@ -160,6 +161,8 @@ namespace DFHack {
         DFHACK_EXPORT int64_t ctime (std::string path);
         DFHACK_EXPORT int64_t mtime (std::string path);
         DFHACK_EXPORT int listdir (std::string dir, std::vector<std::string> &files);
+        // set include_prefix to false to prevent dir from being prepended to
+        // paths returned in files
         DFHACK_EXPORT int listdir_recursive (std::string dir, std::map<std::string, bool> &files,
             int depth = 10, bool include_prefix = true);
     }

From e61f2b74516c208fed05ee3e420e231f15f282a3 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 23 Jul 2020 22:44:34 -0700
Subject: [PATCH 216/547] update Lua API.rst

---
 docs/Lua API.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index c62d0f379..569dc4c49 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -2116,8 +2116,10 @@ unless otherwise noted.
 * ``dfhack.filesystem.listdir(path)``
 
   Lists files/directories in a directory.  Returns ``{}`` if ``path`` does not exist.
+  Set include_prefix to false if you don't want the ``path`` string prepended to the
+  returned filenames.
 
-* ``dfhack.filesystem.listdir_recursive(path [, depth = 10])``
+* ``dfhack.filesystem.listdir_recursive(path [, depth = 10[, include_prefix = true]])``
 
   Lists all files/directories in a directory and its subdirectories. All directories
   are listed before their contents. Returns a table with subtables of the format::

From cafdc1620b5e57ac744064c448682bd417cabcb4 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 24 Jul 2020 22:15:35 -0400
Subject: [PATCH 217/547] Improve Lua listdir_recursive error handling

Ref #519, #1609
---
 library/LuaApi.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index c20be4618..5b731ecc7 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -2404,10 +2404,10 @@ static int filesystem_listdir_recursive(lua_State *L)
     luaL_checktype(L,1,LUA_TSTRING);
     std::string dir=lua_tostring(L,1);
     int depth = 10;
-    if (lua_type(L, 2) == LUA_TNUMBER)
-        depth = lua_tounsigned(L, 2);
+    if (lua_gettop(L) >= 2)
+        depth = luaL_checkint(L, 2);
     bool include_prefix = true;
-    if (lua_type(L, 3) == LUA_TBOOLEAN)
+    if (lua_gettop(L) >= 3)
         include_prefix = lua_toboolean(L, 3);
     std::map<std::string, bool> files;
     int err = DFHack::Filesystem::listdir_recursive(dir, files, depth, include_prefix);

From fcb14623a71ecd796f46c97a25b06e1fba9bf0c9 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 24 Jul 2020 22:18:00 -0400
Subject: [PATCH 218/547] Update authors, submodules

Ref dfhack/scripts#162
---
 docs/Authors.rst | 1 +
 library/xml      | 2 +-
 scripts          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/Authors.rst b/docs/Authors.rst
index 3c2777a7d..55ecbb17c 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -43,6 +43,7 @@ Deon
 DoctorVanGogh           DoctorVanGogh
 Donald Ruegsegger       hashaash
 doomchild               doomchild
+ElMendukol              ElMendukol
 enjia2000
 Eric Wald               eswald
 Erik Youngren           Artanis
diff --git a/library/xml b/library/xml
index 7822df15e..bada2199d 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 7822df15ed44ca9e68d7270329ffd54dd7744977
+Subproject commit bada2199d16bd8e97d15efee7cbe05e5eb6ee6ee
diff --git a/scripts b/scripts
index a5e385bb2..f028d38e4 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit a5e385bb2a3c72f878be614cb0cc004aafa17f79
+Subproject commit f028d38e4ee9d60b9295a07d23ddb8dcc5197699

From 48d4013bcb8102a683545d3e63797a086bc68f44 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Fri, 24 Jul 2020 22:07:16 -0700
Subject: [PATCH 219/547] don't list subdirectories named 'internal'

instead of just specifically for lua files with a '-internal.lua' suffix
---
 docs/changelog.txt | 2 +-
 library/Core.cpp   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 19209ca60..949e8fe56 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -56,7 +56,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Lua
 - Added a ``ref_target`` field to primitive field references, corresponding to the ``ref-target`` XML attribute
-- Support for splitting scripts into multiple files without polluting the output of '#DFHack ls'. Scripts that end in '-internal.lua' will not be listed, but but they can still be 'require'd from other scripts.
+- Support for splitting scripts into multiple files without polluting the output of ``#DFHack ls``. Scripts can now add internal files to an ``scripts/internal`` folder.
 
 ## Ruby
 - Updated ``item_find`` and ``building_find`` to use centralized logic that works on more screens
diff --git a/library/Core.cpp b/library/Core.cpp
index 9192d5772..c6ce9ea48 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -301,7 +301,7 @@ static void listScripts(PluginManager *plug_mgr, std::map<string,string> &pset,
     path += '/';
     for (size_t i = 0; i < files.size(); i++)
     {
-        if (hasEnding(files[i], ".lua") && !hasEnding(files[i], "-internal.lua"))
+        if (hasEnding(files[i], ".lua"))
         {
             string help = getScriptHelp(path + files[i], "--");
             string key = prefix + files[i].substr(0, files[i].size()-4);
@@ -317,7 +317,7 @@ static void listScripts(PluginManager *plug_mgr, std::map<string,string> &pset,
                 pset[key] = help;
             }
         }
-        else if (all && !files[i].empty() && files[i][0] != '.')
+        else if (all && !files[i].empty() && files[i][0] != '.' && files[i] != "internal")
         {
             listScripts(plug_mgr, pset, path+files[i]+"/", all, prefix+files[i]+"/");
         }

From e614e28beb2ae4d2979b4a94fe32ae3b8df79a51 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Fri, 24 Jul 2020 23:40:27 -0700
Subject: [PATCH 220/547] exempt scripts under 'internal' from docstring req

---
 travis/script-docs.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/travis/script-docs.py b/travis/script-docs.py
index b2c8063bf..a102ae35b 100755
--- a/travis/script-docs.py
+++ b/travis/script-docs.py
@@ -81,7 +81,9 @@ def check_file(fname):
 def main():
     """Check that all DFHack scripts include documentation"""
     err = 0
-    for root, _, files in os.walk(SCRIPT_PATH):
+    exclude = set(['internal'])
+    for root, dirs, files in os.walk(SCRIPT_PATH, topdown=True):
+        dirs[:] = [d for d in dirs if d not in exclude]
         for f in files:
             if f[-3:] in {'.rb', 'lua'}:
                 err += check_file(join(root, f))

From 7c921d8c916dce2cc06a1f885198e8f1dca58622 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 25 Jul 2020 13:02:35 -0400
Subject: [PATCH 221/547] Lua listdir_recursive: allow nil to be used for
 default arguments

https://github.com/DFHack/dfhack/pull/1609#issuecomment-663803777
---
 library/LuaApi.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 5b731ecc7..25843875d 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -2404,10 +2404,10 @@ static int filesystem_listdir_recursive(lua_State *L)
     luaL_checktype(L,1,LUA_TSTRING);
     std::string dir=lua_tostring(L,1);
     int depth = 10;
-    if (lua_gettop(L) >= 2)
+    if (lua_gettop(L) >= 2 && !lua_isnil(L, 2))
         depth = luaL_checkint(L, 2);
     bool include_prefix = true;
-    if (lua_gettop(L) >= 3)
+    if (lua_gettop(L) >= 3 && !lua_isnil(L, 3))
         include_prefix = lua_toboolean(L, 3);
     std::map<std::string, bool> files;
     int err = DFHack::Filesystem::listdir_recursive(dir, files, depth, include_prefix);

From e0b37c8320213920dccda4fc6341ea52a6823481 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 25 Jul 2020 13:03:22 -0400
Subject: [PATCH 222/547] Update scripts (gui/advfort_items)

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index f028d38e4..ad67c79f8 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit f028d38e4ee9d60b9295a07d23ddb8dcc5197699
+Subproject commit ad67c79f8074a491c144144b2825cd05c80a2236

From 0f0306fc848bbdeb60a9c705578a38c0e67c4b99 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 25 Jul 2020 15:20:20 -0400
Subject: [PATCH 223/547] Move to internal changelog section + shorten

---
 docs/changelog.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 949e8fe56..8a45ba5b7 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -54,9 +54,11 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - Added ``Filesystem::mkdir_recursive``
 - Extended ``Filesystem::listdir_recursive`` to optionally make returned filenames relative to the start directory
 
+## Internals
+- Added support for splitting scripts into multiple files in the ``scripts/internal`` folder without polluting the output of `ls`
+
 ## Lua
 - Added a ``ref_target`` field to primitive field references, corresponding to the ``ref-target`` XML attribute
-- Support for splitting scripts into multiple files without polluting the output of ``#DFHack ls``. Scripts can now add internal files to an ``scripts/internal`` folder.
 
 ## Ruby
 - Updated ``item_find`` and ``building_find`` to use centralized logic that works on more screens

From 4891b4fd5e98801e414bdf57b4129df2515d4689 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 25 Jul 2020 20:22:52 -0400
Subject: [PATCH 224/547] Fix indexing primitive refs with integers (broken in
 #1543), add tests

Apparently lua_tostring has the side effect of *converting* numbers to strings
---
 library/LuaTypes.cpp               | 19 +++---
 test/structures/primitive_refs.lua | 92 ++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 8 deletions(-)
 create mode 100644 test/structures/primitive_refs.lua

diff --git a/library/LuaTypes.cpp b/library/LuaTypes.cpp
index 845d273e3..d496ba56f 100644
--- a/library/LuaTypes.cpp
+++ b/library/LuaTypes.cpp
@@ -707,15 +707,18 @@ static type_identity *find_primitive_field(lua_State *state, int field, const ch
  */
 static int meta_primitive_index(lua_State *state)
 {
-    const char *attr = lua_tostring(state, -1);
-    if (strcmp(attr, "ref_target") == 0) {
-        const struct_field_info *field_info = get_object_ref_header(state, 1)->field_info;
-        if (field_info && field_info->extra && field_info->extra->ref_target) {
-            LookupInTable(state, field_info->extra->ref_target, &DFHACK_TYPEID_TABLE_TOKEN);
-        } else {
-            lua_pushnil(state);
+    if (lua_type(state, -1) == LUA_TSTRING)
+    {
+        const char *attr = lua_tostring(state, -1);
+        if (strcmp(attr, "ref_target") == 0) {
+            const struct_field_info *field_info = get_object_ref_header(state, 1)->field_info;
+            if (field_info && field_info->extra && field_info->extra->ref_target) {
+                LookupInTable(state, field_info->extra->ref_target, &DFHACK_TYPEID_TABLE_TOKEN);
+            } else {
+                lua_pushnil(state);
+            }
+            return 1;
         }
-        return 1;
     }
 
     uint8_t *ptr = get_object_addr(state, 1, 2, "read");
diff --git a/test/structures/primitive_refs.lua b/test/structures/primitive_refs.lua
new file mode 100644
index 000000000..9de5bc980
--- /dev/null
+++ b/test/structures/primitive_refs.lua
@@ -0,0 +1,92 @@
+utils = require('utils')
+
+function with_temp_ref(...)
+    local args = {...}
+    local dtype = 'int32_t'
+    if type(args[1]) == 'string' then
+        dtype = table.remove(args, 1)
+    end
+    local count = 1
+    if type(args[1]) == 'number' then
+        count = table.remove(args, 1)
+    end
+    local func = table.remove(args, 1)
+    assert(type(func) == 'function')
+    dfhack.with_temp_object(df.new(dtype, count), func, table.unpack(args))
+end
+
+function test.zero_initialize()
+    with_temp_ref(function(x)
+        expect.eq(x.value, 0)
+    end)
+end
+
+function test.zero_initialize_array()
+    with_temp_ref(2, function(x)
+        expect.eq(x:_displace(1).value, 0)
+    end)
+end
+
+function test.displace_zero()
+    with_temp_ref(function(x)
+        expect.eq(x, x:_displace(0))
+    end)
+end
+
+function test.displace_nonzero()
+    with_temp_ref(2, function(x)
+        expect.ne(x, x:_displace(1))
+        expect.eq(utils.addressof(x) + x:sizeof(), utils.addressof(x:_displace(1)))
+    end)
+end
+
+function test.displace_negative()
+    with_temp_ref(2, function(x)
+        expect.true_(x:_displace(1):_displace(-1).value)
+    end)
+end
+
+function test.index_read()
+    with_temp_ref(function(x)
+        expect.eq(x.value, x[0])
+    end)
+end
+
+function test.index_write()
+    with_temp_ref(function(x)
+        x[0] = 1
+        expect.eq(x.value, 1)
+        expect.eq(x[0], 1)
+        x.value = 2
+        expect.eq(x.value, 2)
+        expect.eq(x[0], 2)
+    end)
+end
+
+function test.index_write_multi()
+    local len = 3
+    with_temp_ref(len, function(x)
+        for i = 0, len - 1 do
+            x[i] = i * i
+        end
+        for i = 0, len - 1 do
+            expect.eq(x[i], i * i)
+        end
+    end)
+end
+
+function test.index_read_negative()
+    with_temp_ref(function(x)
+        expect.error_match(function()
+            expect.true_(x:_displace(1)[-1])
+        end, 'negative index')
+    end)
+end
+
+function test.index_write_negative()
+    with_temp_ref(function(x)
+        expect.error_match(function()
+            x:_displace(1)[-1] = 7
+        end, 'negative index')
+    end)
+end

From 4e218c7de30dd859c3c2ca033dd0a5b1b8951df7 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 26 Jul 2020 02:00:13 -0400
Subject: [PATCH 225/547] Update xml

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index bada2199d..389ffde5a 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit bada2199d16bd8e97d15efee7cbe05e5eb6ee6ee
+Subproject commit 389ffde5a96b3c8263c0c2a2376e387aa2343fad

From f0ad730a3798bbe60c2afa1b3274963adf085425 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 26 Jul 2020 02:11:20 -0400
Subject: [PATCH 226/547] Lua: Fix off-by-one preventing accessing last
 df-other-vectors item by ID, add tests

---
 library/LuaTypes.cpp              |  2 +-
 test/structures/other_vectors.lua | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 test/structures/other_vectors.lua

diff --git a/library/LuaTypes.cpp b/library/LuaTypes.cpp
index d496ba56f..740b3f689 100644
--- a/library/LuaTypes.cpp
+++ b/library/LuaTypes.cpp
@@ -1451,7 +1451,7 @@ void other_vectors_identity::build_metatable(lua_State *state)
 
     auto keys = &index_enum->getKeys()[-index_enum->getFirstItem()];
 
-    for (int64_t i = 0; i < index_enum->getLastItem(); i++)
+    for (int64_t i = 0; i <= index_enum->getLastItem(); i++)
     {
         lua_getfield(state, base+2, keys[i]);
         lua_rawseti(state, base+2, int(i));
diff --git a/test/structures/other_vectors.lua b/test/structures/other_vectors.lua
new file mode 100644
index 000000000..43a50dc2a
--- /dev/null
+++ b/test/structures/other_vectors.lua
@@ -0,0 +1,27 @@
+function test.index_name()
+    for _, k in ipairs(df.units_other_id) do
+        expect.eq(df.global.world.units.other[k]._kind, 'container')
+    end
+end
+
+function test.index_name_bad()
+    expect.error_match(function()
+        expect.eq(df.global.world.units.other.SOME_FAKE_NAME, 'container')
+    end, 'not found.$')
+end
+
+function test.index_id()
+    for i in ipairs(df.units_other_id) do
+        expect.eq(df.global.world.units.other[i]._kind, 'container')
+    end
+end
+
+function test.index_id_bad()
+    expect.error_match(function()
+        expect.eq(df.global.world.units.other[df.units_other_id._first_item - 1], 'container')
+    end, 'Cannot read field')
+    expect.error_match(function()
+        expect.eq(df.global.world.units.other[df.units_other_id._last_item + 1], 'container')
+    end, 'Cannot read field')
+end
+

From 4554ca35f3eef40137d5b264fdfda673eca60be0 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 26 Jul 2020 23:11:04 -0400
Subject: [PATCH 227/547] Ruby: add _indexenum wrapper to OtherVectors for
 compat with devel/scanitemsother

Ref #1558
---
 plugins/ruby/ruby-autogen-defs.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/ruby/ruby-autogen-defs.rb b/plugins/ruby/ruby-autogen-defs.rb
index c72ffeb2b..162914e32 100644
--- a/plugins/ruby/ruby-autogen-defs.rb
+++ b/plugins/ruby/ruby-autogen-defs.rb
@@ -213,6 +213,9 @@ module DFHack
                 end
             end
 
+            def _indexenum
+                self.class._enum
+            end
             def [](i)
                 self.send(self.class._enum.sym(i))
             end

From 569370489adf34bdb5089bd0ab406069943cf9db Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 26 Jul 2020 23:16:13 -0400
Subject: [PATCH 228/547] Update submodules (fixes #1576)

---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index 389ffde5a..d6800389a 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 389ffde5a96b3c8263c0c2a2376e387aa2343fad
+Subproject commit d6800389a501d53dcc353d7e82137f5e2a7d08c8
diff --git a/scripts b/scripts
index ad67c79f8..3678042e4 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit ad67c79f8074a491c144144b2825cd05c80a2236
+Subproject commit 3678042e41f84669c0faf5984f22cf3742186091

From 289e0df828297b75a96fef2d1132ca7aa7de890e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 27 Jul 2020 01:12:14 -0400
Subject: [PATCH 229/547] Roll back to actions/checkout v1

v2 uses the wrong commit sometimes: actions/checkout#299
---
 .github/workflows/build.yml | 4 ++--
 library/xml                 | 2 +-
 scripts                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fb98bfa0b..8c3819f11 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
             zlib1g-dev
         pip install sphinx
     - name: Clone DFHack
-      uses: actions/checkout@v2
+      uses: actions/checkout@v1
       with:
         fetch-depth: 0  # unlimited - we need past tags
         submodules: true
@@ -99,7 +99,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install lua5.3
     - name: Clone DFHack
-      uses: actions/checkout@v2
+      uses: actions/checkout@v1
       with:
         submodules: true
         # don't need tags here
diff --git a/library/xml b/library/xml
index d6800389a..61bdd4236 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit d6800389a501d53dcc353d7e82137f5e2a7d08c8
+Subproject commit 61bdd4236ef9cdde03516d73444ff3708c8ee822
diff --git a/scripts b/scripts
index 3678042e4..9799af8cb 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 3678042e41f84669c0faf5984f22cf3742186091
+Subproject commit 9799af8cb4c825ca9dbe6e6293c28790a5edbfef

From c1219642b518b57722c6d6d19f63152dc27c8ac0 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 28 Jul 2020 00:21:23 -0400
Subject: [PATCH 230/547] Reorganize dev docs TOC, add label to remote TOC

---
 docs/Remote.rst    | 2 +-
 docs/index-dev.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/Remote.rst b/docs/Remote.rst
index a6f07ebc0..435873f71 100644
--- a/docs/Remote.rst
+++ b/docs/Remote.rst
@@ -12,7 +12,7 @@ available are not comprehensive, but can be extended with plugins.
 
 .. _Google protobuf: https://developers.google.com/protocol-buffers
 
-.. contents::
+.. contents:: Contents
     :local:
 
 
diff --git a/docs/index-dev.rst b/docs/index-dev.rst
index 560137609..95e5e3fdd 100644
--- a/docs/index-dev.rst
+++ b/docs/index-dev.rst
@@ -12,9 +12,9 @@ These are pages relevant to people developing for DFHack.
    /docs/Compile
    /docs/NEWS-dev
    /docs/Lua API
+   /docs/Remote
    /docs/Documentation
    /docs/Structures-intro
    /docs/Memory-research
-   /docs/Remote
    /docs/Binpatches
 

From 411176c75e40a7a5cd3cc49cd7a8520ab64373ae Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 28 Jul 2020 00:38:22 -0400
Subject: [PATCH 231/547] Add rudimentary map docs with tile descriptions from
 @AtomicChicken

Based on http://www.bay12forums.com/smf/index.php?topic=164123.msg8158676#msg8158676
---
 docs/Lua API.rst   |  2 ++
 docs/api/Maps.rst  | 59 ++++++++++++++++++++++++++++++++++++++++++++++
 docs/api/index.rst |  8 +++++++
 docs/index-dev.rst |  1 +
 4 files changed, 70 insertions(+)
 create mode 100644 docs/api/Maps.rst
 create mode 100644 docs/api/index.rst

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index de5741861..8c3763245 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -1414,6 +1414,8 @@ Items module
 
   Checks whether the item is assigned to a squad.
 
+.. _lua-maps:
+
 Maps module
 -----------
 
diff --git a/docs/api/Maps.rst b/docs/api/Maps.rst
new file mode 100644
index 000000000..cfffe7905
--- /dev/null
+++ b/docs/api/Maps.rst
@@ -0,0 +1,59 @@
+.. include:: <isonum.txt>
+
+========
+Maps API
+========
+
+DFHack offers several ways to access and manipulate map data.
+
+* C++: the ``Maps`` and ``MapCache`` modules
+* Lua: the `dfhack.maps module <lua-maps>`_
+* All languages: the ``map`` field of the ``world`` global contains raw map data
+  when the world is loaded.
+
+.. note::
+
+    This page will eventually go into more detail about the available APIs.
+    For now, it is just an overview of how DF map data is structured.
+
+.. contents:: Contents
+    :local:
+
+Tiles
+=====
+
+The DF map has several types of tiles:
+
+- **Local tiles** are at the smallest scale. In regular fortress/adventure mode
+  play, the cursor takes up 1 local tile.
+
+  Objects that use local tile coordinates include:
+
+  - Units
+  - Items
+  - Projectiles
+
+- **Blocks** are 16 |times| 16 |times| 1 groups of local tiles. Internally, many
+  tile details are stored at the block level for space-efficiency reasons.
+  Blocks are visible during zoomed-in fast travel in adventure mode.
+
+  Objects that use block coordinates include:
+
+  - Armies
+
+- **Region tiles** are 3 |times| 3 groups of columns of blocks (they span the
+  entire z-axis), or 48 |times| 48 columns of local tiles. DF sometimes refers
+  to these as "mid-level tiles" (MLTs). Region tiles are visible when resizing
+  a fortress before embarking, or in zoomed-out fast travel in adventure mode.
+
+- **World tiles** are
+
+  - 16 |times| 16 groups of region tiles, or
+  - 48 |times| 48 groups of columns of blocks, or
+  - 768 |times| 768 groups of columns of local tiles
+
+  World tiles are visible on the world map before embarking, as well as in the
+  civilization map in fortress mode and the quest log in adventure mode.
+
+- Some map features are stored in 16 |times| 16 groups of world tiles, sometimes
+  referred to as "feature shells".
diff --git a/docs/api/index.rst b/docs/api/index.rst
new file mode 100644
index 000000000..1fe03e9a8
--- /dev/null
+++ b/docs/api/index.rst
@@ -0,0 +1,8 @@
+====================
+DFHack API Reference
+====================
+
+.. toctree::
+    :maxdepth: 1
+
+    /docs/api/Maps
diff --git a/docs/index-dev.rst b/docs/index-dev.rst
index 95e5e3fdd..3788baf1d 100644
--- a/docs/index-dev.rst
+++ b/docs/index-dev.rst
@@ -13,6 +13,7 @@ These are pages relevant to people developing for DFHack.
    /docs/NEWS-dev
    /docs/Lua API
    /docs/Remote
+   /docs/api/index
    /docs/Documentation
    /docs/Structures-intro
    /docs/Memory-research

From f546816eb984cd384c324ae0119640cb0e1a4b99 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 28 Jul 2020 00:39:59 -0400
Subject: [PATCH 232/547] Update submodules

---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index 61bdd4236..0afb796c4 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 61bdd4236ef9cdde03516d73444ff3708c8ee822
+Subproject commit 0afb796c4e81102a8cf57b120945b365c704793c
diff --git a/scripts b/scripts
index 9799af8cb..ef428bec5 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 9799af8cb4c825ca9dbe6e6293c28790a5edbfef
+Subproject commit ef428bec5269a060c0d706cad75397db4e508db9

From d504e476c55a644647a0c99908ce39cab0928066 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 28 Jul 2020 23:42:37 -0400
Subject: [PATCH 233/547] Update xml

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index 0afb796c4..ecd6bcc9e 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 0afb796c4e81102a8cf57b120945b365c704793c
+Subproject commit ecd6bcc9ed67c62fa605561b27574467df792342

From 437923bd2ef2a3e072ac8eaa0e1f177695116c7e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 29 Jul 2020 22:40:05 -0400
Subject: [PATCH 234/547] Update scripts/pref-adjust

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index ef428bec5..a50a72a14 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit ef428bec5269a060c0d706cad75397db4e508db9
+Subproject commit a50a72a143cab62348909c3568ddbe63745e5451

From 19ad5c92d64396d77eac93e78a66b9714f6751d1 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Thu, 30 Jul 2020 10:09:41 +0200
Subject: [PATCH 235/547] corrected incursion bugs

---
 plugins/embark-assistant/survey.cpp | 76 +++++++++++++++++++++++++++--
 1 file changed, 71 insertions(+), 5 deletions(-)

diff --git a/plugins/embark-assistant/survey.cpp b/plugins/embark-assistant/survey.cpp
index 2d5dca04d..fb44440a1 100644
--- a/plugins/embark-assistant/survey.cpp
+++ b/plugins/embark-assistant/survey.cpp
@@ -1641,10 +1641,10 @@ uint8_t  embark_assist::survey::translate_corner(embark_assist::defs::world_tile
     bool n_region_type_active;
     bool w_region_type_active;
     bool home_region_type_active;
-    uint8_t nw_region_type_level;
-    uint8_t n_region_type_level;
-    uint8_t w_region_type_level;
-    uint8_t home_region_type_level;
+    int8_t nw_region_type_level;
+    int8_t n_region_type_level;
+    int8_t w_region_type_level;
+    int8_t home_region_type_level;
 
     if (corner_location == 4) {  //  We're the reference. No change.
     }
@@ -1666,6 +1666,39 @@ uint8_t  embark_assist::survey::translate_corner(embark_assist::defs::world_tile
             return 4;
         }
         else {  //  East side corners of the east edge of the world
+            nw_region_type = embark_assist::survey::region_type_of(survey_results, x, y, effective_i - 1, effective_k - 1);
+            w_region_type = embark_assist::survey::region_type_of(survey_results, x, y, effective_i - 1, effective_k);
+
+            if (nw_region_type == df::world_region_type::Lake ||
+                nw_region_type == df::world_region_type::Ocean) {
+                nw_region_type_level = 0;
+            }
+            else if (nw_region_type == df::world_region_type::Mountains) {
+                nw_region_type_level = 1;
+            }
+            else {
+                nw_region_type_level = 2;
+            }
+
+            if (w_region_type == df::world_region_type::Lake ||
+                w_region_type == df::world_region_type::Ocean) {
+                w_region_type_level = 0;
+            }
+            else if (w_region_type == df::world_region_type::Mountains) {
+                w_region_type_level = 1;
+            }
+            else {
+                w_region_type_level = 2;
+            }
+
+            if (nw_region_type_level < w_region_type_level) {
+                return 4;
+            }
+            else if (nw_region_type_level > w_region_type_level) {
+                return 1;
+            }
+
+            //  Neither tile will automatically yield to the other
             if (corner_location == 5) {
                 return 1;
             }
@@ -1675,11 +1708,44 @@ uint8_t  embark_assist::survey::translate_corner(embark_assist::defs::world_tile
         }
     }
     else if (effective_y == world_data->world_height) {
+        nw_region_type = embark_assist::survey::region_type_of(survey_results, x, y, effective_i - 1, effective_k - 1);
+        n_region_type = embark_assist::survey::region_type_of(survey_results, x, y, effective_i, effective_k - 1);
+
+        if (nw_region_type == df::world_region_type::Lake ||
+            nw_region_type == df::world_region_type::Ocean) {
+            nw_region_type_level = 0;
+        }
+        else if (nw_region_type == df::world_region_type::Mountains) {
+            nw_region_type_level = 1;
+        }
+        else {
+            nw_region_type_level = 2;
+        }
+
+        if (n_region_type == df::world_region_type::Lake ||
+            n_region_type == df::world_region_type::Ocean) {
+            n_region_type_level = 0;
+        }
+        else if (n_region_type == df::world_region_type::Mountains) {
+            n_region_type_level = 1;
+        }
+        else {
+            n_region_type_level = 2;
+        }
+
+        if (nw_region_type_level < n_region_type_level) {
+            return 4;
+        }
+        else if (nw_region_type_level > n_region_type_level) {
+            return 5;
+        }
+
+        //  Neither tile will automatically yield to the other
         if (corner_location == 7) {
             return 4;
         }
         else {  //  Can only be corner_location == 8
-            return 3;
+            return 5;
         }
     }
 

From bb66ef32a7f4ba6c66fca854482de092b8e447cd Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 2 Aug 2020 12:55:36 -0400
Subject: [PATCH 236/547] Tone down a couple warnings

There have been a few cases of people thinking these are more important than they actually are
---
 library/DataDefs.cpp      | 2 +-
 library/PluginManager.cpp | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/library/DataDefs.cpp b/library/DataDefs.cpp
index f8f65b108..28761efa3 100644
--- a/library/DataDefs.cpp
+++ b/library/DataDefs.cpp
@@ -334,7 +334,7 @@ virtual_identity *virtual_identity::find(void *vtable)
         return p;
     }
 
-    std::cerr << "UNKNOWN CLASS '" << name << "': vtable = 0x"
+    std::cerr << "Class not in symbols.xml: '" << name << "': vtable = 0x"
               << std::hex << uintptr_t(vtable) << std::dec << std::endl;
 
     known[vtable] = NULL;
diff --git a/library/PluginManager.cpp b/library/PluginManager.cpp
index 05db0521d..db42c5c84 100644
--- a/library/PluginManager.cpp
+++ b/library/PluginManager.cpp
@@ -313,8 +313,12 @@ bool Plugin::load(color_ostream &con)
     if (plug_git_desc_ptr)
     {
         if (strcmp(dfhack_git_desc, plug_git_desc) != 0)
-            con.printerr("Warning: Plugin %s compiled for DFHack %s, running DFHack %s\n",
+        {
+            std::string msg = stl_sprintf("Warning: Plugin %s compiled for DFHack %s, running DFHack %s\n",
                 *plug_name, plug_git_desc, dfhack_git_desc);
+            con << msg;
+            cerr << msg;
+        }
     }
     else
         con.printerr("Warning: Plugin %s missing git information\n", *plug_name);

From dba7df7ab8ba562726f10f6b9a5f6312e0637b70 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 2 Aug 2020 23:10:35 -0400
Subject: [PATCH 237/547] Add "delete word" support to Console-posix

---
 docs/changelog.txt        |  1 +
 library/Console-posix.cpp | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 8a45ba5b7..bf953d562 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -55,6 +55,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - Extended ``Filesystem::listdir_recursive`` to optionally make returned filenames relative to the start directory
 
 ## Internals
+- Linux/macOS: Added console keybindings for deleting words (Alt+Backspace and Alt+d in most terminals)
 - Added support for splitting scripts into multiple files in the ``scripts/internal`` folder without polluting the output of `ls`
 
 ## Lua
diff --git a/library/Console-posix.cpp b/library/Console-posix.cpp
index 6fb1cbff3..595f50e97 100644
--- a/library/Console-posix.cpp
+++ b/library/Console-posix.cpp
@@ -541,6 +541,7 @@ namespace DFHack
                     return Console::SHUTDOWN;
                 }
                 lock->lock();
+                const int old_cursor = raw_cursor;
                 /* Only autocomplete when the callback is set. It returns < 0 when
                  * there was an error reading from fd. Otherwise it will return the
                  * character that should be handled next. */
@@ -597,6 +598,29 @@ namespace DFHack
                     {
                         forward_word();
                     }
+                    else if (seq[0] == 127 || seq[0] == 8) // backspace || ctrl-h
+                    {
+                        // delete word
+                        back_word();
+                        if (old_cursor > raw_cursor)
+                        {
+                            yank_buffer = raw_buffer.substr(raw_cursor, old_cursor - raw_cursor);
+                            raw_buffer.erase(raw_cursor, old_cursor - raw_cursor);
+                            prompt_refresh();
+                        }
+                    }
+                    else if (seq[0] == 'd')
+                    {
+                        // delete word forward
+                        forward_word();
+                        if (old_cursor < raw_cursor)
+                        {
+                            yank_buffer = raw_buffer.substr(old_cursor, raw_cursor - old_cursor);
+                            raw_buffer.erase(old_cursor, raw_cursor - old_cursor);
+                            raw_cursor = old_cursor;
+                            prompt_refresh();
+                        }
+                    }
                     else if(seq[0] == '[')
                     {
                         if (!read_char(seq[1]))

From 00a240fcaf55f6141153f97aba0ea63e6d2b95f3 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 4 Aug 2020 16:44:34 -0400
Subject: [PATCH 238/547] Update scripts (dfhack/scripts#114)

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index a50a72a14..70ce0a12b 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit a50a72a143cab62348909c3568ddbe63745e5451
+Subproject commit 70ce0a12bc0eb14b3782abe7033a6d2dd31863fe

From 9510dd52e13c037b08ebecfa23dd46491f77737e Mon Sep 17 00:00:00 2001
From: Ryan Bennitt <ryanbennitt@googlemail.com>
Date: Tue, 4 Aug 2020 23:01:28 +0100
Subject: [PATCH 239/547] Add Goal to Manipulator Detail Modes

---
 library/include/modules/Units.h |  5 ++
 library/modules/Units.cpp       | 67 +++++++++++++++++++++++++++
 plugins/manipulator.cpp         | 81 +++++++++++++++++++++++++++++----
 3 files changed, 145 insertions(+), 8 deletions(-)

diff --git a/library/include/modules/Units.h b/library/include/modules/Units.h
index f5995583b..c719a60a9 100644
--- a/library/include/modules/Units.h
+++ b/library/include/modules/Units.h
@@ -32,6 +32,7 @@ distribution.
 #include "DataDefs.h"
 
 #include "df/caste_raw_flags.h"
+#include "df/goal_type.h"
 #include "df/job_skill.h"
 #include "df/mental_attribute_type.h"
 #include "df/misc_trait_type.h"
@@ -180,6 +181,10 @@ DFHACK_EXPORT std::string getCasteProfessionName(int race, int caste, df::profes
 DFHACK_EXPORT int8_t getProfessionColor(df::unit *unit, bool ignore_noble = false);
 DFHACK_EXPORT int8_t getCasteProfessionColor(int race, int caste, df::profession pid);
 
+DFHACK_EXPORT df::goal_type getGoalType(df::unit *unit, int goalIndex = 0);
+DFHACK_EXPORT std::string getGoalName(df::unit *unit, int goalIndex = 0);
+DFHACK_EXPORT bool isGoalAchieved(df::unit *unit, int goalIndex = 0);
+
 DFHACK_EXPORT std::string getSquadName(df::unit *unit);
 
 DFHACK_EXPORT df::activity_entry *getMainSocialActivity(df::unit *unit);
diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp
index 422060803..87c71ac67 100644
--- a/library/modules/Units.cpp
+++ b/library/modules/Units.cpp
@@ -1437,6 +1437,73 @@ int8_t Units::getCasteProfessionColor(int race, int casteid, df::profession pid)
     return 3;
 }
 
+df::goal_type Units::getGoalType(df::unit *unit, int goalIndex)
+{
+    CHECK_NULL_POINTER(unit);
+
+    df::goal_type goal = df::goal_type::STAY_ALIVE;
+    if (unit->status.current_soul
+        && unit->status.current_soul->personality.dreams.size() > goalIndex)
+    {
+        goal = unit->status.current_soul->personality.dreams[goalIndex]->type;
+    }
+    return goal;
+}
+
+std::string Units::getGoalName(df::unit *unit, int goalIndex)
+{
+    CHECK_NULL_POINTER(unit);
+
+    df::goal_type goal = getGoalType(unit, goalIndex);
+    bool achieved_goal = isGoalAchieved(unit, goalIndex);
+
+    switch (goal)
+    {
+    default:
+    case df::goal_type::STAY_ALIVE:
+        return achieved_goal ? "Stayed Alive" : "Stay Alive";
+    case df::goal_type::MAINTAIN_ENTITY_STATUS:
+        return achieved_goal ? "Maintained Status" : "Maintain Status";
+    case df::goal_type::START_A_FAMILY:
+        return isFemale(unit) ?
+            (achieved_goal ? "Is a Mother" : "Be a Mother") :
+            (achieved_goal ? "Is a Father" : "Be a Father");
+    case df::goal_type::RULE_THE_WORLD:
+        return achieved_goal ? "Ruled the World" : "Rule the World";
+    case df::goal_type::CREATE_A_GREAT_WORK_OF_ART:
+        return achieved_goal ? "Made Great Artwork" : "Create Great Artwork";
+    case df::goal_type::CRAFT_A_MASTERWORK:
+        return achieved_goal ? "Crafted a Masterwork" : "Craft a Masterwork";
+    case df::goal_type::BRING_PEACE_TO_THE_WORLD:
+        return achieved_goal ? "Brought World Peace" : "Bring Peace to World";
+    case df::goal_type::BECOME_A_LEGENDARY_WARRIOR:
+        return achieved_goal ? "Is Legendary Warrior" : "Be Legendary Warrior";
+    case df::goal_type::MASTER_A_SKILL:
+        return achieved_goal ? "Mastered a Skill" : "Master a Skill";
+    case df::goal_type::FALL_IN_LOVE:
+        return achieved_goal ? "Fell in Love" : "Fall in Love";
+    case df::goal_type::SEE_THE_GREAT_NATURAL_SITES:
+        return achieved_goal ? "Saw Natural Wonders" : "See Natural Wonders";
+    case df::goal_type::IMMORTALITY:
+        return achieved_goal ? "Immortal" : "Immortality";
+    case df::goal_type::MAKE_A_GREAT_DISCOVERY:
+        return achieved_goal ? "Made Great Discovery" : "Make Great Discovery";
+    case df::goal_type::ATTAINING_RANK_IN_SOCIETY:
+        return achieved_goal ? "Attained Social Rank" : "Attain Social Rank";
+    case df::goal_type::BATHING_THE_WORLD_IN_CHAOS:
+        return achieved_goal ? "World is in Chaos" : "Bathe World in Chaos";
+    }
+}
+
+bool Units::isGoalAchieved(df::unit *unit, int goalIndex)
+{
+    CHECK_NULL_POINTER(unit);
+
+    return unit->status.current_soul
+        && unit->status.current_soul->personality.dreams.size() > goalIndex
+        && unit->status.current_soul->personality.dreams[goalIndex]->flags.whole != 0;
+}
+
 std::string Units::getSquadName(df::unit *unit)
 {
     CHECK_NULL_POINTER(unit);
diff --git a/plugins/manipulator.cpp b/plugins/manipulator.cpp
index a013df335..4bb285f0b 100644
--- a/plugins/manipulator.cpp
+++ b/plugins/manipulator.cpp
@@ -32,9 +32,12 @@
 #include "df/caste_raw.h"
 #include "df/historical_entity.h"
 #include "df/entity_raw.h"
+#include "df/goal_type.h"
+#include "df/unit_personality.h"
 
 #include "uicommon.h"
 #include "listcolumn.h"
+#include "manipulator.h"
 
 using std::stringstream;
 using std::set;
@@ -287,6 +290,9 @@ struct UnitInfo
     string name;
     string transname;
     string profession;
+    string goal;
+    enum { NEUTRAL, MALE, FEMALE } goal_gender;
+    bool achieved_goal;
     int8_t color;
     int active_index;
     string squad_effective_name;
@@ -310,7 +316,8 @@ struct UnitInfo
 enum detail_cols {
     DETAIL_MODE_PROFESSION,
     DETAIL_MODE_SQUAD,
-    DETAIL_MODE_JOB
+    DETAIL_MODE_JOB,
+    DETAIL_MODE_GOAL
 };
 enum altsort_mode {
     ALTSORT_NAME,
@@ -348,6 +355,21 @@ bool sortByProfession (const UnitInfo *d1, const UnitInfo *d2)
         return (d1->profession < d2->profession);
 }
 
+bool sortByGoal (const UnitInfo *d1, const UnitInfo *d2)
+{
+    if (!d1->unit->status.current_soul)
+        return !descending;
+    if (!d2->unit->status.current_soul)
+        return descending;
+
+    df::goal_type goal1 = Units::getGoalType(d1->unit);
+    df::goal_type goal2 = Units::getGoalType(d2->unit);
+    if (descending)
+        return (goal1 > goal2);
+    else
+        return (goal1 < goal2);
+}
+
 bool sortBySquad (const UnitInfo *d1, const UnitInfo *d2)
 {
     bool gt = false;
@@ -583,6 +605,8 @@ namespace unit_ops {
     }
     string get_profname(UnitInfo *u)
         { return Units::getProfessionName(u->unit); }
+    string get_goalname(UnitInfo *u)
+        { return Units::getGoalName(u->unit); }
     string get_real_profname(UnitInfo *u)
     {
         string tmp = u->unit->custom_profession;
@@ -1237,6 +1261,14 @@ void viewscreen_unitlaborsst::refreshNames()
         cur->name = Translation::TranslateName(Units::getVisibleName(unit), false);
         cur->transname = Translation::TranslateName(Units::getVisibleName(unit), true);
         cur->profession = Units::getProfessionName(unit);
+        cur->goal = Units::getGoalName(unit);
+        df::goal_type goal = Units::getGoalType(unit);
+        if (goal == df::goal_type::START_A_FAMILY) {
+            cur->goal_gender = Units::isFemale(unit) ? UnitInfo::FEMALE : UnitInfo::MALE;
+        } else {
+            cur->goal_gender = UnitInfo::NEUTRAL;
+        }
+        cur->achieved_goal = Units::isGoalAchieved(unit);
 
         if (unit->job.current_job == NULL) {
             df::activity_event *event = Units::getMainSocialEvent(unit);
@@ -1298,8 +1330,10 @@ void viewscreen_unitlaborsst::calcSize()
             detail_cmp = units[i]->squad_info.size();
         } else if (detail_mode == DETAIL_MODE_JOB) {
             detail_cmp = units[i]->job_desc.size();
-        } else {
+        } else if (detail_mode == DETAIL_MODE_PROFESSION) {
             detail_cmp = units[i]->profession.size();
+        } else {
+            detail_cmp = units[i]->goal.size();
         }
         if (size_t(col_maxwidth[DISP_COLUMN_DETAIL]) < detail_cmp)
             col_maxwidth[DISP_COLUMN_DETAIL] = detail_cmp;
@@ -1736,8 +1770,10 @@ void viewscreen_unitlaborsst::feed(set<df::interface_key> *events)
                 std::stable_sort(units.begin(), units.end(), sortBySquad);
             } else if (detail_mode == DETAIL_MODE_JOB) {
                 std::stable_sort(units.begin(), units.end(), sortByJob);
-            } else {
+            } else if (detail_mode == DETAIL_MODE_PROFESSION){
                 std::stable_sort(units.begin(), units.end(), sortByProfession);
+            } else {
+                std::stable_sort(units.begin(), units.end(), sortByGoal);
             }
             break;
         case ALTSORT_STRESS:
@@ -1777,9 +1813,11 @@ void viewscreen_unitlaborsst::feed(set<df::interface_key> *events)
         if (detail_mode == DETAIL_MODE_SQUAD) {
             detail_mode = DETAIL_MODE_JOB;
         } else if (detail_mode == DETAIL_MODE_JOB) {
-            detail_mode = DETAIL_MODE_PROFESSION;
-        } else {
+            detail_mode = DETAIL_MODE_GOAL;
+        } else if (detail_mode == DETAIL_MODE_PROFESSION) {
             detail_mode = DETAIL_MODE_SQUAD;
+        } else {
+            detail_mode = DETAIL_MODE_PROFESSION;
         }
     }
 
@@ -1888,8 +1926,10 @@ void viewscreen_unitlaborsst::render()
         detail_str = "Squad";
     } else if (detail_mode == DETAIL_MODE_JOB) {
         detail_str = "Job";
-    } else {
+    } else if (detail_mode == DETAIL_MODE_PROFESSION) {
         detail_str = "Profession";
+    } else {
+        detail_str = "Goal";
     }
     Screen::paintString(Screen::Pen(' ', 7, 0), col_offsets[DISP_COLUMN_DETAIL], 2, detail_str);
 
@@ -1978,9 +2018,32 @@ void viewscreen_unitlaborsst::render()
             } else {
                 fg = COLOR_LIGHTCYAN;
             }
-        } else {
+        } else if (detail_mode == DETAIL_MODE_PROFESSION) {
             fg = cur->color;
             detail_str = cur->profession;
+        } else {
+            if (cur->goal_gender == UnitInfo::NEUTRAL) {
+                if (cur->achieved_goal) {
+                    fg = COLOR_LIGHTGREEN;
+                } else {
+                    fg = COLOR_BROWN;
+                }
+            } else if (cur->goal_gender == UnitInfo::FEMALE) {
+                if (cur->achieved_goal) {
+                    fg = COLOR_LIGHTRED;
+                }
+                else {
+                    fg = COLOR_MAGENTA;
+                }
+            } else {
+                if (cur->achieved_goal) {
+                    fg = COLOR_LIGHTCYAN;
+                }
+                else {
+                    fg = COLOR_BLUE;
+                }
+            }
+            detail_str = cur->goal;
         }
         detail_str.resize(col_widths[DISP_COLUMN_DETAIL]);
         Screen::paintString(Screen::Pen(' ', fg, bg), col_offsets[DISP_COLUMN_DETAIL], 4 + row, detail_str);
@@ -2140,8 +2203,10 @@ void viewscreen_unitlaborsst::render()
             OutputString(15, x, y, "Squad");
         } else if (detail_mode == DETAIL_MODE_JOB) {
             OutputString(15, x, y, "Job");
-        } else {
+        } else if (detail_mode == DETAIL_MODE_PROFESSION){
             OutputString(15, x, y, "Profession");
+        } else {
+            OutputString(15, x, y, "Goal");
         }
         break;
     case ALTSORT_STRESS:

From 2b26117685dbcab50106a46b6a05e71f4f338ff4 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Wed, 5 Aug 2020 15:44:00 -0700
Subject: [PATCH 240/547] update quickfort docs and configs

---
 data/blueprints/README.md             |  15 +
 data/blueprints/README.txt            |  14 -
 data/quickfort/aliases-common.txt     | 497 ++++++++++++++++++++------
 dfhack-config/quickfort/aliases.txt   |  97 +++--
 dfhack-config/quickfort/quickfort.txt |  26 +-
 5 files changed, 501 insertions(+), 148 deletions(-)
 create mode 100644 data/blueprints/README.md
 delete mode 100644 data/blueprints/README.txt

diff --git a/data/blueprints/README.md b/data/blueprints/README.md
new file mode 100644
index 000000000..d81f0e3b4
--- /dev/null
+++ b/data/blueprints/README.md
@@ -0,0 +1,15 @@
+This directory is for quickfort blueprints. You can apply them to your fortress
+map with the DFHack
+[quickfort script](https://docs.dfhack.org/en/stable/docs/_auto/base.html#quickfort).
+
+You can create blueprints by hand or by using any spreadsheet application,
+saving them as .xlsx or .csv files. You can also build your plan "for real" in
+Dwarf Fortress, and then export your map using the DFHack
+[blueprint plugin](https://docs.dfhack.org/en/stable/docs/Plugins.html#blueprint)
+for later replay in a different fort.
+
+DFHack blueprints are compatible with the original Quickfort 2.0 syntax. If you
+have existing blueprints that worked with https://github.com/joelpt/quickfort,
+then they should work just fine in DFHack quickfort.
+
+There are many ready-to-use examples of blueprints in the library subfolder.
diff --git a/data/blueprints/README.txt b/data/blueprints/README.txt
deleted file mode 100644
index 2096476c5..000000000
--- a/data/blueprints/README.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-This directory is for quickfort blueprints. You can apply them to your fortress
-map with the DFHack quickfort plugin. See
-https://docs.dfhack.org/en/stable/docs/Scripts.html#quickfort for details.
-
-You can create blueprints by hand or by using any spreadsheet application,
-saving them as .xlsx or .csv files. You can also build your plan "for real" in
-Dwarf Fortress, and then export your map using the DFHack blueprint for later
-replay in a different fort. See
-https://docs.dfhack.org/en/stable/docs/Plugins.html#blueprint for more info.
-
-DFHack blueprints follow the original Quickfort 2.0 syntax. See
-https://github.com/joelpt/quickfort for joelpt's excellent documentation.
-
-There are many ready-to-use examples of blueprints in the library subfolder.
diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt
index b4e19c782..09bb7e3f0 100644
--- a/data/quickfort/aliases-common.txt
+++ b/data/quickfort/aliases-common.txt
@@ -1,135 +1,428 @@
-# quickfort aliases common baseline configuration file
+# Common baseline for aliases for quickfort query mode blueprints.
 #
-# Defines custom keycode shortcuts for blueprints. Please DO NOT EDIT this file
-# directly. Instead, custom aliases should be added to
-# dfhack-config/quickfort/aliases.txt.
+# Please DO NOT EDIT this file directly. Instead, custom aliases should be added
+# to dfhack-config/quickfort/aliases.txt. See that file for syntax
+# documentation.
 #
-# Syntax:
-#   aliasname: keystrokes
-#
-# Special keys:
-#   {Right}, {Left}, {Up}, {Down}, >, < move the DF cursor
-#   {/}, {*}, {+}, {-} can be used to navigate some DF menus
-#   {Enter}, +{Enter}, {ExitMenu} - Enter, Shift+Enter, and Escape, respectively
-#   {Wait} pauses playback briefly
-#
-# Special keys can be repeated by adding a number inside the curly braces, for
-# example: {Down 5}
+# The aliases in this file were tested in DF 0.47.04 on 2020 Jul 18.
 #
-# Some shorthand:
-#   &   expands to {Enter}
-#   @   expands to +{Enter}
-#   ^   expands to {ExitMenu}
-#   %   expands to {Wait}
+# The aliases are generally split into three categories:
+# 1) The aliases that name a type disables everything else for that stockpile
+#    category and enable only that type. For example, "preparedfood" enables
+#    prepared food and disables all other types of food.
+# 2) The aliases that start with "forbid" only forbid (or toggle) the named type
+#    and leave the rest of the stockpile untouched.
+# 3) The aliases that start with "permit" only permit (or toggle) the named type
+#    and leave the rest of the stockpile untouched.
 #
-# The aliases in this file were tested in DF 0.47.04 on 2020 Jul 18.
+# Aliases that don't fit into those two categories have comments explaining
+# their usage.
+
+
+########################################
+# general purpose stockpile adjustments
+########################################
+
+linksonly: a
+nocontainers: CE
+
+# for configuring stockpiles to give to other nearby stockpiles/workshops
+give2up: g{Up 2}&
+give2down: g{Down 2}&
+give2left: g{Left 2}&
+give2right: g{Right 2}&
+give10up: g{Up 10}&
+give10down: g{Down 10}&
+give10left: g{Left 10}&
+give10right: g{Right 10}&
+
+# use to toggle a sequence of stockpile options. for example: {togglesequence 5}
+togglesequence: &{Down}
+togglesequence2: &{Down 2}
+enablesequence: e{Down}
+
+# Enables everything but corpses and refuse. Refuse is excluded since otherwise
+# clothes and armor in this quantum stockpile will rot away. If you want bones
+# in your quantum stockpile, apply this alias to a refuse stockpile (but don't
+# put useful clothes or armor in there!)
+quantum: {linksonly}{nocontainers}{enableanimals}{enablefood}{furnitureprefix}{enablestone}{enableammo}{enablecoins}{enablebars}{enablegems}{enablefinishedgoods}{enableleather}{enablecloth}{enablewood}}{enableweapons}{enablearmor}{enablesheet}
+
+# Run one of the quantumstopfrom* aliases over a track stop that is set to dump
+# into a quantum stockpile. The alias will set up the stop to accept all types
+# (the actual types stored in the quantum stockpile is controlled by the feeder
+# stockpile) and link the indicated adjacent feeder stockpile. All you need to
+# do afterwards is assign a vehicle to the stop (and optionally give the route a
+# name). The track stop does not need to be constructed yet, but the stockpile
+# needs to be in place so we can link to it.
+quantumstopprefix: ^hrs&xxx&{enablesequence 17}^
+quantumstopfromeast: {quantumstopprefix}s{Right}p^{Left}^q
+quantumstopfromsouth: {quantumstopprefix}s{Down}p^{Up}^q
+quantumstopfromwest: {quantumstopprefix}s{Left}p^{Right}^q
+quantumstopfromnorth: {quantumstopprefix}s{Up}p^{Down}^q
+
+
+##################################
+# animal stockpile adjustments
+##################################
+
+animalsprefix:  s
+enableanimals:  {animalsprefix}e^
+disableanimals: {animalsprefix}d^
+
+# enables only the specified type (and disables everything else)
+cages: {animalsprefix}bu^
+traps: {animalsprefix}bj^
+
+# forbids specific items in an already-configured stockpile
+forbidcages: {animalsprefix}u^
+forbidtraps: {animalsprefix}j^
+
 
 ##################################
 # food stockpile adjustments
 ##################################
 
-seeds: s{Down}deb{Right}{Down 9}p^
-noseeds: s{Down}dea{Right}{Down 9}f^
-booze: s{Down}deb{Right}{Down 5}p{Down}p^
-food: s{Down}dea{Right}{Down 5}f{Down}f{Down 3}f^
-plants: s{Down}deb{Right}{Down 4}p^
+foodprefix:  s{Down}
+enablefood:  {foodprefix}e^
+disablefood: {foodprefix}d^
+
+preparedfood:   {foodprefix}bu^
+unpreparedfish: {foodprefix}b{Right}{Down 2}p^
+plants:         {foodprefix}b{Right}{Down 4}p^
+booze:          {foodprefix}b{Right}{Down 5}p{Down}p^
+seeds:          {foodprefix}b{Right}{Down 9}p^
+dye:            {foodprefix}b{Right}{Down 11}{Right}{Down 28}{togglesequence 4}^
+tallow:         {foodprefix}b{Right}{Down 13}{Right}{Down}{togglesequence2 811}^
+miscliquid:     {foodprefix}b{Right}{Down 18}p^
+
+forbidpreparedfood:   {foodprefix}u^
+forbidunpreparedfish: {foodprefix}{Right}{Down 2}f^
+forbidplants:         {foodprefix}{Right}{Down 4}f^
+forbidbooze:          {foodprefix}{Right}{Down 5}f{Down}f^
+forbidseeds:          {foodprefix}{Right}{Down 9}f^
+forbiddye:            {foodprefix}{Right}{Down 11}{Right}{Down 28}{togglesequence 4}^
+forbidtallow:         {foodprefix}{Right}{Down 13}{Right}{Down}{togglesequence2 811}^
+forbidmiscliquid:     {foodprefix}{Right}{Down 18}f^
+
+permitpreparedfood:   {forbidpreparedfood}
+permitunpreparedfish: {foodprefix}{Right}{Down 2}p^
+permitplants:         {foodprefix}{Right}{Down 4}p^
+permitbooze:          {foodprefix}{Right}{Down 5}p{Down}p^
+permitseeds:          {foodprefix}{Right}{Down 9}p^
+permitdye:            {forbiddye}
+permittallow:         {forbidtallow}
+permitmiscliquid:     {foodprefix}{Right}{Down 18}p^
+
+# enables everything but seeds
+noseeds: {disablefood}{enablefood}{forbidseeds}
+
+# enables all food except for the types listed above
+food:    {noseeds}{forbidpreparedfood}{forbidunpreparedfish}{forbidplants}{forbidbooze}{forbiddye}{forbidtallow}{forbidmiscliquid}
+
 
 ##################################
-# refuse stockpile adjustments
+# furniture stockpile adjustments
 ##################################
 
-corpses: s{Down 4}deb{Right 2}&{Down 2}&{Left}{Down}p{Down}p^
-bones: s{Down 4}deb{Right}{Down 3}p{Down}p^
-rawhides: s{Down 4}deb{Right 2}{Down}&^
-tannedhides: s{Down 4}deb{Right 2}{Down 53}&^
+furnitureprefix:  s{Down 2}
+enablefurniture:  {furnitureprefix}e^
+disablefurniture: {furnitureprefix}d^
+
+pots:    {furnitureprefix}de{Right}f{Right}{Up 5}&^
+bags:    {furnitureprefix}de{Right}f{Right}{Up 10}&{Left}{Down}f{Down}f{Down}f{Right}{Down}&{Down 6}&{Down}&{Down 6}&^
+buckets: {furnitureprefix}de{Right}f{Right}{Up 12}&^
+sand:    {furnitureprefix}de{Right}f{Right}{Up}&^
+
+
+###########################################
+# corpses and refuse stockpile adjustments
+###########################################
+
+corpsesprefix:  s{Down 3}
+enablecorpses:  {corpsesprefix}e^
+disablecorpses: {corpsesprefix}d{Up}d^
+
+refuseprefix:  s{Down 4}
+enablerefuse:  {refuseprefix}e^
+disablerefuse: {refuseprefix}d^
+
+# bodyparts include remains/corpses and rotten rawhdes
+bodyparts:   {refuseprefix}b{Right 2}&{Down 2}&{Left}{Down}p{Down}p^
+rawhides:    {refuseprefix}b{Right 2}{Down}&^
+tannedhides: {refuseprefix}b{Right 2}{Down 53}&^
+skulls:      {refuseprefix}b{Right}{Down 3}p^
+bones:       {refuseprefix}b{Right}{Down 4}p^
+shells:      {refuseprefix}b{Right}{Down 5}p^
+teeth:       {refuseprefix}b{Right}{Down 6}p^
+horns:       {refuseprefix}b{Right}{Down 7}p^
+hair:        {refuseprefix}b{Right}{Down 8}p^
+craftrefuse: {skulls}{permitbones}{permitshells}{permitteeth}{permithorns}{permithair}
+
+forbidbodyparts:   {refuseprefix}{Right 2}&{Down 2}&{Left}{Down}f{Down}f^
+forbidrawhides:    {refuseprefix}{Right 2}{Down}&^
+forbidtannedhides: {refuseprefix}{Right 2}{Down 53}&^
+forbidskulls:      {refuseprefix}{Right}{Down 3}f^
+forbidbones:       {refuseprefix}{Right}{Down 4}f^
+forbidshells:      {refuseprefix}{Right}{Down 5}f^
+forbidteeth:       {refuseprefix}{Right}{Down 6}f^
+forbidhorns:       {refuseprefix}{Right}{Down 7}f^
+forbidhair:        {refuseprefix}{Right}{Down 8}f^
+forbidcraftrefuse: {forbidskulls}{forbidbones}{forbidshells}{forbidteeth}{forbidhorns}{forbidhair}
+
+permitbodyparts:   {refuseprefix}{Right 2}&{Down 2}&{Left}{Down}p{Down}p^
+permitrawhides:    {forbidrawhides}
+permittannedhides: {forbidtannedhides}
+permitskulls:      {refuseprefix}{Right}{Down 3}p^
+permitbones:       {refuseprefix}{Right}{Down 4}p^
+permitshells:      {refuseprefix}{Right}{Down 5}p^
+permitteeth:       {refuseprefix}{Right}{Down 6}p^
+permithorns:       {refuseprefix}{Right}{Down 7}p^
+permithair:        {refuseprefix}{Right}{Down 8}p^
+permitcraftrefuse: {permitskulls}{permitbones}{permitshells}{permitteeth}{permithorns}{permithair}
+
 
 ##################################
 # stone stockpile adjustments
 ##################################
 
-metal: s{Down 5}deb{Right}p^
-nometal: s{Down 5}dea{Right}f^
-bauxite: s{Down 5}deb{Right}{Down 2}{Right}{Down 42}&^
+stoneprefix:  s{Down 5}
+enablestone:  {stoneprefix}e^
+disablestone: {stoneprefix}d^
+
+metal:         {stoneprefix}b{Right}p^
+iron:          {stoneprefix}b{Right}{Right}&{Down}&{Down 13}&^
+economic:      {stoneprefix}b{Right}{Down}p^
+flux:          {stoneprefix}b{Right}{Down}{Right}{togglesequence 4}{Down 4}&^
+plaster:       {stoneprefix}b{Right}{Down}{Right}{Down 6}&{Down 3}{togglesequence 3}^
+coalproducing: {stoneprefix}b{Right}{Down}{Right}{Down 4}{togglesequence 2}^
+otherstone:    {stoneprefix}b{Right}{Down 2}p^
+bauxite:       {stoneprefix}b{Right}{Down 2}{Right}{Down 42}&^
+clay:          {stoneprefix}b{Right}{Down 3}p^
+
+forbidmetal:         {stoneprefix}{Right}f^
+forbidiron:          {stoneprefix}{Right}{Right}&{Down}&{Down 13}&^
+forbideconomic:      {stoneprefix}{Right}{Down}f^
+forbidflux:          {stoneprefix}{Right}{Down}{Right}{togglesequence 4}{Down 4}&^
+forbidplaster:       {stoneprefix}{Right}{Down}{Right}{Down 6}&{Down 3}{togglesequence 3}^
+forbidcoalproducing: {stoneprefix}{Right}{Down}{Right}{Down 4}{togglesequence 2}^
+forbidotherstone:    {stoneprefix}{Right}{Down 2}f^
+forbidbauxite:       {stoneprefix}{Right}{Down 2}{Right}{Down 42}&^
+forbidclay:          {stoneprefix}{Right}{Down 3}f^
+
+permitmetal:         {stoneprefix}{Right}p^
+permitiron:          {forbidiron}
+permiteconomic:      {stoneprefix}{Right}{Down}p^
+permitflux:          {forbidflux}
+permitplaster:       {forbidplaster}
+permitcoalproducing: {forbidcoalproducing}
+permitotherstone:    {stoneprefix}{Right}{Down 2}p^
+permitbauxite:       {forbidbauxite}
+permitclay:          {stoneprefix}{Right}{Down 3}p^
+
+
+##################################
+# ammo stockpile adjustments
+##################################
+
+ammoprefix:  s{Down 6}
+enableammo:  {ammoprefix}e^
+disableammo: {ammoprefix}d^
+
+bolts: {ammoprefix}a{Right 2}{Down}{togglesequence 2}^
+
+forbidmetalbolts:  {ammoprefix}{Right}{Down}f^
+forbidwoodenbolts: {ammoprefix}{Right}{Down 2}{Right}&^
+forbidbonebolts:   {ammoprefix}{Right}{Down 2}{Right}{Down}&^
+
+
+##################################
+# bar stockpile adjustments
+##################################
+
+barsprefix:  s{Down 8}
+enablebars:  {barsprefix}e^
+disablebars: {barsprefix}d^
+
+bars:        {barsprefix}b{Right}p{Down}p^
+metalbars:   {barsprefix}b{Right}p^
+ironbars:    {barsprefix}b{Right 2}&^
+steelbars:   {barsprefix}b{Right 2}{Down 8}&^
+pigironbars: {barsprefix}b{Right 2}{Down 9}&^
+otherbars:   {barsprefix}b{Right}{Down}p^
+coal:        {barsprefix}b{Right}{Down}{Right}&^
+potash:      {barsprefix}b{Right}{Down}{Right}{Down}&^
+ash:         {barsprefix}b{Right}{Down}{Right}{Down 2}&^
+pearlash:    {barsprefix}b{Right}{Down}{Right}{Down 3}&^
+soap:        {barsprefix}b{Right}{Down}{Right}{Down 4}&^
+blocks:      {barsprefix}b{Down 2}p{Down}p{Down}p^
+
+forbidbars:        {barsprefix}{Right}f{Down}f^
+forbidmetalbars:   {barsprefix}{Right}f^
+forbidironbars:    {barsprefix}{Right 2}&^
+forbidsteelbars:   {barsprefix}{Right 2}{Down 8}&^
+forbidpigironbars: {barsprefix}{Right 2}{Down 9}&^
+forbidotherbars:   {barsprefix}{Right}{Down}f^
+forbidcoal:        {barsprefix}{Right}{Down}{Right}&^
+forbidpotash:      {barsprefix}{Right}{Down}{Right}{Down}&^
+forbidash:         {barsprefix}{Right}{Down}{Right}{Down 2}&^
+forbidpearlash:    {barsprefix}{Right}{Down}{Right}{Down 3}&^
+forbidsoap:        {barsprefix}{Right}{Down}{Right}{Down 4}&^
+forbidblocks:      {barsprefix}{Down 2}f{Down}f{Down}f^
+
+
+##################################
+# gem stockpile adjustments
+##################################
+
+gemsprefix:  s{Down 9}
+enablegems:  {gemsprefix}e^
+disablegems: {gemsprefix}d^
+
+roughgems:  {gemsprefix}b{Right}p^
+roughglass: {gemsprefix}b{Right}{Down}p^
+cutgems:    {gemsprefix}b{Right}{Down 2}p^
+cutglass:   {gemsprefix}b{Right}{Down 3}p^
+cutstone:   {gemsprefix}b{Right}{Down 4}p^
+
+forbidroughgems:  {gemsprefix}{Right}f^
+forbidroughglass: {gemsprefix}{Right}{Down}f^
+forbidcutgems:    {gemsprefix}{Right}{Down 2}f^
+forbidcutglass:   {gemsprefix}{Right}{Down 3}f^
+forbidcutstone:   {gemsprefix}{Right}{Down 4}f^
+
+
+#######################################
+# finished goods stockpile adjustments
+#######################################
+
+finishedgoodsprefix:  s{Down 10}
+enablefinishedgoods:  {finishedgoodsprefix}e^
+disablefinishedgoods: {finishedgoodsprefix}d^
+
+jugs: {finishedgoodsprefix}{Right}f{Right}{Up 2}&{Left}{Down 2}f{Down}f{Down}f^
 
-# Only use nobauxite on stone piles that you want to accept all "Other Stone" on.
-# This alias works by permitting all "Other Stone",then forbidding just bauxite.
-# Thus you wouldn't want to use this on a metal-only pile, for example.
-nobauxite: s{Down 5}{Right}{Down 2}p{Right}{Down 42}&^
 
 ##################################
-# misc stockpile adjustments
+# cloth
 ##################################
 
-# Artifacts-only stockpile, usable on any type of existing pile.
-artifacts: sd{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down}d{Down 4}deu{Right}{Up}f{Right}{Up}&{Left 2}{Down 4}e{Right}{Up}f{Right}{Up}&{Left 2}{Down 4}e{Right}{Up}f{Right}{Up}&{Left 2}{Down 4}e{Right}{Up}f{Right}{Up}&{Left 2}{Down}e{Right}{Up}f{Right}{Up}&{Left 2}^
+clothprefix:  s{Down 12}
+enablecloth:  {clothprefix}e^
+disablecloth: {clothprefix}d^
 
-# Bans artifacts on any pile (or rather, allows items of any quality except Artifact quality).
-# This should be safe to run on any type of pile.
-noartifacts: sd{Down 2}{Right}{Up}fp{Right}{Up}&{Down 2}{Left 2}{Down 4}{Right}{Up}fp{Right}{Up}&{Down 2}{Left 2}{Down 4}{Right}{Up}fp{Right}{Up}&{Down 2}{Left 2}{Down 4}{Right}{Up}fp{Right}{Up}&{Down 2}{Left 2}{Down}{Right}{Up}fp{Right}{Up}&{Down 2}{Left 2}^
+thread:           {clothprefix}b{Right}p{Down}p{Down}p^
+adamantinethread: {clothprefix}b{Right}{Down 3}p^
+cloth:            {clothprefix}b{Right}{Down 4}p{Down}p{Down}p^
+adamantinecloth:  {clothprefix}b{Right}{Up}p^
+
+
+##################################
+# weapon stockpile adjustments
+##################################
+
+weaponsprefix:  s{Down 14}
+enableweapons:  {weaponsprefix}e^
+disableweapons: {weaponsprefix}d^
+
+metalweapons:  {forbidtrapcomponents}{forbidstoneweapons}{forbidotherweapons}
+ironweapons:   {metalweapons}{forbidweapons}{permitironweapons}
+copperweapons: {metalweapons}{forbidweapons}{permitcopperweapons}
+steelweapons:  {metalweapons}{forbidweapons}{permitsteelweapons}
+
+forbidweapons:        {weaponsprefix}{Right}f^
+forbidtrapcomponents: {weaponsprefix}{Right}{Down}f^
+forbidmetalweapons:   {weaponsprefix}{Right}{Down 2}f^
+forbidstoneweapons:   {weaponsprefix}{Right}{Down 3}f^
+forbidotherweapons:   {weaponsprefix}{Right}{Down 4}f^
+forbidironweapons:    {weaponsprefix}{Right}{Down 2}{Right}&^
+forbidcopperweapons:  {weaponsprefix}{Right}{Down 2}{Right}{Down 3}&^
+forbidsteelweapons:   {weaponsprefix}{Right}{Down 2}{Right}{Down 8}&^
+
+permitweapons:        {weaponsprefix}{Right}p^
+permittrapcomponents: {weaponsprefix}{Right}{Down}p^
+permitmetalweapons:   {weaponsprefix}{Right}{Down 2}p^
+permitstoneweapons:   {weaponsprefix}{Right}{Down 3}p^
+permitotherweapons:   {weaponsprefix}{Right}{Down 4}p^
+permitironweapons:    {forbidironweapons}
+permitcopperweapons:  {forbidcopperweapons}
+permitsteelweapons:   {forbidsteelweapons}
+
+masterworkweapons: {weaponsprefix}{Right}{Down 5}f{Right}{Down 5}&^
+artifactweapons:   {weaponsprefix}{Right}{Down 5}f{Right}{Down 6}&^
+
+forbidmasterworkweapons: {weaponsprefix}{Right}{Down 5}{Right}{Down 5}&^
+forbidartifactweapons:   {weaponsprefix}{Right}{Down 5}{Right}{Down 6}&^
+
+permitmasterworkweapons: {forbidmasterworkweapons}
+permitartifactweapons:   {forbidartifactweapons}
+
+
+##################################
+# armor stockpile adjustments
+##################################
+
+armorprefix:  s{Down 15}
+enablearmor:  {armorprefix}e^
+disablearmor: {armorprefix}d^
+
+metalarmor:  {forbidotherarmor}
+otherarmor:  {forbidmetalarmor}
+ironarmor:   {metalarmor}{forbidmetalarmor}{permitironarmor}
+copperarmor: {metalarmor}{forbidmetalarmor}{permitcopperarmor}
+steelarmor:  {metalarmor}{forbidmetalarmor}{permitsteelarmor}
+
+forbidmetalarmor:  {armorprefix}{Right}{Down 6}f^
+forbidotherarmor:  {armorprefix}{Right}{Down 7}f^
+forbidironarmor:   {armorprefix}{Right}{Down 6}{Right}&^
+forbidcopperarmor: {armorprefix}{Right}{Down 6}{Right}{Down 3}&^
+forbidsteelarmor:  {armorprefix}{Right}{Down 6}{Right}{Down 8}&^
+
+permitmetalarmor:   {armorprefix}{Right}{Down 6}p^
+permitotherarmor:   {armorprefix}{Right}{Down 7}p^
+permitironarmor:    {forbidironarmor}
+permitcopperarmor:  {forbidcopperarmor}
+permitsteelarmor:   {forbidsteelarmor}
+
+masterworkarmor: {armorprefix}{Right}{Down 8}f{Right}{Down 5}&^
+artifactarmor:   {armorprefix}{Right}{Down 8}f{Right}{Down 6}&^
+
+forbidmasterworkarmor: {armorprefix}{Right}{Down 8}{Right}{Down 5}&^
+forbidartifactarmor:   {armorprefix}{Right}{Down 8}{Right}{Down 6}&^
+
+permitmasterworkarmor: {forbidmasterworkarmor}
+permitartifactarmor:   {forbidartifactarmor}
+
+
+##################################
+# others
+##################################
+
+coinsprefix:  s{Down 7}
+enablecoins:  {coinsprefix}e^
+disablecoins: {coinsprefix}d^
+
+leatherprefix:  s{Down 11}
+enableleather:  {leatherprefix}e^
+disableleather: {leatherprefix}d^
+
+woodprefix:  s{Down 13}
+enablewood:  {woodprefix}e^
+disablewood: {woodprefix}d^
+
+sheetprefix:  s{Down 16}
+enablesheet:  {sheetprefix}e^
+disablesheet: {sheetprefix}d^
 
-# Set a finished goods stockpile to crappy low-quality trade goods only.
-# Position such a stockpile near fort entrances to (hopefully) let thieves steal low quality junk.
-junkgoods: s{Down 10}de{Right 2}&{Down 5}&{Down}&{Down}&{Down}&{Down 8}&{Down 2}&{Down}&{Down}&{Down}&{Down}&{Down}&{Left}{Down}f{Right}{Down}&{Down}&{Left}{Down}f{Down 2}f{Right}&{Down}&^
 
 ##################################
 # farm plots
 ##################################
 
-# Sets a farm plot to grow the LAST type of seed in the list of available seeds, for all 4 seasons.
-# The last seed is used because it's usually Plump helmet spawn, suitable for post-embark. If you
-# only have 1 seed type, that'll be grown.
-growlastcropall: a{/}&b{/}&c{/}&d{/}&
+# Sets a farm plot to grow the LAST type of seed in the list of available seeds
+# for all 4 seasons. The last seed is used because it's usually Plump helmet
+# spawn, suitable for post-embark. If you only have 1 seed type, that'll be
+# grown.
+growlastcropall: a/&b/&c/&d/&
 
 # Like growlastcropall but grows the first one in the list instead.
 growfirstcropall: a&b&c&d&
-
-##################################
-# mining tracks
-##################################
-
-# The following aliases make it more convenient to build the various types of mine tracks.
-# For example, to build a north/south track 'Track (NS)', you would put trackNS in a cell(s).
-trackN: CT{Enter}
-trackS: CT{+ 1}{Enter}
-trackE: CT{+ 2}{Enter}
-trackW: CT{+ 3}{Enter}
-trackNS: CT{+ 4}{Enter}
-trackNE: CT{+ 5}{Enter}
-trackNW: CT{+ 6}{Enter}
-trackSE: CT{+ 7}{Enter}
-trackSW: CT{+ 8}{Enter}
-trackEW: CT{+ 9}{Enter}
-trackNSE: CT{+ 10}{Enter}
-trackNSW: CT{+ 11}{Enter}
-trackNEW: CT{+ 12}{Enter}
-trackSEW: CT{+ 13}{Enter}
-trackNSEW: CT{+ 14}{Enter}
-trackrampN: CT{+ 15}{Enter}
-trackrampS: CT{+ 15}{+ 1}{Enter}
-trackrampE: CT{+ 15}{+ 2}{Enter}
-trackrampW: CT{+ 15}{+ 3}{Enter}
-trackrampNS: CT{+ 15}{+ 4}{Enter}
-trackrampNE: CT{+ 15}{+ 5}{Enter}
-trackrampNW: CT{+ 15}{+ 6}{Enter}
-trackrampSE: CT{+ 15}{+ 7}{Enter}
-trackrampSW: CT{+ 15}{+ 8}{Enter}
-trackrampEW: CT{+ 15}{+ 9}{Enter}
-trackrampNSE: CT{+ 15}{+ 10}{Enter}
-trackrampNSW: CT{+ 15}{+ 11}{Enter}
-trackrampNEW: CT{+ 15}{+ 12}{Enter}
-trackrampSEW: CT{+ 15}{+ 13}{Enter}
-trackrampNSEW: CT{+ 15}{+ 14}{Enter}
-
-# Aliases for building track rollers; use e.g. rollerHqqq to make a low-speed horizontal roller
-rollerH: Mrs
-rollerV: Mr
-rollerNS: Mr
-rollerSN: Mrss
-rollerEW: Mrs
-rollerWE: Mrsss
-
-# Aliases for building track stops that dump in each of the four directions
-trackstopN: CSd
-trackstopS: CSdd
-trackstopE: CSddd
-trackstopW: CSdddd
diff --git a/dfhack-config/quickfort/aliases.txt b/dfhack-config/quickfort/aliases.txt
index 52cdb2893..05f2833f5 100644
--- a/dfhack-config/quickfort/aliases.txt
+++ b/dfhack-config/quickfort/aliases.txt
@@ -1,30 +1,83 @@
-# quickfort aliases configuration file
+# aliases for quickfort query mode blueprints
 #
-# Defines custom keycode shortcuts for blueprints. Definitions in this file take
-# precedence over any definitions in the baseline aliases configuration file at
-# hack/data/quickfort/aliases-common.txt. See that file for aliases that are
-# already defined.
+# This file defines custom keycode shortcuts for query mode blueprints.
+# Definitions in this file take precedence over any definitions in the baseline
+# aliases configuration file at hack/data/quickfort/aliases-common.txt. See that
+# file for aliases that are already defined.
 #
-# This file can be used to simplify repetitive tasks, such as building minecart
-# tracks or adjusting a food stockpile to accept seeds only. Making new aliases
-# is just a matter of mimicking the keys used to navigate through the menus and
-# select options.
+# If possible, build on the baseline aliases when defining your own aliases. If
+# the DF UI screens change, updated baseline aliases may allow your aliases to
+# automatically adapt to the new UI. For example, if you create an alias to
+# modify particular furniture stockpile settings, start your alias with
+# "{furnitureprefix}" instead of manually writing "s{Down 2}". Then, if the
+# location of the furniture setting changes, your alias will automatically
+# inherit the updated position when DFHack is updated.
 #
-# Syntax:
+# Aliases simplify repetitive tasks, such as configuring workshop profiles or
+# adjusting a food stockpile to accept only seeds. Making new aliases is just a
+# matter of mimicking the keys used to navigate through the menus and select
+# options. Use the aliases in your blueprint spreadsheets by writing an alias by
+# itself in a cell, like "nocontainers", or reference an alias in a larger
+# sequence by enclosing in in curly brackets, like "{nocontainers}{linksonly}"
+#
+# For example, say you have the following build and place blueprints:
+#
+# #build start(4;1;upper left corner of stockpile) mason stockpile
+# ~,  ~, ~, `, `, `
+# ~, wm, ~, `, `, `
+# ~,  ~, ~, `, `, `
+#
+# #place start(4;1;upper left corner of stockpile) build mason
+# ~, ~, ~, s, s, s
+# ~, ~, ~, s, s, s
+# ~, ~, ~, s, s, s
+#
+# and you want to configure the stockpile to hold only non-economic ("other")
+# stone and to give to the adjacent mason workshop. You could write the
+# keystrokes directly:
+#
+# #query start(4;1;upper left corner of stockpile) configure mason
+# ~, ~, ~, s{Down 5}deb{Right}{Down 2}p^, `, `
+# ~, ~, ~, g{Left 2}&, `, `
+# ~, ~, ~, `, `, `
+#
+# or you could use alias names:
+#
+# #query start(4;1;upper left corner of stockpile) configure mason
+# ~, ~, ~, otherstone, `, `
+# ~, ~, ~, give2left,  `, `
+# ~, ~, ~, `,          `, `
+#
+#
+# The syntax for defining aliases is:
 #   aliasname: keystrokes
 #
-# Special keys:
-#   {Right}, {Left}, {Up}, {Down}, >, < move the DF cursor
-#   {/}, {*}, {+}, {-} can be used to navigate some DF menus
-#   {Enter}, +{Enter}, {ExitMenu} - Enter, Shift+Enter, and Escape, respectively
-#   {Wait} pauses playback briefly
+# Where aliasname is at least two letters or digits long and keystrokes are
+# whatever you would type into the DF UI. A keystroke can also be a named
+# keycode from the DF interface definition file (data/init/interface.txt),
+# enclosed in curly brackets like an alias, like: "{Right}" or "{Enter}". In
+# order to avoid naming conflicts between aliases and keycodes, the convention
+# is to start aliases with a lowercase letter. You can add spaces in between
+# keystrokes to make them easier to read. Spaces in keystroke sequences will be
+# ignored. To insert a literal space, use "{Space}"
 #
-# Special keys can be repeated by adding a number inside the curly braces, for
-# example: {Down 5}
+# Anything enclosed within curly brackets can also have a number after it,
+# indicating how many times that alias or keycode should be repeated. For
+# example: "{buildblocks 9}" or "{Down 5}".
 #
-# Some shorthand:
+# Ctrl, Alt, and Shift modifiers can be specified for the next keycode by adding
+# them as keycodes. For example, Alt-h is written as "{Alt}h".
+#
+# Some frequently-used keystrokes are assigned shorthand characters. Think of
+# them as single-character aliases that don't need to be surrounded in curly
+# brackets:
 #   &   expands to {Enter}
-#   @   expands to +{Enter}
-#   ^   expands to {ExitMenu}
-#   %   expands to {Wait}
-
+#   @   expands to {Shift}{Enter}
+#   +   expands to {Shift}
+#   ~   expands to {Alt}
+#   !   expands to {Ctrl}
+#   ^   expands to {ESC}
+#
+# If you need literal verisons of the shorthand characters, surround them in
+# curly brackets, for example: "{+}"
+#
diff --git a/dfhack-config/quickfort/quickfort.txt b/dfhack-config/quickfort/quickfort.txt
index 683c1da7d..8a30124a1 100644
--- a/dfhack-config/quickfort/quickfort.txt
+++ b/dfhack-config/quickfort/quickfort.txt
@@ -1,20 +1,26 @@
 # quickfort main configuration file
 #
 # Set startup defaults for the quickfort script in this file. Settings can be
-# dynamically overridden in the active session with the `quickfort set` command.
+# temporarily overridden in the active session with the `quickfort set` command.
+#
+# If you have edited this file but want to revert to "factory defaults", delete
+# this file and a fresh one will be copied from
+# dfhack-config/default/quickfort/qickfort.txt the next time you start DFHack.
 
-# Directory to search for blueprints. Can be set to an absolute or relative
+# Directory tree to search for blueprints. Can be set to an absolute or relative
 # path. If set to a relative path, resolves to a directory under the DF folder.
 blueprints_dir=blueprints
 
 # Set to "true" or "false". If true, will designate dig blueprints in marker
-# mode. If false, only cells with dig codes prefixed with ``m`` will be
-# designated in marker mode.
+# mode. If false, only cells with dig codes explicitly prefixed with an "m" will
+# be designated in marker mode.
 force_marker_mode=false
 
-# Allows you to manually select building materials for each
-# building/construction when running (or creating orders for) build blueprints.
-# Materials in selection dialogs are ordered according to preferences in
-# materials.txt. If false, will only prompt for materials that have :labels.
-# See https://github.com/joelpt/quickfort#manual-material-selection for details.
-force_interactive_build=false
+# Set to the maximum number of resources you want assigned to stockpiles of the
+# relevant types. Set to -1 for DF defaults (number of stockpile tiles for
+# stockpiles that take barrels and bins, 1 wheelbarrow for stone stockpiles).
+# The default here for wheelbarrows is 0 since using wheelbarrows normally
+# *decreases* the efficiency of your fort.
+stockpiles_max_barrels=-1
+stockpiles_max_bins=-1
+stockpiles_max_wheelbarrows=0

From 02c0a6c8f64bea5d823f3fc9f271fd25761c7d6c Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 6 Aug 2020 00:53:06 -0400
Subject: [PATCH 241/547] Update getplants to use new plant_raw.material_defs
 layout

a9f219baf9dda6d8cc300251fc040420e84bbc49 applied to #1564
---
 plugins/getplants.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp
index 2f12029f6..cfe499a9b 100644
--- a/plugins/getplants.cpp
+++ b/plugins/getplants.cpp
@@ -264,7 +264,7 @@ bool picked(const df::plant *plant, int32_t growth_subtype) {
 
 bool designate(const df::plant *plant, bool farming) {
     df::plant_raw *plant_raw = world->raws.plants.all[plant->material];
-    const DFHack::MaterialInfo basic_mat = DFHack::MaterialInfo(plant_raw->material_defs.type_basic_mat, plant_raw->material_defs.idx_basic_mat);
+    const DFHack::MaterialInfo basic_mat = DFHack::MaterialInfo(plant_raw->material_defs.type[plant_material_def::basic_mat], plant_raw->material_defs.idx[plant_material_def::basic_mat]);
 
     if (basic_mat.material->flags.is_set(material_flags::EDIBLE_RAW) ||
         basic_mat.material->flags.is_set(material_flags::EDIBLE_COOKED))
@@ -309,8 +309,8 @@ bool designate(const df::plant *plant, bool farming) {
                 {
                     for (size_t k = 0; growth_mat.material->reaction_product.material.mat_type.size(); k++)
                     {
-                        if (growth_mat.material->reaction_product.material.mat_type[k] == plant_raw->material_defs.type_seed &&
-                            growth_mat.material->reaction_product.material.mat_index[k] == plant_raw->material_defs.idx_seed)
+                        if (growth_mat.material->reaction_product.material.mat_type[k] == plant_raw->material_defs.type[plant_material_def::seed] &&
+                            growth_mat.material->reaction_product.material.mat_index[k] == plant_raw->material_defs.idx[plant_material_def::seed])
                         {
                             seedSource = true;
                             break;

From 7c2af344a1e10f93c966da3b2a4a02a76544677e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 6 Aug 2020 02:04:23 -0400
Subject: [PATCH 242/547] Update changelog (#1564) and xml
 (dfhack/df-structures#400)

---
 docs/changelog.txt | 1 +
 library/xml        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index bf953d562..95d18693f 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -40,6 +40,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - Fixed a segfault when attempting to start a headless session with a graphical PRINT_MODE setting
 - Fixed an issue with the macOS launcher failing to un-quarantine some files
 - Linux: fixed ``dfhack.getDFPath()`` (Lua) and ``Process::getPath()`` (C++) to always return the DF root path, even if the working directory has changed
+- `getplants`: fixed issues causing plants to be collected even if they have no growths (or unripe growths)
 - `labormanager`: fixed handling of new jobs in 0.47
 - `embark-assistant`: fixed a couple of incursion handling bugs.
 - Fixed ``Units::isEggLayer``, ``Units::isGrazer``, ``Units::isMilkable``, ``Units::isTrainableHunting``, ``Units::isTrainableWar``, and ``Units::isTamable`` ignoring the unit's caste
diff --git a/library/xml b/library/xml
index ecd6bcc9e..9fca46ccc 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit ecd6bcc9ed67c62fa605561b27574467df792342
+Subproject commit 9fca46ccca28e0948014b9d56a096ad7343473f1

From bdb9433822685b519d26144be805acf0b74be75a Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 6 Aug 2020 02:30:17 -0400
Subject: [PATCH 243/547] Update/expand Contributing.rst regarding pull
 requests

---
 docs/Contributing.rst | 45 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/docs/Contributing.rst b/docs/Contributing.rst
index ab92d0571..0619e8ba3 100644
--- a/docs/Contributing.rst
+++ b/docs/Contributing.rst
@@ -13,7 +13,7 @@ Contributing Code
 =================
 Several things should be kept in mind when contributing code to DFHack.
 
-Code Format
+Code format
 -----------
 * Four space indents for C++. Never use tabs for indentation in any language.
 * LF (Unix style) line terminators
@@ -26,18 +26,45 @@ Code Format
   * #includes should be sorted. C++ libraries first, then dfhack modules, then df structures,
     then local includes. Within each category they should be sorted alphabetically.
 
-How to get new code into DFHack
+Pull request guidelines
+-----------------------
+* Pull requests should be based on (and submitted to) the default branch of the
+  relevant repo, which is the branch you see when you access the repo on GitHub
+  or clone the repo without specifying a branch. As of 0.47.04-r1, this is
+  ``develop`` for the main DFHack repo and ``master`` for other repos.
+* Use a new branch for each feature or bugfix so that your changes can be merged
+  independently (i.e. not the ``master`` or ``develop`` branch of your fork).
+
+  * An exception: for a collection of small miscellaneous changes (e.g.
+    structures research), one branch instead of many small branches is fine. It
+    is still preferred that this branch be dedicated to this purpose, i.e. not
+    ``master`` or ``develop``. Your pull request may be merged at any point
+    unless you indicate that it isn't ready (see below), but you can continue to
+    push to the same branch and open new pull requests as needed.
+
+* Try to keep pull requests relatively small so that they are easier to review
+  and merge.
+
+  * If you expect to make a large number of related additions or changes (e.g.
+    adding a large new plugin), multiple PRs are preferred, as they allow more
+    frequent (and easier) feedback. If development of this feature is expected
+    to take a while, we may create a dedicated branch to merge your pull
+    requests into instead of the repo's default branch.
+
+* If you plan to make additional changes to your pull request in the near
+  future, or if it isn't quite ready to be merged, mark it as a
+  `draft pull request <https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests#draft-pull-requests>`_
+  or add "WIP" to the title. Otherwise, your pull request may be reviewed and/or
+  merged prematurely.
+
+General contribution guidelines
 -------------------------------
-* Submit pull requests to the ``develop`` branch, not the ``master`` branch.
-  (The ``master`` branch always points at the most recent release)
-* Use a new branch for each feature or bugfix so that your changes can be merged independently
-  (i.e. not the master or develop branch of your fork).
-* If possible, compile on multiple platforms when changing anything that compiles
-* It must pass CI - run ``python travis/all.py`` to check this.
+* If convenient, compile on multiple platforms when changing anything that
+  compiles. Our CI should catch anything that fails to build, but checking in
+  advance can be faster.
 * Update documentation when applicable - see `docs-standards` for details.
 * Update ``changelog.txt`` and ``docs/Authors.rst`` when applicable. See
   `build-changelog` for more information on the changelog format.
-* Create a GitHub pull request once finished
 * Submit ideas and bug reports as :issue:`issues on GitHub <>`.
   Posts in the forum thread can easily get missed or forgotten.
 * Work on :issue:`reported problems <?q=is:open+-label:idea>`

From 0c53b2b6c5e26899af7eaa1d7d6b44bf8672bed7 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 6 Aug 2020 22:30:29 -0400
Subject: [PATCH 244/547] Add do-job-now tweak

Forum thread: http://www.bay12forums.com/smf/index.php?topic=176700
Original source: https://github.com/dlmarquis/dfhack/blob/dojobnow-r1/plugins/dojobnow.cpp

Co-authored-by: dlmarquis <dlmarquis@users.noreply.github.com>
---
 docs/Authors.rst                  |  1 +
 docs/Plugins.rst                  |  1 +
 docs/changelog.txt                |  1 +
 plugins/tweak/tweak.cpp           |  6 +++++
 plugins/tweak/tweaks/do-job-now.h | 43 +++++++++++++++++++++++++++++++
 5 files changed, 52 insertions(+)
 create mode 100644 plugins/tweak/tweaks/do-job-now.h

diff --git a/docs/Authors.rst b/docs/Authors.rst
index 55ecbb17c..31789aa52 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -110,6 +110,7 @@ Nikolay Amiantov        abbradar
 nocico                  nocico
 Omniclasm
 OwnageIsMagic           OwnageIsMagic
+palenerd                dlmarquis
 Patrik Lundell          PatrikLundell
 Paul Fenwick            pjf
 PeridexisErrant         PeridexisErrant
diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index 3a4133873..120dae1d4 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -305,6 +305,7 @@ Subcommands that persist until disabled or DF quits:
 :craft-age-wear:        Fixes the behavior of crafted items wearing out over time (:bug:`6003`).
                         With this tweak, items made from cloth and leather will gain a level of
                         wear  every 20 years.
+:do-job-now:            Adds a job priority toggle to the jobs list
 :embark-profile-name:   Allows the use of lowercase letters when saving embark profiles
 :eggs-fertile:          Displays a fertility indicator on nestboxes
 :farm-plot-select:      Adds "Select all" and "Deselect all" options to farm plot menus
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 95d18693f..e7a01f4fe 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -34,6 +34,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 # Future
 
 ## New Tweaks
+- `tweak` do-job-now: adds a job priority toggle to the jobs list
 - `tweak` reaction-gloves: adds an option to make reactions produce gloves in sets with correct handedness
 
 ## Fixes
diff --git a/plugins/tweak/tweak.cpp b/plugins/tweak/tweak.cpp
index 13e08f174..2c15c3903 100644
--- a/plugins/tweak/tweak.cpp
+++ b/plugins/tweak/tweak.cpp
@@ -86,6 +86,7 @@
 #include "tweaks/civ-agreement-ui.h"
 #include "tweaks/condition-material.h"
 #include "tweaks/craft-age-wear.h"
+#include "tweaks/do-job-now.h"
 #include "tweaks/eggs-fertile.h"
 #include "tweaks/embark-profile-name.h"
 #include "tweaks/farm-plot-select.h"
@@ -200,6 +201,8 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
         "    Fixes a crash in the work order contition material list (bug 9905).\n"
         "  tweak craft-age-wear [disable]\n"
         "    Makes cloth and leather items wear out at the correct rate (bug 6003).\n"
+        "  tweak do-job-now [disable]\n"
+        "    Adds a job priority toggle to the jobs list.\n"
         "  tweak embark-profile-name [disable]\n"
         "    Allows the use of lowercase letters when saving embark profiles\n"
         "  tweak eggs-fertile [disable]\n"
@@ -280,6 +283,9 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
 
     TWEAK_HOOK("craft-age-wear", craft_age_wear_hook, ageItem);
 
+    TWEAK_HOOK("do-job-now", do_job_now_hook, feed);
+    TWEAK_HOOK("do-job-now", do_job_now_hook, render);
+
     TWEAK_HOOK("eggs-fertile", egg_fertile_hook, render);
 
     TWEAK_HOOK("embark-profile-name", embark_profile_name_hook, feed);
diff --git a/plugins/tweak/tweaks/do-job-now.h b/plugins/tweak/tweaks/do-job-now.h
new file mode 100644
index 000000000..74d4c36da
--- /dev/null
+++ b/plugins/tweak/tweaks/do-job-now.h
@@ -0,0 +1,43 @@
+#include "df/viewscreen_joblistst.h"
+
+struct do_job_now_hook : public df::viewscreen_joblistst {
+    typedef df::viewscreen_joblistst interpose_base;
+
+    bool handleInput(std::set<df::interface_key> *input) {
+        if (input->count(interface_key::CUSTOM_N)) {
+            df::job *job = vector_get(jobs, cursor_pos);
+            if (job) {
+                job->flags.bits.do_now = !job->flags.bits.do_now;
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    DEFINE_VMETHOD_INTERPOSE(void, feed, (std::set<df::interface_key> *input)) {
+        if (!handleInput(input)) {
+            INTERPOSE_NEXT(feed)(input);
+        }
+    }
+
+    DEFINE_VMETHOD_INTERPOSE(void, render, ()) {
+        INTERPOSE_NEXT(render)();
+        int x = 32;
+        auto dim = Screen::getWindowSize();
+        int y = dim.y - 2;
+        bool do_now = false;
+
+        df::job *job = vector_get(jobs, cursor_pos);
+        if (job) {
+            do_now = job->flags.bits.do_now;
+        }
+
+        OutputHotkeyString(x, y, (!do_now ? "Do job now!" : "Normal priority"),
+            interface_key::CUSTOM_N, false, x, COLOR_WHITE, COLOR_LIGHTRED);
+    }
+};
+
+IMPLEMENT_VMETHOD_INTERPOSE(do_job_now_hook, feed);
+IMPLEMENT_VMETHOD_INTERPOSE(do_job_now_hook, render);

From c7e4c724e848696b4854010f2b20bcfb9ecb3756 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 6 Aug 2020 22:34:39 -0400
Subject: [PATCH 245/547] Sort tweaks alphabetically

---
 docs/Plugins.rst        | 6 +++++-
 plugins/tweak/tweak.cpp | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index 120dae1d4..6699163c2 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -291,6 +291,8 @@ One-shot subcommands:
 
 Subcommands that persist until disabled or DF quits:
 
+.. comment: sort these alphabetically
+
 :adamantine-cloth-wear: Prevents adamantine clothing from wearing out while being worn (:bug:`6481`).
 :advmode-contained:     Works around :bug:`6202`, custom reactions with container inputs
                         in advmode. The issue is that the screen tries to force you to select
@@ -336,12 +338,14 @@ Subcommands that persist until disabled or DF quits:
                         i.e. stop the rightmost list of the Positions page of the military
                         screen from constantly resetting to the top.
 :nestbox-color:         Fixes the color of built nestboxes
+:reaction-gloves:       Fixes reactions to produce gloves in sets with correct handedness (:bug:`6273`)
 :shift-8-scroll:        Gives Shift-8 (or :kbd:`*`) priority when scrolling menus, instead of scrolling the map
 :stable-cursor:         Saves the exact cursor position between t/q/k/d/b/etc menus of fortress mode.
 :stone-status-all:      Adds an option to toggle the economic status of all stones
 :title-start-rename:    Adds a safe rename option to the title screen "Start Playing" menu
 :tradereq-pet-gender:   Displays pet genders on the trade request screen
-:reaction-gloves:       Fixes reactions to produce gloves in sets with correct handedness (:bug:`6273`)
+
+.. comment: sort these alphabetically
 
 .. _fix-armory:
 
diff --git a/plugins/tweak/tweak.cpp b/plugins/tweak/tweak.cpp
index 2c15c3903..237014209 100644
--- a/plugins/tweak/tweak.cpp
+++ b/plugins/tweak/tweak.cpp
@@ -183,6 +183,7 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
         /*"  tweak fix-dimensions [disable]\n"
         "    Fixes subtracting small amount of thread/cloth/liquid from a stack\n"
         "    by splitting the stack and subtracting from the remaining single item.\n"*/
+        // sort these alphabetically
         "  tweak adamantine-cloth-wear [disable]\n"
         "    Stops adamantine clothing from wearing out while being worn (bug 6481).\n"
         "  tweak advmode-contained [disable]\n"
@@ -246,6 +247,8 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
         "  tweak pausing-fps-counter [disable]\n"
         "    Replace fortress mode FPS counter with one that stops counting \n"
         "    when paused.\n"
+        "  tweak reaction-gloves [disable]\n"
+        "    Changes custom reactions to produce gloves in sets with correct handedness\n"
         "  tweak shift-8-scroll [disable]\n"
         "    Gives Shift+8 (or *) priority when scrolling menus, instead of \n"
         "    scrolling the map\n"
@@ -255,8 +258,7 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector <Plugi
         "    Adds a safe rename option to the title screen \"Start Playing\" menu\n"
         "  tweak tradereq-pet-gender [disable]\n"
         "    Displays the gender of pets in the trade request list\n"
-        "  tweak reaction-gloves [disable]\n"
-        "    Changes custom reactions to produce gloves in sets with correct handedness\n"
+        // sort these alphabetically
 //        "  tweak military-training [disable]\n"
 //        "    Speed up melee squad training, removing inverse dependency on unit count.\n"
     ));

From ed9f724117eb45d7f818c81072f293873809ea56 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 6 Aug 2020 22:44:49 -0400
Subject: [PATCH 246/547] Use BUILDJOB_NOW key, dim text when no job is
 selected

---
 plugins/tweak/tweaks/do-job-now.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/tweak/tweaks/do-job-now.h b/plugins/tweak/tweaks/do-job-now.h
index 74d4c36da..a498b1f8b 100644
--- a/plugins/tweak/tweaks/do-job-now.h
+++ b/plugins/tweak/tweaks/do-job-now.h
@@ -4,7 +4,7 @@ struct do_job_now_hook : public df::viewscreen_joblistst {
     typedef df::viewscreen_joblistst interpose_base;
 
     bool handleInput(std::set<df::interface_key> *input) {
-        if (input->count(interface_key::CUSTOM_N)) {
+        if (input->count(interface_key::BUILDJOB_NOW)) {
             df::job *job = vector_get(jobs, cursor_pos);
             if (job) {
                 job->flags.bits.do_now = !job->flags.bits.do_now;
@@ -34,8 +34,8 @@ struct do_job_now_hook : public df::viewscreen_joblistst {
             do_now = job->flags.bits.do_now;
         }
 
-        OutputHotkeyString(x, y, (!do_now ? "Do job now!" : "Normal priority"),
-            interface_key::CUSTOM_N, false, x, COLOR_WHITE, COLOR_LIGHTRED);
+        OutputHotkeyString(x, y, (!do_now ? "Do job now!" : "Reset priority"),
+            interface_key::BUILDJOB_NOW, false, x, job ? COLOR_WHITE : COLOR_DARKGREY, COLOR_LIGHTRED);
     }
 };
 

From 498fd9a1a67b2a609b912f911dd3848bb9ef4b00 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 6 Aug 2020 22:45:46 -0400
Subject: [PATCH 247/547] Flush plugin warning messages

---
 library/PluginManager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/PluginManager.cpp b/library/PluginManager.cpp
index db42c5c84..a1b1bd293 100644
--- a/library/PluginManager.cpp
+++ b/library/PluginManager.cpp
@@ -316,8 +316,8 @@ bool Plugin::load(color_ostream &con)
         {
             std::string msg = stl_sprintf("Warning: Plugin %s compiled for DFHack %s, running DFHack %s\n",
                 *plug_name, plug_git_desc, dfhack_git_desc);
-            con << msg;
-            cerr << msg;
+            con << msg << flush;
+            cerr << msg << flush;
         }
     }
     else

From 939e97caa0021c6782d99a1763f8052764b17c2f Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 6 Aug 2020 22:46:21 -0400
Subject: [PATCH 248/547] Update scripts/list-agreements

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 70ce0a12b..823d47c4d 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 70ce0a12bc0eb14b3782abe7033a6d2dd31863fe
+Subproject commit 823d47c4d181ac5b754dce5d605f3e7f242aed26

From 2302dfe3d62cc37d6ce7c815ad818ba5ca162ff8 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 6 Aug 2020 23:32:31 -0700
Subject: [PATCH 249/547] add quickfort user guide (first draft)

Much of the text was reused (with permission) from Joel Thornton's
Python Quickfort 2.0 user guide.
---
 data/blueprints/README.md | 458 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 446 insertions(+), 12 deletions(-)

diff --git a/data/blueprints/README.md b/data/blueprints/README.md
index d81f0e3b4..6f11df32a 100644
--- a/data/blueprints/README.md
+++ b/data/blueprints/README.md
@@ -1,15 +1,449 @@
-This directory is for quickfort blueprints. You can apply them to your fortress
-map with the DFHack
-[quickfort script](https://docs.dfhack.org/en/stable/docs/_auto/base.html#quickfort).
 
-You can create blueprints by hand or by using any spreadsheet application,
-saving them as .xlsx or .csv files. You can also build your plan "for real" in
-Dwarf Fortress, and then export your map using the DFHack
-[blueprint plugin](https://docs.dfhack.org/en/stable/docs/Plugins.html#blueprint)
-for later replay in a different fort.
+[//]: # (The online version of this manual, which may be easier to read, is)
+[//]: # (at https://github.com/DFHack/dfhack/tree/develop/data/blueprints)
 
-DFHack blueprints are compatible with the original Quickfort 2.0 syntax. If you
-have existing blueprints that worked with https://github.com/joelpt/quickfort,
-then they should work just fine in DFHack quickfort.
+[//]: # (Note to editors: don't word wrap -- it breaks the formatting on GitHub)
 
-There are many ready-to-use examples of blueprints in the library subfolder.
+DFHack Quickfort User Manual
+============================
+
+DFHack Quickfort is a DFHack script that helps you build fortresses from "blueprint" .csv and .xlsx files. Many applications exist to edit these files, such as MS Excel and [Google Sheets](https://sheets.new). You can also build your plan "for real" in Dwarf Fortress, and then export your map using DFHack's [blueprint](https://docs.dfhack.org/en/stable/docs/Plugins.html#blueprint) plugin. Most layout and building-oriented DF commands are supported through the use of multiple files or spreadsheets, each describing a different phase of DF construction: designation, building, placing stockpiles, and setting configuration.
+
+The original idea and 1.0 codebase came from [Valdemar's](https://dwarffortresswiki.org/index.php/User:Valdemar) auto-designation macro. Joel Thornton (joelpt) reimplemented the core logic in Python and extended its functionality with [Quickfort 2.0](https://github.com/joelpt/quickfort). This DFHack-native implementation, called "DFHack Quickfort" or just "quickfort", builds upon Quickfort 2.0's formats and features. DFHack Quickfort is written in Lua and interacts with Dwarf Fortress memory structures directly, allowing for instantaneous blueprint application, error checking and recovery, and many other advanced features.
+
+This document focuses on DFHack Quickfort's capabilities and teaches players how to understand and build blueprint files.  Much of the text was originally written by Joel Thornton, reused here with his permission.
+
+For those just looking to apply blueprints, check out the [quickfort command syntax](https://docs.dfhack.org/en/stable/docs/_auto/base.html#quickfort) in the DFHack Scripts documentation. There are many ready-to-use blueprints available in the `blueprints/library` subfolder in your DFHack installation. Browse them on your computer or [online](https://github.com/DFHack/dfhack/tree/develop/data/blueprints/library), or run `quickfort list -l` at the `DFHack#` prompt to list them, and then `quickfort run` to apply them to your fort!
+
+See the [Links section](#links) for more information and online resources.
+
+
+Table of Contents
+-----------------
+
+* [Features](#features)
+* [Editing Blueprints](#editing-blueprints)
+  * [Area expansion syntax](#area-expansion-syntax)
+  * [Automatic area expansion](#automatic-area-expansion)
+  * [Specifying a starting position](#specifying-a-starting-position)
+  * [Multilevel blueprints](#multilevel-blueprints)
+  * [Minecart tracks](#minecart-tracks)
+* [Packaging a set of blueprints](#packaging-a-set-of-blueprints)
+* [Troubleshooting](#troubleshooting)
+* [Tips and tricks](#tips-and-tricks)
+* [Links](#links)
+
+
+Features
+--------
+
+* General
+  * Manages complete blueprints to handle the four main phases of DF construction
+  * Supports .csv and multi-worksheet .xlsx blueprint files
+  * Near-instant application, even for very large and complex blueprints
+  * Blueprints can span multiple z-levels
+  * Undo functionality for dig, build, and place blueprints
+  * Automatic cropping of blueprints so you don't get errors if the blueprint extends off the map
+  * Can generate manager orders for everything required to apply build blueprints
+  * Library of ready-to-use blueprints included
+  * Verbose output mode for debugging blueprints
+* Dig mode
+  * Supports all types of designations, including dumping/forbidding items and setting traffic areas
+  * Supports applying dig blueprints in marker mode
+  * Handles carving arbitrarily complex minecart tracks, including tracks that cross other tracks
+* Build and place modes
+  * Supports stockpiles of all shapes, not just rectangular blocks
+  * Configurable maximums for bins, barrels and wheelbarrows assigned to created stockpiles
+  * Automatic expansion of building footprints to their minimum dimensions, so only the center tile of a multi-tile building needs to be recorded in the blueprint
+  * Designates complete constructions at once, without having to wait for each tile to become supported before you can build it
+  * Automatic splitting of stockpiles and buildings that exceed maximum dimension limits
+  * Tile occupancy and validity checking so, for example, buildings that cannot be placed on a certain tile will simply be skipped instead of the blueprint failing to apply. Blueprints that are only partially applied for any reason (for example, you need to dig out some more tiles) can be safely reapplied to build the remaining buildings.
+  * Relaxed rules for farm plot and road placement, allowing tiles that are separated by invalid tiles (e.g. stone tiles for farm plots) to be part of the same structure
+* Query mode
+  * Support sending arbitrary keystroke sequences to the UI -- configure *anything*
+  * Supports aliases to automate frequent keystroke combos
+  * Supports including aliases in other aliases, and repeating key sequences a specified number of times
+  * Includes a library of pre-made and tested aliases to automate most common tasks, such as configuring stockpiles for important item types or creating hauling routes for quantum stockpiles.
+  * Skips sending key sequences when the cursor is over a tile that does not have a stockpile or building
+  * Instant halting of query blueprint application when keystroke errors are detected, such as when a key sequence leaves us stuck in a submenu
+
+
+Editing Blueprints
+------------------
+
+The format of Quickfort-compatible blueprint files is straightforward.
+
+It is recommended to use a spreadsheet editor such as Excel, [Google Sheets](https://sheets.new), or [LibreOffice](https://www.libreoffice.org) to edit these files, but any text editor will do.
+
+The first line (or upper-left cell) of the spreadsheet should look like this:
+
+    #dig This is a decription.
+
+The keyword "dig" tells Quickfort we are going to be using the Designations menu in DF. The following "mode" keywords are understood:
+
+    dig     Designations menu (d)
+    build   Build menu (b)
+    place   Place stockpiles menu (p)
+    query   Set building tasks/prefs menu (q)
+
+Optionally following this keyword and a space, you may enter a comment. This comment will appear in the output of `quickfort list` when run from the `DFHack#` prompt. You can use this space for explanations, attribution, etc.
+
+Below this line begin entering the keys you want sent in each cell. For example, we could dig out a 4x4 room like so (spaces are used as column separators here for clarity, but a real .csv file would have commas):
+
+    #dig
+    d d d d #
+    d d d d #
+    d d d d #
+    d d d d #
+    # # # # #
+
+Note the # symbols at the right end of each row and below the last row. These are completely optional, but can be helpful when visualizing the layout.
+
+Once the dwarves have that dug out, let's build a walled-in bedroom within our dug-out area:
+
+    #build
+    Cw Cw Cw Cw #
+    Cw b  h  Cw #
+    Cw       Cw #
+    Cw Cw    Cw #
+    #  #  #  #  #
+
+Note my generosity - in addition to the bed (b) I've built a chest (h) here for the dwarf as well. Note that you must use the full series of keys needed to build something in each cell, e.g. 'Cw' enters DF's constructions submenu (C) and selects walls (w).
+
+I'd also like to place a booze stockpile in the 2 unoccupied tiles in the room.
+
+    #place Place a food stockpile
+    ` ` ` ` #
+    ` ` ` ` #
+    ` f(2x1)#
+    ` ` ` ` #
+    # # # # #
+
+This illustration may be a little hard to understand. The f(2x1) is in column 2, row 3. All the other cells are empty. QF considers both "`" (backtick -- the character under the tilde) and "~" (tilde) characters within cells to be empty cells; this can help with multilayer or fortress-wide blueprint layouts as 'chalk lines'.
+
+With f(2x1), we've asked QF to place a food stockpile 2 units wide by 1 high unit. Note that the f(2x1) syntax isn't actually necessary here; we could have just used:
+
+    #place Place a food stockpile
+    ` ` ` ` #
+    ` ` ` ` #
+    ` f f ` #
+    ` ` ` ` #
+    # # # # #
+
+QF is smart enough to recognize this as a 2x1 food stockpile, and creates it as such rather than as two 1x1 food stockpiles. Quickfort recognizes any connected region of identical designations as a single stockpile. The tiles can be connected orthogonally or diagonally, just as long as they are touching somehow.
+
+Lastly, let's turn the bed into a bedroom and set the food stockpile to hold only booze.
+
+    #query
+    ` ` ` ` #
+    ` r&  ` #
+    ` booze #
+    ` ` ` ` #
+    # # # # #
+
+In column 2, row 2 we have "r&". This sends the "r" key to DF when the cursor is over the bed, causing us to 'make room' and "&", which is a special symbol that expands to "{Enter}", to indicate that we're done.
+
+In column 2, row 3 we have "booze". This is one of many alias keywords defined in the included [baseline aliases file](https://github.com/DFHack/dfhack/tree/develop/data/quickfort/aliases-common.txt). This particular alias sets a food stockpile to carry booze only. It sends the keys needed to navigate DF's stockpile settings menu, and then sends an Escape character ("^" or "{ESC}") to exit back to the map. It is important to exit out of any menus that you enter while in query mode so that the cursor can move to the next tile when it is done configuring the current tile.
+
+Check out the included [blueprint library](https://github.com/DFHack/dfhack/tree/develop/data/blueprints/library) to see many more examples. Read the baseline aliases file for helpful pre-packaged aliases, or create your own in [dfhack-config/quickfort/aliases.txt](https://github.com/DFHack/dfhack/tree/develop/dfhack-config/quickfort/aliases.txt) in your DFHack installation.
+
+
+Area expansion syntax
+---------------------
+
+In Quickfort, the following blueprints are equivalent:
+
+    #dig a 3x3 area
+    d d d #
+    d d d #
+    d d d #
+    # # # #
+
+    #dig the same area with d(3x3) specified in row 1, col 1
+    d(3x3)#
+    ` ` ` #
+    ` ` ` #
+    # # # #
+
+The second example uses Quickfort's "area expansion syntax", which takes the form:
+
+    cmds(WxH)
+
+In Quickfort the above two examples of specifying a contiguous 3x3 area produce identical output: a single 3x3 designation will be performed, rather than nine 1x1 designations as the first example might suggest.
+
+Area expansion syntax can only specify rectangular areas. If you want to create extent-based structures (e.g. farm plots or stockpiles) in different shapes, use the first format above. For example:
+
+    #place L shaped food stockpile
+    f f ` ` #
+    f f ` ` #
+    f f f f #
+    f f f f #
+    # # # # #
+
+Area expansion syntax also sets boundaries, which can be useful if you want adjacent, but separate, stockpiles of the same type:
+
+    #place Two touching but separate food stockpiles
+    f(4x2)  #
+    ~ ~ ~ ~ #
+    f(4x2)  #
+    ~ ~ ~ ~ #
+    # # # # #
+
+As mentioned previously, "~" characters are ignored as comment characters and can be used for visualizing the blueprint layout. The blueprint can be equivalently written as:
+
+    #place Two touching but separate food stockpiles
+    f(4x2)  #
+    ~ ~ ~ ~ #
+    f f f f #
+    f f f f #
+    # # # # #
+
+since the area expansion syntax of the upper stockpile prevents it from combining with the lower, freeform syntax stockpile.
+
+Area expansion syntax can also be used for buildings which have an adjustable size, like bridges. The following blueprints are equivalent:
+
+    #build a 4x2 bridge from row 1, col 1
+    ga(4x2)  `  #
+    `  `  `  `  #
+    #  #  #  #  #
+
+    #build a 4x2 bridge from row 1, col 1
+    ga ga ga ga #
+    ga ga ga ga #
+    #  #  #  #  #
+
+
+Automatic area expansion
+------------------------
+
+Buildings larger than 1x1, like workshops, can be represented in any of three ways. You can designate just their center tile with empty cells around it to leave room for the footprint, like this:
+
+    #build a mason workshop in row 2, col 2 that will occupy the 3x3 area
+    `  `  `  #
+    `  wm `  #
+    `  `  `  #
+    #  #  #  #
+
+Or you can fill out the entire footprint like this:
+
+    #build a mason workshop
+    wm wm wm #
+    wm wm wm #
+    wm wm wm #
+    #  #  #  #
+
+This format may be verbose for regular workshops, but it can be very helpful for laying out structures like screw pump towers and waterwheels, whose "center point" can be non-obvious.
+
+Finally, you can use area expansion syntax to represent the workshop:
+
+    #build a mason workshop
+    wm(3x3)  #
+    `  `  `  #
+    `  `  `  #
+    #  #  #  #
+
+This style can be convenient for laying out multiple buildings of the same type. If you are building a large-scale block factory, for example, this will create 20 mason workshops all in a row:
+
+    #build line of 20 mason workshops
+    wm(60x3) #
+
+Quickfort will intelligently break large areas of the same designation into appropriately-sized chunks.
+
+
+Specifying a starting position
+------------------------------
+
+You can optionally specify a cursor starting position for a particular blueprint, simplifying the task of blueprint alignment. This can be helpful for blueprints that are based on a central staircase, for example.
+
+To specify a cursor starting position, use the following modified format for the header line of your blueprint:
+
+    #mode start(X;Y;STARTCOMMENT) comment
+
+where X and Y specify the starting cursor position (1;1 is the top left cell) and STARTCOMMENT (optional) is information about where to position the cursor. This information appears in the `quickfort list` output.
+
+A couple examples:
+
+    #dig start(3; 3; Center tile of a 5-tile square) Regular blueprint comment
+    #build start(10;15)
+
+
+Multilevel blueprints
+---------------------
+
+Multilevel blueprints are accommodated by separating Z-levels of the blueprint with #> (go down one z-level) or #< (go up one z-level) at the end of each floor.
+
+    #dig Stairs leading down to a small room below
+    j  `  `  #
+    `  `  `  #
+    `  `  `  #
+    #> #  #  #
+    u  d  d  #
+    d  d  d  #
+    d  d  d  #
+    #  #  #  #
+
+
+Minecart tracks
+---------------
+
+There are two ways to produce minecart tracks, and they are handled very differently by the game. You can carve them into hard natural floors or you can construct them out of building materials. Constructed tracks are conceptually simpler, so we'll start with them.
+
+### Constructed Tracks ###
+
+Quickfort supports the designation of track stops and rollers through the normal mechanisms: a #build blueprint with `CS` and some number of 'd' and 'a' characters (for selecting dump direction and friction) in a cell designates a track stop and a #build blueprint with `Mr` and some number of 's' and 'q' characters (for direction and speed) designates a roller. This can get confusing very quickly and is very difficult to read in a blueprint. Constructed track segments don't even have keys associated with them at all!
+
+To solve this problem, Quickfort provides the following keywords for use in build blueprints:
+
+    -- Track segments --
+    trackN
+    trackS
+    trackE
+    trackW
+    trackNS
+    trackNE
+    trackNW
+    trackSE
+    trackSW
+    trackEW
+    trackNSE
+    trackNSW
+    trackNEW
+    trackSEW
+    trackNSEW
+
+    -- Track/ramp segments --
+    trackrampN
+    trackrampS
+    trackrampE
+    trackrampW
+    trackrampNS
+    trackrampNE
+    trackrampNW
+    trackrampSE
+    trackrampSW
+    trackrampEW
+    trackrampNSE
+    trackrampNSW
+    trackrampNEW
+    trackrampSEW
+    trackrampNSEW
+
+    -- Horizontal and vertical roller segments --
+    rollerH
+    rollerV
+    rollerNS
+    rollerSN
+    rollerEW
+    rollerWE
+
+    Note: append up to four 'q' characters to roller keywords to set roller
+    speed. E.g. a roller that propels from East to West at the slowest speed can
+    be specified with 'rollerEWqqqq'.
+
+    -- Track stops that (optionally) dump to the N/S/E/W --
+    trackstop
+    trackstopN
+    trackstopS
+    trackstopE
+    trackstopW
+
+    Note: append up to four 'a' characters to trackstop keywords to set friction
+    amount. E.g. a stop that applies the smallest amount of friction can be
+    specified with 'trackstopaaaa'.
+
+As an example, you can create an E-W track with stops at each end that dump to their outside directions with the following blueprint:
+
+    #build Example track
+    trackstopW trackEW trackEW trackEW trackstopE
+
+Note that the **only** way to build track and track/ramp segments is with the keywords. The UI method of using "+" and "-" keys to select the track type from a list does not work since DFHack Quickfort doesn't actually send keys to the UI in order to build buildings. The text in your spreadsheet cells is mapped directly into DFHack API calls. Only query-mode blueprints still send actual keycodes to the UI.
+
+### Carved Tracks ###
+
+In the game, you carve a minecart track by specifying a beginning and ending tile and the game "adds" the designation to the tiles. You cannot designate single tiles. For example to carve two track segments that cross each other, you might use the cursor to designate a line of three vertical tiles like this:
+
+    `  start here  `  #
+    `  `           `  #
+    `  end here    `  #
+
+Then to carve the cross, you'd do a horizonal segment:
+
+    `           `  `         #
+    start here  `  end here  #
+    `           `  `         #
+
+This will result in a carved track that would be equivalent to a constructed track of the form:
+
+    #build
+    `       trackS     `       #
+    trackE  trackNSEW  trackW  #
+    `       trackN     `       #
+    #       #          #       #
+
+To carve this same track with a dig blueprint, you'd use area expansion syntax with a height or width of 1 to indicate the segments to designate:
+
+    #dig
+    `       T(1x3)  `  #
+    T(3x1)  `       `  #
+    `       `       `  #
+    #       #       #  #
+
+"But wait!", I can hear you say, "How do you designate a track corner that opens to the South and East? You can't put both T(1xH) and T(Wx1) in the same cell!" This is true, but you can specify both width and height, and for tracks, QF interprets it as an upper-left corner extending to the right W tiles and down H tiles. For example, to carve a track in a closed ring, you'd write:
+
+    #dig
+    T(3x3)  `  T(1x3)  #
+    `       `  `       #
+    T(3x1)  `  `       #
+    #       #  #       #
+
+Which would result in a carved track simliar to a constructed track of the form:
+
+    #build
+    trackSE  trackEW  trackSW  #
+    trackNS  `        trackNS  #
+    trackNE  trackEW  trackNW  #
+    #        #        #        #
+
+
+Packaging a set of blueprints
+-----------------------------
+
+A complete QF specification for a section of your fortress may contain 4 or more separate blueprints, one for each "phase" of construction (dig, build, place stockpiles, query building adjustments).
+
+To manage all the separate blueprints, it is often convenient to keep related blueprints in a single .xlsx file, with each blueprint in a separate sheet within the file. Online spreadsheet applications like [Google Sheets](https://sheets.new) make it easy to work with multiple related blueprints, and, as a bonus, they retain any formatting you've set, like column sizes and coloring.
+
+Of course, you could still choose to keep your blueprints in single-sheet .csv files and just give related blueprints similar names. The blueprint modes suggest a convenient naming scheme for .csv-based blueprint "stacks":
+
+    bedroom.1.dig.csv
+    bedroom.2.build.csv
+    bedroom.3.place.csv
+    bedroom.4.query.csv
+
+But the naming is completely up to you, of course.
+
+
+Tips and Tricks
+---------------
+
+* During blueprint application, especially query blueprints, don't click the mouse on the DF window or type any keys. They can change the state of the game while the blueprint is being applied, resulting in strange errors.
+
+* After digging out an area, you may wish to smooth and/or engrave the area before starting the build phase, as dwarves may be unable to access walls or floors that are behind/under built objects.
+
+* As of DF 0.34.x, it is no longer possible to build doors (d) at the same time that you build adjacent walls (Cw). Doors must now be built *after* walls are constructed for them to be next to. This does not affect the more common case where walls exist as a side-effect of having dug-out a room in a #dig blueprint.
+
+
+Links
+-----
+
+### Quickfort links ###
+
+* [Quickfort command syntax](https://docs.dfhack.org/en/stable/docs/_auto/base.html#quickfort)
+* [Quickfort forum thread](http://www.bay12forums.com/smf/index.php?topic=176889.0)
+* [Quickfort blueprints library](https://github.com/DFHack/dfhack/tree/develop/data/blueprints/library)
+* [DFHack issue tracker](https://github.com/DFHack/dfhack/issues)
+* [Quickfort source code](https://github.com/DFHack/scripts/tree/master/internal/quickfort)
+
+### Related tools ###
+
+* DFHack's [blueprint plugin](https://docs.dfhack.org/en/stable/docs/Plugins.html#blueprint) can generate blueprints from actual DF maps.
+* [Python Quickfort](http://joelpt.net/quickfort) is the previous, Python-based implementation that DFHack's quickfort script was inspired by.

From b033e4644f8ea414aa12975b2261c797ccf5619c Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Fri, 7 Aug 2020 12:44:40 -0700
Subject: [PATCH 250/547] add xlsxio as a submodule

---
 .gitmodules    | 4 ++++
 depends/xlsxio | 1 +
 2 files changed, 5 insertions(+)
 create mode 160000 depends/xlsxio

diff --git a/.gitmodules b/.gitmodules
index 98e06473d..0ccd3810a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,7 @@
 [submodule "depends/jsoncpp"]
 	path = depends/jsoncpp-sub
 	url = ../../DFHack/jsoncpp.git
+[submodule "depends/xlsxio"]
+	path = depends/xlsxio
+	url = ../../brechtsanders/xlsxio.git
+	shallow = true
diff --git a/depends/xlsxio b/depends/xlsxio
new file mode 160000
index 000000000..2d12a8844
--- /dev/null
+++ b/depends/xlsxio
@@ -0,0 +1 @@
+Subproject commit 2d12a88448b6f40594b2b2e0d0ce7207d0efa021

From 1fc800e7652d344a53f988b3977cca37f08fa568 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Fri, 7 Aug 2020 13:08:06 -0700
Subject: [PATCH 251/547] fix xlsxio lib to current commit

so it doesn't break us with incompatibile changes. we only need to
update this lib if/when we run into a bug with it. no need to introduce
instability by tracking HEAD
---
 depends/xlsxio | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/xlsxio b/depends/xlsxio
index 2d12a8844..261d56815 160000
--- a/depends/xlsxio
+++ b/depends/xlsxio
@@ -1 +1 @@
-Subproject commit 2d12a88448b6f40594b2b2e0d0ce7207d0efa021
+Subproject commit 261d56815b29908fc960fecb9cb3143db4b485ad

From a85b77e6f156a75684d00a60911b060f00c631b8 Mon Sep 17 00:00:00 2001
From: Ryan Bennitt <ryanbennitt@googlemail.com>
Date: Fri, 7 Aug 2020 22:07:48 +0100
Subject: [PATCH 252/547] Retrieve goal string values from enum attributes and
 add new Units methods to Lua API and docs

---
 docs/Lua API.rst          | 24 +++++++++++++++++++++
 library/LuaApi.cpp        |  3 +++
 library/modules/Units.cpp | 45 +++++++++------------------------------
 plugins/manipulator.cpp   |  1 -
 4 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 8c3763245..45ccd46a9 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -1277,6 +1277,30 @@ Units module
 
   Retrieves the profession color for the given race/caste using raws.
 
+* ``dfhack.units.getGoalType(unit[,goalIndex])``
+
+  Retrieves the goal type of the dream that the given unit has.
+  By default the goal of the first dream is returned.
+  The goalIndex parameter may be used to retrieve additional dream goals.
+  Currently only one dream per unit is supported by Dwarf Fortress.
+  Support for multiple dreams may be added in future versions of Dwarf Fortress.
+
+* ``dfhack.units.getGoalName(unit[,goalIndex])``
+
+  Retrieves the short name describing the goal of the dream that the given unit has.
+  By default the goal of the first dream is returned.
+  The goalIndex parameter may be used to retrieve additional dream goals.
+  Currently only one dream per unit is supported by Dwarf Fortress.
+  Support for multiple dreams may be added in future versions of Dwarf Fortress.
+
+* ``dfhack.units.isGoalAchieved(unit[,goalIndex])``
+
+  Checks if given unit has achieved the goal of the dream.
+  By default the status of the goal of the first dream is returned.
+  The goalIndex parameter may be used to check additional dream goals.
+  Currently only one dream per unit is supported by Dwarf Fortress.
+  Support for multiple dreams may be added in future versions of Dwarf Fortress.
+
 * ``dfhack.units.getStressCategory(unit)``
 
   Returns a number from 0-6 indicating stress. 0 is most stressed; 6 is least.
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 25843875d..13c9386ff 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -1604,6 +1604,9 @@ static const LuaWrapper::FunctionReg dfhack_units_module[] = {
     WRAPM(Units, getCasteProfessionName),
     WRAPM(Units, getProfessionColor),
     WRAPM(Units, getCasteProfessionColor),
+    WRAPM(Units, getGoalType),
+    WRAPM(Units, getGoalName),
+    WRAPM(Units, isGoalAchieved),
     WRAPM(Units, getSquadName),
     WRAPM(Units, isWar),
     WRAPM(Units, isHunter),
diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp
index 87c71ac67..32fe3b5b9 100644
--- a/library/modules/Units.cpp
+++ b/library/modules/Units.cpp
@@ -61,6 +61,7 @@ using namespace std;
 #include "df/identity_type.h"
 #include "df/game_mode.h"
 #include "df/histfig_entity_link_positionst.h"
+#include "df/histfig_relationship_type.h"
 #include "df/historical_entity.h"
 #include "df/historical_figure.h"
 #include "df/historical_figure_info.h"
@@ -1457,42 +1458,16 @@ std::string Units::getGoalName(df::unit *unit, int goalIndex)
     df::goal_type goal = getGoalType(unit, goalIndex);
     bool achieved_goal = isGoalAchieved(unit, goalIndex);
 
-    switch (goal)
-    {
-    default:
-    case df::goal_type::STAY_ALIVE:
-        return achieved_goal ? "Stayed Alive" : "Stay Alive";
-    case df::goal_type::MAINTAIN_ENTITY_STATUS:
-        return achieved_goal ? "Maintained Status" : "Maintain Status";
-    case df::goal_type::START_A_FAMILY:
-        return isFemale(unit) ?
-            (achieved_goal ? "Is a Mother" : "Be a Mother") :
-            (achieved_goal ? "Is a Father" : "Be a Father");
-    case df::goal_type::RULE_THE_WORLD:
-        return achieved_goal ? "Ruled the World" : "Rule the World";
-    case df::goal_type::CREATE_A_GREAT_WORK_OF_ART:
-        return achieved_goal ? "Made Great Artwork" : "Create Great Artwork";
-    case df::goal_type::CRAFT_A_MASTERWORK:
-        return achieved_goal ? "Crafted a Masterwork" : "Craft a Masterwork";
-    case df::goal_type::BRING_PEACE_TO_THE_WORLD:
-        return achieved_goal ? "Brought World Peace" : "Bring Peace to World";
-    case df::goal_type::BECOME_A_LEGENDARY_WARRIOR:
-        return achieved_goal ? "Is Legendary Warrior" : "Be Legendary Warrior";
-    case df::goal_type::MASTER_A_SKILL:
-        return achieved_goal ? "Mastered a Skill" : "Master a Skill";
-    case df::goal_type::FALL_IN_LOVE:
-        return achieved_goal ? "Fell in Love" : "Fall in Love";
-    case df::goal_type::SEE_THE_GREAT_NATURAL_SITES:
-        return achieved_goal ? "Saw Natural Wonders" : "See Natural Wonders";
-    case df::goal_type::IMMORTALITY:
-        return achieved_goal ? "Immortal" : "Immortality";
-    case df::goal_type::MAKE_A_GREAT_DISCOVERY:
-        return achieved_goal ? "Made Great Discovery" : "Make Great Discovery";
-    case df::goal_type::ATTAINING_RANK_IN_SOCIETY:
-        return achieved_goal ? "Attained Social Rank" : "Attain Social Rank";
-    case df::goal_type::BATHING_THE_WORLD_IN_CHAOS:
-        return achieved_goal ? "World is in Chaos" : "Bathe World in Chaos";
+    std::string goal_name = achieved_goal ? ENUM_ATTR(goal_type, achieved_short_name, goal) : ENUM_ATTR(goal_type, short_name, goal);
+    if (goal == df::goal_type::START_A_FAMILY) {
+        std::string parent = ENUM_KEY_STR(histfig_relationship_type, histfig_relationship_type::Parent);
+        size_t start_pos = goal_name.find(parent);
+        if (start_pos != std::string::npos) {
+            df::histfig_relationship_type parent_type = isFemale(unit) ? histfig_relationship_type::Mother : histfig_relationship_type::Father;
+            goal_name.replace(start_pos, parent.length(), ENUM_KEY_STR(histfig_relationship_type, parent_type));
+        }
     }
+    return goal_name;
 }
 
 bool Units::isGoalAchieved(df::unit *unit, int goalIndex)
diff --git a/plugins/manipulator.cpp b/plugins/manipulator.cpp
index 4bb285f0b..ae7b3f800 100644
--- a/plugins/manipulator.cpp
+++ b/plugins/manipulator.cpp
@@ -37,7 +37,6 @@
 
 #include "uicommon.h"
 #include "listcolumn.h"
-#include "manipulator.h"
 
 using std::stringstream;
 using std::set;

From c76f71cd461f12a7ef861326321fc076f660864b Mon Sep 17 00:00:00 2001
From: Ryan Bennitt <ryanbennitt@googlemail.com>
Date: Fri, 7 Aug 2020 22:20:11 +0100
Subject: [PATCH 253/547] Update xml library submodule

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index 9fca46ccc..51e237b9b 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 9fca46ccca28e0948014b9d56a096ad7343473f1
+Subproject commit 51e237b9b2e667d48fbb793ac29d782d7326c39a

From f7fda8e7f52fbcecd18b0a7d5f87ef31797d8156 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 8 Aug 2020 00:06:59 -0400
Subject: [PATCH 254/547] Update changelog, authors, xml (#1615)

---
 docs/Authors.rst   | 1 +
 docs/changelog.txt | 1 +
 library/xml        | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/Authors.rst b/docs/Authors.rst
index 31789aa52..a9036a33c 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -142,6 +142,7 @@ rout
 rubybrowncoat           rubybrowncoat
 Rumrusher               rumrusher
 RusAnon                 RusAnon
+Ryan Bennitt            ryanbennitt
 sami
 scamtank                scamtank
 Sebastian Wolfertz      Enkrod
diff --git a/docs/changelog.txt b/docs/changelog.txt
index e7a01f4fe..f5bdb42b3 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -55,6 +55,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## API
 - Added ``Filesystem::mkdir_recursive``
 - Extended ``Filesystem::listdir_recursive`` to optionally make returned filenames relative to the start directory
+- ``Units``: added goal-related functions: ``getGoalType()``, ``getGoalName()``, ``isGoalAchieved()``
 
 ## Internals
 - Linux/macOS: Added console keybindings for deleting words (Alt+Backspace and Alt+d in most terminals)
diff --git a/library/xml b/library/xml
index 51e237b9b..daa353138 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 51e237b9b2e667d48fbb793ac29d782d7326c39a
+Subproject commit daa3531384c6d222c7a28f6a73de3201a27f391d

From ee8d1302980cf4e805a4f4ef170bd9f1411b3a27 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 8 Aug 2020 00:12:59 -0400
Subject: [PATCH 255/547] Use existing pronoun_type enum

---
 plugins/manipulator.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/manipulator.cpp b/plugins/manipulator.cpp
index ae7b3f800..28b946be2 100644
--- a/plugins/manipulator.cpp
+++ b/plugins/manipulator.cpp
@@ -290,7 +290,7 @@ struct UnitInfo
     string transname;
     string profession;
     string goal;
-    enum { NEUTRAL, MALE, FEMALE } goal_gender;
+    df::pronoun_type goal_gender;
     bool achieved_goal;
     int8_t color;
     int active_index;
@@ -1263,9 +1263,9 @@ void viewscreen_unitlaborsst::refreshNames()
         cur->goal = Units::getGoalName(unit);
         df::goal_type goal = Units::getGoalType(unit);
         if (goal == df::goal_type::START_A_FAMILY) {
-            cur->goal_gender = Units::isFemale(unit) ? UnitInfo::FEMALE : UnitInfo::MALE;
+            cur->goal_gender = unit->sex;
         } else {
-            cur->goal_gender = UnitInfo::NEUTRAL;
+            cur->goal_gender = df::pronoun_type::it;
         }
         cur->achieved_goal = Units::isGoalAchieved(unit);
 
@@ -2021,13 +2021,13 @@ void viewscreen_unitlaborsst::render()
             fg = cur->color;
             detail_str = cur->profession;
         } else {
-            if (cur->goal_gender == UnitInfo::NEUTRAL) {
+            if (cur->goal_gender == df::pronoun_type::it) {
                 if (cur->achieved_goal) {
                     fg = COLOR_LIGHTGREEN;
                 } else {
                     fg = COLOR_BROWN;
                 }
-            } else if (cur->goal_gender == UnitInfo::FEMALE) {
+            } else if (cur->goal_gender == df::pronoun_type::she) {
                 if (cur->achieved_goal) {
                     fg = COLOR_LIGHTRED;
                 }

From cb1b751988666bdca41d5e5e9ebb53f613a4decb Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 8 Aug 2020 00:31:28 -0400
Subject: [PATCH 256/547] Update submodules

---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index daa353138..ce21a92c0 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit daa3531384c6d222c7a28f6a73de3201a27f391d
+Subproject commit ce21a92c03a5a512c740917cdff85eadf5c4fdd0
diff --git a/scripts b/scripts
index 823d47c4d..f732c1e4b 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 823d47c4d181ac5b754dce5d605f3e7f242aed26
+Subproject commit f732c1e4b3c7c7577b2fc07e1655b81a24340ae3

From 6a1f046995391e383d28b590126c8367128892db Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 8 Aug 2020 00:31:33 -0400
Subject: [PATCH 257/547] Add --sizecheck option to Linux launcher script,
 update docs

---
 docs/Memory-research.rst | 19 +++++++++++++++----
 package/linux/dfhack     |  5 +++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/docs/Memory-research.rst b/docs/Memory-research.rst
index 41aa437c8..3f615750a 100644
--- a/docs/Memory-research.rst
+++ b/docs/Memory-research.rst
@@ -86,10 +86,13 @@ You should not count on DF being stable when using this.
 DFHack's implementation of sizecheck is currently only tested on Linux, although
 it probably also works on macOS. It can be built with the ``BUILD_SIZECHECK``
 `CMake option <compile-build-options>`, which produces a ``libsizecheck``
-library installed in the ``hack`` folder. You will need to preload this library
-manually, by setting ``PRELOAD_LIB`` on Linux (or ``LD_PRELOAD`` if editing
-the ``dfhack`` launcher script directly), or by editing the ``dfhack``
-launcher script and adding the library to ``DYLD_INSERT_LIBRARIES`` on macOS.
+library installed in the ``hack`` folder. On Linux, passing ``--sc`` as the
+first argument to the ``dfhack`` launcher script will load this library on
+startup. On other platforms, or when passing a different argument to the
+launcher (such as for `linux-gdb`), you will need to preload this library
+manually, by setting ``PRELOAD_LIB`` on Linux (or ``LD_PRELOAD`` if editing the
+``dfhack`` launcher script directly), or by editing the ``dfhack`` launcher
+script and adding the library to ``DYLD_INSERT_LIBRARIES`` on macOS.
 
 There is also an older sizecheck implementation by Mifki available on
 `GitHub <https://github.com/mifki/df-sizecheck>`__ (``b.cpp`` is the main
@@ -129,6 +132,14 @@ Some basic GDB commands:
 See the `official GDB documentation <https://www.gnu.org/software/gdb/documentation/>`_
 for more details.
 
+Other analysis tools
+--------------------
+
+The ``dfhack`` launcher script on Linux has support for launching several other
+tools alongside DFHack, including Valgrind (as well as Callgrind and Helgrind)
+and strace. See the script for the exact command-line option to specify. Note
+that currently only one tool at a time is supported, and must be specified
+with the first argument to the script.
 
 df-structures GUI
 -----------------
diff --git a/package/linux/dfhack b/package/linux/dfhack
index b63c3a253..6b542f405 100755
--- a/package/linux/dfhack
+++ b/package/linux/dfhack
@@ -146,6 +146,11 @@ case "$1" in
     exec setarch "$setarch_arch" -R env LD_PRELOAD="$PRELOAD_LIB" ./libs/Dwarf_Fortress "$@"
     # script does not resume
     ;;
+  --sc | --sizecheck)
+    PRELOAD_LIB="${PRELOAD_LIB:+$PRELOAD_LIB:}./hack/libsizecheck.so"
+    MALLOC_PERTURB_=45 setarch "$setarch_arch" -R env LD_PRELOAD="$PRELOAD_LIB" ./libs/Dwarf_Fortress "$@"
+    ret=$?
+    ;;
   *)
     setarch "$setarch_arch" -R env LD_PRELOAD="$PRELOAD_LIB" ./libs/Dwarf_Fortress "$@"
     ret=$?

From a28e9393704d4de58760b06b87e564105df183d8 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 8 Aug 2020 00:45:57 -0400
Subject: [PATCH 258/547] Recalculate size after toggling columns (goals can be
 longer than professions)

---
 plugins/manipulator.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/manipulator.cpp b/plugins/manipulator.cpp
index 28b946be2..b333afae5 100644
--- a/plugins/manipulator.cpp
+++ b/plugins/manipulator.cpp
@@ -1769,7 +1769,7 @@ void viewscreen_unitlaborsst::feed(set<df::interface_key> *events)
                 std::stable_sort(units.begin(), units.end(), sortBySquad);
             } else if (detail_mode == DETAIL_MODE_JOB) {
                 std::stable_sort(units.begin(), units.end(), sortByJob);
-            } else if (detail_mode == DETAIL_MODE_PROFESSION){
+            } else if (detail_mode == DETAIL_MODE_PROFESSION) {
                 std::stable_sort(units.begin(), units.end(), sortByProfession);
             } else {
                 std::stable_sort(units.begin(), units.end(), sortByGoal);
@@ -1818,6 +1818,7 @@ void viewscreen_unitlaborsst::feed(set<df::interface_key> *events)
         } else {
             detail_mode = DETAIL_MODE_PROFESSION;
         }
+        calcSize();
     }
 
     if (events->count(interface_key::CUSTOM_SHIFT_X))
@@ -2202,7 +2203,7 @@ void viewscreen_unitlaborsst::render()
             OutputString(15, x, y, "Squad");
         } else if (detail_mode == DETAIL_MODE_JOB) {
             OutputString(15, x, y, "Job");
-        } else if (detail_mode == DETAIL_MODE_PROFESSION){
+        } else if (detail_mode == DETAIL_MODE_PROFESSION) {
             OutputString(15, x, y, "Profession");
         } else {
             OutputString(15, x, y, "Goal");

From 3b3b0be8c584eb7ba3ee33d4004ad1aadc3eb300 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 8 Aug 2020 02:00:12 -0400
Subject: [PATCH 259/547] Update submodules, tweak changelog order

---
 docs/changelog.txt | 2 +-
 library/xml        | 2 +-
 scripts            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index f5bdb42b3..e033f393b 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -48,6 +48,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `RemoteFortressReader`: fixed a couple crashes that could result from decoding invalid enum items (``site_realization_building_type`` and ``improvement_type``)
 
 ## Misc Improvements
+- Linux/macOS: Added console keybindings for deleting words (Alt+Backspace and Alt+d in most terminals)
 - `blueprint`: now writes blueprints to the ``blueprints/`` subfolder instead of the df root folder
 - `blueprint`: now automatically creates folder trees when organizing blueprints into subfolders (e.g. ``blueprint 30 30 1 rooms/dining dig`` will create the file ``blueprints/rooms/dining-dig.csv``); previously it would fail if the ``blueprints/rooms/`` directory didn't already exist
 - `confirm`: added a confirmation dialog for convicting dwarves of crimes
@@ -58,7 +59,6 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``Units``: added goal-related functions: ``getGoalType()``, ``getGoalName()``, ``isGoalAchieved()``
 
 ## Internals
-- Linux/macOS: Added console keybindings for deleting words (Alt+Backspace and Alt+d in most terminals)
 - Added support for splitting scripts into multiple files in the ``scripts/internal`` folder without polluting the output of `ls`
 
 ## Lua
diff --git a/library/xml b/library/xml
index ce21a92c0..23e076b70 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit ce21a92c03a5a512c740917cdff85eadf5c4fdd0
+Subproject commit 23e076b7079a48b91c59451be64319dd36476994
diff --git a/scripts b/scripts
index f732c1e4b..933849569 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit f732c1e4b3c7c7577b2fc07e1655b81a24340ae3
+Subproject commit 9338495695c3892b8ce407b71a79059b39624334

From 13380008c4959fc21b94a91cf09961a785c48f63 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 8 Aug 2020 13:28:31 -0400
Subject: [PATCH 260/547] Update scripts, authors, changelog

---
 docs/Authors.rst                           |  4 ++--
 docs/changelog.txt                         | 10 ++++++++++
 docs/sphinx_extensions/dfhack/changelog.py |  1 +
 scripts                                    |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/docs/Authors.rst b/docs/Authors.rst
index a9036a33c..42fda0985 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -60,7 +60,6 @@ Ian S                   kremlin-
 IndigoFenix
 James Gilles            kazimuth
 James Logsdon           jlogsdon
-Japa                    JapaMala
 Jared Adams
 Jeremy Apthorp          nornagon
 Jim Lisi                stonetoad
@@ -136,6 +135,7 @@ Robert Janetzko         robertjanetzko
 RocheLimit
 rofl0r                  rofl0r
 root
+Rose                    RosaryMala
 Roses                   Pheosics
 Ross M                  RossM
 rout
@@ -173,7 +173,7 @@ U-glouglou\\simon
 Valentin Ochs           Cat-Ion
 Vitaly Pronkin          pronvit                 mifki
 ViTuRaS                 ViTuRaS
-Vjek
+Vjek                    vjek
 Warmist                 warmist
 Wes Malone              wesQ3
 Will Rogers             wjrogers
diff --git a/docs/changelog.txt b/docs/changelog.txt
index e033f393b..00c7fafcb 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -46,12 +46,17 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `embark-assistant`: fixed a couple of incursion handling bugs.
 - Fixed ``Units::isEggLayer``, ``Units::isGrazer``, ``Units::isMilkable``, ``Units::isTrainableHunting``, ``Units::isTrainableWar``, and ``Units::isTamable`` ignoring the unit's caste
 - `RemoteFortressReader`: fixed a couple crashes that could result from decoding invalid enum items (``site_realization_building_type`` and ``improvement_type``)
+- `RemoteFortressReader`: fixed an issue that could cause block coordinates to be incorrect
+- `rendermax`: fixed a hang that could occur when enabling some renderers, notably on Linux
+- `stonesense`: fixed a crash when launching Stonesense
+- `stonesense`: fixed some issues that could cause the splash screen to hang
 
 ## Misc Improvements
 - Linux/macOS: Added console keybindings for deleting words (Alt+Backspace and Alt+d in most terminals)
 - `blueprint`: now writes blueprints to the ``blueprints/`` subfolder instead of the df root folder
 - `blueprint`: now automatically creates folder trees when organizing blueprints into subfolders (e.g. ``blueprint 30 30 1 rooms/dining dig`` will create the file ``blueprints/rooms/dining-dig.csv``); previously it would fail if the ``blueprints/rooms/`` directory didn't already exist
 - `confirm`: added a confirmation dialog for convicting dwarves of crimes
+- `manipulator`: added a new column option to display units' goals
 
 ## API
 - Added ``Filesystem::mkdir_recursive``
@@ -67,6 +72,11 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Ruby
 - Updated ``item_find`` and ``building_find`` to use centralized logic that works on more screens
 
+## Documentation
+- Expanded the installation guide
+- Added some new dev-facing pages, including dedicated pages about the remote API, memory research, and documentation
+- Made a couple theme adjustments
+
 # 0.47.04-r1
 
 ## Fixes
diff --git a/docs/sphinx_extensions/dfhack/changelog.py b/docs/sphinx_extensions/dfhack/changelog.py
index 6f444d36f..d38f8c060 100644
--- a/docs/sphinx_extensions/dfhack/changelog.py
+++ b/docs/sphinx_extensions/dfhack/changelog.py
@@ -29,6 +29,7 @@ CHANGELOG_SECTIONS = [
     'Lua',
     'Ruby',
     'Structures',
+    'Documentation',
 ]
 
 REPLACEMENTS = {
diff --git a/scripts b/scripts
index 933849569..155b00ab6 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 9338495695c3892b8ce407b71a79059b39624334
+Subproject commit 155b00ab65dd9a1efc56c34c1238a68dce80fe5d

From 8f047530c49094545f580d250587c0b6cae5ba5a Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 8 Aug 2020 14:28:17 -0400
Subject: [PATCH 261/547] Make Units::getRaceNameById and other ID-related
 functions available to Lua

---
 docs/changelog.txt | 1 +
 library/LuaApi.cpp | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 00c7fafcb..f1c423da2 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -68,6 +68,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Lua
 - Added a ``ref_target`` field to primitive field references, corresponding to the ``ref-target`` XML attribute
+- Made ``dfhack.units.getRaceNameById()``, ``dfhack.units.getRaceBabyNameById()``, and ``dfhack.units.getRaceChildNameById()`` available to Lua
 
 ## Ruby
 - Updated ``item_find`` and ``building_find`` to use centralized logic that works on more screens
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 13c9386ff..78364083f 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -1617,8 +1617,11 @@ static const LuaWrapper::FunctionReg dfhack_units_module[] = {
     WRAPM(Units, getPhysicalDescription),
     WRAPM(Units, getRaceName),
     WRAPM(Units, getRaceNamePlural),
+    WRAPM(Units, getRaceNameById),
     WRAPM(Units, getRaceBabyName),
+    WRAPM(Units, getRaceBabyNameById),
     WRAPM(Units, getRaceChildName),
+    WRAPM(Units, getRaceChildNameById),
     WRAPM(Units, isBaby),
     WRAPM(Units, isChild),
     WRAPM(Units, isAdult),

From 7ee58ada7b976272e07af280a3567f1976088795 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 8 Aug 2020 14:29:24 -0400
Subject: [PATCH 262/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 155b00ab6..385950715 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 155b00ab65dd9a1efc56c34c1238a68dce80fe5d
+Subproject commit 385950715a4cd8b62d57bf35d7e25c4025fd3f25

From 8c5b21b7eec7f6d41e6156b4a011c92486c62505 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 8 Aug 2020 14:34:47 -0400
Subject: [PATCH 263/547] Fix a couple warnings in the Units module (#1615)

---
 library/include/modules/Units.h | 6 +++---
 library/modules/Units.cpp       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/library/include/modules/Units.h b/library/include/modules/Units.h
index c719a60a9..e2d34254d 100644
--- a/library/include/modules/Units.h
+++ b/library/include/modules/Units.h
@@ -181,9 +181,9 @@ DFHACK_EXPORT std::string getCasteProfessionName(int race, int caste, df::profes
 DFHACK_EXPORT int8_t getProfessionColor(df::unit *unit, bool ignore_noble = false);
 DFHACK_EXPORT int8_t getCasteProfessionColor(int race, int caste, df::profession pid);
 
-DFHACK_EXPORT df::goal_type getGoalType(df::unit *unit, int goalIndex = 0);
-DFHACK_EXPORT std::string getGoalName(df::unit *unit, int goalIndex = 0);
-DFHACK_EXPORT bool isGoalAchieved(df::unit *unit, int goalIndex = 0);
+DFHACK_EXPORT df::goal_type getGoalType(df::unit *unit, size_t goalIndex = 0);
+DFHACK_EXPORT std::string getGoalName(df::unit *unit, size_t goalIndex = 0);
+DFHACK_EXPORT bool isGoalAchieved(df::unit *unit, size_t goalIndex = 0);
 
 DFHACK_EXPORT std::string getSquadName(df::unit *unit);
 
diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp
index d5c871f5b..a8f96b29f 100644
--- a/library/modules/Units.cpp
+++ b/library/modules/Units.cpp
@@ -1439,7 +1439,7 @@ int8_t Units::getCasteProfessionColor(int race, int casteid, df::profession pid)
     return 3;
 }
 
-df::goal_type Units::getGoalType(df::unit *unit, int goalIndex)
+df::goal_type Units::getGoalType(df::unit *unit, size_t goalIndex)
 {
     CHECK_NULL_POINTER(unit);
 
@@ -1452,7 +1452,7 @@ df::goal_type Units::getGoalType(df::unit *unit, int goalIndex)
     return goal;
 }
 
-std::string Units::getGoalName(df::unit *unit, int goalIndex)
+std::string Units::getGoalName(df::unit *unit, size_t goalIndex)
 {
     CHECK_NULL_POINTER(unit);
 
@@ -1471,7 +1471,7 @@ std::string Units::getGoalName(df::unit *unit, int goalIndex)
     return goal_name;
 }
 
-bool Units::isGoalAchieved(df::unit *unit, int goalIndex)
+bool Units::isGoalAchieved(df::unit *unit, size_t goalIndex)
 {
     CHECK_NULL_POINTER(unit);
 

From 73ba692f15f35bf9e9ea2452b280e4bed694f9e6 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 8 Aug 2020 14:46:42 -0400
Subject: [PATCH 264/547] Fix road building (#1596)

Paved roads need architecture before road building
---
 plugins/labormanager/joblabormapper.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/labormanager/joblabormapper.cpp b/plugins/labormanager/joblabormapper.cpp
index 4a71b40bf..6a97aa75f 100644
--- a/plugins/labormanager/joblabormapper.cpp
+++ b/plugins/labormanager/joblabormapper.cpp
@@ -200,6 +200,8 @@ static df::building* get_building_from_job(df::job* j)
 
 static df::unit_labor construction_build_labor(df::building_actual* b)
 {
+    if (b->getType() == df::building_type::RoadPaved)
+        return df::unit_labor::BUILD_ROAD;
     // Find last item in building with use mode appropriate to the building's constructions state
     // For screw pumps contained_items[0] = pipe, 1 corkscrew, 2 block
     // For wells 0 mechanism, 1 rope, 2 bucket, 3 block
@@ -332,6 +334,7 @@ public:
         case df::building_type::Bridge:
         case df::building_type::ArcheryTarget:
         case df::building_type::WaterWheel:
+        case df::building_type::RoadPaved:
         case df::building_type::Well:
         case df::building_type::ScrewPump:
         case df::building_type::Wagon:
@@ -345,8 +348,6 @@ public:
             return construction_build_labor(b);
         }
         break;
-        case df::building_type::RoadPaved:
-            return df::unit_labor::BUILD_ROAD;
         case df::building_type::FarmPlot:
             return df::unit_labor::PLANT;
         case df::building_type::Chair:

From 504b0c1ec7f748789b01773003afcb292a756727 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 8 Aug 2020 14:47:59 -0400
Subject: [PATCH 265/547] Update changelog (#1596)

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index f1c423da2..f147e2a67 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -43,6 +43,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - Linux: fixed ``dfhack.getDFPath()`` (Lua) and ``Process::getPath()`` (C++) to always return the DF root path, even if the working directory has changed
 - `getplants`: fixed issues causing plants to be collected even if they have no growths (or unripe growths)
 - `labormanager`: fixed handling of new jobs in 0.47
+- `labormanager`: fixed an issue preventing custom furnaces from being built
 - `embark-assistant`: fixed a couple of incursion handling bugs.
 - Fixed ``Units::isEggLayer``, ``Units::isGrazer``, ``Units::isMilkable``, ``Units::isTrainableHunting``, ``Units::isTrainableWar``, and ``Units::isTamable`` ignoring the unit's caste
 - `RemoteFortressReader`: fixed a couple crashes that could result from decoding invalid enum items (``site_realization_building_type`` and ``improvement_type``)

From f2b0f012c9895aa3fd743ad50fab9e6fb78b479d Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 8 Aug 2020 14:53:24 -0400
Subject: [PATCH 266/547] Bump to 0.47.04-r2

---
 CMakeLists.txt     | 2 +-
 docs/changelog.txt | 2 ++
 library/xml        | 2 +-
 scripts            | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44d6a02ce..cd06587eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,7 +184,7 @@ endif()
 
 # set up versioning.
 set(DF_VERSION "0.47.04")
-set(DFHACK_RELEASE "r1")
+set(DFHACK_RELEASE "r2")
 set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
diff --git a/docs/changelog.txt b/docs/changelog.txt
index f147e2a67..9317df86e 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -33,6 +33,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 # Future
 
+# 0.47.04-r2
+
 ## New Tweaks
 - `tweak` do-job-now: adds a job priority toggle to the jobs list
 - `tweak` reaction-gloves: adds an option to make reactions produce gloves in sets with correct handedness
diff --git a/library/xml b/library/xml
index 23e076b70..036b662a1 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 23e076b7079a48b91c59451be64319dd36476994
+Subproject commit 036b662a1bbc96b4911f3cbe74dfa1243b6459bc
diff --git a/scripts b/scripts
index 385950715..568c586ce 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 385950715a4cd8b62d57bf35d7e25c4025fd3f25
+Subproject commit 568c586ce2474af89c64a4cc7c876edb35931d43

From 89a6309788a6ff2d1a64ba951c5427f9de8f0f79 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 8 Aug 2020 15:24:12 -0700
Subject: [PATCH 267/547] build xlsxio and link it into dfhack, add lua api

---
 CMakeLists.txt                       |  19 +++++
 depends/CMakeLists.txt               |  11 +++
 library/CMakeLists.txt               |   4 +-
 library/LuaApi.cpp                   |  43 ++++++++++
 library/include/modules/XlsxReader.h |  45 +++++++++++
 library/modules/XlsxReader.cpp       | 115 +++++++++++++++++++++++++++
 6 files changed, 236 insertions(+), 1 deletion(-)
 create mode 100644 library/include/modules/XlsxReader.h
 create mode 100644 library/modules/XlsxReader.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44d6a02ce..6a2230721 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -364,6 +364,8 @@ endif()
 
 #### expose depends ####
 
+include(ExternalProject)
+
 if(UNIX)
     # Rescan for pthread and zlib if the build arch changed
     if(NOT "${DFHACK_BUILD_ARCH}" STREQUAL "${DFHACK_BUILD_ARCH_PREV}")
@@ -415,6 +417,23 @@ endif()
 
 # build the lib itself
 if(BUILD_LIBRARY)
+    ExternalProject_Get_Property(xlsxio_project INSTALL_DIR)
+    set(XLSXIO_INSTALL_DIR ${INSTALL_DIR})
+    include_directories(${XLSXIO_INSTALL_DIR}/include)
+    add_library(xlsxio_read STATIC IMPORTED)
+    set_target_properties(xlsxio_read PROPERTIES
+            IMPORTED_LOCATION ${XLSXIO_INSTALL_DIR}/lib/libxlsxio_read.a)
+    add_dependencies(xlsxio_read xlsxio_project)
+
+    # just pull from the system until I figure out how to integrate these deps
+    # into the build
+    add_library(zip SHARED IMPORTED)
+    set_target_properties(zip PROPERTIES
+            IMPORTED_LOCATION /usr/lib64/libzip.so)
+    add_library(expat SHARED IMPORTED)
+    set_target_properties(expat PROPERTIES
+            IMPORTED_LOCATION /usr/lib64/libexpat.so)
+
     add_subdirectory(library)
     install(FILES LICENSE.rst docs/changelog.txt DESTINATION ${DFHACK_USERDOC_DESTINATION})
 endif()
diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index aac250c39..e43c80266 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -17,3 +17,14 @@ option(CLSOCKET_SHARED "Build clsocket lib as shared." OFF)
 option(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON)
 add_subdirectory(clsocket)
 ide_folder(clsocket "Depends")
+
+set(XLSXIO_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/xlsxio)
+ExternalProject_Add(xlsxio_project
+    PREFIX      xlsxio
+    SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/xlsxio
+    INSTALL_DIR ${XLSXIO_INSTALL_DIR}
+    BUILD_BYPRODUCTS ${XLSXIO_INSTALL_DIR}/lib/libxlsxio_read.a
+    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR}
+)
+    #-DLIBZIP_DIR=
+    #-DEXPAT_DIR=
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 2de293e15..583c8768f 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -144,6 +144,7 @@ set(MODULE_HEADERS
     include/modules/Translation.h
     include/modules/Units.h
     include/modules/World.h
+    include/modules/XlsxReader.h
 )
 
 set(MODULE_SOURCES
@@ -172,6 +173,7 @@ set(MODULE_SOURCES
     modules/Units.cpp
     modules/Windows.cpp
     modules/World.cpp
+    modules/XlsxReader.cpp
 )
 
 set(STATIC_FIELDS_FILES)
@@ -409,7 +411,7 @@ if(APPLE)
     set_target_properties(dfhack PROPERTIES SOVERSION 1.0.0)
 endif()
 
-target_link_libraries(dfhack protobuf-lite clsocket lua jsoncpp_lib_static dfhack-version ${PROJECT_LIBS})
+target_link_libraries(dfhack protobuf-lite clsocket lua jsoncpp_lib_static xlsxio_read zip expat dfhack-version ${PROJECT_LIBS})
 set_target_properties(dfhack PROPERTIES INTERFACE_LINK_LIBRARIES "")
 
 target_link_libraries(dfhack-client protobuf-lite clsocket jsoncpp_lib_static)
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 25843875d..49fdf4c73 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -60,6 +60,7 @@ distribution.
 #include "modules/Translation.h"
 #include "modules/Units.h"
 #include "modules/World.h"
+#include "modules/XlsxReader.h"
 
 #include "LuaWrapper.h"
 #include "LuaTools.h"
@@ -2474,6 +2475,47 @@ static const LuaWrapper::FunctionReg dfhack_kitchen_module[] = {
     {NULL, NULL}
 };
 
+/***** XlsxReader module *****/
+
+static const LuaWrapper::FunctionReg dfhack_xlsxreader_module[] = {
+    WRAPM(XlsxReader, open_xlsx_file),
+    WRAPM(XlsxReader, close_xlsx_file),
+    WRAPM(XlsxReader, list_sheets),
+    WRAPM(XlsxReader, open_sheet),
+    WRAPM(XlsxReader, close_sheet),
+    WRAPM(XlsxReader, get_next_row),
+    {NULL, NULL}
+};
+
+// takes the sheet handle and returns a string, or nil if there is no next cell
+// in the current row.
+static int xlsxreader_get_next_cell(lua_State *L)
+{
+    if (lua_gettop(L) != 1 || lua_isnil(L, 1))
+    {
+        luaL_error(L, "invalid sheet handle");
+    }
+    luaL_checktype(L, 1, LUA_TUSERDATA);
+    XlsxReader::xlsx_sheet_handle sheet_handle = lua_touserdata(L, 1);
+
+    std::string value;
+    bool ok = XlsxReader::get_next_cell(sheet_handle, value);
+    if (!ok)
+    {
+        lua_pushnil(L);
+    }
+    else
+    {
+        lua_pushstring(L, value.c_str());
+    }
+    return 1;
+}
+
+static const luaL_Reg dfhack_xlsxreader_funcs[] = {
+    {"get_next_cell", xlsxreader_get_next_cell},
+    {NULL, NULL}
+};
+
 /***** Console module *****/
 
 namespace console {
@@ -3027,6 +3069,7 @@ void OpenDFHackApi(lua_State *state)
     OpenModule(state, "filesystem", dfhack_filesystem_module, dfhack_filesystem_funcs);
     OpenModule(state, "designations", dfhack_designations_module, dfhack_designations_funcs);
     OpenModule(state, "kitchen", dfhack_kitchen_module);
+    OpenModule(state, "xlsxreader", dfhack_xlsxreader_module, dfhack_xlsxreader_funcs);
     OpenModule(state, "console", dfhack_console_module);
     OpenModule(state, "internal", dfhack_internal_module, dfhack_internal_funcs);
 }
diff --git a/library/include/modules/XlsxReader.h b/library/include/modules/XlsxReader.h
new file mode 100644
index 000000000..93ea1cf20
--- /dev/null
+++ b/library/include/modules/XlsxReader.h
@@ -0,0 +1,45 @@
+/*
+ * Wrapper for xlsxio_read library functions.
+ */
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "Export.h"
+
+/**
+ * \defgroup grp_xlsx_reader Xlsx file reader
+ * @ingroup grp_modules
+ */
+namespace DFHack
+{
+namespace XlsxReader
+{
+
+typedef void* xlsx_file_handle;
+typedef void* xlsx_sheet_handle;
+
+// returns NULL on error
+DFHACK_EXPORT xlsx_file_handle open_xlsx_file(std::string filename);
+DFHACK_EXPORT void close_xlsx_file(xlsx_file_handle file_handle);
+DFHACK_EXPORT std::vector<std::string> list_sheets(xlsx_file_handle file_handle);
+
+// returns XLSXIOReaderSheet object or NULL on error
+DFHACK_EXPORT xlsx_sheet_handle open_sheet(
+        xlsx_file_handle file_handle, std::string sheet_name);
+DFHACK_EXPORT void close_sheet(xlsx_sheet_handle sheet_handle);
+
+// start reading the next row of data; must be called before GetNextCell .
+// returns false if there is no next row to get.
+DFHACK_EXPORT bool get_next_row(xlsx_sheet_handle sheet_handle);
+
+// fills the value param with the contents of the cell in the next column cell
+// in the current row.
+// returns false if there are no more cells in this row.
+DFHACK_EXPORT bool get_next_cell(
+        xlsx_sheet_handle sheet_handle, std::string& value);
+
+}
+}
diff --git a/library/modules/XlsxReader.cpp b/library/modules/XlsxReader.cpp
new file mode 100644
index 000000000..d13582450
--- /dev/null
+++ b/library/modules/XlsxReader.cpp
@@ -0,0 +1,115 @@
+/*
+ * Wrapper for xlsxio_read library functions.
+ *
+ * Sample usage:
+ *
+ *  std::string filename = "sample_file.xlsx";
+ *  xlsxioreader xlsxfile = XlsxReader::open_xlsx_file(filename);
+ *  if (xlsxfile == NULL) {
+ *      printf("cannot open file: '%s'", filename.c_str());
+ *      return false;
+ *  }
+ *  auto sheetNames = XlsxReader::list_sheets(xlsxfile);
+ *  for (auto sheetName = sheetNames.begin();
+ *       sheetName != sheetNames.end();
+ *       ++sheetName) {
+ *      printf("reading sheet: %s\n", sheetName->c_str());
+ *      xlsxioreadersheet xlsxsheet =
+ *              XlsxReader::open_sheet(xlsxfile, *sheetName);
+ *      if (xlsxsheet == NULL) {
+ *          printf("cannot open sheet: '%s'", sheetName->c_str());
+ *          continue;
+ *      }
+ *      std::string value;
+ *      int row_num = 1;
+ *      while (XlsxReader::GetNextRow(xlsxsheet)) {
+ *          std::string s;
+ *          printf("%d:\t", row_num);
+ *          while (XlsxReader::GetNextCell(xlsxsheet, s)) {
+ *              printf("%s\t", s.c_str());
+ *          }
+ *          printf("\n");
+ *          ++row_num;
+ *      }
+ *      XlsxReader::close_sheet(xlsxsheet);
+ *  }
+ *  XlsxReader::close_xlsx_file(xlsxfile);
+ *  return true;
+ */
+
+#include <xlsxio_read.h>
+
+#include "modules/XlsxReader.h"
+
+using namespace DFHack;
+
+
+// returns NULL on error
+DFHACK_EXPORT XlsxReader::xlsx_file_handle XlsxReader::open_xlsx_file(
+        std::string filename)
+{
+    return xlsxioread_open(filename.c_str());
+}
+
+DFHACK_EXPORT void XlsxReader::close_xlsx_file(
+        XlsxReader::xlsx_file_handle file_handle)
+{
+    xlsxioread_close((xlsxioreader)file_handle);
+}
+
+static int list_callback(const XLSXIOCHAR* name, void* cbdata)
+{
+    auto sheetNames = (std::vector<std::string> *)cbdata;
+    sheetNames->push_back(name);
+    return 0;
+}
+
+DFHACK_EXPORT std::vector<std::string> XlsxReader::list_sheets(
+    XlsxReader::xlsx_file_handle file_handle)
+{
+    auto sheetNames = std::vector<std::string>();
+    xlsxioread_list_sheets(
+            (xlsxioreader)file_handle, list_callback, &sheetNames);
+    return sheetNames;
+}
+
+// returns XLSXIOReaderSheet object or NULL on error
+DFHACK_EXPORT XlsxReader::xlsx_sheet_handle XlsxReader::open_sheet(
+    XlsxReader::xlsx_file_handle file_handle, std::string sheet_name)
+{
+    if (file_handle == NULL)
+        return NULL;
+    return xlsxioread_sheet_open(
+        (xlsxioreader)file_handle, sheet_name.c_str(), XLSXIOREAD_SKIP_NONE);
+}
+
+DFHACK_EXPORT void XlsxReader::close_sheet(
+        XlsxReader::xlsx_sheet_handle sheet_handle)
+{
+    xlsxioread_sheet_close((xlsxioreadersheet)sheet_handle);
+}
+
+// start reading the next row of data; must be called before GetNextCell .
+// returns false if there is no next row to get.
+DFHACK_EXPORT bool XlsxReader::get_next_row(
+        XlsxReader::xlsx_sheet_handle sheet_handle)
+{
+    return xlsxioread_sheet_next_row((xlsxioreadersheet)sheet_handle) != 0;
+}
+
+// fills the value param with the contents of the cell in the next column cell
+// in the current row.
+// returns false if there are no more cells in this row.
+DFHACK_EXPORT bool XlsxReader::get_next_cell(
+    XlsxReader::xlsx_sheet_handle sheet_handle, std::string& value)
+{
+    char* result;
+    if (!xlsxioread_sheet_next_cell_string((xlsxioreadersheet)sheet_handle,
+                                           &result)) {
+        value.clear();
+        return false;
+    }
+    value.assign(result);
+    free(result);
+    return true;
+}

From 8c7fb808e14f7cbfd0bbb5307f50202947061274 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 8 Aug 2020 17:55:49 -0700
Subject: [PATCH 268/547] get xlsxio Lua API working

---
 library/LuaApi.cpp | 44 +++++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 30a084635..0265eee20 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -2486,39 +2486,57 @@ static const LuaWrapper::FunctionReg dfhack_kitchen_module[] = {
 static const LuaWrapper::FunctionReg dfhack_xlsxreader_module[] = {
     WRAPM(XlsxReader, open_xlsx_file),
     WRAPM(XlsxReader, close_xlsx_file),
-    WRAPM(XlsxReader, list_sheets),
     WRAPM(XlsxReader, open_sheet),
     WRAPM(XlsxReader, close_sheet),
-    WRAPM(XlsxReader, get_next_row),
     {NULL, NULL}
 };
 
-// takes the sheet handle and returns a string, or nil if there is no next cell
-// in the current row.
-static int xlsxreader_get_next_cell(lua_State *L)
+// internal function to factor out handle extraction
+static void * get_xlsxreader_handle(lua_State *L)
 {
-    if (lua_gettop(L) != 1 || lua_isnil(L, 1))
+    if (lua_gettop(L) < 1 || lua_isnil(L, 1))
     {
-        luaL_error(L, "invalid sheet handle");
+        luaL_error(L, "invalid xlsxreader handle");
     }
-    luaL_checktype(L, 1, LUA_TUSERDATA);
-    XlsxReader::xlsx_sheet_handle sheet_handle = lua_touserdata(L, 1);
+    luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+    return lua_touserdata(L, 1);
+}
+
+// takes a file handle and returns a table-list of sheet names
+static int xlsxreader_list_sheets(lua_State *L)
+{
+    XlsxReader::xlsx_file_handle file_handle = get_xlsxreader_handle(L);
+    Lua::PushVector(L, XlsxReader::list_sheets(file_handle), true);
+    return 1;
+}
 
-    std::string value;
-    bool ok = XlsxReader::get_next_cell(sheet_handle, value);
+// takes the sheet handle and returns a table-list of strings, or nil if we
+// already processed the last row in the file.
+static int xlsxreader_get_row(lua_State *L)
+{
+    XlsxReader::xlsx_sheet_handle sheet_handle = get_xlsxreader_handle(L);
+    bool ok = XlsxReader::get_next_row(sheet_handle);
     if (!ok)
     {
         lua_pushnil(L);
     }
     else
     {
-        lua_pushstring(L, value.c_str());
+        std::string value;
+        auto cells = std::vector<std::string>();
+        while (XlsxReader::get_next_cell(sheet_handle, value))
+        {
+            cells.push_back(value);
+        }
+        Lua::PushVector(L, cells, true);
     }
+
     return 1;
 }
 
 static const luaL_Reg dfhack_xlsxreader_funcs[] = {
-    {"get_next_cell", xlsxreader_get_next_cell},
+    {"list_sheets", xlsxreader_list_sheets},
+    {"get_row", xlsxreader_get_row},
     {NULL, NULL}
 };
 

From 4f0eb4bca6d80fb1d7f1822f509c4082a3e79158 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 8 Aug 2020 19:47:02 -0700
Subject: [PATCH 269/547] add libzip dep

---
 .gitmodules    | 3 +++
 depends/libzip | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 depends/libzip

diff --git a/.gitmodules b/.gitmodules
index 0ccd3810a..b41fa0437 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -20,3 +20,6 @@
 	path = depends/xlsxio
 	url = ../../brechtsanders/xlsxio.git
 	shallow = true
+[submodule "depends/libzip"]
+	path = depends/libzip
+	url = ../../nih-at/libzip.git
diff --git a/depends/libzip b/depends/libzip
new file mode 160000
index 000000000..2134d8c34
--- /dev/null
+++ b/depends/libzip
@@ -0,0 +1 @@
+Subproject commit 2134d8c34dbb8988076e8f2fc3b8be75fdb780bf

From eeeb638c1c5641c94771601558321ccbb0e5f4c3 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 8 Aug 2020 19:48:11 -0700
Subject: [PATCH 270/547] fix libzip at v1.7.3

---
 depends/libzip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/libzip b/depends/libzip
index 2134d8c34..66e496489 160000
--- a/depends/libzip
+++ b/depends/libzip
@@ -1 +1 @@
-Subproject commit 2134d8c34dbb8988076e8f2fc3b8be75fdb780bf
+Subproject commit 66e496489bdae81bfda8b0088172871d8fda0032

From 28eaf0ae8b6eba53d164d5a642202e16cbd42ff8 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 8 Aug 2020 20:04:46 -0700
Subject: [PATCH 271/547] add libzip to the build

---
 CMakeLists.txt         | 11 ++++++++---
 depends/CMakeLists.txt |  9 +++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c9ada74a..490e1bb55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -425,11 +425,16 @@ if(BUILD_LIBRARY)
             IMPORTED_LOCATION ${XLSXIO_INSTALL_DIR}/lib/libxlsxio_read.a)
     add_dependencies(xlsxio_read xlsxio_project)
 
+    ExternalProject_Get_Property(libzip_project INSTALL_DIR)
+    set(LIBZIP_INSTALL_DIR ${INSTALL_DIR})
+    include_directories(${LIBZIP_INSTALL_DIR}/include)
+    add_library(zip STATIC IMPORTED)
+    set_target_properties(zip PROPERTIES
+            IMPORTED_LOCATION ${LIBZIP_INSTALL_DIR}/lib64/libzip.a)
+    add_dependencies(zip libzip_project)
+
     # just pull from the system until I figure out how to integrate these deps
     # into the build
-    add_library(zip SHARED IMPORTED)
-    set_target_properties(zip PROPERTIES
-            IMPORTED_LOCATION /usr/lib64/libzip.so)
     add_library(expat SHARED IMPORTED)
     set_target_properties(expat PROPERTIES
             IMPORTED_LOCATION /usr/lib64/libexpat.so)
diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index e43c80266..d5669080e 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -18,6 +18,15 @@ option(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependenc
 add_subdirectory(clsocket)
 ide_folder(clsocket "Depends")
 
+set(LIBZIP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzip)
+ExternalProject_Add(libzip_project
+    PREFIX      libzip
+    SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libzip
+    INSTALL_DIR ${LIBZIP_INSTALL_DIR}
+    BUILD_BYPRODUCTS ${LIBZIP_INSTALL_DIR}/lib64/libzip.a
+    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${LIBZIP_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_DOC=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REGRESS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DENABLE_BZIP2=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_LZMA=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+)
+
 set(XLSXIO_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/xlsxio)
 ExternalProject_Add(xlsxio_project
     PREFIX      xlsxio

From cffac8ed93078d1d3e22087d3e5f415466b4004a Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 8 Aug 2020 20:07:54 -0700
Subject: [PATCH 272/547] fix line endings in XlsxReader.cpp

---
 library/modules/XlsxReader.cpp | 230 ++++++++++++++++-----------------
 1 file changed, 115 insertions(+), 115 deletions(-)

diff --git a/library/modules/XlsxReader.cpp b/library/modules/XlsxReader.cpp
index d13582450..405369c85 100644
--- a/library/modules/XlsxReader.cpp
+++ b/library/modules/XlsxReader.cpp
@@ -1,115 +1,115 @@
-/*
- * Wrapper for xlsxio_read library functions.
- *
- * Sample usage:
- *
- *  std::string filename = "sample_file.xlsx";
- *  xlsxioreader xlsxfile = XlsxReader::open_xlsx_file(filename);
- *  if (xlsxfile == NULL) {
- *      printf("cannot open file: '%s'", filename.c_str());
- *      return false;
- *  }
- *  auto sheetNames = XlsxReader::list_sheets(xlsxfile);
- *  for (auto sheetName = sheetNames.begin();
- *       sheetName != sheetNames.end();
- *       ++sheetName) {
- *      printf("reading sheet: %s\n", sheetName->c_str());
- *      xlsxioreadersheet xlsxsheet =
- *              XlsxReader::open_sheet(xlsxfile, *sheetName);
- *      if (xlsxsheet == NULL) {
- *          printf("cannot open sheet: '%s'", sheetName->c_str());
- *          continue;
- *      }
- *      std::string value;
- *      int row_num = 1;
- *      while (XlsxReader::GetNextRow(xlsxsheet)) {
- *          std::string s;
- *          printf("%d:\t", row_num);
- *          while (XlsxReader::GetNextCell(xlsxsheet, s)) {
- *              printf("%s\t", s.c_str());
- *          }
- *          printf("\n");
- *          ++row_num;
- *      }
- *      XlsxReader::close_sheet(xlsxsheet);
- *  }
- *  XlsxReader::close_xlsx_file(xlsxfile);
- *  return true;
- */
-
-#include <xlsxio_read.h>
-
-#include "modules/XlsxReader.h"
-
-using namespace DFHack;
-
-
-// returns NULL on error
-DFHACK_EXPORT XlsxReader::xlsx_file_handle XlsxReader::open_xlsx_file(
-        std::string filename)
-{
-    return xlsxioread_open(filename.c_str());
-}
-
-DFHACK_EXPORT void XlsxReader::close_xlsx_file(
-        XlsxReader::xlsx_file_handle file_handle)
-{
-    xlsxioread_close((xlsxioreader)file_handle);
-}
-
-static int list_callback(const XLSXIOCHAR* name, void* cbdata)
-{
-    auto sheetNames = (std::vector<std::string> *)cbdata;
-    sheetNames->push_back(name);
-    return 0;
-}
-
-DFHACK_EXPORT std::vector<std::string> XlsxReader::list_sheets(
-    XlsxReader::xlsx_file_handle file_handle)
-{
-    auto sheetNames = std::vector<std::string>();
-    xlsxioread_list_sheets(
-            (xlsxioreader)file_handle, list_callback, &sheetNames);
-    return sheetNames;
-}
-
-// returns XLSXIOReaderSheet object or NULL on error
-DFHACK_EXPORT XlsxReader::xlsx_sheet_handle XlsxReader::open_sheet(
-    XlsxReader::xlsx_file_handle file_handle, std::string sheet_name)
-{
-    if (file_handle == NULL)
-        return NULL;
-    return xlsxioread_sheet_open(
-        (xlsxioreader)file_handle, sheet_name.c_str(), XLSXIOREAD_SKIP_NONE);
-}
-
-DFHACK_EXPORT void XlsxReader::close_sheet(
-        XlsxReader::xlsx_sheet_handle sheet_handle)
-{
-    xlsxioread_sheet_close((xlsxioreadersheet)sheet_handle);
-}
-
-// start reading the next row of data; must be called before GetNextCell .
-// returns false if there is no next row to get.
-DFHACK_EXPORT bool XlsxReader::get_next_row(
-        XlsxReader::xlsx_sheet_handle sheet_handle)
-{
-    return xlsxioread_sheet_next_row((xlsxioreadersheet)sheet_handle) != 0;
-}
-
-// fills the value param with the contents of the cell in the next column cell
-// in the current row.
-// returns false if there are no more cells in this row.
-DFHACK_EXPORT bool XlsxReader::get_next_cell(
-    XlsxReader::xlsx_sheet_handle sheet_handle, std::string& value)
-{
-    char* result;
-    if (!xlsxioread_sheet_next_cell_string((xlsxioreadersheet)sheet_handle,
-                                           &result)) {
-        value.clear();
-        return false;
-    }
-    value.assign(result);
-    free(result);
-    return true;
-}
+/*
+ * Wrapper for xlsxio_read library functions.
+ *
+ * Sample usage:
+ *
+ *  std::string filename = "sample_file.xlsx";
+ *  xlsxioreader xlsxfile = XlsxReader::open_xlsx_file(filename);
+ *  if (xlsxfile == NULL) {
+ *      printf("cannot open file: '%s'", filename.c_str());
+ *      return false;
+ *  }
+ *  auto sheetNames = XlsxReader::list_sheets(xlsxfile);
+ *  for (auto sheetName = sheetNames.begin();
+ *       sheetName != sheetNames.end();
+ *       ++sheetName) {
+ *      printf("reading sheet: %s\n", sheetName->c_str());
+ *      xlsxioreadersheet xlsxsheet =
+ *              XlsxReader::open_sheet(xlsxfile, *sheetName);
+ *      if (xlsxsheet == NULL) {
+ *          printf("cannot open sheet: '%s'", sheetName->c_str());
+ *          continue;
+ *      }
+ *      std::string value;
+ *      int row_num = 1;
+ *      while (XlsxReader::GetNextRow(xlsxsheet)) {
+ *          std::string s;
+ *          printf("%d:\t", row_num);
+ *          while (XlsxReader::GetNextCell(xlsxsheet, s)) {
+ *              printf("%s\t", s.c_str());
+ *          }
+ *          printf("\n");
+ *          ++row_num;
+ *      }
+ *      XlsxReader::close_sheet(xlsxsheet);
+ *  }
+ *  XlsxReader::close_xlsx_file(xlsxfile);
+ *  return true;
+ */
+
+#include <xlsxio_read.h>
+
+#include "modules/XlsxReader.h"
+
+using namespace DFHack;
+
+
+// returns NULL on error
+DFHACK_EXPORT XlsxReader::xlsx_file_handle XlsxReader::open_xlsx_file(
+        std::string filename)
+{
+    return xlsxioread_open(filename.c_str());
+}
+
+DFHACK_EXPORT void XlsxReader::close_xlsx_file(
+        XlsxReader::xlsx_file_handle file_handle)
+{
+    xlsxioread_close((xlsxioreader)file_handle);
+}
+
+static int list_callback(const XLSXIOCHAR* name, void* cbdata)
+{
+    auto sheetNames = (std::vector<std::string> *)cbdata;
+    sheetNames->push_back(name);
+    return 0;
+}
+
+DFHACK_EXPORT std::vector<std::string> XlsxReader::list_sheets(
+    XlsxReader::xlsx_file_handle file_handle)
+{
+    auto sheetNames = std::vector<std::string>();
+    xlsxioread_list_sheets(
+            (xlsxioreader)file_handle, list_callback, &sheetNames);
+    return sheetNames;
+}
+
+// returns XLSXIOReaderSheet object or NULL on error
+DFHACK_EXPORT XlsxReader::xlsx_sheet_handle XlsxReader::open_sheet(
+    XlsxReader::xlsx_file_handle file_handle, std::string sheet_name)
+{
+    if (file_handle == NULL)
+        return NULL;
+    return xlsxioread_sheet_open(
+        (xlsxioreader)file_handle, sheet_name.c_str(), XLSXIOREAD_SKIP_NONE);
+}
+
+DFHACK_EXPORT void XlsxReader::close_sheet(
+        XlsxReader::xlsx_sheet_handle sheet_handle)
+{
+    xlsxioread_sheet_close((xlsxioreadersheet)sheet_handle);
+}
+
+// start reading the next row of data; must be called before GetNextCell .
+// returns false if there is no next row to get.
+DFHACK_EXPORT bool XlsxReader::get_next_row(
+        XlsxReader::xlsx_sheet_handle sheet_handle)
+{
+    return xlsxioread_sheet_next_row((xlsxioreadersheet)sheet_handle) != 0;
+}
+
+// fills the value param with the contents of the cell in the next column cell
+// in the current row.
+// returns false if there are no more cells in this row.
+DFHACK_EXPORT bool XlsxReader::get_next_cell(
+    XlsxReader::xlsx_sheet_handle sheet_handle, std::string& value)
+{
+    char* result;
+    if (!xlsxioread_sheet_next_cell_string((xlsxioreadersheet)sheet_handle,
+                                           &result)) {
+        value.clear();
+        return false;
+    }
+    value.assign(result);
+    free(result);
+    return true;
+}

From 8de39c2d7d1c64631043eab751d0ce4787b65612 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 8 Aug 2020 20:09:29 -0700
Subject: [PATCH 273/547] add libexpat as a submodule

---
 .gitmodules      | 5 +++++
 depends/libexpat | 1 +
 2 files changed, 6 insertions(+)
 create mode 160000 depends/libexpat

diff --git a/.gitmodules b/.gitmodules
index b41fa0437..e24bfb707 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -23,3 +23,8 @@
 [submodule "depends/libzip"]
 	path = depends/libzip
 	url = ../../nih-at/libzip.git
+	shallow = true
+[submodule "depends/libexpat"]
+	path = depends/libexpat
+	url = ../../libexpat/libexpat.git
+	shallow = true
diff --git a/depends/libexpat b/depends/libexpat
new file mode 160000
index 000000000..990e3d07e
--- /dev/null
+++ b/depends/libexpat
@@ -0,0 +1 @@
+Subproject commit 990e3d07eaa127007f9d304a9b4c6ffadc61b1fe

From e7afc4cfeb6d8c0e4670e7d517b926f2164dbbac Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 8 Aug 2020 20:10:13 -0700
Subject: [PATCH 274/547] fix libexpat at v2.2.9

---
 depends/libexpat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/libexpat b/depends/libexpat
index 990e3d07e..a7bc26b69 160000
--- a/depends/libexpat
+++ b/depends/libexpat
@@ -1 +1 @@
-Subproject commit 990e3d07eaa127007f9d304a9b4c6ffadc61b1fe
+Subproject commit a7bc26b69768f7fb24f0c7976fae24b157b85b13

From 8a05f09cd612249897c8767d4acc0f6ac956d92b Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 8 Aug 2020 20:18:43 -0700
Subject: [PATCH 275/547] add libexpat to the build

---
 CMakeLists.txt         | 10 ++++++----
 depends/CMakeLists.txt | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 490e1bb55..5dcd87b56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -433,11 +433,13 @@ if(BUILD_LIBRARY)
             IMPORTED_LOCATION ${LIBZIP_INSTALL_DIR}/lib64/libzip.a)
     add_dependencies(zip libzip_project)
 
-    # just pull from the system until I figure out how to integrate these deps
-    # into the build
-    add_library(expat SHARED IMPORTED)
+    ExternalProject_Get_Property(libexpat_project INSTALL_DIR)
+    set(LIBEXPAT_INSTALL_DIR ${INSTALL_DIR})
+    include_directories(${LIBEXPAT_INSTALL_DIR}/include)
+    add_library(expat STATIC IMPORTED)
     set_target_properties(expat PROPERTIES
-            IMPORTED_LOCATION /usr/lib64/libexpat.so)
+            IMPORTED_LOCATION ${LIBEXPAT_INSTALL_DIR}/lib64/libexpat.a)
+    add_dependencies(expat libexpat_project)
 
     add_subdirectory(library)
     install(FILES LICENSE.rst docs/changelog.txt DESTINATION ${DFHACK_USERDOC_DESTINATION})
diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index d5669080e..9735e7fc7 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -18,6 +18,15 @@ option(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependenc
 add_subdirectory(clsocket)
 ide_folder(clsocket "Depends")
 
+set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat)
+ExternalProject_Add(libexpat_project
+    PREFIX      libexpat
+    SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libexpat/expat
+    INSTALL_DIR ${LIBEXPAT_INSTALL_DIR}
+    BUILD_BYPRODUCTS ${LIBEXPAT_INSTALL_DIR}/lib64/libexpat.a
+    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${LIBEXPAT_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+)
+
 set(LIBZIP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzip)
 ExternalProject_Add(libzip_project
     PREFIX      libzip
@@ -33,7 +42,7 @@ ExternalProject_Add(xlsxio_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/xlsxio
     INSTALL_DIR ${XLSXIO_INSTALL_DIR}
     BUILD_BYPRODUCTS ${XLSXIO_INSTALL_DIR}/lib/libxlsxio_read.a
-    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR}
+    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR}
 )
-    #-DLIBZIP_DIR=
-    #-DEXPAT_DIR=
+add_dependencies(xlsxio_project libexpat_project)
+add_dependencies(xlsxio_project libzip_project)

From 8753f9feaff9df8367e6031e2cc299014dac1d55 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 8 Aug 2020 20:42:03 -0700
Subject: [PATCH 276/547] use correct lib dir on 32-bit

---
 CMakeLists.txt         | 15 +++++++++------
 depends/CMakeLists.txt | 10 ++++++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5dcd87b56..dbd028a36 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -419,26 +419,29 @@ endif()
 if(BUILD_LIBRARY)
     ExternalProject_Get_Property(xlsxio_project INSTALL_DIR)
     set(XLSXIO_INSTALL_DIR ${INSTALL_DIR})
+    ExternalProject_Get_Property(xlsxio_project BUILD_BYPRODUCTS)
+    set(XLSXIO_LIB ${BUILD_BYPRODUCTS})
     include_directories(${XLSXIO_INSTALL_DIR}/include)
     add_library(xlsxio_read STATIC IMPORTED)
-    set_target_properties(xlsxio_read PROPERTIES
-            IMPORTED_LOCATION ${XLSXIO_INSTALL_DIR}/lib/libxlsxio_read.a)
+    set_target_properties(xlsxio_read PROPERTIES IMPORTED_LOCATION ${XLSXIO_LIB})
     add_dependencies(xlsxio_read xlsxio_project)
 
     ExternalProject_Get_Property(libzip_project INSTALL_DIR)
     set(LIBZIP_INSTALL_DIR ${INSTALL_DIR})
+    ExternalProject_Get_Property(libzip_project BUILD_BYPRODUCTS)
+    set(LIBZIP_LIB ${BUILD_BYPRODUCTS})
     include_directories(${LIBZIP_INSTALL_DIR}/include)
     add_library(zip STATIC IMPORTED)
-    set_target_properties(zip PROPERTIES
-            IMPORTED_LOCATION ${LIBZIP_INSTALL_DIR}/lib64/libzip.a)
+    set_target_properties(zip PROPERTIES IMPORTED_LOCATION ${LIBZIP_LIB})
     add_dependencies(zip libzip_project)
 
     ExternalProject_Get_Property(libexpat_project INSTALL_DIR)
     set(LIBEXPAT_INSTALL_DIR ${INSTALL_DIR})
+    ExternalProject_Get_Property(libexpat_project BUILD_BYPRODUCTS)
+    set(LIBEXPAT_LIB ${BUILD_BYPRODUCTS})
     include_directories(${LIBEXPAT_INSTALL_DIR}/include)
     add_library(expat STATIC IMPORTED)
-    set_target_properties(expat PROPERTIES
-            IMPORTED_LOCATION ${LIBEXPAT_INSTALL_DIR}/lib64/libexpat.a)
+    set_target_properties(expat PROPERTIES IMPORTED_LOCATION ${LIBEXPAT_LIB})
     add_dependencies(expat libexpat_project)
 
     add_subdirectory(library)
diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 9735e7fc7..4b11f4110 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -18,12 +18,18 @@ option(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependenc
 add_subdirectory(clsocket)
 ide_folder(clsocket "Depends")
 
+if("${DFHACK_BUILD_ARCH}" STREQUAL "64")
+    set(OUTPUT_LIB_DIR "lib64")
+else()
+    set(OUTPUT_LIB_DIR "lib")
+endif()
+
 set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat)
 ExternalProject_Add(libexpat_project
     PREFIX      libexpat
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libexpat/expat
     INSTALL_DIR ${LIBEXPAT_INSTALL_DIR}
-    BUILD_BYPRODUCTS ${LIBEXPAT_INSTALL_DIR}/lib64/libexpat.a
+    BUILD_BYPRODUCTS ${LIBEXPAT_INSTALL_DIR}/${OUTPUT_LIB_DIR}/libexpat.a
     CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${LIBEXPAT_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 )
 
@@ -32,7 +38,7 @@ ExternalProject_Add(libzip_project
     PREFIX      libzip
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libzip
     INSTALL_DIR ${LIBZIP_INSTALL_DIR}
-    BUILD_BYPRODUCTS ${LIBZIP_INSTALL_DIR}/lib64/libzip.a
+    BUILD_BYPRODUCTS ${LIBZIP_INSTALL_DIR}/${OUTPUT_LIB_DIR}/libzip.a
     CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${LIBZIP_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_DOC=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REGRESS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DENABLE_BZIP2=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_LZMA=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 )
 

From d65504eb828e76bdff7348c15e3d6a1629942524 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 8 Aug 2020 21:19:38 -0700
Subject: [PATCH 277/547] ensure CFLAGS and CXXFLAGS get propagated to deps

---
 depends/CMakeLists.txt | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 4b11f4110..2e2872d20 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -18,19 +18,13 @@ option(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependenc
 add_subdirectory(clsocket)
 ide_folder(clsocket "Depends")
 
-if("${DFHACK_BUILD_ARCH}" STREQUAL "64")
-    set(OUTPUT_LIB_DIR "lib64")
-else()
-    set(OUTPUT_LIB_DIR "lib")
-endif()
-
 set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat)
 ExternalProject_Add(libexpat_project
     PREFIX      libexpat
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libexpat/expat
     INSTALL_DIR ${LIBEXPAT_INSTALL_DIR}
-    BUILD_BYPRODUCTS ${LIBEXPAT_INSTALL_DIR}/${OUTPUT_LIB_DIR}/libexpat.a
-    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${LIBEXPAT_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+    BUILD_BYPRODUCTS ${LIBEXPAT_INSTALL_DIR}/lib/libexpat.a
+    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${LIBEXPAT_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
 )
 
 set(LIBZIP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzip)
@@ -38,8 +32,8 @@ ExternalProject_Add(libzip_project
     PREFIX      libzip
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libzip
     INSTALL_DIR ${LIBZIP_INSTALL_DIR}
-    BUILD_BYPRODUCTS ${LIBZIP_INSTALL_DIR}/${OUTPUT_LIB_DIR}/libzip.a
-    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${LIBZIP_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_DOC=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REGRESS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DENABLE_BZIP2=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_LZMA=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+    BUILD_BYPRODUCTS ${LIBZIP_INSTALL_DIR}/lib/libzip.a
+    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${LIBZIP_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_DOC=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REGRESS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DENABLE_BZIP2=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_LZMA=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
 )
 
 set(XLSXIO_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/xlsxio)
@@ -48,7 +42,7 @@ ExternalProject_Add(xlsxio_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/xlsxio
     INSTALL_DIR ${XLSXIO_INSTALL_DIR}
     BUILD_BYPRODUCTS ${XLSXIO_INSTALL_DIR}/lib/libxlsxio_read.a
-    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR}
+    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
 )
 add_dependencies(xlsxio_project libexpat_project)
 add_dependencies(xlsxio_project libzip_project)

From 1cfe2735d3eb59a006efb110641954f0fd1e1b9a Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 8 Aug 2020 22:03:42 -0700
Subject: [PATCH 278/547] build deps in verbose mode for debugging

---
 depends/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 2e2872d20..2e5dde062 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -24,7 +24,7 @@ ExternalProject_Add(libexpat_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libexpat/expat
     INSTALL_DIR ${LIBEXPAT_INSTALL_DIR}
     BUILD_BYPRODUCTS ${LIBEXPAT_INSTALL_DIR}/lib/libexpat.a
-    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${LIBEXPAT_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${LIBEXPAT_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 )
 
 set(LIBZIP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzip)
@@ -33,7 +33,7 @@ ExternalProject_Add(libzip_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libzip
     INSTALL_DIR ${LIBZIP_INSTALL_DIR}
     BUILD_BYPRODUCTS ${LIBZIP_INSTALL_DIR}/lib/libzip.a
-    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${LIBZIP_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_DOC=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REGRESS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DENABLE_BZIP2=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_LZMA=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${LIBZIP_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_DOC=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REGRESS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DENABLE_BZIP2=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_LZMA=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 )
 
 set(XLSXIO_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/xlsxio)
@@ -42,7 +42,7 @@ ExternalProject_Add(xlsxio_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/xlsxio
     INSTALL_DIR ${XLSXIO_INSTALL_DIR}
     BUILD_BYPRODUCTS ${XLSXIO_INSTALL_DIR}/lib/libxlsxio_read.a
-    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 )
 add_dependencies(xlsxio_project libexpat_project)
 add_dependencies(xlsxio_project libzip_project)

From 8d157012d0a43c1a2fe0518a274cd28598c50fbf Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 8 Aug 2020 22:04:49 -0700
Subject: [PATCH 279/547] build dfhack with verbosity on too

---
 library/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 583c8768f..c78f7f58e 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -4,6 +4,8 @@ cmake_minimum_required(VERSION 2.8.12)
 # prevent CMake warnings about INTERFACE_LINK_LIBRARIES vs LINK_INTERFACE_LIBRARIES
 cmake_policy(SET CMP0022 NEW)
 
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
 # build options
 option(BUILD_DEVEL "Install/package files required for development(For SDK)." OFF)
 if(UNIX)

From b0cb40c5ea2941287450c1fd9352a40c2e50a49d Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 8 Aug 2020 22:42:50 -0700
Subject: [PATCH 280/547] pass the cmake environment to deps

---
 depends/CMakeLists.txt | 16 +++++++++++++---
 library/CMakeLists.txt |  2 --
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 2e5dde062..87e9d74bf 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -18,13 +18,23 @@ option(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependenc
 add_subdirectory(clsocket)
 ide_folder(clsocket "Depends")
 
+# assemble environment args to pass on to dependency projects
+get_cmake_property(vars CACHE_VARIABLES)
+foreach(var ${vars})
+  get_property(currentHelpString CACHE "${var}" PROPERTY HELPSTRING)
+    if("${currentHelpString}" MATCHES "No help, variable specified on the command line." OR "${currentHelpString}" STREQUAL "")
+        message("${var} = [${${var}}]  --  ${currentHelpString}") # uncomment to see the variables being processed
+        list(APPEND CL_ARGS "-D${var}=${${var}}")
+    endif()
+endforeach()
+
 set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat)
 ExternalProject_Add(libexpat_project
     PREFIX      libexpat
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libexpat/expat
     INSTALL_DIR ${LIBEXPAT_INSTALL_DIR}
     BUILD_BYPRODUCTS ${LIBEXPAT_INSTALL_DIR}/lib/libexpat.a
-    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${LIBEXPAT_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBEXPAT_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 )
 
 set(LIBZIP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzip)
@@ -33,7 +43,7 @@ ExternalProject_Add(libzip_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libzip
     INSTALL_DIR ${LIBZIP_INSTALL_DIR}
     BUILD_BYPRODUCTS ${LIBZIP_INSTALL_DIR}/lib/libzip.a
-    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${LIBZIP_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_DOC=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REGRESS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DENABLE_BZIP2=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_LZMA=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBZIP_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_DOC=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REGRESS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DENABLE_BZIP2=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_LZMA=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 )
 
 set(XLSXIO_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/xlsxio)
@@ -42,7 +52,7 @@ ExternalProject_Add(xlsxio_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/xlsxio
     INSTALL_DIR ${XLSXIO_INSTALL_DIR}
     BUILD_BYPRODUCTS ${XLSXIO_INSTALL_DIR}/lib/libxlsxio_read.a
-    CMAKE_ARGS  -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 )
 add_dependencies(xlsxio_project libexpat_project)
 add_dependencies(xlsxio_project libzip_project)
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index c78f7f58e..583c8768f 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -4,8 +4,6 @@ cmake_minimum_required(VERSION 2.8.12)
 # prevent CMake warnings about INTERFACE_LINK_LIBRARIES vs LINK_INTERFACE_LIBRARIES
 cmake_policy(SET CMP0022 NEW)
 
-set(CMAKE_VERBOSE_MAKEFILE ON)
-
 # build options
 option(BUILD_DEVEL "Install/package files required for development(For SDK)." OFF)
 if(UNIX)

From 51794d91eda59faeadd1190b96a55f922f881b07 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 8 Aug 2020 23:55:24 -0700
Subject: [PATCH 281/547] really get the env vars

---
 depends/CMakeLists.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 87e9d74bf..f2ccff398 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -21,12 +21,12 @@ ide_folder(clsocket "Depends")
 # assemble environment args to pass on to dependency projects
 get_cmake_property(vars CACHE_VARIABLES)
 foreach(var ${vars})
-  get_property(currentHelpString CACHE "${var}" PROPERTY HELPSTRING)
-    if("${currentHelpString}" MATCHES "No help, variable specified on the command line." OR "${currentHelpString}" STREQUAL "")
-        message("${var} = [${${var}}]  --  ${currentHelpString}") # uncomment to see the variables being processed
-        list(APPEND CL_ARGS "-D${var}=${${var}}")
-    endif()
+  if(var MATCHES "^CMAKE_" AND NOT var MATCHES "^CMAKE_CACHE" AND NOT var MATCHES "^CMAKE_HOME" AND NOT var MATCHES "^CMAKE_PROJECT")
+    message("${var} = [${${var}}]")
+    list(APPEND CL_ARGS "-D${var}=${${var}}")
+  endif()
 endforeach()
+message("final CL_ARGS = ${CL_ARGS}")
 
 set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat)
 ExternalProject_Add(libexpat_project

From bb988d25e674ede1d2fe74af18a0885708d7f156 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 9 Aug 2020 00:24:25 -0700
Subject: [PATCH 282/547] try to get the library suffix right for windows

---
 depends/CMakeLists.txt | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index f2ccff398..7e0a4027b 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -21,19 +21,31 @@ ide_folder(clsocket "Depends")
 # assemble environment args to pass on to dependency projects
 get_cmake_property(vars CACHE_VARIABLES)
 foreach(var ${vars})
-  if(var MATCHES "^CMAKE_" AND NOT var MATCHES "^CMAKE_CACHE" AND NOT var MATCHES "^CMAKE_HOME" AND NOT var MATCHES "^CMAKE_PROJECT")
+  if(var MATCHES "^CMAKE_"
+     AND NOT var MATCHES "^CMAKE_CACHE"
+     AND NOT var MATCHES "^CMAKE_HOME"
+     AND NOT var MATCHES "^CMAKE_PROJECT")
+    message("${var} = [${${var}}]")
+    list(APPEND CL_ARGS "-D${var}=${${var}}")
+  endif()
+  if(var MATCHES "^ZLIB")
     message("${var} = [${${var}}]")
     list(APPEND CL_ARGS "-D${var}=${${var}}")
   endif()
 endforeach()
-message("final CL_ARGS = ${CL_ARGS}")
+
+if(WIN32)
+  set(LIB_SUFFIX "MD.lib")
+else()
+  set(LIB_SUFFIX ".a")
+endif()
 
 set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat)
 ExternalProject_Add(libexpat_project
     PREFIX      libexpat
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libexpat/expat
     INSTALL_DIR ${LIBEXPAT_INSTALL_DIR}
-    BUILD_BYPRODUCTS ${LIBEXPAT_INSTALL_DIR}/lib/libexpat.a
+    BUILD_BYPRODUCTS ${LIBEXPAT_INSTALL_DIR}/lib/libexpat${LIB_SUFFIX}
     CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBEXPAT_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 )
 
@@ -42,7 +54,7 @@ ExternalProject_Add(libzip_project
     PREFIX      libzip
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libzip
     INSTALL_DIR ${LIBZIP_INSTALL_DIR}
-    BUILD_BYPRODUCTS ${LIBZIP_INSTALL_DIR}/lib/libzip.a
+    BUILD_BYPRODUCTS ${LIBZIP_INSTALL_DIR}/lib/libzip${LIB_SUFFIX}
     CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBZIP_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_DOC=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REGRESS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DENABLE_BZIP2=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_LZMA=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 )
 
@@ -51,7 +63,7 @@ ExternalProject_Add(xlsxio_project
     PREFIX      xlsxio
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/xlsxio
     INSTALL_DIR ${XLSXIO_INSTALL_DIR}
-    BUILD_BYPRODUCTS ${XLSXIO_INSTALL_DIR}/lib/libxlsxio_read.a
+    BUILD_BYPRODUCTS ${XLSXIO_INSTALL_DIR}/lib/libxlsxio_read${LIB_SUFFIX}
     CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 )
 add_dependencies(xlsxio_project libexpat_project)

From 43bcec4a57c55ed2cce404013820d378aaf973f1 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 9 Aug 2020 00:46:50 -0700
Subject: [PATCH 283/547] move libzip to older version

although they declare that they only need cmake 3.0.2, they started
using add_compile_definitions(), which was added in cmake 3.12

git checkout 29b881d fixes this
---
 depends/libzip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/libzip b/depends/libzip
index 66e496489..29b881d28 160000
--- a/depends/libzip
+++ b/depends/libzip
@@ -1 +1 @@
-Subproject commit 66e496489bdae81bfda8b0088172871d8fda0032
+Subproject commit 29b881d286f43189ff7392f609da78daa80c0606

From c7cf7fdd30fc2bef7193464cecc503008a6698c4 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 9 Aug 2020 02:00:06 -0700
Subject: [PATCH 284/547] define EXPAT_LIBRARIES for xlsxio

---
 depends/CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 7e0a4027b..21b244272 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -41,11 +41,12 @@ else()
 endif()
 
 set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat)
+set(LIBEXPAT_OUTPUT_LIB ${LIBEXPAT_INSTALL_DIR}/lib/libexpat${LIB_SUFFIX})
 ExternalProject_Add(libexpat_project
     PREFIX      libexpat
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libexpat/expat
     INSTALL_DIR ${LIBEXPAT_INSTALL_DIR}
-    BUILD_BYPRODUCTS ${LIBEXPAT_INSTALL_DIR}/lib/libexpat${LIB_SUFFIX}
+    BUILD_BYPRODUCTS ${LIBEXPAT_OUTPUT_LIB}
     CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBEXPAT_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 )
 
@@ -64,7 +65,7 @@ ExternalProject_Add(xlsxio_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/xlsxio
     INSTALL_DIR ${XLSXIO_INSTALL_DIR}
     BUILD_BYPRODUCTS ${XLSXIO_INSTALL_DIR}/lib/libxlsxio_read${LIB_SUFFIX}
-    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DEXPAT_LIBRARIES=${LIBEXPAT_OUTPUT_LIB} -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 )
 add_dependencies(xlsxio_project libexpat_project)
 add_dependencies(xlsxio_project libzip_project)

From 204240f3e34d0d1522157cf9306117a2c80063e2 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 9 Aug 2020 02:14:37 -0700
Subject: [PATCH 285/547] specify expat include dir for xlsxio

---
 depends/CMakeLists.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 21b244272..9f2e98763 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -35,13 +35,15 @@ foreach(var ${vars})
 endforeach()
 
 if(WIN32)
-  set(LIB_SUFFIX "MD.lib")
+  set(EXPAT_LIB_SUFFIX "MD.lib")
+  set(LIB_SUFFIX ".lib")
 else()
+  set(EXPAT_LIB_SUFFIX ".a")
   set(LIB_SUFFIX ".a")
 endif()
 
 set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat)
-set(LIBEXPAT_OUTPUT_LIB ${LIBEXPAT_INSTALL_DIR}/lib/libexpat${LIB_SUFFIX})
+set(LIBEXPAT_OUTPUT_LIB ${LIBEXPAT_INSTALL_DIR}/lib/libexpat${EXPAT_LIB_SUFFIX})
 ExternalProject_Add(libexpat_project
     PREFIX      libexpat
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libexpat/expat
@@ -65,7 +67,7 @@ ExternalProject_Add(xlsxio_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/xlsxio
     INSTALL_DIR ${XLSXIO_INSTALL_DIR}
     BUILD_BYPRODUCTS ${XLSXIO_INSTALL_DIR}/lib/libxlsxio_read${LIB_SUFFIX}
-    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DEXPAT_LIBRARIES=${LIBEXPAT_OUTPUT_LIB} -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DEXPAT_LIBRARIES=${LIBEXPAT_OUTPUT_LIB} -DEXPAT_INCLUDE_DIR=${LIBEXPAT_INSTALL_DIR}/include -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 )
 add_dependencies(xlsxio_project libexpat_project)
 add_dependencies(xlsxio_project libzip_project)

From 79415cf097b1de8e9b33734d347b44259d47fb11 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 9 Aug 2020 02:24:05 -0700
Subject: [PATCH 286/547] clean up dep lib vars

---
 CMakeLists.txt         | 15 ---------------
 depends/CMakeLists.txt | 18 +++++++++++++-----
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbd028a36..e5e88ceb3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -417,32 +417,17 @@ endif()
 
 # build the lib itself
 if(BUILD_LIBRARY)
-    ExternalProject_Get_Property(xlsxio_project INSTALL_DIR)
-    set(XLSXIO_INSTALL_DIR ${INSTALL_DIR})
-    ExternalProject_Get_Property(xlsxio_project BUILD_BYPRODUCTS)
-    set(XLSXIO_LIB ${BUILD_BYPRODUCTS})
     include_directories(${XLSXIO_INSTALL_DIR}/include)
     add_library(xlsxio_read STATIC IMPORTED)
     set_target_properties(xlsxio_read PROPERTIES IMPORTED_LOCATION ${XLSXIO_LIB})
-    add_dependencies(xlsxio_read xlsxio_project)
 
-    ExternalProject_Get_Property(libzip_project INSTALL_DIR)
-    set(LIBZIP_INSTALL_DIR ${INSTALL_DIR})
-    ExternalProject_Get_Property(libzip_project BUILD_BYPRODUCTS)
-    set(LIBZIP_LIB ${BUILD_BYPRODUCTS})
     include_directories(${LIBZIP_INSTALL_DIR}/include)
     add_library(zip STATIC IMPORTED)
     set_target_properties(zip PROPERTIES IMPORTED_LOCATION ${LIBZIP_LIB})
-    add_dependencies(zip libzip_project)
 
-    ExternalProject_Get_Property(libexpat_project INSTALL_DIR)
-    set(LIBEXPAT_INSTALL_DIR ${INSTALL_DIR})
-    ExternalProject_Get_Property(libexpat_project BUILD_BYPRODUCTS)
-    set(LIBEXPAT_LIB ${BUILD_BYPRODUCTS})
     include_directories(${LIBEXPAT_INSTALL_DIR}/include)
     add_library(expat STATIC IMPORTED)
     set_target_properties(expat PROPERTIES IMPORTED_LOCATION ${LIBEXPAT_LIB})
-    add_dependencies(expat libexpat_project)
 
     add_subdirectory(library)
     install(FILES LICENSE.rst docs/changelog.txt DESTINATION ${DFHACK_USERDOC_DESTINATION})
diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 9f2e98763..475166285 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -43,31 +43,39 @@ else()
 endif()
 
 set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat)
-set(LIBEXPAT_OUTPUT_LIB ${LIBEXPAT_INSTALL_DIR}/lib/libexpat${EXPAT_LIB_SUFFIX})
+set(LIBEXPAT_INSTALL_DIR ${LIBEXPAT_INSTALL_DIR} PARENT_SCOPE)
+set(LIBEXPAT_LIB ${LIBEXPAT_INSTALL_DIR}/lib/libexpat${EXPAT_LIB_SUFFIX})
+set(LIBEXPAT_LIB ${LIBEXPAT_LIB} PARENT_SCOPE)
 ExternalProject_Add(libexpat_project
     PREFIX      libexpat
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libexpat/expat
     INSTALL_DIR ${LIBEXPAT_INSTALL_DIR}
-    BUILD_BYPRODUCTS ${LIBEXPAT_OUTPUT_LIB}
+    BUILD_BYPRODUCTS ${LIBEXPAT_LIB}
     CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBEXPAT_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 )
 
 set(LIBZIP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzip)
+set(LIBZIP_INSTALL_DIR ${LIBZIP_INSTALL_DIR} PARENT_SCOPE)
+set(LIBZIP_LIB ${LIBZIP_INSTALL_DIR}/lib/libzip${LIB_SUFFIX})
+set(LIBZIP_LIB ${LIBZIP_LIB} PARENT_SCOPE)
 ExternalProject_Add(libzip_project
     PREFIX      libzip
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libzip
     INSTALL_DIR ${LIBZIP_INSTALL_DIR}
-    BUILD_BYPRODUCTS ${LIBZIP_INSTALL_DIR}/lib/libzip${LIB_SUFFIX}
+    BUILD_BYPRODUCTS ${LIBZIP_LIB}
     CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBZIP_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_DOC=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REGRESS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DENABLE_BZIP2=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_LZMA=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 )
 
 set(XLSXIO_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/xlsxio)
+set(XLSXIO_INSTALL_DIR ${XLSXIO_INSTALL_DIR} PARENT_SCOPE)
+set(XLSXIO_LIB ${XLSXIO_INSTALL_DIR}/lib/libxlsxio_read${LIB_SUFFIX})
+set(XLSXIO_LIB ${XLSXIO_LIB} PARENT_SCOPE)
 ExternalProject_Add(xlsxio_project
     PREFIX      xlsxio
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/xlsxio
     INSTALL_DIR ${XLSXIO_INSTALL_DIR}
-    BUILD_BYPRODUCTS ${XLSXIO_INSTALL_DIR}/lib/libxlsxio_read${LIB_SUFFIX}
-    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DEXPAT_LIBRARIES=${LIBEXPAT_OUTPUT_LIB} -DEXPAT_INCLUDE_DIR=${LIBEXPAT_INSTALL_DIR}/include -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+    BUILD_BYPRODUCTS ${XLSXIO_LIB}
+    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DEXPAT_LIBRARIES=${LIBEXPAT_LIB} -DEXPAT_INCLUDE_DIR=${LIBEXPAT_INSTALL_DIR}/include -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 )
 add_dependencies(xlsxio_project libexpat_project)
 add_dependencies(xlsxio_project libzip_project)

From f04a9c3180b6a32f77e57a130a0636868a70ee7f Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 9 Aug 2020 02:32:31 -0700
Subject: [PATCH 287/547] clean up logging; use xlsxio's misspelling of "DIRS"

---
 depends/CMakeLists.txt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 475166285..808bb4304 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -25,11 +25,9 @@ foreach(var ${vars})
      AND NOT var MATCHES "^CMAKE_CACHE"
      AND NOT var MATCHES "^CMAKE_HOME"
      AND NOT var MATCHES "^CMAKE_PROJECT")
-    message("${var} = [${${var}}]")
     list(APPEND CL_ARGS "-D${var}=${${var}}")
   endif()
   if(var MATCHES "^ZLIB")
-    message("${var} = [${${var}}]")
     list(APPEND CL_ARGS "-D${var}=${${var}}")
   endif()
 endforeach()
@@ -51,7 +49,7 @@ ExternalProject_Add(libexpat_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libexpat/expat
     INSTALL_DIR ${LIBEXPAT_INSTALL_DIR}
     BUILD_BYPRODUCTS ${LIBEXPAT_LIB}
-    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBEXPAT_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBEXPAT_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 )
 
 set(LIBZIP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzip)
@@ -63,7 +61,7 @@ ExternalProject_Add(libzip_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libzip
     INSTALL_DIR ${LIBZIP_INSTALL_DIR}
     BUILD_BYPRODUCTS ${LIBZIP_LIB}
-    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBZIP_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_DOC=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REGRESS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DENABLE_BZIP2=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_LZMA=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBZIP_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_DOC=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REGRESS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DENABLE_BZIP2=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_LZMA=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 )
 
 set(XLSXIO_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/xlsxio)
@@ -75,7 +73,7 @@ ExternalProject_Add(xlsxio_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/xlsxio
     INSTALL_DIR ${XLSXIO_INSTALL_DIR}
     BUILD_BYPRODUCTS ${XLSXIO_LIB}
-    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DEXPAT_LIBRARIES=${LIBEXPAT_LIB} -DEXPAT_INCLUDE_DIR=${LIBEXPAT_INSTALL_DIR}/include -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DEXPAT_LIBRARIES=${LIBEXPAT_LIB} -DEXPAT_INCLUDE_DIRS=${LIBEXPAT_INSTALL_DIR}/include -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 )
 add_dependencies(xlsxio_project libexpat_project)
 add_dependencies(xlsxio_project libzip_project)

From 8913d43d6f8cfe8d3921ef3f05f7fae4ddce2947 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 9 Aug 2020 02:59:22 -0700
Subject: [PATCH 288/547] ensure xlsxio_project gets built before dfhack

---
 CMakeLists.txt         | 6 ++----
 depends/CMakeLists.txt | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5e88ceb3..eeb8c8d12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -420,17 +420,15 @@ if(BUILD_LIBRARY)
     include_directories(${XLSXIO_INSTALL_DIR}/include)
     add_library(xlsxio_read STATIC IMPORTED)
     set_target_properties(xlsxio_read PROPERTIES IMPORTED_LOCATION ${XLSXIO_LIB})
-
-    include_directories(${LIBZIP_INSTALL_DIR}/include)
     add_library(zip STATIC IMPORTED)
     set_target_properties(zip PROPERTIES IMPORTED_LOCATION ${LIBZIP_LIB})
-
-    include_directories(${LIBEXPAT_INSTALL_DIR}/include)
     add_library(expat STATIC IMPORTED)
     set_target_properties(expat PROPERTIES IMPORTED_LOCATION ${LIBEXPAT_LIB})
 
     add_subdirectory(library)
     install(FILES LICENSE.rst docs/changelog.txt DESTINATION ${DFHACK_USERDOC_DESTINATION})
+
+    add_dependencies(dfhack xlsxio_project)
 endif()
 
 file(WRITE "${CMAKE_BINARY_DIR}/dfhack_setarch.txt" ${DFHACK_SETARCH})
diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 808bb4304..0b747c157 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -41,7 +41,6 @@ else()
 endif()
 
 set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat)
-set(LIBEXPAT_INSTALL_DIR ${LIBEXPAT_INSTALL_DIR} PARENT_SCOPE)
 set(LIBEXPAT_LIB ${LIBEXPAT_INSTALL_DIR}/lib/libexpat${EXPAT_LIB_SUFFIX})
 set(LIBEXPAT_LIB ${LIBEXPAT_LIB} PARENT_SCOPE)
 ExternalProject_Add(libexpat_project
@@ -53,7 +52,6 @@ ExternalProject_Add(libexpat_project
 )
 
 set(LIBZIP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzip)
-set(LIBZIP_INSTALL_DIR ${LIBZIP_INSTALL_DIR} PARENT_SCOPE)
 set(LIBZIP_LIB ${LIBZIP_INSTALL_DIR}/lib/libzip${LIB_SUFFIX})
 set(LIBZIP_LIB ${LIBZIP_LIB} PARENT_SCOPE)
 ExternalProject_Add(libzip_project

From 7a0853025a0955190b9a53a87c85180d96cd627e Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 9 Aug 2020 03:30:59 -0700
Subject: [PATCH 289/547] use non-standard xlsxio lib name on windows

---
 depends/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 0b747c157..db132a809 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -35,9 +35,11 @@ endforeach()
 if(WIN32)
   set(EXPAT_LIB_SUFFIX "MD.lib")
   set(LIB_SUFFIX ".lib")
+  set(XLSXIO_LIB_PREFIX "")
 else()
   set(EXPAT_LIB_SUFFIX ".a")
   set(LIB_SUFFIX ".a")
+  set(XLSXIO_LIB_PREFIX "lib")
 endif()
 
 set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat)
@@ -64,7 +66,7 @@ ExternalProject_Add(libzip_project
 
 set(XLSXIO_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/xlsxio)
 set(XLSXIO_INSTALL_DIR ${XLSXIO_INSTALL_DIR} PARENT_SCOPE)
-set(XLSXIO_LIB ${XLSXIO_INSTALL_DIR}/lib/libxlsxio_read${LIB_SUFFIX})
+set(XLSXIO_LIB ${XLSXIO_INSTALL_DIR}/lib/${XLSXIO_LIB_PREFIX}xlsxio_read${LIB_SUFFIX})
 set(XLSXIO_LIB ${XLSXIO_LIB} PARENT_SCOPE)
 ExternalProject_Add(xlsxio_project
     PREFIX      xlsxio

From 5fc627a16f26c7acae4d0bf8b858066440afa9d1 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 9 Aug 2020 04:03:04 -0700
Subject: [PATCH 290/547] no lib prefix for libzip on windows too

---
 depends/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index db132a809..bb5dc72dc 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -35,11 +35,11 @@ endforeach()
 if(WIN32)
   set(EXPAT_LIB_SUFFIX "MD.lib")
   set(LIB_SUFFIX ".lib")
-  set(XLSXIO_LIB_PREFIX "")
+  set(LIB_PREFIX "")
 else()
   set(EXPAT_LIB_SUFFIX ".a")
   set(LIB_SUFFIX ".a")
-  set(XLSXIO_LIB_PREFIX "lib")
+  set(LIB_PREFIX "lib")
 endif()
 
 set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat)
@@ -54,7 +54,7 @@ ExternalProject_Add(libexpat_project
 )
 
 set(LIBZIP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzip)
-set(LIBZIP_LIB ${LIBZIP_INSTALL_DIR}/lib/libzip${LIB_SUFFIX})
+set(LIBZIP_LIB ${LIBZIP_INSTALL_DIR}/lib/${LIB_PREFIX}zip${LIB_SUFFIX})
 set(LIBZIP_LIB ${LIBZIP_LIB} PARENT_SCOPE)
 ExternalProject_Add(libzip_project
     PREFIX      libzip
@@ -66,7 +66,7 @@ ExternalProject_Add(libzip_project
 
 set(XLSXIO_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/xlsxio)
 set(XLSXIO_INSTALL_DIR ${XLSXIO_INSTALL_DIR} PARENT_SCOPE)
-set(XLSXIO_LIB ${XLSXIO_INSTALL_DIR}/lib/${XLSXIO_LIB_PREFIX}xlsxio_read${LIB_SUFFIX})
+set(XLSXIO_LIB ${XLSXIO_INSTALL_DIR}/lib/${LIB_PREFIX}xlsxio_read${LIB_SUFFIX})
 set(XLSXIO_LIB ${XLSXIO_LIB} PARENT_SCOPE)
 ExternalProject_Add(xlsxio_project
     PREFIX      xlsxio

From a41f7c099843d23286857f976ab962b336e679c5 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 9 Aug 2020 08:54:42 -0700
Subject: [PATCH 291/547] convert XlsxReader module to xlsxreader plugin

---
 CMakeLists.txt                       |  12 --
 depends/CMakeLists.txt               |   2 +
 library/CMakeLists.txt               |   4 +-
 library/LuaApi.cpp                   |  61 ----------
 library/include/modules/XlsxReader.h |  45 -------
 library/modules/XlsxReader.cpp       | 115 -----------------
 plugins/CMakeLists.txt               |  11 ++
 plugins/lua/xlsxreader.lua           |  17 +++
 plugins/xlsxreader.cpp               | 176 +++++++++++++++++++++++++++
 9 files changed, 207 insertions(+), 236 deletions(-)
 delete mode 100644 library/include/modules/XlsxReader.h
 delete mode 100644 library/modules/XlsxReader.cpp
 create mode 100644 plugins/lua/xlsxreader.lua
 create mode 100644 plugins/xlsxreader.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eeb8c8d12..cd06587eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -364,8 +364,6 @@ endif()
 
 #### expose depends ####
 
-include(ExternalProject)
-
 if(UNIX)
     # Rescan for pthread and zlib if the build arch changed
     if(NOT "${DFHACK_BUILD_ARCH}" STREQUAL "${DFHACK_BUILD_ARCH_PREV}")
@@ -417,18 +415,8 @@ endif()
 
 # build the lib itself
 if(BUILD_LIBRARY)
-    include_directories(${XLSXIO_INSTALL_DIR}/include)
-    add_library(xlsxio_read STATIC IMPORTED)
-    set_target_properties(xlsxio_read PROPERTIES IMPORTED_LOCATION ${XLSXIO_LIB})
-    add_library(zip STATIC IMPORTED)
-    set_target_properties(zip PROPERTIES IMPORTED_LOCATION ${LIBZIP_LIB})
-    add_library(expat STATIC IMPORTED)
-    set_target_properties(expat PROPERTIES IMPORTED_LOCATION ${LIBEXPAT_LIB})
-
     add_subdirectory(library)
     install(FILES LICENSE.rst docs/changelog.txt DESTINATION ${DFHACK_USERDOC_DESTINATION})
-
-    add_dependencies(dfhack xlsxio_project)
 endif()
 
 file(WRITE "${CMAKE_BINARY_DIR}/dfhack_setarch.txt" ${DFHACK_SETARCH})
diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index bb5dc72dc..69ce40ae3 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -32,6 +32,8 @@ foreach(var ${vars})
   endif()
 endforeach()
 
+include(ExternalProject)
+
 if(WIN32)
   set(EXPAT_LIB_SUFFIX "MD.lib")
   set(LIB_SUFFIX ".lib")
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 583c8768f..2de293e15 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -144,7 +144,6 @@ set(MODULE_HEADERS
     include/modules/Translation.h
     include/modules/Units.h
     include/modules/World.h
-    include/modules/XlsxReader.h
 )
 
 set(MODULE_SOURCES
@@ -173,7 +172,6 @@ set(MODULE_SOURCES
     modules/Units.cpp
     modules/Windows.cpp
     modules/World.cpp
-    modules/XlsxReader.cpp
 )
 
 set(STATIC_FIELDS_FILES)
@@ -411,7 +409,7 @@ if(APPLE)
     set_target_properties(dfhack PROPERTIES SOVERSION 1.0.0)
 endif()
 
-target_link_libraries(dfhack protobuf-lite clsocket lua jsoncpp_lib_static xlsxio_read zip expat dfhack-version ${PROJECT_LIBS})
+target_link_libraries(dfhack protobuf-lite clsocket lua jsoncpp_lib_static dfhack-version ${PROJECT_LIBS})
 set_target_properties(dfhack PROPERTIES INTERFACE_LINK_LIBRARIES "")
 
 target_link_libraries(dfhack-client protobuf-lite clsocket jsoncpp_lib_static)
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 0265eee20..78364083f 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -60,7 +60,6 @@ distribution.
 #include "modules/Translation.h"
 #include "modules/Units.h"
 #include "modules/World.h"
-#include "modules/XlsxReader.h"
 
 #include "LuaWrapper.h"
 #include "LuaTools.h"
@@ -2481,65 +2480,6 @@ static const LuaWrapper::FunctionReg dfhack_kitchen_module[] = {
     {NULL, NULL}
 };
 
-/***** XlsxReader module *****/
-
-static const LuaWrapper::FunctionReg dfhack_xlsxreader_module[] = {
-    WRAPM(XlsxReader, open_xlsx_file),
-    WRAPM(XlsxReader, close_xlsx_file),
-    WRAPM(XlsxReader, open_sheet),
-    WRAPM(XlsxReader, close_sheet),
-    {NULL, NULL}
-};
-
-// internal function to factor out handle extraction
-static void * get_xlsxreader_handle(lua_State *L)
-{
-    if (lua_gettop(L) < 1 || lua_isnil(L, 1))
-    {
-        luaL_error(L, "invalid xlsxreader handle");
-    }
-    luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
-    return lua_touserdata(L, 1);
-}
-
-// takes a file handle and returns a table-list of sheet names
-static int xlsxreader_list_sheets(lua_State *L)
-{
-    XlsxReader::xlsx_file_handle file_handle = get_xlsxreader_handle(L);
-    Lua::PushVector(L, XlsxReader::list_sheets(file_handle), true);
-    return 1;
-}
-
-// takes the sheet handle and returns a table-list of strings, or nil if we
-// already processed the last row in the file.
-static int xlsxreader_get_row(lua_State *L)
-{
-    XlsxReader::xlsx_sheet_handle sheet_handle = get_xlsxreader_handle(L);
-    bool ok = XlsxReader::get_next_row(sheet_handle);
-    if (!ok)
-    {
-        lua_pushnil(L);
-    }
-    else
-    {
-        std::string value;
-        auto cells = std::vector<std::string>();
-        while (XlsxReader::get_next_cell(sheet_handle, value))
-        {
-            cells.push_back(value);
-        }
-        Lua::PushVector(L, cells, true);
-    }
-
-    return 1;
-}
-
-static const luaL_Reg dfhack_xlsxreader_funcs[] = {
-    {"list_sheets", xlsxreader_list_sheets},
-    {"get_row", xlsxreader_get_row},
-    {NULL, NULL}
-};
-
 /***** Console module *****/
 
 namespace console {
@@ -3093,7 +3033,6 @@ void OpenDFHackApi(lua_State *state)
     OpenModule(state, "filesystem", dfhack_filesystem_module, dfhack_filesystem_funcs);
     OpenModule(state, "designations", dfhack_designations_module, dfhack_designations_funcs);
     OpenModule(state, "kitchen", dfhack_kitchen_module);
-    OpenModule(state, "xlsxreader", dfhack_xlsxreader_module, dfhack_xlsxreader_funcs);
     OpenModule(state, "console", dfhack_console_module);
     OpenModule(state, "internal", dfhack_internal_module, dfhack_internal_funcs);
 }
diff --git a/library/include/modules/XlsxReader.h b/library/include/modules/XlsxReader.h
deleted file mode 100644
index 93ea1cf20..000000000
--- a/library/include/modules/XlsxReader.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Wrapper for xlsxio_read library functions.
- */
-
-#pragma once
-
-#include <string>
-#include <vector>
-
-#include "Export.h"
-
-/**
- * \defgroup grp_xlsx_reader Xlsx file reader
- * @ingroup grp_modules
- */
-namespace DFHack
-{
-namespace XlsxReader
-{
-
-typedef void* xlsx_file_handle;
-typedef void* xlsx_sheet_handle;
-
-// returns NULL on error
-DFHACK_EXPORT xlsx_file_handle open_xlsx_file(std::string filename);
-DFHACK_EXPORT void close_xlsx_file(xlsx_file_handle file_handle);
-DFHACK_EXPORT std::vector<std::string> list_sheets(xlsx_file_handle file_handle);
-
-// returns XLSXIOReaderSheet object or NULL on error
-DFHACK_EXPORT xlsx_sheet_handle open_sheet(
-        xlsx_file_handle file_handle, std::string sheet_name);
-DFHACK_EXPORT void close_sheet(xlsx_sheet_handle sheet_handle);
-
-// start reading the next row of data; must be called before GetNextCell .
-// returns false if there is no next row to get.
-DFHACK_EXPORT bool get_next_row(xlsx_sheet_handle sheet_handle);
-
-// fills the value param with the contents of the cell in the next column cell
-// in the current row.
-// returns false if there are no more cells in this row.
-DFHACK_EXPORT bool get_next_cell(
-        xlsx_sheet_handle sheet_handle, std::string& value);
-
-}
-}
diff --git a/library/modules/XlsxReader.cpp b/library/modules/XlsxReader.cpp
deleted file mode 100644
index 405369c85..000000000
--- a/library/modules/XlsxReader.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Wrapper for xlsxio_read library functions.
- *
- * Sample usage:
- *
- *  std::string filename = "sample_file.xlsx";
- *  xlsxioreader xlsxfile = XlsxReader::open_xlsx_file(filename);
- *  if (xlsxfile == NULL) {
- *      printf("cannot open file: '%s'", filename.c_str());
- *      return false;
- *  }
- *  auto sheetNames = XlsxReader::list_sheets(xlsxfile);
- *  for (auto sheetName = sheetNames.begin();
- *       sheetName != sheetNames.end();
- *       ++sheetName) {
- *      printf("reading sheet: %s\n", sheetName->c_str());
- *      xlsxioreadersheet xlsxsheet =
- *              XlsxReader::open_sheet(xlsxfile, *sheetName);
- *      if (xlsxsheet == NULL) {
- *          printf("cannot open sheet: '%s'", sheetName->c_str());
- *          continue;
- *      }
- *      std::string value;
- *      int row_num = 1;
- *      while (XlsxReader::GetNextRow(xlsxsheet)) {
- *          std::string s;
- *          printf("%d:\t", row_num);
- *          while (XlsxReader::GetNextCell(xlsxsheet, s)) {
- *              printf("%s\t", s.c_str());
- *          }
- *          printf("\n");
- *          ++row_num;
- *      }
- *      XlsxReader::close_sheet(xlsxsheet);
- *  }
- *  XlsxReader::close_xlsx_file(xlsxfile);
- *  return true;
- */
-
-#include <xlsxio_read.h>
-
-#include "modules/XlsxReader.h"
-
-using namespace DFHack;
-
-
-// returns NULL on error
-DFHACK_EXPORT XlsxReader::xlsx_file_handle XlsxReader::open_xlsx_file(
-        std::string filename)
-{
-    return xlsxioread_open(filename.c_str());
-}
-
-DFHACK_EXPORT void XlsxReader::close_xlsx_file(
-        XlsxReader::xlsx_file_handle file_handle)
-{
-    xlsxioread_close((xlsxioreader)file_handle);
-}
-
-static int list_callback(const XLSXIOCHAR* name, void* cbdata)
-{
-    auto sheetNames = (std::vector<std::string> *)cbdata;
-    sheetNames->push_back(name);
-    return 0;
-}
-
-DFHACK_EXPORT std::vector<std::string> XlsxReader::list_sheets(
-    XlsxReader::xlsx_file_handle file_handle)
-{
-    auto sheetNames = std::vector<std::string>();
-    xlsxioread_list_sheets(
-            (xlsxioreader)file_handle, list_callback, &sheetNames);
-    return sheetNames;
-}
-
-// returns XLSXIOReaderSheet object or NULL on error
-DFHACK_EXPORT XlsxReader::xlsx_sheet_handle XlsxReader::open_sheet(
-    XlsxReader::xlsx_file_handle file_handle, std::string sheet_name)
-{
-    if (file_handle == NULL)
-        return NULL;
-    return xlsxioread_sheet_open(
-        (xlsxioreader)file_handle, sheet_name.c_str(), XLSXIOREAD_SKIP_NONE);
-}
-
-DFHACK_EXPORT void XlsxReader::close_sheet(
-        XlsxReader::xlsx_sheet_handle sheet_handle)
-{
-    xlsxioread_sheet_close((xlsxioreadersheet)sheet_handle);
-}
-
-// start reading the next row of data; must be called before GetNextCell .
-// returns false if there is no next row to get.
-DFHACK_EXPORT bool XlsxReader::get_next_row(
-        XlsxReader::xlsx_sheet_handle sheet_handle)
-{
-    return xlsxioread_sheet_next_row((xlsxioreadersheet)sheet_handle) != 0;
-}
-
-// fills the value param with the contents of the cell in the next column cell
-// in the current row.
-// returns false if there are no more cells in this row.
-DFHACK_EXPORT bool XlsxReader::get_next_cell(
-    XlsxReader::xlsx_sheet_handle sheet_handle, std::string& value)
-{
-    char* result;
-    if (!xlsxioread_sheet_next_cell_string((xlsxioreadersheet)sheet_handle,
-                                           &result)) {
-        value.clear();
-        return false;
-    }
-    value.assign(result);
-    free(result);
-    return true;
-}
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 678b7eec2..6531165e1 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -77,6 +77,14 @@ set_source_files_properties( Brushes.h PROPERTIES HEADER_FILE_ONLY TRUE )
 add_library(buildingplan-lib STATIC buildingplan-lib.cpp)
 target_link_libraries(buildingplan-lib dfhack)
 
+# xlsxreader deps
+add_library(xlsxio_read STATIC IMPORTED)
+set_target_properties(xlsxio_read PROPERTIES IMPORTED_LOCATION ${XLSXIO_LIB})
+add_library(zip STATIC IMPORTED)
+set_target_properties(zip PROPERTIES IMPORTED_LOCATION ${LIBZIP_LIB})
+add_library(expat STATIC IMPORTED)
+set_target_properties(expat PROPERTIES IMPORTED_LOCATION ${LIBEXPAT_LIB})
+
 # Plugins
 option(BUILD_SUPPORTED "Build the supported plugins (reveal, probe, etc.)." ON)
 if(BUILD_SUPPORTED)
@@ -175,8 +183,11 @@ if(BUILD_SUPPORTED)
     add_subdirectory(tweak)
     dfhack_plugin(workflow workflow.cpp LINK_LIBRARIES lua)
     dfhack_plugin(workNow workNow.cpp)
+    dfhack_plugin(xlsxreader xlsxreader.cpp LINK_LIBRARIES lua xlsxio_read zip expat z)
     dfhack_plugin(zone zone.cpp LINK_LIBRARIES lua)
 endif()
+target_include_directories(xlsxreader PRIVATE ${XLSXIO_INSTALL_DIR}/include)
+add_dependencies(xlsxreader xlsxio_project)
 
 # this is the skeleton plugin. If you want to make your own, make a copy and then change it
 option(BUILD_SKELETON "Build the skeleton plugin." OFF)
diff --git a/plugins/lua/xlsxreader.lua b/plugins/lua/xlsxreader.lua
new file mode 100644
index 000000000..3dbc1f2d8
--- /dev/null
+++ b/plugins/lua/xlsxreader.lua
@@ -0,0 +1,17 @@
+local _ENV = mkmodule('plugins.xlsxreader')
+
+--[[
+
+ Native functions:
+
+ * file_handle open_xlsx_file(filename)
+ * close_xlsx_file(file_handle)
+ * sheet_names list_sheets(file_handle)
+
+ * sheet_handle open_sheet(file_handle, sheet_name)
+ * close_sheet(sheet_handle)
+ * cell_strings get_row(sheet_handle)
+
+--]]
+
+return _ENV
diff --git a/plugins/xlsxreader.cpp b/plugins/xlsxreader.cpp
new file mode 100644
index 000000000..9c773718d
--- /dev/null
+++ b/plugins/xlsxreader.cpp
@@ -0,0 +1,176 @@
+/*
+ * Wrapper for xlsxio_read library functions.
+ *
+ * Sample usage:
+ *
+ *  std::string filename = "sample_file.xlsx";
+ *  xlsxioreader xlsxfile = XlsxReader::open_xlsx_file(filename);
+ *  if (xlsxfile == NULL) {
+ *      printf("cannot open file: '%s'", filename.c_str());
+ *      return false;
+ *  }
+ *  auto sheetNames = XlsxReader::list_sheets(xlsxfile);
+ *  for (auto sheetName = sheetNames.begin();
+ *       sheetName != sheetNames.end();
+ *       ++sheetName) {
+ *      printf("reading sheet: %s\n", sheetName->c_str());
+ *      xlsxioreadersheet xlsxsheet =
+ *              XlsxReader::open_sheet(xlsxfile, *sheetName);
+ *      if (xlsxsheet == NULL) {
+ *          printf("cannot open sheet: '%s'", sheetName->c_str());
+ *          continue;
+ *      }
+ *      std::string value;
+ *      int row_num = 1;
+ *      while (XlsxReader::GetNextRow(xlsxsheet)) {
+ *          std::string s;
+ *          printf("%d:\t", row_num);
+ *          while (XlsxReader::GetNextCell(xlsxsheet, s)) {
+ *              printf("%s\t", s.c_str());
+ *          }
+ *          printf("\n");
+ *          ++row_num;
+ *      }
+ *      XlsxReader::close_sheet(xlsxsheet);
+ *  }
+ *  XlsxReader::close_xlsx_file(xlsxfile);
+ *  return true;
+ */
+
+#include <xlsxio_read.h>
+
+#include "DataFuncs.h"
+#include "LuaTools.h"
+#include "PluginManager.h"
+
+using namespace DFHack;
+
+DFHACK_PLUGIN("xlsxreader");
+
+typedef void* xlsx_file_handle;
+typedef void* xlsx_sheet_handle;
+
+// returns NULL on error
+xlsx_file_handle open_xlsx_file(std::string filename)
+{
+    return xlsxioread_open(filename.c_str());
+}
+
+void close_xlsx_file(xlsx_file_handle file_handle)
+{
+    xlsxioread_close((xlsxioreader)file_handle);
+}
+
+// returns XLSXIOReaderSheet object or NULL on error
+xlsx_sheet_handle open_sheet(xlsx_file_handle file_handle, std::string sheet_name)
+{
+    if (file_handle == NULL)
+        return NULL;
+    return xlsxioread_sheet_open((xlsxioreader)file_handle,
+                                 sheet_name.c_str(), XLSXIOREAD_SKIP_NONE);
+}
+
+void close_sheet(xlsx_sheet_handle sheet_handle)
+{
+    xlsxioread_sheet_close((xlsxioreadersheet)sheet_handle);
+}
+
+static int list_callback(const XLSXIOCHAR* name, void* cbdata)
+{
+    auto sheetNames = (std::vector<std::string> *)cbdata;
+    sheetNames->push_back(name);
+    return 0;
+}
+
+// start reading the next row of data; must be called before get_next_cell.
+// returns false if there is no next row to get.
+static bool get_next_row(xlsx_sheet_handle sheet_handle)
+{
+    return xlsxioread_sheet_next_row((xlsxioreadersheet)sheet_handle) != 0;
+}
+
+// fills the value param with the contents of the cell in the next column cell
+// in the current row.
+// returns false if there are no more cells in this row.
+static bool get_next_cell(xlsx_sheet_handle sheet_handle, std::string& value)
+{
+    char* result;
+    if (!xlsxioread_sheet_next_cell_string(
+                (xlsxioreadersheet)sheet_handle, &result)) {
+        value.clear();
+        return false;
+    }
+    value.assign(result);
+    free(result);
+    return true;
+}
+
+// internal function to factor out handle extraction
+static void * get_xlsxreader_handle(lua_State *L)
+{
+    if (lua_gettop(L) < 1 || lua_isnil(L, 1))
+    {
+        luaL_error(L, "invalid xlsxreader handle");
+    }
+    luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
+    return lua_touserdata(L, 1);
+}
+
+// takes a file handle and returns a table-list of sheet names
+int list_sheets(lua_State *L)
+{
+    xlsxioreader file_handle = (xlsxioreader)get_xlsxreader_handle(L);
+    auto sheetNames = std::vector<std::string>();
+    xlsxioread_list_sheets(file_handle, list_callback, &sheetNames);
+    Lua::PushVector(L, sheetNames, true);
+    return 1;
+}
+
+// takes the sheet handle and returns a table-list of strings, or nil if we
+// already processed the last row in the file.
+int get_row(lua_State *L)
+{
+    xlsxioreadersheet sheet_handle =
+    (xlsxioreadersheet)get_xlsxreader_handle(L);
+    bool ok = get_next_row(sheet_handle);
+    if (!ok)
+    {
+        lua_pushnil(L);
+    }
+    else
+    {
+        std::string value;
+        auto cells = std::vector<std::string>();
+        while (get_next_cell(sheet_handle, value))
+        {
+            cells.push_back(value);
+        }
+        Lua::PushVector(L, cells, true);
+    }
+
+    return 1;
+}
+
+DFHACK_PLUGIN_LUA_FUNCTIONS {
+    DFHACK_LUA_FUNCTION(open_xlsx_file),
+    DFHACK_LUA_FUNCTION(close_xlsx_file),
+    DFHACK_LUA_FUNCTION(open_sheet),
+    DFHACK_LUA_FUNCTION(close_sheet),
+    DFHACK_LUA_END
+};
+
+DFHACK_PLUGIN_LUA_COMMANDS{
+    DFHACK_LUA_COMMAND(list_sheets),
+    DFHACK_LUA_COMMAND(get_row),
+    DFHACK_LUA_END
+};
+
+DFhackCExport command_result plugin_init(color_ostream &, std::vector<PluginCommand> &)
+{
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_shutdown(color_ostream &)
+{
+    return CR_OK;
+}

From 4a04273fae91ff7aaa9c3bb2cb2bebed65220f3f Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 9 Aug 2020 09:28:19 -0700
Subject: [PATCH 292/547] document xlsxreader functions

---
 docs/Lua API.rst           | 31 +++++++++++++++++++++++++++++++
 docs/Plugins.rst           |  3 ++-
 plugins/lua/xlsxreader.lua | 18 ++++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 45ccd46a9..e66989e35 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4102,6 +4102,37 @@ Lua plugin classes
 - ``shuffle()``: shuffles the sequence of numbers
 - ``next()``: returns next number in the sequence
 
+xlsxreader
+==========
+
+Utility functions to facilitate reading .xlsx spreadsheets. It provides the
+following API methods:
+
+ - ``file_handle open_xlsx_file(filename)``
+ - ``close_xlsx_file(file_handle)``
+ - ``sheet_names list_sheets(file_handle)``
+ - ``sheet_handle open_sheet(file_handle, sheet_name)``
+ - ``close_sheet(sheet_handle)``
+ - ``cell_strings get_row(sheet_handle)``
+
+ Example::
+
+    local xlsxreader = require('plugins.xlsxreader')
+
+    local filepath = "path/to/some_file.xlsx"
+    local xlsx_file = xlsxreader.open_xlsx_file(filepath)
+    for _, sheet_name in ipairs(xlsxreader.list_sheets(xlsx_file)) do
+        print('reading sheet: '..sheet_name)
+        local xlsx_sheet = xlsxreader.open_sheet(xlsx_file, sheet_name)
+        local row_cells = xlsxreader.get_row(xlsx_sheet)
+        while row_cells do
+            printall(row_cells)
+            row_cells = xlsxreader.get_row(xlsx_sheet)
+        end
+        xlsxreader.close_sheet(xlsx_sheet)
+    end
+    xlsxreader.close_xlsx_file(xlsx_file)
+
 =======
 Scripts
 =======
diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index 6699163c2..9b5569e62 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -2939,10 +2939,11 @@ Lua API
 =======
 
 Some plugins consist solely of native libraries exposed to Lua. They are listed
-in the `lua-api` file under `lua-plugins`:
+in the `lua-api` file under `lua-plugins`::
 
 * `eventful`
 * `building-hacks`
 * `luasocket`
 * `map-render`
 * `cxxrandom`
+* `xlsxreader`
diff --git a/plugins/lua/xlsxreader.lua b/plugins/lua/xlsxreader.lua
index 3dbc1f2d8..09ba01978 100644
--- a/plugins/lua/xlsxreader.lua
+++ b/plugins/lua/xlsxreader.lua
@@ -12,6 +12,24 @@ local _ENV = mkmodule('plugins.xlsxreader')
  * close_sheet(sheet_handle)
  * cell_strings get_row(sheet_handle)
 
+Sample usage:
+
+    local xlsxreader = require('plugins.xlsxreader')
+
+    local filepath = "path/to/some_file.xlsx"
+    local xlsx_file = xlsxreader.open_xlsx_file(filepath)
+    for _, sheet_name in ipairs(xlsxreader.list_sheets(xlsx_file)) do
+        print('reading sheet: '..sheet_name)
+        local xlsx_sheet = xlsxreader.open_sheet(xlsx_file, sheet_name)
+        local row_cells = xlsxreader.get_row(xlsx_sheet)
+        while row_cells do
+            printall(row_cells)
+            row_cells = xlsxreader.get_row(xlsx_sheet)
+        end
+        xlsxreader.close_sheet(xlsx_sheet)
+    end
+    xlsxreader.close_xlsx_file(xlsx_file)
+
 --]]
 
 return _ENV

From 5294360908c462ea24a613230df18dc336f55d75 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 9 Aug 2020 09:46:54 -0700
Subject: [PATCH 293/547] more windows library naming shenanigans

---
 plugins/CMakeLists.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 6531165e1..2bc135d33 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -85,6 +85,12 @@ set_target_properties(zip PROPERTIES IMPORTED_LOCATION ${LIBZIP_LIB})
 add_library(expat STATIC IMPORTED)
 set_target_properties(expat PROPERTIES IMPORTED_LOCATION ${LIBEXPAT_LIB})
 
+if(WIN32)
+  set(LIB_Z_LIB "zlib.lib")
+else()
+  set(LIB_Z_LIB "z")
+endif()
+
 # Plugins
 option(BUILD_SUPPORTED "Build the supported plugins (reveal, probe, etc.)." ON)
 if(BUILD_SUPPORTED)
@@ -183,7 +189,7 @@ if(BUILD_SUPPORTED)
     add_subdirectory(tweak)
     dfhack_plugin(workflow workflow.cpp LINK_LIBRARIES lua)
     dfhack_plugin(workNow workNow.cpp)
-    dfhack_plugin(xlsxreader xlsxreader.cpp LINK_LIBRARIES lua xlsxio_read zip expat z)
+    dfhack_plugin(xlsxreader xlsxreader.cpp LINK_LIBRARIES lua xlsxio_read zip expat ${LIB_Z_LIB})
     dfhack_plugin(zone zone.cpp LINK_LIBRARIES lua)
 endif()
 target_include_directories(xlsxreader PRIVATE ${XLSXIO_INSTALL_DIR}/include)

From e2129673c12750a89b5939d0d353cfc597fc8c46 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 9 Aug 2020 10:11:24 -0700
Subject: [PATCH 294/547] fix zlib path on windows

---
 plugins/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 2bc135d33..c2798cd7d 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -86,7 +86,7 @@ add_library(expat STATIC IMPORTED)
 set_target_properties(expat PROPERTIES IMPORTED_LOCATION ${LIBEXPAT_LIB})
 
 if(WIN32)
-  set(LIB_Z_LIB "zlib.lib")
+  set(LIB_Z_LIB "depends/zlib/lib/zlib.lib")
 else()
   set(LIB_Z_LIB "z")
 endif()

From 06e3f77e39d106fdc1633e3e6bfc207447a1d805 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 9 Aug 2020 10:47:15 -0700
Subject: [PATCH 295/547] fix windows zlib path, hopefully for the last time

---
 plugins/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index c2798cd7d..bc897ba7d 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -86,7 +86,7 @@ add_library(expat STATIC IMPORTED)
 set_target_properties(expat PROPERTIES IMPORTED_LOCATION ${LIBEXPAT_LIB})
 
 if(WIN32)
-  set(LIB_Z_LIB "depends/zlib/lib/zlib.lib")
+  set(LIB_Z_LIB "depends/zlib/lib/zlib")
 else()
   set(LIB_Z_LIB "z")
 endif()

From 679ca41da8739aad216fd28735b30ef08903011d Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 9 Aug 2020 21:22:17 -0700
Subject: [PATCH 296/547] make sure xlsxio knows to link statically

---
 depends/CMakeLists.txt | 3 +--
 plugins/xlsxreader.cpp | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 69ce40ae3..a2eafb052 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -72,10 +72,9 @@ set(XLSXIO_LIB ${XLSXIO_INSTALL_DIR}/lib/${LIB_PREFIX}xlsxio_read${LIB_SUFFIX})
 set(XLSXIO_LIB ${XLSXIO_LIB} PARENT_SCOPE)
 ExternalProject_Add(xlsxio_project
     PREFIX      xlsxio
+    DEPENDS     libexpat_project libzip_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/xlsxio
     INSTALL_DIR ${XLSXIO_INSTALL_DIR}
     BUILD_BYPRODUCTS ${XLSXIO_LIB}
     CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DEXPAT_LIBRARIES=${LIBEXPAT_LIB} -DEXPAT_INCLUDE_DIRS=${LIBEXPAT_INSTALL_DIR}/include -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 )
-add_dependencies(xlsxio_project libexpat_project)
-add_dependencies(xlsxio_project libzip_project)
diff --git a/plugins/xlsxreader.cpp b/plugins/xlsxreader.cpp
index 9c773718d..fb5039465 100644
--- a/plugins/xlsxreader.cpp
+++ b/plugins/xlsxreader.cpp
@@ -37,6 +37,7 @@
  *  return true;
  */
 
+#define BUILD_XLSXIO_STATIC
 #include <xlsxio_read.h>
 
 #include "DataFuncs.h"

From 6da364a60b628a078c45bea1870ca3991561e404 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 10 Aug 2020 00:01:47 -0700
Subject: [PATCH 297/547] ensure libexpat is used as a static lib

---
 depends/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index a2eafb052..9d63f3c37 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -38,10 +38,12 @@ if(WIN32)
   set(EXPAT_LIB_SUFFIX "MD.lib")
   set(LIB_SUFFIX ".lib")
   set(LIB_PREFIX "")
+  set(XLSXIO_C_FLAGS "${CMAKE_C_FLAGS} /DXML_STATIC")
 else()
   set(EXPAT_LIB_SUFFIX ".a")
   set(LIB_SUFFIX ".a")
   set(LIB_PREFIX "lib")
+  set(XLSXIO_C_FLAGS "${CMAKE_C_FLAGS} -DXML_STATIC")
 endif()
 
 set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat)
@@ -76,5 +78,5 @@ ExternalProject_Add(xlsxio_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/xlsxio
     INSTALL_DIR ${XLSXIO_INSTALL_DIR}
     BUILD_BYPRODUCTS ${XLSXIO_LIB}
-    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DEXPAT_LIBRARIES=${LIBEXPAT_LIB} -DEXPAT_INCLUDE_DIRS=${LIBEXPAT_INSTALL_DIR}/include -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DEXPAT_LIBRARIES=${LIBEXPAT_LIB} -DEXPAT_INCLUDE_DIRS=${LIBEXPAT_INSTALL_DIR}/include -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_C_FLAGS=${XLSXIO_C_FLAGS}
 )

From 702228bf124ad656153c65eb17e2d9b93a107082 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 10 Aug 2020 01:01:13 -0700
Subject: [PATCH 298/547] use standard CMAKE vars for prefixes and suffixes

---
 depends/CMakeLists.txt | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 9d63f3c37..2437794bb 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -35,19 +35,15 @@ endforeach()
 include(ExternalProject)
 
 if(WIN32)
-  set(EXPAT_LIB_SUFFIX "MD.lib")
-  set(LIB_SUFFIX ".lib")
-  set(LIB_PREFIX "")
+  set(EXPAT_LIB_NAME_SUFFIX "MD")
   set(XLSXIO_C_FLAGS "${CMAKE_C_FLAGS} /DXML_STATIC")
 else()
-  set(EXPAT_LIB_SUFFIX ".a")
-  set(LIB_SUFFIX ".a")
-  set(LIB_PREFIX "lib")
+  set(EXPAT_LIB_NAME_SUFFIX "")
   set(XLSXIO_C_FLAGS "${CMAKE_C_FLAGS} -DXML_STATIC")
 endif()
 
 set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat)
-set(LIBEXPAT_LIB ${LIBEXPAT_INSTALL_DIR}/lib/libexpat${EXPAT_LIB_SUFFIX})
+set(LIBEXPAT_LIB ${LIBEXPAT_INSTALL_DIR}/lib/libexpat${EXPAT_LIB_NAME_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
 set(LIBEXPAT_LIB ${LIBEXPAT_LIB} PARENT_SCOPE)
 ExternalProject_Add(libexpat_project
     PREFIX      libexpat
@@ -58,7 +54,7 @@ ExternalProject_Add(libexpat_project
 )
 
 set(LIBZIP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzip)
-set(LIBZIP_LIB ${LIBZIP_INSTALL_DIR}/lib/${LIB_PREFIX}zip${LIB_SUFFIX})
+set(LIBZIP_LIB ${LIBZIP_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}zip${CMAKE_STATIC_LIBRARY_SUFFIX})
 set(LIBZIP_LIB ${LIBZIP_LIB} PARENT_SCOPE)
 ExternalProject_Add(libzip_project
     PREFIX      libzip
@@ -70,7 +66,7 @@ ExternalProject_Add(libzip_project
 
 set(XLSXIO_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/xlsxio)
 set(XLSXIO_INSTALL_DIR ${XLSXIO_INSTALL_DIR} PARENT_SCOPE)
-set(XLSXIO_LIB ${XLSXIO_INSTALL_DIR}/lib/${LIB_PREFIX}xlsxio_read${LIB_SUFFIX})
+set(XLSXIO_LIB ${XLSXIO_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}xlsxio_read${CMAKE_STATIC_LIBRARY_SUFFIX})
 set(XLSXIO_LIB ${XLSXIO_LIB} PARENT_SCOPE)
 ExternalProject_Add(xlsxio_project
     PREFIX      xlsxio

From 69322ec4299e09c19d0581654d933cd29a75d4b1 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 10 Aug 2020 01:13:16 -0700
Subject: [PATCH 299/547] use proper USERDATA instead of LIGHTUSERDATA

---
 plugins/xlsxreader.cpp | 108 +++++++++++++++++++++--------------------
 1 file changed, 56 insertions(+), 52 deletions(-)

diff --git a/plugins/xlsxreader.cpp b/plugins/xlsxreader.cpp
index fb5039465..02b83127d 100644
--- a/plugins/xlsxreader.cpp
+++ b/plugins/xlsxreader.cpp
@@ -48,36 +48,53 @@ using namespace DFHack;
 
 DFHACK_PLUGIN("xlsxreader");
 
-typedef void* xlsx_file_handle;
-typedef void* xlsx_sheet_handle;
+struct handle_identity : public compound_identity {
+    handle_identity(): compound_identity(0, nullptr, nullptr, "handle") {};
+    DFHack::identity_type type() override { return IDTYPE_OPAQUE; }
+};
+
+struct xlsx_file_handle {
+    const xlsxioreader handle;
+    xlsx_file_handle(xlsxioreader handle): handle(handle) {}
+    static handle_identity _identity;
+};
+
+struct xlsx_sheet_handle {
+    const xlsxioreadersheet handle;
+    xlsx_sheet_handle(xlsxioreadersheet handle): handle(handle) {}
+    static handle_identity _identity;
+};
+
+handle_identity xlsx_file_handle::_identity;
+handle_identity xlsx_sheet_handle::_identity;
 
 // returns NULL on error
-xlsx_file_handle open_xlsx_file(std::string filename)
-{
-    return xlsxioread_open(filename.c_str());
+xlsx_file_handle* open_xlsx_file(std::string filename) {
+    return new xlsx_file_handle(xlsxioread_open(filename.c_str()));
 }
 
-void close_xlsx_file(xlsx_file_handle file_handle)
-{
-    xlsxioread_close((xlsxioreader)file_handle);
+void close_xlsx_file(xlsx_file_handle *file_handle) {
+    CHECK_NULL_POINTER(file_handle);
+    xlsxioread_close(file_handle->handle);
+    delete(file_handle);
 }
 
 // returns XLSXIOReaderSheet object or NULL on error
-xlsx_sheet_handle open_sheet(xlsx_file_handle file_handle, std::string sheet_name)
-{
-    if (file_handle == NULL)
-        return NULL;
-    return xlsxioread_sheet_open((xlsxioreader)file_handle,
-                                 sheet_name.c_str(), XLSXIOREAD_SKIP_NONE);
+xlsx_sheet_handle* open_sheet(xlsx_file_handle *file_handle,
+                              std::string sheet_name) {
+    CHECK_NULL_POINTER(file_handle);
+    return new xlsx_sheet_handle(
+        xlsxioread_sheet_open(file_handle->handle,
+                              sheet_name.c_str(), XLSXIOREAD_SKIP_NONE));
 }
 
-void close_sheet(xlsx_sheet_handle sheet_handle)
-{
-    xlsxioread_sheet_close((xlsxioreadersheet)sheet_handle);
+void close_sheet(xlsx_sheet_handle *sheet_handle) {
+    CHECK_NULL_POINTER(sheet_handle);
+    xlsxioread_sheet_close(sheet_handle->handle);
+    delete(sheet_handle);
 }
 
-static int list_callback(const XLSXIOCHAR* name, void* cbdata)
-{
+static int list_callback(const XLSXIOCHAR* name, void* cbdata) {
     auto sheetNames = (std::vector<std::string> *)cbdata;
     sheetNames->push_back(name);
     return 0;
@@ -85,19 +102,16 @@ static int list_callback(const XLSXIOCHAR* name, void* cbdata)
 
 // start reading the next row of data; must be called before get_next_cell.
 // returns false if there is no next row to get.
-static bool get_next_row(xlsx_sheet_handle sheet_handle)
-{
-    return xlsxioread_sheet_next_row((xlsxioreadersheet)sheet_handle) != 0;
+static bool get_next_row(xlsx_sheet_handle *sheet_handle) {
+    return xlsxioread_sheet_next_row(sheet_handle->handle) != 0;
 }
 
 // fills the value param with the contents of the cell in the next column cell
 // in the current row.
 // returns false if there are no more cells in this row.
-static bool get_next_cell(xlsx_sheet_handle sheet_handle, std::string& value)
-{
+static bool get_next_cell(xlsx_sheet_handle *sheet_handle, std::string& value) {
     char* result;
-    if (!xlsxioread_sheet_next_cell_string(
-                (xlsxioreadersheet)sheet_handle, &result)) {
+    if (!xlsxioread_sheet_next_cell_string(sheet_handle->handle, &result)) {
         value.clear();
         return false;
     }
@@ -106,44 +120,35 @@ static bool get_next_cell(xlsx_sheet_handle sheet_handle, std::string& value)
     return true;
 }
 
-// internal function to factor out handle extraction
-static void * get_xlsxreader_handle(lua_State *L)
-{
-    if (lua_gettop(L) < 1 || lua_isnil(L, 1))
-    {
+// internal function to extract a handle from the first stack param
+static void * get_xlsxreader_handle(lua_State *L) {
+    if (lua_gettop(L) < 1 || lua_isnil(L, 1)) {
         luaL_error(L, "invalid xlsxreader handle");
     }
-    luaL_checktype(L, 1, LUA_TLIGHTUSERDATA);
-    return lua_touserdata(L, 1);
+    luaL_checktype(L, 1, LUA_TUSERDATA);
+    return LuaWrapper::get_object_ref(L, 1);
 }
 
 // takes a file handle and returns a table-list of sheet names
-int list_sheets(lua_State *L)
-{
-    xlsxioreader file_handle = (xlsxioreader)get_xlsxreader_handle(L);
+int list_sheets(lua_State *L) {
+    auto file_handle = (xlsx_file_handle *)get_xlsxreader_handle(L);
     auto sheetNames = std::vector<std::string>();
-    xlsxioread_list_sheets(file_handle, list_callback, &sheetNames);
+    xlsxioread_list_sheets(file_handle->handle, list_callback, &sheetNames);
     Lua::PushVector(L, sheetNames, true);
     return 1;
 }
 
 // takes the sheet handle and returns a table-list of strings, or nil if we
 // already processed the last row in the file.
-int get_row(lua_State *L)
-{
-    xlsxioreadersheet sheet_handle =
-    (xlsxioreadersheet)get_xlsxreader_handle(L);
+int get_row(lua_State *L) {
+    auto sheet_handle = (xlsx_sheet_handle *)get_xlsxreader_handle(L);
     bool ok = get_next_row(sheet_handle);
-    if (!ok)
-    {
+    if (!ok) {
         lua_pushnil(L);
-    }
-    else
-    {
+    } else {
         std::string value;
         auto cells = std::vector<std::string>();
-        while (get_next_cell(sheet_handle, value))
-        {
+        while (get_next_cell(sheet_handle, value)) {
             cells.push_back(value);
         }
         Lua::PushVector(L, cells, true);
@@ -166,12 +171,11 @@ DFHACK_PLUGIN_LUA_COMMANDS{
     DFHACK_LUA_END
 };
 
-DFhackCExport command_result plugin_init(color_ostream &, std::vector<PluginCommand> &)
-{
+DFhackCExport command_result plugin_init(color_ostream &,
+                                         std::vector<PluginCommand> &) {
     return CR_OK;
 }
 
-DFhackCExport command_result plugin_shutdown(color_ostream &)
-{
+DFhackCExport command_result plugin_shutdown(color_ostream &) {
     return CR_OK;
 }

From 17c509a5961def16be02a4d1279944e89418a9b4 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 10 Aug 2020 09:18:49 -0700
Subject: [PATCH 300/547] update sample code for xlsxreader to use finalize

---
 plugins/lua/xlsxreader.lua | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/plugins/lua/xlsxreader.lua b/plugins/lua/xlsxreader.lua
index 09ba01978..323231915 100644
--- a/plugins/lua/xlsxreader.lua
+++ b/plugins/lua/xlsxreader.lua
@@ -16,19 +16,31 @@ Sample usage:
 
     local xlsxreader = require('plugins.xlsxreader')
 
-    local filepath = "path/to/some_file.xlsx"
-    local xlsx_file = xlsxreader.open_xlsx_file(filepath)
-    for _, sheet_name in ipairs(xlsxreader.list_sheets(xlsx_file)) do
+    local function dump_sheet(xlsx_file, sheet_name)
         print('reading sheet: '..sheet_name)
         local xlsx_sheet = xlsxreader.open_sheet(xlsx_file, sheet_name)
-        local row_cells = xlsxreader.get_row(xlsx_sheet)
-        while row_cells do
-            printall(row_cells)
-            row_cells = xlsxreader.get_row(xlsx_sheet)
-        end
-        xlsxreader.close_sheet(xlsx_sheet)
+        dfhack.with_finalize(
+            function () xlsxreader.close_sheet(xlsx_sheet) end,
+            function ()
+                local row_cells = xlsxreader.get_row(xlsx_sheet)
+                while row_cells do
+                    printall(row_cells)
+                    row_cells = xlsxreader.get_row(xlsx_sheet)
+                end
+            end
+        )
     end
-    xlsxreader.close_xlsx_file(xlsx_file)
+
+    local filepath = "path/to/some_file.xlsx"
+    local xlsx_file = xlsxreader.open_xlsx_file(filepath)
+    dfhack.with_finalize(
+        function () xlsxreader.close_xlsx_file(xlsx_file) end,
+        function ()
+            for _, sheet_name in ipairs(xlsxreader.list_sheets(xlsx_file)) do
+                dump_sheet(xlsx_file, sheet_name)
+            end
+        end
+    )
 
 --]]
 

From a2279cc9a72b567812856f6e606bba38c55e6c2f Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 10 Aug 2020 14:37:59 -0700
Subject: [PATCH 301/547] update docs in Lua API.rst too

---
 docs/Lua API.rst | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index e66989e35..45eeca78e 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4119,19 +4119,31 @@ following API methods:
 
     local xlsxreader = require('plugins.xlsxreader')
 
-    local filepath = "path/to/some_file.xlsx"
-    local xlsx_file = xlsxreader.open_xlsx_file(filepath)
-    for _, sheet_name in ipairs(xlsxreader.list_sheets(xlsx_file)) do
+    local function dump_sheet(xlsx_file, sheet_name)
         print('reading sheet: '..sheet_name)
         local xlsx_sheet = xlsxreader.open_sheet(xlsx_file, sheet_name)
-        local row_cells = xlsxreader.get_row(xlsx_sheet)
-        while row_cells do
-            printall(row_cells)
-            row_cells = xlsxreader.get_row(xlsx_sheet)
-        end
-        xlsxreader.close_sheet(xlsx_sheet)
+        dfhack.with_finalize(
+            function () xlsxreader.close_sheet(xlsx_sheet) end,
+            function ()
+                local row_cells = xlsxreader.get_row(xlsx_sheet)
+                while row_cells do
+                    printall(row_cells)
+                    row_cells = xlsxreader.get_row(xlsx_sheet)
+                end
+            end
+        )
     end
-    xlsxreader.close_xlsx_file(xlsx_file)
+
+    local filepath = "path/to/some_file.xlsx"
+    local xlsx_file = xlsxreader.open_xlsx_file(filepath)
+    dfhack.with_finalize(
+        function () xlsxreader.close_xlsx_file(xlsx_file) end,
+        function ()
+            for _, sheet_name in ipairs(xlsxreader.list_sheets(xlsx_file)) do
+                dump_sheet(xlsx_file, sheet_name)
+            end
+        end
+    )
 
 =======
 Scripts

From 0d9614154f1f85e508549941a7519b59e21135bf Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 10 Aug 2020 23:04:05 -0700
Subject: [PATCH 302/547] don't turn a rst list into code

---
 docs/Plugins.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index 9b5569e62..e98e46073 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -2939,7 +2939,7 @@ Lua API
 =======
 
 Some plugins consist solely of native libraries exposed to Lua. They are listed
-in the `lua-api` file under `lua-plugins`::
+in the `lua-api` file under `lua-plugins`:
 
 * `eventful`
 * `building-hacks`

From 438d264b3154cb95fbf6c66d0146202b8347016c Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 10 Aug 2020 23:09:03 -0700
Subject: [PATCH 303/547] use separate identity classes for each handle type

---
 plugins/xlsxreader.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/plugins/xlsxreader.cpp b/plugins/xlsxreader.cpp
index 02b83127d..58321705d 100644
--- a/plugins/xlsxreader.cpp
+++ b/plugins/xlsxreader.cpp
@@ -48,25 +48,32 @@ using namespace DFHack;
 
 DFHACK_PLUGIN("xlsxreader");
 
-struct handle_identity : public compound_identity {
-    handle_identity(): compound_identity(0, nullptr, nullptr, "handle") {};
+struct xlsx_file_handle_identity : public compound_identity {
+    xlsx_file_handle_identity()
+        :compound_identity(0, nullptr, nullptr, "handle") {};
+    DFHack::identity_type type() override { return IDTYPE_OPAQUE; }
+};
+
+struct xlsx_sheet_handle_identity : public compound_identity {
+    xlsx_sheet_handle_identity()
+        :compound_identity(0, nullptr, nullptr, "handle") {};
     DFHack::identity_type type() override { return IDTYPE_OPAQUE; }
 };
 
 struct xlsx_file_handle {
     const xlsxioreader handle;
     xlsx_file_handle(xlsxioreader handle): handle(handle) {}
-    static handle_identity _identity;
+    static xlsx_file_handle_identity _identity;
 };
 
 struct xlsx_sheet_handle {
     const xlsxioreadersheet handle;
     xlsx_sheet_handle(xlsxioreadersheet handle): handle(handle) {}
-    static handle_identity _identity;
+    static xlsx_sheet_handle_identity _identity;
 };
 
-handle_identity xlsx_file_handle::_identity;
-handle_identity xlsx_sheet_handle::_identity;
+xlsx_file_handle_identity xlsx_file_handle::_identity;
+xlsx_sheet_handle_identity xlsx_sheet_handle::_identity;
 
 // returns NULL on error
 xlsx_file_handle* open_xlsx_file(std::string filename) {

From 1e9562bd76a83557ed4af7ac574e445f801366f8 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 10 Aug 2020 23:35:38 -0700
Subject: [PATCH 304/547] add target label for xlsxreader

---
 docs/Lua API.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 45eeca78e..5cecfb7f2 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4102,6 +4102,8 @@ Lua plugin classes
 - ``shuffle()``: shuffles the sequence of numbers
 - ``next()``: returns next number in the sequence
 
+.. _xlsxreader:
+
 xlsxreader
 ==========
 

From c6f9eb519a166c49d6bb37aecf3948689a71788f Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 11 Aug 2020 13:44:07 -0700
Subject: [PATCH 305/547] remove outdated example code in xlsxreader.cpp

there is already good example code in Lua API.rst and in xlsxreader.lua,
so just remove this one
---
 plugins/xlsxreader.cpp | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/plugins/xlsxreader.cpp b/plugins/xlsxreader.cpp
index 58321705d..560d3cc2e 100644
--- a/plugins/xlsxreader.cpp
+++ b/plugins/xlsxreader.cpp
@@ -1,40 +1,5 @@
 /*
  * Wrapper for xlsxio_read library functions.
- *
- * Sample usage:
- *
- *  std::string filename = "sample_file.xlsx";
- *  xlsxioreader xlsxfile = XlsxReader::open_xlsx_file(filename);
- *  if (xlsxfile == NULL) {
- *      printf("cannot open file: '%s'", filename.c_str());
- *      return false;
- *  }
- *  auto sheetNames = XlsxReader::list_sheets(xlsxfile);
- *  for (auto sheetName = sheetNames.begin();
- *       sheetName != sheetNames.end();
- *       ++sheetName) {
- *      printf("reading sheet: %s\n", sheetName->c_str());
- *      xlsxioreadersheet xlsxsheet =
- *              XlsxReader::open_sheet(xlsxfile, *sheetName);
- *      if (xlsxsheet == NULL) {
- *          printf("cannot open sheet: '%s'", sheetName->c_str());
- *          continue;
- *      }
- *      std::string value;
- *      int row_num = 1;
- *      while (XlsxReader::GetNextRow(xlsxsheet)) {
- *          std::string s;
- *          printf("%d:\t", row_num);
- *          while (XlsxReader::GetNextCell(xlsxsheet, s)) {
- *              printf("%s\t", s.c_str());
- *          }
- *          printf("\n");
- *          ++row_num;
- *      }
- *      XlsxReader::close_sheet(xlsxsheet);
- *  }
- *  XlsxReader::close_xlsx_file(xlsxfile);
- *  return true;
  */
 
 #define BUILD_XLSXIO_STATIC

From cfc736caa1d627c800cee49221d30945bfc8567d Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 11 Aug 2020 14:18:09 -0700
Subject: [PATCH 306/547] give the identity classes distinctive name fields

both would have been represented as "handle" to Lua
---
 plugins/xlsxreader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/xlsxreader.cpp b/plugins/xlsxreader.cpp
index 560d3cc2e..d8e6264f7 100644
--- a/plugins/xlsxreader.cpp
+++ b/plugins/xlsxreader.cpp
@@ -15,13 +15,13 @@ DFHACK_PLUGIN("xlsxreader");
 
 struct xlsx_file_handle_identity : public compound_identity {
     xlsx_file_handle_identity()
-        :compound_identity(0, nullptr, nullptr, "handle") {};
+        :compound_identity(0, nullptr, nullptr, "xlsx_file_handle") {};
     DFHack::identity_type type() override { return IDTYPE_OPAQUE; }
 };
 
 struct xlsx_sheet_handle_identity : public compound_identity {
     xlsx_sheet_handle_identity()
-        :compound_identity(0, nullptr, nullptr, "handle") {};
+        :compound_identity(0, nullptr, nullptr, "xlsx_sheet_handle") {};
     DFHack::identity_type type() override { return IDTYPE_OPAQUE; }
 };
 

From 0bda289b1769429fa17e12862626502498440529 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 11 Aug 2020 14:51:17 -0700
Subject: [PATCH 307/547] move xlsxreader identity statics to dfhack lib

---
 library/CMakeLists.txt          |  3 +++
 library/PluginStatics.cpp       |  9 +++++++++
 library/include/PluginStatics.h | 34 +++++++++++++++++++++++++++++++++
 plugins/xlsxreader.cpp          | 28 +--------------------------
 4 files changed, 47 insertions(+), 27 deletions(-)
 create mode 100644 library/PluginStatics.cpp
 create mode 100644 library/include/PluginStatics.h

diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 2de293e15..b551c03f9 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -40,6 +40,8 @@ set(MAIN_HEADERS
     include/Module.h
     include/Pragma.h
     include/MemAccess.h
+    include/PluginManager.h
+    include/PluginStatics.h
     include/Signal.hpp
     include/TileTypes.h
     include/Types.h
@@ -72,6 +74,7 @@ set(MAIN_SOURCES
     MiscUtils.cpp
     Types.cpp
     PluginManager.cpp
+    PluginStatics.cpp
     TileTypes.cpp
     VersionInfoFactory.cpp
     RemoteClient.cpp
diff --git a/library/PluginStatics.cpp b/library/PluginStatics.cpp
new file mode 100644
index 000000000..d5abdb840
--- /dev/null
+++ b/library/PluginStatics.cpp
@@ -0,0 +1,9 @@
+#include "PluginStatics.h"
+
+namespace DFHack {
+
+// xlsxreader statics
+DFHACK_EXPORT xlsx_file_handle_identity xlsx_file_handle::_identity;
+DFHACK_EXPORT xlsx_sheet_handle_identity xlsx_sheet_handle::_identity;
+
+}
diff --git a/library/include/PluginStatics.h b/library/include/PluginStatics.h
new file mode 100644
index 000000000..b5ca4b468
--- /dev/null
+++ b/library/include/PluginStatics.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "DataIdentity.h"
+
+namespace DFHack {
+
+// xlsxreader definitions
+struct xlsx_file_handle_identity : public compound_identity {
+    xlsx_file_handle_identity()
+        :compound_identity(0, nullptr, nullptr, "xlsx_file_handle") {};
+    DFHack::identity_type type() override { return IDTYPE_OPAQUE; }
+};
+
+struct xlsx_sheet_handle_identity : public compound_identity {
+    xlsx_sheet_handle_identity()
+        :compound_identity(0, nullptr, nullptr, "xlsx_sheet_handle") {};
+    DFHack::identity_type type() override { return IDTYPE_OPAQUE; }
+};
+
+struct xlsx_file_handle {
+    typedef struct xlsxio_read_struct* xlsxioreader;
+    const xlsxioreader handle;
+    xlsx_file_handle(xlsxioreader handle): handle(handle) {}
+    static xlsx_file_handle_identity _identity;
+};
+
+struct xlsx_sheet_handle {
+    typedef struct xlsxio_read_sheet_struct* xlsxioreadersheet;
+    const xlsxioreadersheet handle;
+    xlsx_sheet_handle(xlsxioreadersheet handle): handle(handle) {}
+    static xlsx_sheet_handle_identity _identity;
+};
+
+}
diff --git a/plugins/xlsxreader.cpp b/plugins/xlsxreader.cpp
index d8e6264f7..6f76f5e97 100644
--- a/plugins/xlsxreader.cpp
+++ b/plugins/xlsxreader.cpp
@@ -8,38 +8,12 @@
 #include "DataFuncs.h"
 #include "LuaTools.h"
 #include "PluginManager.h"
+#include "PluginStatics.h"
 
 using namespace DFHack;
 
 DFHACK_PLUGIN("xlsxreader");
 
-struct xlsx_file_handle_identity : public compound_identity {
-    xlsx_file_handle_identity()
-        :compound_identity(0, nullptr, nullptr, "xlsx_file_handle") {};
-    DFHack::identity_type type() override { return IDTYPE_OPAQUE; }
-};
-
-struct xlsx_sheet_handle_identity : public compound_identity {
-    xlsx_sheet_handle_identity()
-        :compound_identity(0, nullptr, nullptr, "xlsx_sheet_handle") {};
-    DFHack::identity_type type() override { return IDTYPE_OPAQUE; }
-};
-
-struct xlsx_file_handle {
-    const xlsxioreader handle;
-    xlsx_file_handle(xlsxioreader handle): handle(handle) {}
-    static xlsx_file_handle_identity _identity;
-};
-
-struct xlsx_sheet_handle {
-    const xlsxioreadersheet handle;
-    xlsx_sheet_handle(xlsxioreadersheet handle): handle(handle) {}
-    static xlsx_sheet_handle_identity _identity;
-};
-
-xlsx_file_handle_identity xlsx_file_handle::_identity;
-xlsx_sheet_handle_identity xlsx_sheet_handle::_identity;
-
 // returns NULL on error
 xlsx_file_handle* open_xlsx_file(std::string filename) {
     return new xlsx_file_handle(xlsxioread_open(filename.c_str()));

From 4f88bb4c3d3f33e44990778d41d1167bacba39fd Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 11 Aug 2020 16:54:53 -0700
Subject: [PATCH 308/547] attempt to solve compilation error on windows

---
 library/include/PluginStatics.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/include/PluginStatics.h b/library/include/PluginStatics.h
index b5ca4b468..a88249eae 100644
--- a/library/include/PluginStatics.h
+++ b/library/include/PluginStatics.h
@@ -21,14 +21,14 @@ struct xlsx_file_handle {
     typedef struct xlsxio_read_struct* xlsxioreader;
     const xlsxioreader handle;
     xlsx_file_handle(xlsxioreader handle): handle(handle) {}
-    static xlsx_file_handle_identity _identity;
+    DFHACK_IMPORT static xlsx_file_handle_identity _identity;
 };
 
 struct xlsx_sheet_handle {
     typedef struct xlsxio_read_sheet_struct* xlsxioreadersheet;
     const xlsxioreadersheet handle;
     xlsx_sheet_handle(xlsxioreadersheet handle): handle(handle) {}
-    static xlsx_sheet_handle_identity _identity;
+    DFHACK_IMPORT static xlsx_sheet_handle_identity _identity;
 };
 
 }

From 39ae2d95fc78d547dd84002d77770a862b794ea1 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 11 Aug 2020 17:06:28 -0700
Subject: [PATCH 309/547] 2nd attempt to solve compilation errors on windows

---
 library/include/PluginStatics.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/library/include/PluginStatics.h b/library/include/PluginStatics.h
index a88249eae..d0835e90f 100644
--- a/library/include/PluginStatics.h
+++ b/library/include/PluginStatics.h
@@ -5,30 +5,30 @@
 namespace DFHack {
 
 // xlsxreader definitions
-struct xlsx_file_handle_identity : public compound_identity {
+struct DFHACK_EXPORT xlsx_file_handle_identity : public compound_identity {
     xlsx_file_handle_identity()
         :compound_identity(0, nullptr, nullptr, "xlsx_file_handle") {};
     DFHack::identity_type type() override { return IDTYPE_OPAQUE; }
 };
 
-struct xlsx_sheet_handle_identity : public compound_identity {
+struct DFHACK_EXPORT xlsx_sheet_handle_identity : public compound_identity {
     xlsx_sheet_handle_identity()
         :compound_identity(0, nullptr, nullptr, "xlsx_sheet_handle") {};
     DFHack::identity_type type() override { return IDTYPE_OPAQUE; }
 };
 
-struct xlsx_file_handle {
+struct DFHACK_EXPORT xlsx_file_handle {
     typedef struct xlsxio_read_struct* xlsxioreader;
     const xlsxioreader handle;
     xlsx_file_handle(xlsxioreader handle): handle(handle) {}
-    DFHACK_IMPORT static xlsx_file_handle_identity _identity;
+    static xlsx_file_handle_identity _identity;
 };
 
-struct xlsx_sheet_handle {
+struct DFHACK_EXPORT xlsx_sheet_handle {
     typedef struct xlsxio_read_sheet_struct* xlsxioreadersheet;
     const xlsxioreadersheet handle;
     xlsx_sheet_handle(xlsxioreadersheet handle): handle(handle) {}
-    DFHACK_IMPORT static xlsx_sheet_handle_identity _identity;
+    static xlsx_sheet_handle_identity _identity;
 };
 
 }

From bda678bcd4d1ca609b296bcf8effc6364ae88fa2 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 11 Aug 2020 19:47:04 -0700
Subject: [PATCH 310/547] add some explanatory text to the top of the header

---
 library/include/PluginStatics.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/library/include/PluginStatics.h b/library/include/PluginStatics.h
index d0835e90f..061fd3a21 100644
--- a/library/include/PluginStatics.h
+++ b/library/include/PluginStatics.h
@@ -1,3 +1,11 @@
+/*
+ * This file and the companion PluginStatics.cpp contain static structures used
+ * by DFHack plugins. Linking them here, into the dfhack library, instead of
+ * into the plugins themselves allows the plugins to be freely unloaded and
+ * reloaded without fear of causing cached references to static data becoming
+ * corrupted.
+ */
+
 #pragma once
 
 #include "DataIdentity.h"

From 0f9f64d13762c28029af04c871aa23f13b4ce3d5 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Wed, 12 Aug 2020 15:14:59 -0700
Subject: [PATCH 311/547] remove materials files and replace with settings

---
 data/quickfort/materials-common.txt   | 8 --------
 dfhack-config/quickfort/materials.txt | 9 ---------
 dfhack-config/quickfort/quickfort.txt | 6 ++++++
 3 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 data/quickfort/materials-common.txt
 delete mode 100644 dfhack-config/quickfort/materials.txt

diff --git a/data/quickfort/materials-common.txt b/data/quickfort/materials-common.txt
deleted file mode 100644
index 256d5deb8..000000000
--- a/data/quickfort/materials-common.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# quickfort materials common baseline configuration file
-#
-# Defines forbidden materials and material preferences for build blueprints.
-# Please DO NOT EDIT this file directly. Instead, custom materials preferences
-# should be added to dfhack-config/quickfort/materials.txt.
-#
-# Syntax TBD
-
diff --git a/dfhack-config/quickfort/materials.txt b/dfhack-config/quickfort/materials.txt
deleted file mode 100644
index 5938f16fe..000000000
--- a/dfhack-config/quickfort/materials.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# quickfort materials preference configuration file
-#
-# Defines forbidden materials and material preferences for build blueprints.
-# Settings in this file take precedence over any settings in the baseline
-# materials configuration file at hack/data/quickfort/materials-common.txt. See
-# that file to view the global defaults.
-#
-# Syntax TBD
-
diff --git a/dfhack-config/quickfort/quickfort.txt b/dfhack-config/quickfort/quickfort.txt
index 8a30124a1..575b7a804 100644
--- a/dfhack-config/quickfort/quickfort.txt
+++ b/dfhack-config/quickfort/quickfort.txt
@@ -11,6 +11,12 @@
 # path. If set to a relative path, resolves to a directory under the DF folder.
 blueprints_dir=blueprints
 
+# Force all blueprint buildings that could be built with any building material
+# to only use blocks. The prevents logs, boulders, and bars (e.g. potash and
+# coal) from being wasted on constructions. If set to false, buildings will be
+# built with any available building material.
+buildings_use_blocks=true
+
 # Set to "true" or "false". If true, will designate dig blueprints in marker
 # mode. If false, only cells with dig codes explicitly prefixed with an "m" will
 # be designated in marker mode.

From 42108a64b9e249a2e7d31cd5b3c9ebd706bc78fa Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Wed, 12 Aug 2020 15:12:53 -0700
Subject: [PATCH 312/547] expose basic buildingplan functionality to Lua

---
 plugins/CMakeLists.txt       |  2 +-
 plugins/buildingplan-lib.cpp |  5 -----
 plugins/buildingplan-lib.h   |  5 +++++
 plugins/buildingplan.cpp     | 22 ++++++++++++++++++++++
 plugins/lua/buildingplan.lua |  3 +++
 5 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 plugins/lua/buildingplan.lua

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 678b7eec2..aa2f70625 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -96,7 +96,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(blueprint blueprint.cpp LINK_LIBRARIES lua)
     dfhack_plugin(burrows burrows.cpp LINK_LIBRARIES lua)
     dfhack_plugin(building-hacks building-hacks.cpp LINK_LIBRARIES lua)
-    dfhack_plugin(buildingplan buildingplan.cpp LINK_LIBRARIES buildingplan-lib)
+    dfhack_plugin(buildingplan buildingplan.cpp LINK_LIBRARIES lua buildingplan-lib)
     dfhack_plugin(changeitem changeitem.cpp)
     dfhack_plugin(changelayer changelayer.cpp)
     dfhack_plugin(changevein changevein.cpp)
diff --git a/plugins/buildingplan-lib.cpp b/plugins/buildingplan-lib.cpp
index 0c29284db..e21c843aa 100644
--- a/plugins/buildingplan-lib.cpp
+++ b/plugins/buildingplan-lib.cpp
@@ -623,11 +623,6 @@ bool Planner::allocatePlannedBuilding(df::building_type type)
         return false;
     }
 
-    for (auto iter = newinst->jobs.begin(); iter != newinst->jobs.end(); iter++)
-    {
-        (*iter)->flags.bits.suspend = true;
-    }
-
     if (type == building_type::Door)
     {
         auto door = virtual_cast<df::building_doorst>(newinst);
diff --git a/plugins/buildingplan-lib.h b/plugins/buildingplan-lib.h
index 0d66e3248..d8d276a55 100644
--- a/plugins/buildingplan-lib.h
+++ b/plugins/buildingplan-lib.h
@@ -403,6 +403,11 @@ public:
 
     void addPlannedBuilding(df::building *bld)
     {
+        for (auto iter = bld->jobs.begin(); iter != bld->jobs.end(); iter++)
+        {
+            (*iter)->flags.bits.suspend = true;
+        }
+
         PlannedBuilding pb(bld, &default_item_filters[bld->getType()]);
         planned_buildings.push_back(pb);
     }
diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index c19eb02e9..c42aeac53 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -1,3 +1,4 @@
+#include "LuaTools.h"
 #include "buildingplan-lib.h"
 
 DFHACK_PLUGIN("buildingplan");
@@ -414,3 +415,24 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 
     return CR_OK;
 }
+
+// Lua API section
+
+static bool isPlannableBuilding(df::building_type type) {
+    return planner.isPlanableBuilding(type);
+}
+
+static void addPlannedBuilding(df::building *bld) {
+    planner.addPlannedBuilding(bld);
+}
+
+static void doCycle() {
+    planner.doCycle();
+}
+
+DFHACK_PLUGIN_LUA_FUNCTIONS {
+    DFHACK_LUA_FUNCTION(isPlannableBuilding),
+    DFHACK_LUA_FUNCTION(addPlannedBuilding),
+    DFHACK_LUA_FUNCTION(doCycle),
+    DFHACK_LUA_END
+};
diff --git a/plugins/lua/buildingplan.lua b/plugins/lua/buildingplan.lua
new file mode 100644
index 000000000..c1f86081c
--- /dev/null
+++ b/plugins/lua/buildingplan.lua
@@ -0,0 +1,3 @@
+local _ENV = mkmodule('plugins.buildingplan')
+
+return _ENV

From 26ce6fe199fa88b18b3463c6d71448f44f1f1b96 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 13 Aug 2020 00:51:34 -0700
Subject: [PATCH 313/547] document labels and multi-blueprint file formats

---
 data/blueprints/README.md | 70 +++++++++++++++++++++++++++++++--------
 1 file changed, 57 insertions(+), 13 deletions(-)

diff --git a/data/blueprints/README.md b/data/blueprints/README.md
index 6f11df32a..f54bbde97 100644
--- a/data/blueprints/README.md
+++ b/data/blueprints/README.md
@@ -13,7 +13,7 @@ The original idea and 1.0 codebase came from [Valdemar's](https://dwarffortressw
 
 This document focuses on DFHack Quickfort's capabilities and teaches players how to understand and build blueprint files.  Much of the text was originally written by Joel Thornton, reused here with his permission.
 
-For those just looking to apply blueprints, check out the [quickfort command syntax](https://docs.dfhack.org/en/stable/docs/_auto/base.html#quickfort) in the DFHack Scripts documentation. There are many ready-to-use blueprints available in the `blueprints/library` subfolder in your DFHack installation. Browse them on your computer or [online](https://github.com/DFHack/dfhack/tree/develop/data/blueprints/library), or run `quickfort list -l` at the `DFHack#` prompt to list them, and then `quickfort run` to apply them to your fort!
+For those just looking to apply blueprints, check out the [quickfort command syntax](https://docs.dfhack.org/en/stable/docs/_auto/base.html#quickfort) in the DFHack Scripts documentation. There are also many ready-to-use blueprints available in the `blueprints/library` subfolder in your DFHack installation. Browse them on your computer or [online](https://github.com/DFHack/dfhack/tree/develop/data/blueprints/library), or run `quickfort list -l` at the `DFHack#` prompt to list them, and then `quickfort run` to apply them to your fort!
 
 See the [Links section](#links) for more information and online resources.
 
@@ -25,7 +25,7 @@ Table of Contents
 * [Editing Blueprints](#editing-blueprints)
   * [Area expansion syntax](#area-expansion-syntax)
   * [Automatic area expansion](#automatic-area-expansion)
-  * [Specifying a starting position](#specifying-a-starting-position)
+  * [Blueprint labels and cursor offsets](#blueprint-labels-and-cursor-offsets)
   * [Multilevel blueprints](#multilevel-blueprints)
   * [Minecart tracks](#minecart-tracks)
 * [Packaging a set of blueprints](#packaging-a-set-of-blueprints)
@@ -40,6 +40,7 @@ Features
 * General
   * Manages complete blueprints to handle the four main phases of DF construction
   * Supports .csv and multi-worksheet .xlsx blueprint files
+  * Supports multiple blueprints per .csv file/spreadsheet sheet
   * Near-instant application, even for very large and complex blueprints
   * Blueprints can span multiple z-levels
   * Undo functionality for dig, build, and place blueprints
@@ -250,21 +251,28 @@ This style can be convenient for laying out multiple buildings of the same type.
 Quickfort will intelligently break large areas of the same designation into appropriately-sized chunks.
 
 
-Specifying a starting position
-------------------------------
+Blueprint labels and cursor offsets
+-----------------------------------
 
-You can optionally specify a cursor starting position for a particular blueprint, simplifying the task of blueprint alignment. This can be helpful for blueprints that are based on a central staircase, for example.
+The modeline has some additional components that we haven't talked about yet. You can give a blueprint a label by adding a `label()` marker and a cursor offset by adding a `start()` marker.
 
-To specify a cursor starting position, use the following modified format for the header line of your blueprint:
+Labels are displayed in the `quickfort list` output and are used for addressing specific blueprints when there are multiple blueprints in a single file or spreadsheet sheet (see [Packaging a set of blueprints](#packaging-a-set-of-blueprints) below). If a blueprint has no label, the label becomes the ordinal of the blueprint's position in the file or sheet. For example, the label of the first blueprint will be "1" if it is not otherwise set, the label of the second blueprint will be "2" if it is not otherwise set, etc. Labels that are explicitly defined must start with a letter to ensure the auto-generated labels don't conflict with user-defined labels.
 
-    #mode start(X;Y;STARTCOMMENT) comment
+Start positions specify a cursor offset for a particular blueprint, simplifying the task of blueprint alignment. This can be helpful for blueprints that are based on a central staircase, for example.
 
-where X and Y specify the starting cursor position (1;1 is the top left cell) and STARTCOMMENT (optional) is information about where to position the cursor. This information appears in the `quickfort list` output.
+The full modeline syntax is:
+
+    #mode label(mylabel) start(X;Y;STARTCOMMENT) comment
+
+where X and Y specify the starting cursor position (1;1 is the top left cell) and STARTCOMMENT (optional) is information about where to position the cursor. This information also appears in the `quickfort list` output.
+
+Note that all elements are optional except for the initial `#mode`, and, of course, if `label` is specified, there must be a label string, and if `start()` is specified, values for X and Y must be present.
 
 A couple examples:
 
     #dig start(3; 3; Center tile of a 5-tile square) Regular blueprint comment
-    #build start(10;15)
+    #build label(noblebedroom) start(10;15)
+    #query label(configstockpiles) No explicit start()  means cursor is at upper left corner
 
 
 Multilevel blueprints
@@ -408,18 +416,54 @@ Which would result in a carved track simliar to a constructed track of the form:
 Packaging a set of blueprints
 -----------------------------
 
-A complete QF specification for a section of your fortress may contain 4 or more separate blueprints, one for each "phase" of construction (dig, build, place stockpiles, query building adjustments).
+A complete specification for a section of your fortress may contain 4 or more separate blueprints, one for each "phase" of construction (dig, build, place stockpiles, query building adjustments).
+
+To manage all the separate blueprints, it is often convenient to keep related blueprints in a single file. For .xlsx spreadsheets, you can keep each blueprint in a separate sheet. Online spreadsheet applications like [Google Sheets](https://sheets.new) make it easy to work with multiple related blueprints, and, as a bonus, they retain any formatting you've set, like column sizes and coloring.
+
+For both .csv files and .xlsx spreadsheets you can also add as many blueprints as you want in a single file or sheet. Just add a modeline in the first column to indicate the start of a new blueprint. Instead of multiple .csv files, you can concatenate them into one single file.
+
+For example, you can store multiple blueprints together like this:
+
+    #dig label(digbed)
+    d d d d #
+    d d d d #
+    d d d d #
+    d d d d #
+    # # # # #
+    #build label(buildbed)
+    b   f h #
+            #
+            #
+    n       #
+    # # # # #
+    #place label(placebed)
+            #
+    f(2x2)  #
+            #
+            #
+    # # # # #
+    #query label(boozebed)
+            #
+    booze   #
+            #
+            #
+    # # # # #
+    #query label(roombed)
+    r{+ 3}& #
+            #
+            #
+            #
+    # # # # #
 
-To manage all the separate blueprints, it is often convenient to keep related blueprints in a single .xlsx file, with each blueprint in a separate sheet within the file. Online spreadsheet applications like [Google Sheets](https://sheets.new) make it easy to work with multiple related blueprints, and, as a bonus, they retain any formatting you've set, like column sizes and coloring.
 
-Of course, you could still choose to keep your blueprints in single-sheet .csv files and just give related blueprints similar names. The blueprint modes suggest a convenient naming scheme for .csv-based blueprint "stacks":
+Of course, you could still choose to keep your blueprints in single-sheet .csv files and just give related blueprints similar names:
 
     bedroom.1.dig.csv
     bedroom.2.build.csv
     bedroom.3.place.csv
     bedroom.4.query.csv
 
-But the naming is completely up to you, of course.
+But the naming and organization is completely up to you.
 
 
 Tips and Tricks

From 7fd7bd2fab5709713463875096fc9aa424cb90c7 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 13 Aug 2020 11:52:34 -0700
Subject: [PATCH 314/547] document meta blueprints and reorg sections

---
 data/blueprints/README.md | 185 ++++++++++++++++++++++++++++----------
 1 file changed, 140 insertions(+), 45 deletions(-)

diff --git a/data/blueprints/README.md b/data/blueprints/README.md
index f54bbde97..05f4c6926 100644
--- a/data/blueprints/README.md
+++ b/data/blueprints/README.md
@@ -25,10 +25,11 @@ Table of Contents
 * [Editing Blueprints](#editing-blueprints)
   * [Area expansion syntax](#area-expansion-syntax)
   * [Automatic area expansion](#automatic-area-expansion)
-  * [Blueprint labels and cursor offsets](#blueprint-labels-and-cursor-offsets)
-  * [Multilevel blueprints](#multilevel-blueprints)
   * [Minecart tracks](#minecart-tracks)
-* [Packaging a set of blueprints](#packaging-a-set-of-blueprints)
+  * [Multilevel blueprints](#multilevel-blueprints)
+  * [Blueprint labels and cursor offsets](#blueprint-labels-and-cursor-offsets)
+  * [Packaging a set of blueprints](#packaging-a-set-of-blueprints)
+  * [Meta blueprints](#meta-blueprints)
 * [Troubleshooting](#troubleshooting)
 * [Tips and tricks](#tips-and-tricks)
 * [Links](#links)
@@ -40,14 +41,15 @@ Features
 * General
   * Manages complete blueprints to handle the four main phases of DF construction
   * Supports .csv and multi-worksheet .xlsx blueprint files
-  * Supports multiple blueprints per .csv file/spreadsheet sheet
   * Near-instant application, even for very large and complex blueprints
+  * Supports multiple blueprints per .csv file/spreadsheet sheet
+  * "meta" blueprints that automate the application of sequences of blueprints
   * Blueprints can span multiple z-levels
   * Undo functionality for dig, build, and place blueprints
   * Automatic cropping of blueprints so you don't get errors if the blueprint extends off the map
   * Can generate manager orders for everything required to apply build blueprints
   * Library of ready-to-use blueprints included
-  * Verbose output mode for debugging blueprints
+  * Verbose output mode for debugging
 * Dig mode
   * Supports all types of designations, including dumping/forbidding items and setting traffic areas
   * Supports applying dig blueprints in marker mode
@@ -87,6 +89,8 @@ The keyword "dig" tells Quickfort we are going to be using the Designations menu
     place   Place stockpiles menu (p)
     query   Set building tasks/prefs menu (q)
 
+There are also "meta" blueprints, but we'll talk about those [later](#meta-blueprints).
+
 Optionally following this keyword and a space, you may enter a comment. This comment will appear in the output of `quickfort list` when run from the `DFHack#` prompt. You can use this space for explanations, attribution, etc.
 
 Below this line begin entering the keys you want sent in each cell. For example, we could dig out a 4x4 room like so (spaces are used as column separators here for clarity, but a real .csv file would have commas):
@@ -251,46 +255,6 @@ This style can be convenient for laying out multiple buildings of the same type.
 Quickfort will intelligently break large areas of the same designation into appropriately-sized chunks.
 
 
-Blueprint labels and cursor offsets
------------------------------------
-
-The modeline has some additional components that we haven't talked about yet. You can give a blueprint a label by adding a `label()` marker and a cursor offset by adding a `start()` marker.
-
-Labels are displayed in the `quickfort list` output and are used for addressing specific blueprints when there are multiple blueprints in a single file or spreadsheet sheet (see [Packaging a set of blueprints](#packaging-a-set-of-blueprints) below). If a blueprint has no label, the label becomes the ordinal of the blueprint's position in the file or sheet. For example, the label of the first blueprint will be "1" if it is not otherwise set, the label of the second blueprint will be "2" if it is not otherwise set, etc. Labels that are explicitly defined must start with a letter to ensure the auto-generated labels don't conflict with user-defined labels.
-
-Start positions specify a cursor offset for a particular blueprint, simplifying the task of blueprint alignment. This can be helpful for blueprints that are based on a central staircase, for example.
-
-The full modeline syntax is:
-
-    #mode label(mylabel) start(X;Y;STARTCOMMENT) comment
-
-where X and Y specify the starting cursor position (1;1 is the top left cell) and STARTCOMMENT (optional) is information about where to position the cursor. This information also appears in the `quickfort list` output.
-
-Note that all elements are optional except for the initial `#mode`, and, of course, if `label` is specified, there must be a label string, and if `start()` is specified, values for X and Y must be present.
-
-A couple examples:
-
-    #dig start(3; 3; Center tile of a 5-tile square) Regular blueprint comment
-    #build label(noblebedroom) start(10;15)
-    #query label(configstockpiles) No explicit start()  means cursor is at upper left corner
-
-
-Multilevel blueprints
----------------------
-
-Multilevel blueprints are accommodated by separating Z-levels of the blueprint with #> (go down one z-level) or #< (go up one z-level) at the end of each floor.
-
-    #dig Stairs leading down to a small room below
-    j  `  `  #
-    `  `  `  #
-    `  `  `  #
-    #> #  #  #
-    u  d  d  #
-    d  d  d  #
-    d  d  d  #
-    #  #  #  #
-
-
 Minecart tracks
 ---------------
 
@@ -413,6 +377,48 @@ Which would result in a carved track simliar to a constructed track of the form:
     #        #        #        #
 
 
+Multilevel blueprints
+---------------------
+
+Multilevel blueprints are accommodated by separating Z-levels of the blueprint with `#>` (go down one z-level) or `#<` (go up one z-level) at the end of each floor.
+
+    #dig Stairs leading down to a small room below
+    j  `  `  #
+    `  `  `  #
+    `  `  `  #
+    #> #  #  #
+    u  d  d  #
+    d  d  d  #
+    d  d  d  #
+    #  #  #  #
+
+The marker must appear in the first column of the row to be recognized, just like a modeline.
+
+
+Blueprint labels and cursor offsets
+-----------------------------------
+
+The modeline has some additional components that we haven't talked about yet. You can give a blueprint a label by adding a `label()` marker and a cursor offset by adding a `start()` marker.
+
+Labels are displayed in the `quickfort list` output and are used for addressing specific blueprints when there are multiple blueprints in a single file or spreadsheet sheet (see [Packaging a set of blueprints](#packaging-a-set-of-blueprints) below). If a blueprint has no label, the label becomes the ordinal of the blueprint's position in the file or sheet. For example, the label of the first blueprint will be "1" if it is not otherwise set, the label of the second blueprint will be "2" if it is not otherwise set, etc. Labels that are explicitly defined must start with a letter to ensure the auto-generated labels don't conflict with user-defined labels.
+
+Start positions specify a cursor offset for a particular blueprint, simplifying the task of blueprint alignment. This can be helpful for blueprints that are based on a central staircase, for example.
+
+The full modeline syntax is:
+
+    #mode label(mylabel) start(X;Y;STARTCOMMENT) comment
+
+where X and Y specify the starting cursor position (1;1 is the top left cell) and STARTCOMMENT (optional) is information about where to position the cursor. This information also appears in the `quickfort list` output.
+
+Note that all elements are optional except for the initial `#mode`, and, of course, if `label` is specified, there must be a label string, and if `start()` is specified, values for X and Y must be present.
+
+A couple examples:
+
+    #dig start(3; 3; Center tile of a 5-tile square) Regular blueprint comment
+    #build label(noblebedroom) start(10;15)
+    #query label(configstockpiles) No explicit start()  means cursor is at upper left corner
+
+
 Packaging a set of blueprints
 -----------------------------
 
@@ -466,6 +472,95 @@ Of course, you could still choose to keep your blueprints in single-sheet .csv f
 But the naming and organization is completely up to you.
 
 
+Meta blueprints
+---------------
+
+Meta blueprints are blueprints that script a series of other blueprints. Many blueprint packages follow this pattern:
+
+- Apply dig blueprint to designate dig areas
+- Wait for miners to dig
+- **Apply build buildprint** to designate buildings
+- **Apply place buildprint** to designate stockpiles
+- **Apply query blueprint** to configure stockpiles
+- Wait for buildings to get built
+- Apply a different query blueprint to configure rooms
+
+Those three "apply"s in the middle might as well get done in one command instead of three. A meta blueprint can encode that sequence. A meta blueprint refers to other blueprints by their label (see the [labels and offsets section](#blueprint-labels-and-cursor-offsets) above) in the same format used by the `DFHack#` quickfort command: "<sheet_name>/<label>", or just "/<label>" for blueprints in .csv files or blueprints in the same spreadsheet sheet as the #meta blueprint that references them.
+
+A few examples might make this clearer. Say you have a .csv file with the following blueprints defined:
+
+    #dig label(digbedroom)
+    ...
+    #build label(buildbedroom)
+    ...
+    #place label(placebedroom)
+    ...
+    #query label(querystockpilesbedroom)
+    ...
+    #query label(makeroombedroom)
+    ...
+
+Note how I've given them all labels so we can address them safely. If I hadn't given them labels, they would receive default labels of "1", "2", "3", etc, but those labels would change if I ever add more blueprints at the top. This is not a problem if we're just running the blueprints from the `quickfort list` command, but meta blueprints need a label that isn't going to change over time.
+
+So let's add a meta blueprint to this file that will combine the middle three blueprints into one:
+
+    #meta plan bedroom: combines build, place, and stockpile config blueprints
+    /buildbedroom
+    /placebedroom
+    /querystockpilesbedroom
+
+Now your sequence is shortened to:
+
+- Apply dig blueprint to designate dig areas
+- Wait for miners to dig
+- **Apply meta buildprint** to build buildings and designate/configure stockpiles
+- Wait for buildings to get built
+- Apply the final query blueprint to configure the room
+
+You can use meta blueprints to lay out your fortress at a larger scale as well. The `#<` and `#>` notation is valid in meta blueprints, so you can, for example, store the dig blueprints for all the levels of your fortress in different sheets in a spreadsheet, and then use a meta blueprint to designate your entire fortress for digging at once. For example, say you have a spreadsheet with the following layout:
+
+Sheet name    | contents
+----------    | --------
+dig_farming   | one #dig blueprint, no label
+dig_industry  | one #dig blueprint, no label
+dig_dining    | four #dig blueprints, with labels "main", "basement", "waterway", and "cistern"
+dig_guildhall | one #dig blueprint, no label
+dig_suites    | one #dig blueprint, no label
+dig_bedrooms  | one #dig blueprint, no label
+
+We can add a sheet named "dig_all" with the following contents (we're expecting a big fort, so we're planning for a lot of bedrooms):
+
+    #meta dig the whole fortress (remember to set force_marker_mode to true)
+    dig_farming/1
+    #>
+    dig_industry/1
+    #>
+    #>
+    dig_dining/main
+    #>
+    dig_dining/basement
+    #>
+    dig_dining/waterway
+    #>
+    dig_dining/cistern
+    #>
+    dig_guildhall/1
+    #>
+    dig_suites/1
+    #>
+    dig_bedrooms/1
+    #>
+    dig_bedrooms/1
+    #>
+    dig_bedrooms/1
+    #>
+    dig_bedrooms/1
+    #>
+    dig_bedrooms/1
+
+Note that for blueprints without an explicit label, we still need to address them by their auto-generated numerical label.
+
+
 Tips and Tricks
 ---------------
 

From 2dc1f1ad3be6082b9eb007312c687346f89371c3 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 13 Aug 2020 21:10:28 -0700
Subject: [PATCH 315/547] document the hidden() modeline marker

---
 data/blueprints/README.md | 48 +++++++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/data/blueprints/README.md b/data/blueprints/README.md
index 05f4c6926..ba561b4b8 100644
--- a/data/blueprints/README.md
+++ b/data/blueprints/README.md
@@ -27,7 +27,7 @@ Table of Contents
   * [Automatic area expansion](#automatic-area-expansion)
   * [Minecart tracks](#minecart-tracks)
   * [Multilevel blueprints](#multilevel-blueprints)
-  * [Blueprint labels and cursor offsets](#blueprint-labels-and-cursor-offsets)
+  * [Modeline optional markers](modeline-optional-markers)
   * [Packaging a set of blueprints](#packaging-a-set-of-blueprints)
   * [Meta blueprints](#meta-blueprints)
 * [Troubleshooting](#troubleshooting)
@@ -395,28 +395,48 @@ Multilevel blueprints are accommodated by separating Z-levels of the blueprint w
 The marker must appear in the first column of the row to be recognized, just like a modeline.
 
 
-Blueprint labels and cursor offsets
------------------------------------
+Modeline optional markers
+-------------------------
 
-The modeline has some additional components that we haven't talked about yet. You can give a blueprint a label by adding a `label()` marker and a cursor offset by adding a `start()` marker.
+The modeline has some additional optional components that we haven't talked about yet. You can:
+
+* give a blueprint a label by adding a `label()` marker
+* set a cursor offset by adding a `start()` marker
+* hide a blueprint with a `hidden()` marker
+
+The full modeline syntax, when everything is specified, is:
+
+    #mode label(mylabel) start(X;Y;STARTCOMMENT) hidden() comment
+
+Note that all elements are optional except for the initial `#mode`. Here are a few examples of modelines with optional elements before we discuss them in more detail:
+
+    #dig start(3; 3; Center tile of a 5-tile square) Regular blueprint comment
+    #build label(noblebedroom) start(10;15)
+    #query label(configstockpiles) No explicit start()  means cursor is at upper left corner
+    #meta label(digwholefort)
+    #dig label(digdining) hidden() managed by the digwholefort meta blueprint
+
+### Blueprint labels ###
 
 Labels are displayed in the `quickfort list` output and are used for addressing specific blueprints when there are multiple blueprints in a single file or spreadsheet sheet (see [Packaging a set of blueprints](#packaging-a-set-of-blueprints) below). If a blueprint has no label, the label becomes the ordinal of the blueprint's position in the file or sheet. For example, the label of the first blueprint will be "1" if it is not otherwise set, the label of the second blueprint will be "2" if it is not otherwise set, etc. Labels that are explicitly defined must start with a letter to ensure the auto-generated labels don't conflict with user-defined labels.
 
-Start positions specify a cursor offset for a particular blueprint, simplifying the task of blueprint alignment. This can be helpful for blueprints that are based on a central staircase, for example.
+### Start positions ###
 
-The full modeline syntax is:
+Start positions specify a cursor offset for a particular blueprint, simplifying the task of blueprint alignment. This is very helpful for blueprints that are based on a central staircase, but it helps whenever a blueprint has an obvious "center". For example:
 
-    #mode label(mylabel) start(X;Y;STARTCOMMENT) comment
+    #build start(2;2;center of workshop) a mason workshop
+    wm wm wm #
+    wm wm wm #
+    wm wm wm #
+    #  #  #  #
 
-where X and Y specify the starting cursor position (1;1 is the top left cell) and STARTCOMMENT (optional) is information about where to position the cursor. This information also appears in the `quickfort list` output.
+will build the workshop *centered* on the cursor, not down and to the right of the cursor.
 
-Note that all elements are optional except for the initial `#mode`, and, of course, if `label` is specified, there must be a label string, and if `start()` is specified, values for X and Y must be present.
+The two numbers specify the column and row (or X and Y offset) where the cursor is expected to be when you apply the blueprint. Position 1;1 is the top left cell. The optional comment will show up in the `quickfort list` output and should contain information about where to position the cursor.
 
-A couple examples:
+### Hiding blueprints ###
 
-    #dig start(3; 3; Center tile of a 5-tile square) Regular blueprint comment
-    #build label(noblebedroom) start(10;15)
-    #query label(configstockpiles) No explicit start()  means cursor is at upper left corner
+A blueprint with a `hidden()` marker won't appear in `quickfort list` output unless the `--hidden` flag is specified. The primary reason for hiding a blueprint (rather than, say, deleting it or moving it out of the `blueprints/` folder) is if a blueprint is intended to be run as part of a larger sequence managed by a [meta blueprint](#meta-blueprints).
 
 
 Packaging a set of blueprints
@@ -485,7 +505,7 @@ Meta blueprints are blueprints that script a series of other blueprints. Many bl
 - Wait for buildings to get built
 - Apply a different query blueprint to configure rooms
 
-Those three "apply"s in the middle might as well get done in one command instead of three. A meta blueprint can encode that sequence. A meta blueprint refers to other blueprints by their label (see the [labels and offsets section](#blueprint-labels-and-cursor-offsets) above) in the same format used by the `DFHack#` quickfort command: "<sheet_name>/<label>", or just "/<label>" for blueprints in .csv files or blueprints in the same spreadsheet sheet as the #meta blueprint that references them.
+Those three "apply"s in the middle might as well get done in one command instead of three. A meta blueprint can encode that sequence. A meta blueprint refers to other blueprints by their label (see the [Modeline optional markers](modeline-optional-markers) section above) in the same format used by the `DFHack#` quickfort command: "<sheet_name>/<label>", or just "/<label>" for blueprints in .csv files or blueprints in the same spreadsheet sheet as the #meta blueprint that references them.
 
 A few examples might make this clearer. Say you have a .csv file with the following blueprints defined:
 

From ab63288097e688f1ec152d60a8f7b3737f77bc8f Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 13 Aug 2020 22:53:31 -0700
Subject: [PATCH 316/547] document zone mode; document current limitations

---
 data/blueprints/README.md | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/data/blueprints/README.md b/data/blueprints/README.md
index ba561b4b8..c48f5f05d 100644
--- a/data/blueprints/README.md
+++ b/data/blueprints/README.md
@@ -32,6 +32,7 @@ Table of Contents
   * [Meta blueprints](#meta-blueprints)
 * [Troubleshooting](#troubleshooting)
 * [Tips and tricks](#tips-and-tricks)
+* [Caveats and limitations](#caveats-and-limitations)
 * [Links](#links)
 
 
@@ -87,6 +88,7 @@ The keyword "dig" tells Quickfort we are going to be using the Designations menu
     dig     Designations menu (d)
     build   Build menu (b)
     place   Place stockpiles menu (p)
+    zone    Activity zones menu (i)
     query   Set building tasks/prefs menu (q)
 
 There are also "meta" blueprints, but we'll talk about those [later](#meta-blueprints).
@@ -581,7 +583,7 @@ We can add a sheet named "dig_all" with the following contents (we're expecting
 Note that for blueprints without an explicit label, we still need to address them by their auto-generated numerical label.
 
 
-Tips and Tricks
+Tips and tricks
 ---------------
 
 * During blueprint application, especially query blueprints, don't click the mouse on the DF window or type any keys. They can change the state of the game while the blueprint is being applied, resulting in strange errors.
@@ -591,6 +593,24 @@ Tips and Tricks
 * As of DF 0.34.x, it is no longer possible to build doors (d) at the same time that you build adjacent walls (Cw). Doors must now be built *after* walls are constructed for them to be next to. This does not affect the more common case where walls exist as a side-effect of having dug-out a room in a #dig blueprint.
 
 
+Caveats and limitations
+-----------------------
+
+* Buildings will be designated regardless of whether you have the required materials, but if materials are not available when the construction job is picked up by a dwarf, the buildings will be canceled and the designations will disappear. Until the buildingplan plugin can be extended to support all building types, you should use `quickfort orders` to pre-manufacture all the materials you need for a `#build`-mode blueprint before you apply it.
+
+* If you use the `jugs` alias in your `#query`-mode blueprints, be aware that there is no way to differentiate jugs from other types of tools in the game. Therefore, `jugs` stockpiles will also take nest boxes and other tools. The only workaround is not to have other tools lying around in your fort.
+
+* `#zone`-mode blueprints can currently only initialize zones with a single activity type.
+
+* Weapon traps and upright spear/spikes can currently only be built with a single weapon.
+
+* Pressure plates can be built, but they cannot be configured yet.
+
+* Building instruments, bookcases, display furniture, and offering places are not yet supported by DFHack.
+
+* This script is relatively new, and there are bound to be bugs! Please report them at the [DFHack issue tracker](https://github.com/DFHack/dfhack/issues) so they can be addressed.
+
+
 Links
 -----
 

From 3e114bb9446fced81c0b50e9b246a34676f90e11 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Fri, 14 Aug 2020 19:45:35 -0700
Subject: [PATCH 317/547] document manager order generation

---
 data/blueprints/README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/data/blueprints/README.md b/data/blueprints/README.md
index c48f5f05d..d9ab30080 100644
--- a/data/blueprints/README.md
+++ b/data/blueprints/README.md
@@ -32,6 +32,7 @@ Table of Contents
   * [Meta blueprints](#meta-blueprints)
 * [Troubleshooting](#troubleshooting)
 * [Tips and tricks](#tips-and-tricks)
+* [Generating manager orders](#generating-manager-orders)
 * [Caveats and limitations](#caveats-and-limitations)
 * [Links](#links)
 
@@ -583,6 +584,23 @@ We can add a sheet named "dig_all" with the following contents (we're expecting
 Note that for blueprints without an explicit label, we still need to address them by their auto-generated numerical label.
 
 
+Generating manager orders
+-------------------------
+
+Quickfort can generate manager orders to make sure you have the proper items in stock to apply a `build`-mode blueprint.
+
+Many items can be manufactured from different source materials. Orders will always choose rock when it can, then wood, then cloth, then iron. You can always remove orders that don't make sense for your fort and manually enqueue a similar order more to your liking. For example, if you want silk ropes instead of cloth ropes, make a new manager order for silk ropes and then remove the generated cloth rope order.
+
+Anything that requires generic building materials (workshops, constructions, etc.) will result in an order for a rock block. One "Make rock blocks" job produces four blocks per input boulder, so the number of jobs ordered will be the number of blocks you need divided by four (rounded up). You might end up with a few extra blocks, but not too many.
+
+If you want your constructions to be in a consistent color, be sure to choose a rock type for all of your 'Make rock blocks' orders by selecting the order and hitting `d`. You might want to set the rock type for other non-block orders to something different if you fear running out of the type of rock that you want to use for blocks.
+
+There are a few building types that will generate extra manager orders for related materials:
+
+- Track stops will generate an order for a minecart
+- Traction benches will generate orders for a table, mechanism, and rope
+
+
 Tips and tricks
 ---------------
 

From eeed2381d07037041d93ade6fb7f1d53fac9951a Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Fri, 14 Aug 2020 21:14:15 -0700
Subject: [PATCH 318/547] mention zones as one of the major phases

---
 data/blueprints/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/blueprints/README.md b/data/blueprints/README.md
index d9ab30080..2018dd4c6 100644
--- a/data/blueprints/README.md
+++ b/data/blueprints/README.md
@@ -445,7 +445,7 @@ A blueprint with a `hidden()` marker won't appear in `quickfort list` output unl
 Packaging a set of blueprints
 -----------------------------
 
-A complete specification for a section of your fortress may contain 4 or more separate blueprints, one for each "phase" of construction (dig, build, place stockpiles, query building adjustments).
+A complete specification for a section of your fortress may contain 5 or more separate blueprints, one for each "phase" of construction (dig, build, place stockpiles, designate zones, query building adjustments).
 
 To manage all the separate blueprints, it is often convenient to keep related blueprints in a single file. For .xlsx spreadsheets, you can keep each blueprint in a separate sheet. Online spreadsheet applications like [Google Sheets](https://sheets.new) make it easy to work with multiple related blueprints, and, as a bonus, they retain any formatting you've set, like column sizes and coloring.
 

From a8f215fcfe1fb2e51ade00508c2336a526922299 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Fri, 14 Aug 2020 21:14:50 -0700
Subject: [PATCH 319/547] remove '+' as a special key. it's too useful.

plus, the original quickfort doesn't seem to have generally treated it
as {Shift}. it was special-cased when it preceded {Enter}, which we
don't need to do.
---
 dfhack-config/quickfort/aliases.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dfhack-config/quickfort/aliases.txt b/dfhack-config/quickfort/aliases.txt
index 05f2833f5..c2de28897 100644
--- a/dfhack-config/quickfort/aliases.txt
+++ b/dfhack-config/quickfort/aliases.txt
@@ -73,11 +73,10 @@
 # brackets:
 #   &   expands to {Enter}
 #   @   expands to {Shift}{Enter}
-#   +   expands to {Shift}
 #   ~   expands to {Alt}
 #   !   expands to {Ctrl}
 #   ^   expands to {ESC}
 #
 # If you need literal verisons of the shorthand characters, surround them in
-# curly brackets, for example: "{+}"
+# curly brackets, for example: "{~}"
 #

From 861c34a4741df4a768dfaaea67bca123502280a1 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Fri, 14 Aug 2020 21:27:16 -0700
Subject: [PATCH 320/547] document the message() marker

---
 data/blueprints/README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/data/blueprints/README.md b/data/blueprints/README.md
index 2018dd4c6..b1be8fc59 100644
--- a/data/blueprints/README.md
+++ b/data/blueprints/README.md
@@ -406,10 +406,11 @@ The modeline has some additional optional components that we haven't talked abou
 * give a blueprint a label by adding a `label()` marker
 * set a cursor offset by adding a `start()` marker
 * hide a blueprint with a `hidden()` marker
+* register a message to be displayed after the blueprint is successfully applied
 
 The full modeline syntax, when everything is specified, is:
 
-    #mode label(mylabel) start(X;Y;STARTCOMMENT) hidden() comment
+    #mode label(mylabel) start(X;Y;STARTCOMMENT) hidden() message(mymessage) comment
 
 Note that all elements are optional except for the initial `#mode`. Here are a few examples of modelines with optional elements before we discuss them in more detail:
 
@@ -418,6 +419,7 @@ Note that all elements are optional except for the initial `#mode`. Here are a f
     #query label(configstockpiles) No explicit start()  means cursor is at upper left corner
     #meta label(digwholefort)
     #dig label(digdining) hidden() managed by the digwholefort meta blueprint
+    #zone label(pastures) message(remember to assign animals to the new pastures)
 
 ### Blueprint labels ###
 
@@ -441,6 +443,10 @@ The two numbers specify the column and row (or X and Y offset) where the cursor
 
 A blueprint with a `hidden()` marker won't appear in `quickfort list` output unless the `--hidden` flag is specified. The primary reason for hiding a blueprint (rather than, say, deleting it or moving it out of the `blueprints/` folder) is if a blueprint is intended to be run as part of a larger sequence managed by a [meta blueprint](#meta-blueprints).
 
+### Messages ###
+
+A blueprint with a `message()` marker will display a message after the blueprint is applied. This is useful for reminding players to take manual steps that cannot be automated, like assigning animals to a pasture or assigning minecarts to a route.
+
 
 Packaging a set of blueprints
 -----------------------------

From 9e3160315791095eee3493f54304e41bfedcce71 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 15 Aug 2020 07:55:16 -0700
Subject: [PATCH 321/547] document multi-init for stockpiles and zones

---
 data/blueprints/README.md | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/data/blueprints/README.md b/data/blueprints/README.md
index b1be8fc59..33cf78aba 100644
--- a/data/blueprints/README.md
+++ b/data/blueprints/README.md
@@ -258,6 +258,24 @@ This style can be convenient for laying out multiple buildings of the same type.
 Quickfort will intelligently break large areas of the same designation into appropriately-sized chunks.
 
 
+Stockpiles and zones
+--------------------
+
+It is very common to have stockpiles that accept multiple categories of items or zones that permit more than one activity. Although it is perfectly valid to declare a single-purpose stockpile or zone and then modify it with a `#query` blueprint, quickfort also supports directly declaring all the types on the `#place` and `#zone`blueprints. For example, to declare a 10x10 area that is a pasture, a fruit picking area, and a meeting area all at once, you could write:
+
+    #zone main pasture and picnic area
+    nmg(10x10) #
+
+And similarly, to declare a stockpile that accepts both corpses and refuse, you could write:
+
+    #place refuse heap
+    yr(20x10) #
+
+The order of the individual letters doesn't matter.
+
+Note that while this notation covers most use cases, tweaking low-level zone parameters, like hospital supply levels, must still be done with a `#query` blueprint.
+
+
 Minecart tracks
 ---------------
 
@@ -589,6 +607,8 @@ We can add a sheet named "dig_all" with the following contents (we're expecting
 
 Note that for blueprints without an explicit label, we still need to address them by their auto-generated numerical label.
 
+You can then hide the blueprints that you now manage with the `meta`-mode blueprint from `quickfort list` by adding a `hidden()` marker to their modelines. That way the output of `quickfort list` won't be cluttered by blueprints that you don't need to run directly. If you ever *do* need to access the managed blueprints individually, you can still see them with `quickfort list --hidden`.
+
 
 Generating manager orders
 -------------------------
@@ -624,8 +644,6 @@ Caveats and limitations
 
 * If you use the `jugs` alias in your `#query`-mode blueprints, be aware that there is no way to differentiate jugs from other types of tools in the game. Therefore, `jugs` stockpiles will also take nest boxes and other tools. The only workaround is not to have other tools lying around in your fort.
 
-* `#zone`-mode blueprints can currently only initialize zones with a single activity type.
-
 * Weapon traps and upright spear/spikes can currently only be built with a single weapon.
 
 * Pressure plates can be built, but they cannot be configured yet.

From 03b28f4e083e7f49a9e7734eb05cc74beebb32cb Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 15 Aug 2020 17:23:12 -0700
Subject: [PATCH 322/547] document inactive zones and extra lever mechanisms

---
 data/blueprints/README.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/data/blueprints/README.md b/data/blueprints/README.md
index 33cf78aba..2681e5607 100644
--- a/data/blueprints/README.md
+++ b/data/blueprints/README.md
@@ -25,6 +25,7 @@ Table of Contents
 * [Editing Blueprints](#editing-blueprints)
   * [Area expansion syntax](#area-expansion-syntax)
   * [Automatic area expansion](#automatic-area-expansion)
+  * [Stockpiles and zones](#stockpiles-and-zones)
   * [Minecart tracks](#minecart-tracks)
   * [Multilevel blueprints](#multilevel-blueprints)
   * [Modeline optional markers](modeline-optional-markers)
@@ -273,7 +274,12 @@ And similarly, to declare a stockpile that accepts both corpses and refuse, you
 
 The order of the individual letters doesn't matter.
 
-Note that while this notation covers most use cases, tweaking low-level zone parameters, like hospital supply levels, must still be done with a `#query` blueprint.
+To toggle the `active` flag for zones, add an `a` character to the string. For example, to create a *disabled* pit zone (that you later intend to turn into a pond and fill carefully to 3-depth water):
+
+    #zone disabled future pond zone
+    pa(1x3) #
+
+Note that while this notation covers most use cases, tweaking low-level zone parameters, like hospital supply levels or converting between pits and ponds, must still be done manually or with a `#query` blueprint.
 
 
 Minecart tracks
@@ -625,6 +631,7 @@ There are a few building types that will generate extra manager orders for relat
 
 - Track stops will generate an order for a minecart
 - Traction benches will generate orders for a table, mechanism, and rope
+- Levers will generate orders for two mechanisms for connecting the lever to a target, in addition to the mechanism required to build the lever itself
 
 
 Tips and tricks

From ae872e812fe6e50407eae4a6ce5368f9f373c76d Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 15 Aug 2020 17:24:12 -0700
Subject: [PATCH 323/547] properly detect valid tiles for civzones

---
 library/include/modules/Buildings.h |  4 +++-
 library/modules/Buildings.cpp       | 10 +++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/library/include/modules/Buildings.h b/library/include/modules/Buildings.h
index 50cbc898f..256e3b7e6 100644
--- a/library/include/modules/Buildings.h
+++ b/library/include/modules/Buildings.h
@@ -141,7 +141,9 @@ DFHACK_EXPORT bool getCorrectSize(df::coord2d &size, df::coord2d &center,
  */
 DFHACK_EXPORT bool checkFreeTiles(df::coord pos, df::coord2d size,
                                   df::building_extents *ext = NULL,
-                                  bool create_ext = false, bool allow_occupied = false);
+                                  bool create_ext = false,
+                                  bool allow_occupied = false,
+                                  bool is_civzone = false);
 
 /**
  * Returns the number of tiles included by the extent, or defval.
diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp
index 5219395c1..3d708dc92 100644
--- a/library/modules/Buildings.cpp
+++ b/library/modules/Buildings.cpp
@@ -574,7 +574,9 @@ bool Buildings::getCorrectSize(df::coord2d &size, df::coord2d &center,
 
 bool Buildings::checkFreeTiles(df::coord pos, df::coord2d size,
                                df::building_extents *ext,
-                               bool create_ext, bool allow_occupied)
+                               bool create_ext,
+                               bool allow_occupied,
+                               bool is_civzone)
 {
     bool found_any = false;
 
@@ -609,7 +611,7 @@ bool Buildings::checkFreeTiles(df::coord pos, df::coord2d size,
             else
             {
                 auto tile = block->tiletype[btile.x][btile.y];
-                if (!HighPassable(tile))
+                if (!is_civzone && !HighPassable(tile))
                     allowed = false;
             }
 
@@ -659,7 +661,9 @@ static bool checkBuildingTiles(df::building *bld, bool can_change)
 
     return Buildings::checkFreeTiles(psize.first, psize.second, &bld->room,
                                      can_change && bld->isExtentShaped(),
-                                     !bld->isSettingOccupancy());
+                                     !bld->isSettingOccupancy(),
+                                     bld->getType() ==
+                                        df::building_type::Civzone);
 }
 
 int Buildings::countExtentTiles(df::building_extents *ext, int defval)

From dd3ff7252d39e1bf3376d7bf3f5610be5e58a05f Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 15 Aug 2020 17:26:38 -0700
Subject: [PATCH 324/547] document additional parameter to checkFreeTiles

---
 docs/Lua API.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 45ccd46a9..28b90f0d0 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -1617,11 +1617,12 @@ General
   using width and height for flexible dimensions.
   Returns *is_flexible, width, height, center_x, center_y*.
 
-* ``dfhack.buildings.checkFreeTiles(pos,size[,extents,change_extents,allow_occupied])``
+* ``dfhack.buildings.checkFreeTiles(pos,size[,extents,change_extents,allow_occupied,is_civzone])``
 
   Checks if the rectangle defined by ``pos`` and ``size``, and possibly extents,
   can be used for placing a building. If ``change_extents`` is true, bad tiles
   are removed from extents. If ``allow_occupied``, the occupancy test is skipped.
+  Set ``is_civzone`` to true if the building is a civzone (like an activity zone).
 
 * ``dfhack.buildings.countExtentTiles(extents,defval)``
 

From e546d3eec3758670d66d7bb1ab5d9cfa9f052a85 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 15 Aug 2020 20:13:48 -0700
Subject: [PATCH 325/547] rename is_civzone to the more general allow_wall

---
 docs/Lua API.rst                    | 5 +++--
 library/include/modules/Buildings.h | 2 +-
 library/modules/Buildings.cpp       | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 28b90f0d0..f9c6c1e60 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -1617,12 +1617,13 @@ General
   using width and height for flexible dimensions.
   Returns *is_flexible, width, height, center_x, center_y*.
 
-* ``dfhack.buildings.checkFreeTiles(pos,size[,extents,change_extents,allow_occupied,is_civzone])``
+* ``dfhack.buildings.checkFreeTiles(pos,size[,extents,change_extents,allow_occupied,allow_wall])``
 
   Checks if the rectangle defined by ``pos`` and ``size``, and possibly extents,
   can be used for placing a building. If ``change_extents`` is true, bad tiles
   are removed from extents. If ``allow_occupied``, the occupancy test is skipped.
-  Set ``is_civzone`` to true if the building is a civzone (like an activity zone).
+  Set ``allow_wall`` to true if the building is unhindered by walls (such as an
+  activity zone).
 
 * ``dfhack.buildings.countExtentTiles(extents,defval)``
 
diff --git a/library/include/modules/Buildings.h b/library/include/modules/Buildings.h
index 256e3b7e6..94bf75499 100644
--- a/library/include/modules/Buildings.h
+++ b/library/include/modules/Buildings.h
@@ -143,7 +143,7 @@ DFHACK_EXPORT bool checkFreeTiles(df::coord pos, df::coord2d size,
                                   df::building_extents *ext = NULL,
                                   bool create_ext = false,
                                   bool allow_occupied = false,
-                                  bool is_civzone = false);
+                                  bool allow_wall = false);
 
 /**
  * Returns the number of tiles included by the extent, or defval.
diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp
index 3d708dc92..976ade441 100644
--- a/library/modules/Buildings.cpp
+++ b/library/modules/Buildings.cpp
@@ -576,7 +576,7 @@ bool Buildings::checkFreeTiles(df::coord pos, df::coord2d size,
                                df::building_extents *ext,
                                bool create_ext,
                                bool allow_occupied,
-                               bool is_civzone)
+                               bool allow_wall)
 {
     bool found_any = false;
 
@@ -611,7 +611,7 @@ bool Buildings::checkFreeTiles(df::coord pos, df::coord2d size,
             else
             {
                 auto tile = block->tiletype[btile.x][btile.y];
-                if (!is_civzone && !HighPassable(tile))
+                if (!allow_wall && !HighPassable(tile))
                     allowed = false;
             }
 

From 1e068ef247af48f358bdc7c3bfbf7b17029bd295 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 15 Aug 2020 22:34:43 -0700
Subject: [PATCH 326/547] output useful error if new deps are not found

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd06587eb..83eca71af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,7 +178,7 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
 endif()
 
 # make sure all the necessary submodules have been set up
-if(NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl OR NOT EXISTS ${dfhack_SOURCE_DIR}/depends/clsocket/CMakeLists.txt)
+if(NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl OR NOT EXISTS ${dfhack_SOURCE_DIR}/depends/clsocket/CMakeLists.txt OR NOT EXISTS ${dfhack_SOURCE_DIR}/depends/libexpat/expat/CMakeLists.txt OR NOT EXISTS ${dfhack_SOURCE_DIR}/depends/libzip/CMakeLists.txt OR NOT EXISTS ${dfhack_SOURCE_DIR}/depends/xlsxio/CMakeLists.txt)
     message(SEND_ERROR "One or more required submodules could not be found! Run 'git submodule update --init' from the root DFHack directory. (See the section 'Getting the Code' in docs/Compile.rst)")
 endif()
 

From 4e331ce4ce200d34ef2b8353ab03e06751c70170 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 15 Aug 2020 22:35:20 -0700
Subject: [PATCH 327/547] much better NULL handling/detection for xlsxreader

---
 plugins/xlsxreader.cpp | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/plugins/xlsxreader.cpp b/plugins/xlsxreader.cpp
index 6f76f5e97..dd5355a6a 100644
--- a/plugins/xlsxreader.cpp
+++ b/plugins/xlsxreader.cpp
@@ -14,13 +14,18 @@ using namespace DFHack;
 
 DFHACK_PLUGIN("xlsxreader");
 
-// returns NULL on error
+// returns NULL if the file failed to open
 xlsx_file_handle* open_xlsx_file(std::string filename) {
-    return new xlsx_file_handle(xlsxioread_open(filename.c_str()));
+    xlsxioreader opaque_file_handle = xlsxioread_open(filename.c_str());
+    if (!opaque_file_handle) {
+        return NULL;
+    }
+    return new xlsx_file_handle(opaque_file_handle);
 }
 
 void close_xlsx_file(xlsx_file_handle *file_handle) {
     CHECK_NULL_POINTER(file_handle);
+    CHECK_NULL_POINTER(file_handle->handle);
     xlsxioread_close(file_handle->handle);
     delete(file_handle);
 }
@@ -29,13 +34,18 @@ void close_xlsx_file(xlsx_file_handle *file_handle) {
 xlsx_sheet_handle* open_sheet(xlsx_file_handle *file_handle,
                               std::string sheet_name) {
     CHECK_NULL_POINTER(file_handle);
-    return new xlsx_sheet_handle(
-        xlsxioread_sheet_open(file_handle->handle,
-                              sheet_name.c_str(), XLSXIOREAD_SKIP_NONE));
+    CHECK_NULL_POINTER(file_handle->handle);
+    xlsxioreadersheet opaque_sheet_handle = xlsxioread_sheet_open(
+        file_handle->handle, sheet_name.c_str(), XLSXIOREAD_SKIP_NONE);
+    if (!opaque_sheet_handle) {
+        return NULL;
+    }
+    return new xlsx_sheet_handle(opaque_sheet_handle);
 }
 
 void close_sheet(xlsx_sheet_handle *sheet_handle) {
     CHECK_NULL_POINTER(sheet_handle);
+    CHECK_NULL_POINTER(sheet_handle->handle);
     xlsxioread_sheet_close(sheet_handle->handle);
     delete(sheet_handle);
 }
@@ -78,6 +88,7 @@ static void * get_xlsxreader_handle(lua_State *L) {
 // takes a file handle and returns a table-list of sheet names
 int list_sheets(lua_State *L) {
     auto file_handle = (xlsx_file_handle *)get_xlsxreader_handle(L);
+    CHECK_NULL_POINTER(file_handle->handle);
     auto sheetNames = std::vector<std::string>();
     xlsxioread_list_sheets(file_handle->handle, list_callback, &sheetNames);
     Lua::PushVector(L, sheetNames, true);
@@ -88,6 +99,7 @@ int list_sheets(lua_State *L) {
 // already processed the last row in the file.
 int get_row(lua_State *L) {
     auto sheet_handle = (xlsx_sheet_handle *)get_xlsxreader_handle(L);
+    CHECK_NULL_POINTER(sheet_handle->handle);
     bool ok = get_next_row(sheet_handle);
     if (!ok) {
         lua_pushnil(L);

From e4a35514abf631665392328913a47a056cad744a Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 15 Aug 2020 23:03:49 -0700
Subject: [PATCH 328/547] document buildingplan Lua API

---
 docs/Lua API.rst             |  9 +++++++++
 plugins/lua/buildingplan.lua | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 45ccd46a9..a890489d9 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3607,6 +3607,15 @@ Native functions:
   ``start`` and ``end`` are tables containing positions (see
   ``xyz2pos``). ``name`` is used as the basis for the filename.
 
+buildingplan
+============
+
+Native functions:
+
+* ``bool isPlannableBuilding(df::building_type type)`` returns whether the building type is handled by buildingplan
+* ``void addPlannedBuilding(df::building *bld)`` suspends the building jobs and adds the building to the monitor list
+* ``void doCycle()`` runs a check for whether buildlings in the monitor list can be assigned items and unsuspended. This method runs automatically twice a game day, so you only need to call it directly if you want buildingplan to do a check right now.
+
 burrows
 =======
 
diff --git a/plugins/lua/buildingplan.lua b/plugins/lua/buildingplan.lua
index c1f86081c..071c07395 100644
--- a/plugins/lua/buildingplan.lua
+++ b/plugins/lua/buildingplan.lua
@@ -1,3 +1,13 @@
 local _ENV = mkmodule('plugins.buildingplan')
 
+--[[
+
+ Native functions:
+
+ * bool isPlannableBuilding(df::building_type type)
+ * void addPlannedBuilding(df::building *bld)
+ * void doCycle()
+
+--]]
+
 return _ENV

From 7a7aff77454b5775ceeade08bd24da8ec6fffe5c Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 15 Aug 2020 23:37:21 -0700
Subject: [PATCH 329/547] closing NULL pointers is ok

---
 plugins/xlsxreader.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/plugins/xlsxreader.cpp b/plugins/xlsxreader.cpp
index dd5355a6a..7f61d6ff5 100644
--- a/plugins/xlsxreader.cpp
+++ b/plugins/xlsxreader.cpp
@@ -24,9 +24,12 @@ xlsx_file_handle* open_xlsx_file(std::string filename) {
 }
 
 void close_xlsx_file(xlsx_file_handle *file_handle) {
-    CHECK_NULL_POINTER(file_handle);
-    CHECK_NULL_POINTER(file_handle->handle);
-    xlsxioread_close(file_handle->handle);
+    if (!file_handle) {
+        return;
+    }
+    if (file_handle->handle) {
+        xlsxioread_close(file_handle->handle);
+    }
     delete(file_handle);
 }
 
@@ -44,9 +47,12 @@ xlsx_sheet_handle* open_sheet(xlsx_file_handle *file_handle,
 }
 
 void close_sheet(xlsx_sheet_handle *sheet_handle) {
-    CHECK_NULL_POINTER(sheet_handle);
-    CHECK_NULL_POINTER(sheet_handle->handle);
-    xlsxioread_sheet_close(sheet_handle->handle);
+    if (!sheet_handle) {
+        return;
+    }
+    if (sheet_handle->handle) {
+        xlsxioread_sheet_close(sheet_handle->handle);
+    }
     delete(sheet_handle);
 }
 

From 4ac51535a054b76b5e06e5a3b82ae151638d158d Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 16 Aug 2020 11:55:42 -0700
Subject: [PATCH 330/547] userguide updates

---
 data/blueprints/README.md | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/data/blueprints/README.md b/data/blueprints/README.md
index 2681e5607..31c6a171f 100644
--- a/data/blueprints/README.md
+++ b/data/blueprints/README.md
@@ -428,7 +428,7 @@ Modeline optional markers
 The modeline has some additional optional components that we haven't talked about yet. You can:
 
 * give a blueprint a label by adding a `label()` marker
-* set a cursor offset by adding a `start()` marker
+* set a cursor offset and/or start hint by adding a `start()` marker
 * hide a blueprint with a `hidden()` marker
 * register a message to be displayed after the blueprint is successfully applied
 
@@ -441,7 +441,7 @@ Note that all elements are optional except for the initial `#mode`. Here are a f
     #dig start(3; 3; Center tile of a 5-tile square) Regular blueprint comment
     #build label(noblebedroom) start(10;15)
     #query label(configstockpiles) No explicit start()  means cursor is at upper left corner
-    #meta label(digwholefort)
+    #meta label(digwholefort) start(center of stairs on surface)
     #dig label(digdining) hidden() managed by the digwholefort meta blueprint
     #zone label(pastures) message(remember to assign animals to the new pastures)
 
@@ -453,7 +453,7 @@ Labels are displayed in the `quickfort list` output and are used for addressing
 
 Start positions specify a cursor offset for a particular blueprint, simplifying the task of blueprint alignment. This is very helpful for blueprints that are based on a central staircase, but it helps whenever a blueprint has an obvious "center". For example:
 
-    #build start(2;2;center of workshop) a mason workshop
+    #build start(2;2;center of workshop) label(masonw) a mason workshop
     wm wm wm #
     wm wm wm #
     wm wm wm #
@@ -461,7 +461,10 @@ Start positions specify a cursor offset for a particular blueprint, simplifying
 
 will build the workshop *centered* on the cursor, not down and to the right of the cursor.
 
-The two numbers specify the column and row (or X and Y offset) where the cursor is expected to be when you apply the blueprint. Position 1;1 is the top left cell. The optional comment will show up in the `quickfort list` output and should contain information about where to position the cursor.
+The two numbers specify the column and row (or X and Y offset) where the cursor is expected to be when you apply the blueprint. Position 1;1 is the top left cell. The optional comment will show up in the `quickfort list` output and should contain information about where to position the cursor. If the start position is 1;1, you can omit the numbers and just add a comment describing where to put the cursor. This is useful for meta blueprints that refer to other blueprints that have fully-specified start() markers. For example, a meta blueprint that refers to the `masonw` blueprint above could look like this:
+
+    #meta start(center of workshop) a mason workshop
+    /masonw
 
 ### Hiding blueprints ###
 
@@ -469,8 +472,10 @@ A blueprint with a `hidden()` marker won't appear in `quickfort list` output unl
 
 ### Messages ###
 
-A blueprint with a `message()` marker will display a message after the blueprint is applied. This is useful for reminding players to take manual steps that cannot be automated, like assigning animals to a pasture or assigning minecarts to a route.
+A blueprint with a `message()` marker will display a message after the blueprint is applied with `quickfort run`. This is useful for reminding players to take manual steps that cannot be automated, like assigning animals to a pasture or assigning minecarts to a route, or listing the next step in a series of blueprints. For long or multi-part messages, it is fine to embed newlines:
 
+    "#meta label(surface1) message(This would be a good time to start digging the industry level.
+    Once the area is clear, continue with /surface2.) clear the embark site and set up pastures"
 
 Packaging a set of blueprints
 -----------------------------
@@ -631,7 +636,8 @@ There are a few building types that will generate extra manager orders for relat
 
 - Track stops will generate an order for a minecart
 - Traction benches will generate orders for a table, mechanism, and rope
-- Levers will generate orders for two mechanisms for connecting the lever to a target, in addition to the mechanism required to build the lever itself
+- Levers will generate orders for extra two mechanisms for connecting the lever to a target
+- Cage traps will generate an order for a cage
 
 
 Tips and tricks
@@ -641,6 +647,8 @@ Tips and tricks
 
 * After digging out an area, you may wish to smooth and/or engrave the area before starting the build phase, as dwarves may be unable to access walls or floors that are behind/under built objects.
 
+* If you are designating more than one level for digging at a time, you can make your miners more efficient by using marker mode (`dM`) on all levels but one. This prevents your miners from digging out a few tiles on one level, then running down/up the stairs to do a few tiles on an adjacent level. With only one level "live" and all other levels in marker mode, your miners can concentrate on one level at a time. You just have to rememer to "unmark" a new level when your miners are done with their current one.
+
 * As of DF 0.34.x, it is no longer possible to build doors (d) at the same time that you build adjacent walls (Cw). Doors must now be built *after* walls are constructed for them to be next to. This does not affect the more common case where walls exist as a side-effect of having dug-out a room in a #dig blueprint.
 
 
@@ -651,6 +659,8 @@ Caveats and limitations
 
 * If you use the `jugs` alias in your `#query`-mode blueprints, be aware that there is no way to differentiate jugs from other types of tools in the game. Therefore, `jugs` stockpiles will also take nest boxes and other tools. The only workaround is not to have other tools lying around in your fort.
 
+* Likewise for bags. The game does not differentiate between empty and full bags, so you'll get gabs of gypsum power and sand in your bags stockpile unless you avoid collecting sand and are careful to assign all your gypsum to your hospital.
+
 * Weapon traps and upright spear/spikes can currently only be built with a single weapon.
 
 * Pressure plates can be built, but they cannot be configured yet.

From 860f07e99462ae337247327a19f510167ce7b34b Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 16 Aug 2020 12:42:16 -0700
Subject: [PATCH 331/547] define quickfort aliases to permit cages and traps

---
 data/quickfort/aliases-common.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt
index 09bb7e3f0..aeed190d6 100644
--- a/data/quickfort/aliases-common.txt
+++ b/data/quickfort/aliases-common.txt
@@ -69,14 +69,15 @@ animalsprefix:  s
 enableanimals:  {animalsprefix}e^
 disableanimals: {animalsprefix}d^
 
-# enables only the specified type (and disables everything else)
 cages: {animalsprefix}bu^
 traps: {animalsprefix}bj^
 
-# forbids specific items in an already-configured stockpile
 forbidcages: {animalsprefix}u^
 forbidtraps: {animalsprefix}j^
 
+permitcages: {forbidcages}
+permittraps: {forbidtraps}
+
 
 ##################################
 # food stockpile adjustments

From a1c731870d1b8c074c7f49d7d622d5285a72e0d8 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 16 Aug 2020 13:49:32 -0700
Subject: [PATCH 332/547] initial files for the quickfort blueprint library

---
 data/blueprints/library/dreamfort.csv         | 1927 +++++++++++++++++
 data/blueprints/library/examples/embark.csv   |   18 +
 .../examples/exploratory-mining-100x10.csv    |   12 +
 .../examples/exploratory-mining-50x50-alt.csv |   43 +
 .../examples/exploratory-mining-50x50.csv     |   43 +
 data/blueprints/library/square-dig.csv        |    4 -
 6 files changed, 2043 insertions(+), 4 deletions(-)
 create mode 100644 data/blueprints/library/dreamfort.csv
 create mode 100644 data/blueprints/library/examples/embark.csv
 create mode 100644 data/blueprints/library/examples/exploratory-mining-100x10.csv
 create mode 100644 data/blueprints/library/examples/exploratory-mining-50x50-alt.csv
 create mode 100644 data/blueprints/library/examples/exploratory-mining-50x50.csv
 delete mode 100644 data/blueprints/library/square-dig.csv

diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
new file mode 100644
index 000000000..796d948f1
--- /dev/null
+++ b/data/blueprints/library/dreamfort.csv
@@ -0,0 +1,1927 @@
+"#meta label(dreamfort_help) message(Welcome to the Dreamfort Walkthrough!
+It can be difficult applying a set of blueprints that you did not write yourself. This
+walkthrough will guide you through the high-level steps of building Dreamfort.
+
+The final fort will have a walled-in area on the surface for livestock, trading, and
+military. One z-level down is the farming level, with related workshops and vents up
+to the surface for miasma control.
+
+Beyond those two, the other layers can be built in any order, at any z-level
+according to your preference and the layout peculiarities of your embark site:
+ - The industry level has a compact, but complete set of workshops and stockpiles
+ - The services level has dining, hospital, and justice services, including a well
+     system. This level is 4 z-levels deep.
+ - The guildhall level has many rooms for buildling libraries, temples, and
+     guildhalls
+ - The suites level has fancy rooms for your nobles
+ - The apartments level(s) has small but well-furnished bedrooms for your other
+     dwarves
+
+Dreamfort has a central staircase-based design. Choose a tile for your staircase on
+the surface in a nice, flat area. For all blueprints, the cursor will start on this
+tile on the z-level where you want to apply the blueprint.
+
+Blueprints that require manual steps (like 'assign animals to pasture') will leave a
+message telling you so after you apply them. Blueprints will also leave messages with
+hints when you might want to run ""quickfort orders"" on specific blueprints to start
+manufacturing needed items.
+
+Directly after embark, apply /surface1 on a flat area on the surface and /industry1
+somewhere below (but not immediately below the surface -- that will be for the farming
+level). Work your way through the steps for those levels: apply /surface2 when
+/surface1 is done, /industry2 when /industry1 is done, etc. Once you channel out parts
+of the surface with /surface3, you can start the farming sequence with /farming1. You
+can start the services, guildhall, suites, and apartments sequences as your fort needs
+those levels.
+
+This .csv file is generated from source .xlsx files. If you want to look at how these
+blueprints are put together, including full lists of their features, it will be easier
+to look at the .xlsx files than this giant .csv. You can view them online at:
+  https://drive.google.com/drive/folders/1iS90EEVqUkxTeZiiukVj1pLloZqabKuP?usp=sharing
+You are welcome to copy those files and make your own modifications!
+) run me for help with dreamfort"
+"#dreamfort.csv is generated with the following command:
+  for fname in dreamfort*.xlsx; do xlsx2csv -a -E Notes -p '' $fname; done | sed 's/,*$//'"
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+""
+"#meta label(surface1) start(staircase center)
+message(This would be a good time to start digging the industry level.
+Once the area is clear, continue with /surface2.) clear an area and set up pastures"
+clear_small/surface_clear_small
+zones/surface_zones
+""
+"#meta label(surface2) start(staircase center) message(This would be a good time to queue manager orders for /surface4, /surface5, and /surface6. If you want a consistent color for your walls, remember to set the rock material for the manager orders for blocks.
+Once the whole area is clear, continue with /surface3.) set up starting workshops/stockpiles and clear a larger area. if you didn't bring blocks, temporarily turn off the buildings_use_blocks setting so you can use wood or boulders"
+build_start/surface_build_start
+place_start/surface_place_start
+query_start/surface_query_start
+clear/surface_clear
+pick/surface_pick
+""
+"#meta label(surface3) start(staircase center) message(Once the channels are dug out and you have around 650 blocks, continue with /surface4. You can also start digging out the sub-surface farming level once the channels are done.) channel to prevent miasma in the sub-surface level"
+dig/surface_channel
+""
+"#meta label(surface4) start(staircase center) message(Once floors and walls are built and you have completed the manager orders for /surface5, continue with /surface5.) cover up the holes with flooring and build walls"
+build_floors/surface_floors
+build_walls/surface_walls
+""
+"#meta label(surface5) start(staircase center) message(Once you have around 1,050 blocks, continue with /surface6) build gates, furniture, the trade depot, and traps"
+build_bridges/surface_gates
+build_buildings/surface_buildings
+""
+"#meta label(surface6) start(staircase center on ground level) message(The surface is secure! If you like, you can build a barracks in the empty entranceway room.) configure hives, build the roof"
+query_buildings/surface_query_buildings
+build_scaffolding/surface_scaffolding
+#<
+build_roof/surface_roof
+#dig label(surface_clear_small) start(23; 25) hidden() use the meta blueprints for normal application
+
+
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,j,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,,,,,,,,`,`,,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,`,`,,,,,,,,`,`
+,,,,,,,,,,,,,,,,,`,`,,,,,,,,`,`
+,,,,,,,,,,,,,,,,,`,`,,,,,,,,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,`,,,,,,,,`
+,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`
+
+
+
+#zone label(surface_zones) start(23; 25) hidden() message(remember to assign your dogs to the staircase pasture and your grazing animals to the large pasture) use the meta blueprints for normal application
+
+
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,gnm(31x17),,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),,,,,,,,n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),n(1x1),`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,`,n(5x5),,,,,`,t(12x5),,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,`,,,,,,`,,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,,,,,,,,`,`,,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,`,`,,,,,,,,`,`
+,,,,,,,,,,,,,,,,,`,`,,,,,,,,`,`
+,,,,,,,,,,,,,,,,,`,`,,,,,,,,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,`,,,,,,,,`
+,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`
+
+
+
+#build label(surface_build_start) start(23; 25) hidden() use the meta blueprints for normal application
+
+
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,D,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,wr,,,,wc,,,,wm,,,,wt,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),`,,,,,,`,,,,,,,,,,,,,`
+,,,,,,`,p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),,,`,`,`,,,,,,,,,,,,,,,`
+,,,,,,`,p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),`,,`,`,`,,`,,,,,,,,,,,,,`
+,,,,,,`,p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),,,`,`,`,,,,,,,,,,,,,,,`
+,,,,,,`,p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),p(1x1),`,,,,,,`,,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,,,,,,,,`,`,,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,`,`,,,,,,,,`,`
+,,,,,,,,,,,,,,,,,`,`,,,,,,,,`,`
+,,,,,,,,,,,,,,,,,`,`,,,,,,,,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,`,,,,,,,,`
+,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`
+
+
+
+#place label(surface_place_start) start(23; 25) hidden() use the meta blueprints for normal application
+
+
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,f(4x4),,,,w(4x4),,,,f(4x4),,,,,s(4x4),,,,gunbzSpd(4x4),,,,hl(4x4),,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,`,,,,,,`,a(12x5),,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,`,,,,,,`,,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,,,,,,,,`,`,,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,`,`,,,,,,,,`,`
+,,,,,,,,,,,,,,,,,`,`,,,,,,,,`,`
+,,,,,,,,,,,,,,,,,`,`,,,,,,,,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,`,,,,,,,,`
+,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`
+
+
+
+#query label(surface_query_start) start(23; 25) hidden() use the meta blueprints for normal application
+
+
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,forbidbooze,,,,,,,,booze,,,,,otherstone,,,,,,,,,,,,,,,`
+,,,,,,`,,,,nocontainers,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,`,,,,,,`,forbidcages,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,`,`,`,,,forbidtraps,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,`,,,,,,`,,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,,,,,,,,`,`,,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,`,`,,,,,,,,`,`
+,,,,,,,,,,,,,,,,,`,`,,,,,,,,`,`
+,,,,,,,,,,,,,,,,,`,`,,,,,,,,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,`,,,,,,,,`
+,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`
+
+
+
+#dig label(surface_clear) start(23; 25) hidden() use the meta blueprints for normal application
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,`,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t,t
+#dig label(surface_pick) start(23; 25) hidden() use the meta blueprints for normal application
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p
+#dig label(surface_channel) start(23; 25) hidden() use the meta blueprints for normal application
+
+
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,h,,,,h,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,`,,,,,,`,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,j,j,j,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,`,,j,j,j,,`,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,j,j,j,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,`,,,,,,`,,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,h,h,,`,`,`,h,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,,,,,,,h,h,,h,`,`,h,`,h,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,h,h,,,,,h,,`,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,`,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,h,h,h,h,h,h,h,h,h,h,h,h,h,h
+,,,,,,`,,,,,,,,,,,,,,,,,,,h,h,h,h,h,h,h,h,h,h,h,h,h,h
+,,,,,,`,,,,,,,,,,,,,,,,,,,h,h,h,h,h,h,h,h,h,h,h,h,h,h
+,,,,,,`,,,,,,,,,,,,`,,,,,,,h,h,h,h,h,h,h,h,h,h,h,h,h,h
+,,,,,,`,,,,,,,,,,,,`,,,,,,,h,h,h,h,h,h,h,h,h,h,h,h,h,h
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,h,h,h,,h,h,h,h,h,h,h,h,h,h,h,h,h,h
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,h,h,h,,h,h,h,h,h,h,h,h,h,h,h,h,h,h
+,,,,,,,,,,,,,,,,,`,`,,,h,h,h,,h,h,h,h,h,h,h,h,h,h,h,h,h,h
+,,,,,,,,,,,,,,,,,`,`,,,,,,,h,h,h,h,h,h,h,h,h,h,h,h,h,h
+,,,,,,,,,,,,,,,,,`,`,,,,h,,,h,h,h,h,h,h,h,h,h,h,h,h,h,h
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`
+,,,,,,,,,,,,,,,,,,`,,,,,,,,`
+,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`
+
+
+
+#build label(surface_floors) start(23; 25) hidden() use the meta blueprints for normal application
+
+
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,Cf,,,,Cf,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,Cf,`,Cf,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,`,Cf,Cf,Cf,Cf,Cf,`,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,Cf,Cf,`,`,`,Cf,Cf,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,`,Cf,`,`,`,Cf,`,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,Cf,Cf,`,`,`,Cf,Cf,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,`,Cf,Cf,Cf,Cf,Cf,`,,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,Cf,`,`,`,`,Cf,`,Cf,`,`,`,`,Cf,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,Cf,`,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,`,Cf,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf
+,,,,,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf
+,,,,,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,,,,,,,,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+
+
+
+
+
+#build label(surface_walls) start(23; 25) hidden() use the meta blueprints for normal application
+
+
+,,,,,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,,Cw,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw
+,,,,,,Cw,,,,,,,,,,,,,Cw,,,,,,Cw,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,Cw,,`,`,`,,Cw,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,,Cw,,,,,,Cw,,,,,,,,,,,,,Cw
+,,,,,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,,Cw,Cw,Cw,Cw,,Cw,,Cw,Cw,Cw,Cw,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw
+,,,,,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,,Cw,Cw,,`,`,`,`,`,,Cw,Cw,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw
+,,,,,,Cw,,,,,,,,,,,,Cw,,`,`,`,`,`,,Cw,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,Cw,,`,`,`,`,`,,Cw,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,`,`,,,,,,`,`,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,`,`,,,,,,`,`,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,`,`,,,,,,`,`,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,Cw,,,,,,,,Cw,,,,,,,,,,,,Cw
+,,,,,,Cw,,,,,,,,,,,,Cw,,,,,,,,Cw,,,,,,,,,,,,Cw
+,,,,,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,,,,,,,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw
+,,,,,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,,,,,,,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw
+,,,,,,`,`,,,,,,,,,,`,`,,,,,,,,`,`,,,,,,,,,,`,`
+,,,,,,`,`,,,,,,,,,,`,`,,,,,,,,`,`,,,,,,,,,,`,`
+,,,,,,`,`,,,,,,,,,,`,`,,,,,,,,`,`,,,,,,,,,,`,`
+,,,,,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,,,,,,,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw
+,,,,,,,,,,,,,,,,,,Cw,,,,,,,,Cw
+,,,,,,,,,,,,,,,,,,Cw,`,`,`,`,`,`,`,Cw
+,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`
+
+
+
+#build label(surface_gates) start(23; 25) hidden() use the meta blueprints for normal application
+
+
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,`,,,,,,`,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,`,,,,,,`,,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,,gw,gw,gw,gw,gw,,`,`,,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,`,,gw,gw,gw,gw,gw,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,gw,gw,gw,gw,gw,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,ga,ga,,,,,,gd,gd,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,ga,ga,,,,,,gd,gd,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,ga,ga,,,,,,gd,gd,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,ga,ga,,,,,,,,,,gd,gd,,,,,,,,ga,ga,,,,,,,,,,gd,gd
+,,,,,,ga,ga,,,,,,,,,,gd,gd,,,,,,,,ga,ga,,,,,,,,,,gd,gd
+,,,,,,ga,ga,,,,,,,,,,gd,gd,,,,,,,,ga,ga,,,,,,,,,,gd,gd
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,`,,,,,,,,`
+,,,,,,,,,,,,,,,,,,`,gw,gw,gw,gw,gw,gw,gw,`
+,,,,,,,,,,,,,,,,,,,gw,gw,gw,gw,gw,gw,gw
+,,,,,,,,,,,,,,,,,,,gw,gw,gw,gw,gw,gw,gw
+
+
+
+#build label(surface_buildings) start(23; 25) hidden() message(Remember to connect the levers to the gates once they are built.) use the meta blueprints for normal application
+
+
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,~h,~h,,,,,,,,,,,,,,,,,,,,,,,,,,,,~h,~h,`
+,,,,,,`,~h,~h,,,,,,,,,,,,,,,,,,,,,,,,,,,,~h,~h,`
+,,,,,,`,~h,~h,,,,,,,,,,,,,,,,,,,,,,,,,,,,~h,~h,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,N,N,N,N,N,N,N,N,N,N,N,N,,,,,,,,N,N,N,N,N,N,N,N,N,N,N,N,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,d,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,`,Tl,,Tl,,Tl,`,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,d,,`,`,`,,d,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,d,,`,`,`,,d,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,`,Tl,Tl,Tl,Tl,Tl,`,,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,d,`,d,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,d,`,`,,,,,,,,`,`,d,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,D,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,Tc,Tc,Tc,Tc,Tc,Tc,Tc,Tc,Tc,,,,,,,,,,,,Tc,Tc,Tc,Tc,Tc,Tc,Tc,Tc,Tc
+,,,,,,,,Tc,Tc,Tc,Tc,Tc,Tc,Tc,Tc,Tc,,,,,,,,,,,,Tc,Tc,Tc,Tc,Tc,Tc,Tc,Tc,Tc
+,,,,,,,,Tc,Tc,Tc,Tc,Tc,Tc,Tc,Tc,Tc,,,,,,,,,,,,Tc,Tc,Tc,Tc,Tc,Tc,Tc,Tc,Tc
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,`,,,,,,,,`
+,,,,,,,,,,,,,,,,Tc,Tc,`,,,,,,,,`,Tc,Tc
+,,,,,,,,,,,,,,,,Tc,Tc,,,,,,,,,,Tc,Tc
+,,,,,,,,,,,,,,,,Tc,Tc,,,,,,,,,,Tc,Tc
+,,,,,,,,,,,,,,,,Tc,Tc,,,,,,,,,,Tc,Tc
+
+
+#query label(surface_query_buildings) start(23; 25) hidden() use the meta blueprints for normal application
+
+
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,cg,cg,,,,,,,,,,,,,,,,,,,,,,,,,,,,cg,cg,`
+,,,,,,`,c,c,,,,,,,,,,,,,,,,,,,,,,,,,,,,c,c,`
+,,,,,,`,cg,cg,,,,,,,,,,,,,,,,,,,,,,,,,,,,cg,cg,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,`,,,,,,`,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,`,,,,,,`,,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,,,,,,,,`,`,,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,`,,,,,,,,`
+,,,,,,,,,,,,,,,,,,`,,,,,,,,`
+
+
+
+
+
+#build label(surface_scaffolding) start(23; 25) hidden() use the meta blueprints for normal application
+
+
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,,`,,,,,,`,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,`,,`,`,`,,`,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,`,,,,,,`,,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,,`,,`,`,`,`,,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,,,,,,,,`,`,,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,,,,,,,,,,,,`,,,,,,,,`,,,,,,,,,,,,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,Cu,`,,,,,,,,`
+,,,,,,,,,,,,,,,,,,`,,,,,,,,`
+
+
+
+
+
+#build label(surface_roof) start(23; 25) hidden() use the meta blueprints for normal application
+
+
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,Cf,`,Cf,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,Cf,`,`,`,`,Cf,`,Cf,`,`,`,`,Cf,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,Cf,`,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,`,Cf,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf
+,,,,,,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf
+,,,,,,,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf,Cf
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,Cd,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+,,,,,,,,,,,,,,,,,,`,Cf,Cf,Cf,Cf,Cf,Cf,Cf,`
+
+
+
+
+
+"#dig label(farming1) start(23; 25; staircase center) message(This would be a good time to queue up manager orders for /farming2. Once the area is dug out, continue with /farming2.)"
+
+
+,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,,d,,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,,,d,,,d,,,d,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,d,,,,d,,,,d,,,,d,d,d,,,d,,,,d
+,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,d,d,,d,d,d
+,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,z,d,d,d,z,d
+,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,,d,,d,,d,d,d,,d,d,d
+,,,,,,,,,d,,,,d,,,,d,,,,d,d,d,,,d,,,,d
+,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,i,i,i,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,d,d,d,d,d,d,d,d,d,d,,d,i,i,i,d,,d,d,d,d,d,d,d,d
+,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,i,i,i,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,,,,,,,,,,,,,d,d,d,,,,,d,,,,,d
+,,,,,,,,,d,d,d,,d,d,d,d,d,d,d,,d,,d,,z,z,d,d,d,,z,d,d,d
+,,,,,,,,,d,d,d,,d,d,d,d,d,d,d,,d,d,d,d,z,z,d,z,d,d,z,d,z,d
+,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,z,z,d,d,d,,z,d,d,d
+,,,,,,,,,d,d,d,,d,d,d,d,d,d,d,,d,d,d,,,,,d,,,,,d
+,,,,,,,,,d,d,d,,d,d,d,d,d,d,d,,d,d,d,,z,z,z,z,z,z,z,z,z,z,z,z,z,z
+,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,z,z,z,z,z,z,z,z,z,z,z,z,z,z
+,,,,,,,,,d,d,d,,d,d,d,d,d,d,d,,d,d,d,,z,z,z,z,z,z,z,z,z,z,z,z,z,z
+,,,,,,,,,d,d,d,,d,d,d,d,d,d,d,,d,,d,,z,z,z,z,z,z,z,z,z,z,z,z,z,z
+,,,,,,,,,,,,,,,,,,,,,,,,,z,z,z,z,z,z,z,z,z,z,z,z,z,z
+,,,,,,,,,,,,,,,,,,,,,z,z,z,,z,z,z,z,z,z,z,z,z,z,z,z,z,z
+,,,,,,,,,,,,,,,,,,,,,z,z,z,d,z,z,z,z,z,z,z,z,z,z,z,z,z,z
+,,,,,,,,,,,,,,,,,,,,,z,z,z,,z,z,z,z,z,z,z,z,z,z,z,z,z,z
+,,,,,,,,,,,,,,,,,,,,,,d,,,z,z,z,z,z,z,z,z,z,z,z,z,z,z
+,,,,,,,,,,,,,,,,,,,,,,z,,,z,z,z,z,z,z,z,z,z,z,z,z,z,z
+
+
+"#meta label(farming2) start(staircase center) message(Once furniture has been placed, continue with /farming3.) build workshops and stockpiles, configure stockpiles"
+build_workshops/farming_workshops
+build_furniture/farming_furniture
+place/farming_place
+query_stockpiles/farming_query_stockpiles
+#build label(farming_workshops) start(23; 25) hidden() use the meta blueprints for normal application
+
+
+,,,,,,,,,p(1x3),p(1x3),p(1x3),p(1x3),p(1x3),p(1x3),p(1x3),p(1x3),`,`,`,,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,`,,,`,,,`,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,,,,`,,,,`,,,,`,`,`,,,`,,,,`
+,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,,,,,,,,`,wq,wp,`,`,ww,`,`,`,wl,`,`,`,`,`,`,`,`,wu,`,`,`,wz,`
+,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,,`,`,`,,`,`,`
+,,,,,,,,,`,,,,`,,,,`,,,,`,`,`,,,`,,,,`
+,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`
+,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,`,`,`,,,,,`,,,,,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,wn,`,`,`,`,wh,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,,,,,`,,,,,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+#build label(farming_furniture) start(23; 25) hidden() use the meta blueprints for normal application
+
+
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,,s,,s,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,d,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,d,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,d,,,d,,,d,,,,`,`,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,d,`,`,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,d,`,`,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,d,`,`,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,d,,,,d,,,,d,,,,`,`,`,,,d,,,,d
+,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,d,`,`,`,d,`,`,`,d,`,`,`
+,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,,d,,d,,`,`,`,,`,`,`
+,,,,,,,,,d,,,,d,,,,d,,,,`,`,`,,,d,,,,d
+,,,,,,,,s,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,`,s
+,,,,,,,,,c,t,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`
+,,,,,,,,s,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,`,s
+,,,,,,,,,,,,,,,,,,,,,`,`,`,,,,,d,,,,,d
+,,,,,,,,,b,b,b,,`,`,`,`,`,`,`,,d,,d,,`,`,`,`,`,,`,`,`,`
+,,,,,,,,,b,`,`,,`,`,`,`,`,`,`,,`,`,`,d,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,b,`,`,d,`,c,c,c,c,c,`,d,`,`,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,,,b,`,h,,`,t,t,t,t,t,`,,`,`,`,,,,,d,,,,,d
+,,,,,,,,,b,`,f,,`,t,t,t,t,t,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,b,`,`,d,`,c,c,c,c,c,`,d,`,`,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,b,`,`,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,b,b,b,,`,`,`,`,`,`,`,,s,,s,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,`,`,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,trackstopS,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+#place label(farming_place) start(23; 25) hidden() use the meta blueprints for normal application
+
+
+,,,,,,,,,`,`,`,`,`,`,`,`,f(3x6),`,`,,`,,`,,f(14x16),`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,f(8x1),`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,b(8x1),`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,`,,,`,,,`,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,f(14x10),`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,,,,`,,,,`,,,,`,`,`,,,`,,,,`
+,,,,,,,,u,u,u,u,`,`,`,u(5x3),`,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,,,,,,,,g,`,`,u,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,g,g,g,g,`,`,`,`,`,`,`,`,,`,,`,,`,`,`,,`,`,`
+,,,,,,,,,`,,,,`,,,,`,,,,`,`,`,,,`,,,,`
+,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`
+,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,`,`,`,,,,,`,,,,,`
+,,,,,,,,,`,`,`,,f(7x2),`,`,`,`,`,`,,`,,`,,r(2x3),`,`,`,`,,f(1x3),`,`,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,,,,,`,,,,,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,,ry(14x10),`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,,f(7x2),`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,ry(3x3),`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,ry(1x1),,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+#query label(farming_query_stockpiles) start(23; 25) hidden() message(remember to assign a minecart to the garbage quantum stockpile) use the meta blueprints for normal application
+
+
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,,`,,`,,forbidplants,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,forbidtallow,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,forbiddye,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,seeds,linksonly,`,`,`,`,`,`,seeds,give2left,nocontainers,`,`,`,`,,forbidunpreparedfish,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,potash,nocontainers,`,`,`,`,`,`,`,`,`,,`,`,`,,forbidmiscliquid,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,`,,,`,,,`,,,,`,`,`,`,forbidpreparedfood,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,plants,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,,,,`,,,,`,,,,`,`,`,,,`,,,,`
+,,,,,,,,bags,nocontainers,`,`,`,`,`,pots,`,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,jugs,nocontainers,`,`,`,`,`,`,`,`,`,`,,`,,`,,`,`,`,,`,`,`
+,,,,,,,,,`,,,,`,,,,`,,,,`,`,`,,,`,,,,`
+,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`
+,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,`,`,`,,,,,`,,,,,`
+,,,,,,,,,`,`,`,,preparedfood,`,`,`,`,`,`,,`,,`,,rawhides,`,`,`,`,,unpreparedfish,`,`,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,nocontainers,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,,,,,`,,,,,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,,give2up,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,,booze,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,bodyparts,linksonly,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,`,`,`,`,give2left,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,quantumstopfromnorth,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,quantum,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+#query label(farming3) start(23; 25 staircase center) message(Check to ensure the office got assigned to your manager.) configure rooms
+
+
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,`,,,`,,,`,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,,,,`,,,,`,,,,`,`,`,,,`,,,,`
+,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,,`,,`,,`,`,`,,`,`,`
+,,,,,,,,,`,,,,`,,,,`,,,,`,`,`,,,`,,,,`
+,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,r--&a+&,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`
+,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,`,`,`,,,,,`,,,,,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`
+,,,,,,,,,r++&d,`,`,,`,`,`,r++&h,`,`,`,,`,`,`,,,,,`,,,,,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+"#dig label(industry1) start(18; 18; staircase center) message(This would be a good time to queue manager orders for /industry2. Once the area is dug out, continue with /industry2.)"
+
+
+,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,,,d,,d,,,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,i,i,i,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,,d,i,i,i,d,,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,i,i,i,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,,,d,,d,,,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d
+
+
+"#meta label(industry2) start(staircase center) build workshops and stockpiles, configure stockpiles"
+build/industry_build
+place/industry_place
+query/industry_query
+#build label(industry_build) start(18; 18) hidden() use the meta blueprints for normal application
+
+
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,wm,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,wr,`,`,wr,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,wj,`,`,`,`,`,`,`,wt,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,wr,`,`,wr,`,`,`,`,`,`,`,trackstopN,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,wm,`,`,`,`,`,`,`,wm,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,wy,`,`,ew,`,`,ew,`,`,`,`,`,`,`,`,`,`,`,`,`,es,`,`,es,`,`,ek,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,,,d,,d,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,d,`,,,,`,d,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,wc,`,`,`,trackstopW,`,`,`,`,,`,,`,,`,,`,`,`,`,trackstopE,`,`,`,wf,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,d,`,,,,`,d,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,,,d,,d,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,wS,`,`,ew,`,`,ew,`,`,`,`,`,`,`,`,`,`,`,`,`,es,`,`,es,`,`,eg,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,wb,`,`,`,`,`,`,`,wk,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,trackstopS,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,ws,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,wd,`,`,`,`,`,`,`,wo,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,we,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+#place label(industry_place) start(18; 18) hidden() use the meta blueprints for normal application
+
+
+,,,,,,,,,,,e,e,e,e,e,e,e,e,e,e,e,e,e
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,e,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,se(3x3),,,`,`,`,`,`,`,`,`,`,`,`,`
+,,f,`,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`,b(1x6)
+,,f,`,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,f,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,f,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,f,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`
+,,f,`,`,`,`,`,`,`,afngwS(3x3),,,`,`,`,,,,`,`,`,sbpdz(3x3),,,`,`,`,`,`,`,`,`
+,,f,`,`,`,`,`,f,`,~,~,~,`,,`,,`,,`,,`,~,~,~,`,b,`,`,`,`,`,`
+,,f,`,`,`,`,`,`,`,~,~,~,`,`,`,,,,`,`,`,~,~,~,`,`,`,`,`,`,`,b(1x6)
+,,f,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`
+,,f,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,f,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,f,`,`,`,`,`,`,`,`,`,`,`,`,`,rhl(3x3),,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,f,`,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,pd(6x3),,,~,~,~,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,~,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,r,`,`,`,`,`,`,~,~,~,~,~,~,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,pd(6x3),,,~,~,~,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,~,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,~,~,`
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+#query label(industry_query) start(18; 18) hidden() message(remember to assign minecarts to to your quantum stockpile hauling routes) use the meta blueprints for normal application
+
+
+,,,,,,,,,,,roughgems,nocontainers,`,`,`,`,t{Down 6}&,`,`,`,`,`,`
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,{quantum}g{Up}{Left 5}&,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,quantumstopfromsouth,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,otherstone,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,miscliquid,`,`,`,`,`,`,`,`,`,`,`,`,`,~,nocontainers,~,`,`,`,`,`,`,`,`,`,`,`,`,`,steelbars
+,,nocontainers,`,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,{cages}{permittraps},,,`,`,`,,,,`,`,`,forbidotherstone,,,`,`,`,`,`,`,`,t{Left 6}{Down}&
+,,`,`,`,`,`,`,{quantum}g{Up 10}{Right 4}&,quantumstopfromeast,~,nocontainers,~,`,,`,,`,,`,,`,~,nocontainers,~,quantumstopfromwest,quantum,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,{tallow}{permitdye},,,`,`,`,,,,`,`,`,~,~,~,`,`,`,`,`,`,`,t{Left 6}{Up}&
+,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,craftrefuse,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,~,nocontainers,~,`,`,`,`,`,`,`,`,`,`,`,`,`,coal
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,nocontainers,`,t{Up 7}&,~,~,~,~
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,quantumstopfromnorth,`,`,`,`,`,`,{ironweapons}{permitsteelweapons}{forbidmasterworkweapons}{forbidartifactweapons}
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,quantum,`,`,`,`,`,`,{ironarmor}{permitsteelarmor},forbidmasterworkarmor,forbidartifactarmor,~,~,~,~
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,nocontainers,give2up,t{Up 11}&,~,~,~,~
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,{metalweapons}{forbidmasterworkweapons}{forbidartifactweapons}
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,metalarmor,forbidmasterworkarmor,forbidartifactarmor,~,~,~,~
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+"#dig label(services1) start(23; 22; staircase center) message(This would be a good time to queue manager orders for /services2. Reapply this dig blueprint after digging to clear cistern ramps. Once the area is dug out, continue with /services2.)"
+
+
+,,d,d,d,,,d,d,d,,,d,d,d
+,,d,d,d,,,d,d,d,,,d,d,d
+,,d,d,d,,,d,d,d,,,d,d,d
+,,,d,,,,,d,,,,,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,h,d,d,d,h,d,d,d,h,d,d,,,,d,h,d,d,h,d,d,h,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,,,,d,d,d,d,d,d,d,d,d,,,,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,,,,d,d,d,d,d,d,d,d,d,,,,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,,,,,,,,d,,,,,,,,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,h,d,d,d,i,i,i,d,d,d,h,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,h,d,,d,i,i,i,d,,d,h,d,,d,d,d,d,h,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,h,d,d,d,i,i,i,d,d,d,h,d,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,d,d,d,,,,,,,,d,,,,,,,,d,d,d,d,d,d,d,d,d
+,,,,,,d,d,,d,d,,,,,,,,,,,,,,,,,,,,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,,d,d,d,d,d,d,,,,,,,,,,,,,,,,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,,d,d,d,d,d,d
+,,d,d,d,d,d,d,,d,d,d,d,d,d
+,,d,d,d,d,d,d,,d,d,d,d,d,d
+,,d,d,d,d,d,d,,d,d,d,d,d,d
+#>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+,,,j,h,j,d,j,h,j,d,j,h,j,,,,,j,h,j,j,h,j,j,h,j
+,,,d,d,d,d,d,d,d,d,d,d,d,,,,,d,d,d,d,d,d,d,d,d
+,,,,,,,,d,,,,,,,,,,,,,,d
+,,,,,,,,d,,,,,,,,,,,,,,d
+,,,,,,,,d,,,,,,,,,,,,d,d,d,d,d
+,,,,,,,,d,,,,,,,,,`,,,d,i,i,i,d,,,`
+,,,,,,,,d,,,,,,,,,`,,,d,i,i,i,d,,,`,,,,,,j,h,j
+,,,,,,,,d,,,,,,,,,`,,,d,i,i,i,d,,,`,,,,,,d,d,d
+,,,,,,,,d,,,,,,,,,,,,d,d,d,d,d,,,,,,,,,,d
+,,,,,,,,d,,,,,,,,,,,,,,d,,,,,,,,,,,,d
+,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+#>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+,,,i,h,i,,i,h,i,,i,h,i,,,,,i,h,i,i,h,i,i,h,i
+
+
+
+,,,,,,,,,,,,,,,,,,,,d,d,d,d,d
+,,,,,,,,,,,,,,,,,,,,d,i,i,i,d
+,,,,,,,,,,,,,,,,,,,,d,i,i,i,d,,,,,,,,,i,h,i
+,,,,,,,,,,,,,,,,,,,,d,i,i,i,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,d,d
+#>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+,,,u,z,u,,u,z,u,,u,z,u,,,,,u,z,u,u,z,u,u,z,u
+
+
+
+,,,,,,,,,,,,,,,,,,,,d,d,d,d,d
+,,,,,,,,,,,,,,,,,,,,d,i,i,i,d
+,,,,,,,,,,,,,,,,,,,,d,i,i,i,d,,,,,,,,,u,z,u
+,,,,,,,,,,,,,,,,,,,,d,i,i,i,d
+,,,,,,,,,,,,,,,,,,,,d,d,d,d,d
+
+
+"#meta label(services2) start(staircase center) message(Once furniture has been placed, continue with /services3.) furniture, stockpiles, hospital, garbage dump"
+build/services_build
+place/services_place
+zone/services_zone
+query_stockpiles/services_query_stockpiles
+#build label(services_build) start(23; 22) hidden() use the meta blueprints for normal application
+
+
+,,b,b,b,,,b,b,b,,,b,b,b
+,,`,`,`,,,`,`,`,,,`,`,`
+,,f,`,h,,,f,`,h,,,f,`,h
+,,,d,,,,,d,,,,,d
+,,s,`,`,s,s,`,`,`,s,s,`,`,s
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,s,`,`,`,`,`,`,`,`,`,`,`,s
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,s,`,`,`,`,`,`,`,`,`,`,`,s
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,s,`,`,`,`,`,`,`,`,`,`,`,s
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,s,`,`,`,`,`,`,`,`,`,`,`,s
+,,`,`,l,`,`,`,l,`,`,`,l,`,`,,,,t,l,b,t,l,b,t,l,b
+,,s,`,`,`,`,`,`,`,`,`,`,`,s,,,,c,v,`,c,v,`,c,v,`,,,,f,`,s,s,`,b,b,b,b
+,,`,`,c,t,t,c,`,c,t,t,c,`,`,,,,`,`,`,`,`,`,`,`,`,,,,h,`,`,`,`,`,`,`,b
+,,s,`,c,t,t,c,`,c,t,t,c,`,s,,,,,,,,d,,,,,,,,f,`,`,`,`,`,t,`,b
+,,`,`,c,t,t,c,`,c,t,t,c,`,`,,`,s,`,,`,`,`,`,`,,`,s,`,,`,`,`,`,`,`,`,`,`
+,,s,`,c,t,t,c,`,c,t,t,c,`,`,d,`,`,`,d,`,`,`,`,`,d,`,`,`,d,`,`,`,`,`,`,`,`,R
+,,`,`,c,t,t,c,`,c,t,t,c,`,`,,`,`,`,,`,`,`,`,`,,`,`,`,,`,`,`,`,l,`,`,`,R
+,,s,`,c,t,t,c,`,c,t,t,c,`,`,d,`,`,`,d,`,`,`,`,`,d,`,`,`,d,`,`,`,`,`,`,`,`,R
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,s,`,,`,`,`,`,`,,`,s,`,,`,`,`,`,`,`,`,`,`
+,,h,s,s,h,`,`,`,`,`,h,s,s,h,,,,,,,,`,,,,,,,,f,`,`,`,`,`,t,`,b
+,,,,,,`,`,,`,`,,,,,,,,,,,,,,,,,,,,h,`,`,`,`,`,`,`,b
+,,`,`,`,`,`,`,,`,`,`,`,`,`,,,,,,,,,,,,,,,,f,`,s,s,`,b,b,b,b
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+#>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+,,,`,`,`,`,`,`,`,`,`,`,`,,,,,`,`,`,`,`,`,`,`,`
+,,,`,`,`,`,`,`,`,`,`,`,`,,,,,`,`,`,`,`,`,`,`,`
+,,,,,,,,d,,,,,,,,,,,,,,d
+,,,,,,,,`,,,,,,,,,,,,,,d
+,,,,,,,,`,,,,,,,,,,,,`,`,`,`,`
+,,,,,,,,`,,,,,,,,,`,,,`,`,`,`,`,,,`
+,,,,,,,,`,,,,,,,,,`,,,`,`,`,`,`,,,`,,,,,,`,`,`
+,,,,,,,,`,,,,,,,,,`,,,`,`,`,`,`,,,`,,,,,,`,`,`
+,,,,,,,,`,,,,,,,,,,,,`,`,`,`,`,,,,,,,,,,d
+,,,,,,,,`,,,,,,,,,,,,,,d,,,,,,,,,,,,`
+,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+
+
+#place label(services_place) start(23; 22) hidden() use the meta blueprints for normal application
+
+
+,,`,`,`,,,`,`,`,,,`,`,`
+,,`,`,`,,,`,`,`,,,`,`,`
+,,`,`,`,,,`,`,`,,,`,`,`
+,,,`,,,,,`,,,,,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,f(1x2),`,`,f(1x2),`,`,f(1x2),,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,f(2x1),`,`,f(2x1),`,`,f(2x1),`,`,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,,,,,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,b(3x5),`,`,,`,`,`,`,`,,b(3x5),`,`,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,,,,,,,,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,,`,`,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,f(6x5),`,`,`,`,`,,f(6x5),`,`,`,`,`,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+
+
+#zone label(services_zone) start(23; 22) hidden() use the meta blueprints for normal application
+
+
+,,`,`,`,,,`,`,`,,,`,`,`
+,,`,`,`,,,`,`,`,,,`,`,`
+,,`,`,`,,,`,`,`,,,`,`,`
+,,,`,,,,,`,,,,,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`,,,,h(9x11),`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,,,,,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,pa,`,`,`,`,`,`,`,`,`,pa,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,pa,`,,`,`,`,`,`,,`,pa,`,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,pa,`,`,`,`,`,`,`,`,`,pa,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,d,,,,,,,,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,,`,`,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+
+
+#query label(services_query_stockpiles) start(23; 22) hidden() use the meta blueprints for normal application
+
+
+,,`,`,`,,,`,`,`,,,`,`,`
+,,`,`,`,,,`,`,`,,,`,`,`
+,,`,`,`,,,`,`,`,,,`,`,`
+,,,`,,,,,`,,,,,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,booze,`,`,booze,`,`,booze,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,preparedfood,t{Down 10}{Left 12}&,t{Down 10}{Left 10}&,preparedfood,t{Down 10}{Left 20}&,t{Down 10}{Left 10}&,preparedfood,t{Down 10}{Left 20}&,t{Down 10}{Left 12}&,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,,,,,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,soap,`,`,,`,`,`,`,`,,soap,`,`,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,nocontainers,`,`,`,`,`,`,`,`,`,nocontainers,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,,,,,,,,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,,`,`,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,preparedfood,`,`,`,`,`,,booze,`,`,`,`,`,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+
+
+#query label(services3) start(23; 22; staircase center) message(the bedrooms are left unconfigured so you can add them as rented rooms for your tavern) set up dining room and jail
+
+
+,,`,`,`,,,`,`,`,,,`,`,`
+,,`,`,`,,,`,`,`,,,`,`,`
+,,`,`,`,,,`,`,`,,,`,`,`
+,,,`,,,,,`,,,,,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,r--&j,`,`,r--&j,`,`,r--&j,`,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,r{+ 11}&h,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,,,,,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,,,,,,,,`,`,`,`,`,`,`,`,`
+,,,,,,`,`,,`,`,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+,,`,`,`,`,`,`,,`,`,`,`,`,`
+
+
+"#dig label(guildhall1) start(25; 25; staircase center) message(This would be a good time to queue manager orders for /guildhall3. Once the area is dug out, continue with /guildhall2.)"
+
+
+,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d,,,,,,,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d,,,,,,,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d,,,,,,,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d,,,,,,,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d,,,d,d,d,,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d,,,d,d,d,,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d
+,,,,,,,d,,,,d,,,,,,,,d,,,,d,d,d,,,,d,,,,,,,,d,,,,d
+,,,,,,,d,,,,d,,,,,,,,d,,,,d,d,d,,,,d,,,,,,,,d,,,,d
+,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,,,,,d,,,,,,,,,,,,d,d,d,,,,,,,,,,,,d
+,,,,,,,,,,,d,,,,,,,,,,,,d,d,d,,,,,,,,,,,,d
+,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d,,,d,d,d,,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d,,,d,d,d,,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d,,,d,d,d,,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d,,,d,d,d,,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d,,,d,d,d,,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d,,,d,d,d,,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d
+,,,,,,,d,,,,d,,,,,,,,d,,,,d,,d,,,,d,,,,,,,,d,,,,d
+,,,,,,,d,,,,d,,,,,,,,d,,,,d,d,d,,,,d,,,,,,,,d,,,,d
+,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,i,i,i,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,i,i,i,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,i,i,i,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,d,,,,d,,,,,,,,d,,,,d,d,d,,,,d,,,,,,,,d,,,,d
+,,,,,,,d,,,,d,,,,,,,,d,,,,d,,d,,,,d,,,,,,,,d,,,,d
+,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d,,,d,d,d,,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d,,,d,d,d,,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d,,,d,d,d,,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d,,,d,d,d,,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d,,,d,d,d,,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d,,,d,d,d,,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d
+,,,,,,,,,,,d,,,,,,,,,,,,d,d,d,,,,,,,,,,,,d
+,,,,,,,,,,,d,,,,,,,,,,,,d,d,d,,,,,,,,,,,,d
+,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,,,,,,,d,,,,d,,,,,,,,d,,,,d,d,d,,,,d,,,,,,,,d,,,,d
+,,,,,,,d,,,,d,,,,,,,,d,,,,d,d,d,,,,d,,,,,,,,d,,,,d
+,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d,,,d,d,d,,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,,d,d,d,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d,,,d,d,d,,,d,d,d,d,d,d,d,,,d,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d,,,,,,,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d,,,,,,,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d,,,,,,,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d
+,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d,,,,,,,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d
+
+
+"#dig label(guildhall2) start(25; 25; staircase center) message(Once tiles are smoothed, continue with /guildhall3.) smooth tiles that will be made inaccessible by furniture"
+
+
+,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,s,s,s,,`,`,`,`,`,`,`,,s,,,,s,,`,`,`,`,`,`,`,,s,s,s,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,s,,,`,`,`,`,`,`,`,,,s,`,s,,,`,`,`,`,`,`,`,,,s,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,,,,,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`
+,,,,,s,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`,,s
+,,,,,s,s,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,s,s
+,,,,,s,,,,,,`,,,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,,,,,s
+,,,,,,,,,,,`,,,,,,,,,,,,`,`,`,,,,,,,,,,,,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,s,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,,,,,,`,,,,`,,,,,,,,`,,,,`,,`,,,,`,,,,,,,,`,,,,`
+,,,,,s,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`,,s
+,,,,,,s,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,s
+,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,s,,`,,`,,`,,s,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,s,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,s
+,,,,,s,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`,,s
+,,,,,,,`,,,,`,,,,,,,,`,,,,`,,`,,,,`,,,,,,,,`,,,,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,s,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,,,,,,,,,,`,,,,,,,,,,,,`,`,`,,,,,,,,,,,,`
+,,,,,s,,,,,,`,,,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,,,,,s
+,,,,,s,s,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,s,s
+,,,,,s,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`,,s
+,,,,,,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,s,,,`,`,`,`,`,`,`,,,s,`,s,,,`,`,`,`,`,`,`,,,s,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,s,s,s,,`,`,`,`,`,`,`,,s,,,,s,,`,`,`,`,`,`,`,,s,s,s,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
+
+
+#build label(guildhall3) start(25; 25; staircase center) message(Smooth the remaining tiles and furnish/declare locations as required.) build basic furniture
+
+
+,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,s,,,`,`,`,`,`,`,`,,,s,t,s,,,`,`,`,`,`,`,`,,,s,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,d,`,`,,,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,,,`,`,d,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,,,,,,d,,,,`,,,,,,,,d,,,,`,`,`,,,,d,,,,,,,,`,,,,d
+,,,,,,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`
+,,,,,,s,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,s
+,,,,,,,,,,,`,,,,,,,,,,,,`,`,`,,,,,,,,,,,,`
+,,,,,,,,,,,`,,,,,,,,,,,,`,`,`,,,,,,,,,,,,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,d,`,`,,,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,,,`,`,d,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,s,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,,,,,,d,,,,`,,,,,,,,d,,,,`,,`,,,,d,,,,,,,,`,,,,d
+,,,,,,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`
+,,,,,,s,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,s
+,,,,,,t,`,`,`,`,`,`,`,`,`,`,`,`,`,s,,`,,`,,`,,s,`,`,`,`,`,`,`,`,`,`,`,`,`,t
+,,,,,,s,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,s
+,,,,,,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`
+,,,,,,,d,,,,`,,,,,,,,d,,,,`,,`,,,,d,,,,,,,,`,,,,d
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,s,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,d,`,`,,,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,,,`,`,d,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,,,,,,,,,,`,,,,,,,,,,,,`,`,`,,,,,,,,,,,,`
+,,,,,,,,,,,`,,,,,,,,,,,,`,`,`,,,,,,,,,,,,`
+,,,,,,s,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,s
+,,,,,,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`
+,,,,,,,d,,,,`,,,,,,,,d,,,,`,`,`,,,,d,,,,,,,,`,,,,d
+,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,d,`,`,,,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,,,`,`,d,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,s,,,`,`,`,`,`,`,`,,,s,t,s,,,`,`,`,`,`,`,`,,,s,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
+
+
+"#dig label(suites1) start(18; 18; staircase center) message(This would be a good time to queue manager orders for /suites2. Once the area is dug out, continue with /suites2) noble suites"
+
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,,,,d,,,,,,d,,,,d,,d,,,,d,,,,,,d,,,,d,d
+,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
+,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
+,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d
+,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
+,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
+,d,d,,,,,,,,,,,,,,d,d,d,,,,,,,,,,,,,,d,d
+,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
+,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
+,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d
+,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
+,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
+,d,d,,,,d,,,,,,d,,,,d,d,d,,,,d,,,,,,d,,,,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,i,i,i,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,,d,d,d,d,d,d,d,d,d,d,,d,i,i,i,d,,d,d,d,d,d,d,d,d,d,d,,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,i,i,i,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,,,,d,,,,,,d,,,,d,d,d,,,,d,,,,,,d,,,,d,d
+,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
+,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
+,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d
+,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
+,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
+,d,d,,,,,,,,,,,,,,d,d,d,,,,,,,,,,,,,,d,d
+,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
+,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
+,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d
+,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
+,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d,d,,d,d,d,d,d,,d,d,d,d,d,,d,d
+,d,d,,,,d,,,,,,d,,,,d,,d,,,,d,,,,,,d,,,,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+
+#build label(suites2) start(18; 18; staircase center) message(bedrooms are left unconfigured so you can assign them to specific nobles)
+
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,,,,d,,,,,,d,,,,d,,d,,,,d,,,,,,d,,,,`,`
+,`,`,,a,r,`,`,h,,h,`,`,r,a,,`,s,`,,a,r,`,`,h,,h,`,`,r,a,,`,`
+,`,`,,`,`,`,`,h,,h,`,`,`,`,,`,`,`,,`,`,`,`,h,,h,`,`,`,`,,`,`
+,`,`,d,`,`,b,`,`,,`,`,b,`,`,d,`,`,`,d,`,`,b,`,`,,`,`,b,`,`,d,`,`
+,`,`,,c,`,`,`,f,,f,`,`,`,c,,`,s,`,,c,`,`,`,f,,f,`,`,`,c,,`,`
+,`,`,,t,`,s,`,n,,n,`,s,`,t,,`,`,`,,t,`,s,`,n,,n,`,s,`,t,,`,`
+,`,`,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,`,`
+,`,`,,t,`,s,`,n,,n,`,s,`,t,,`,s,`,,t,`,s,`,n,,n,`,s,`,t,,`,`
+,`,`,,c,`,`,`,f,,f,`,`,`,c,,`,`,`,,c,`,`,`,f,,f,`,`,`,c,,`,`
+,`,`,d,`,`,b,`,`,,`,`,b,`,`,d,`,`,`,d,`,`,b,`,`,,`,`,b,`,`,d,`,`
+,`,`,,`,`,`,`,h,,h,`,`,`,`,,`,s,`,,`,`,`,`,h,,h,`,`,`,`,,`,`
+,`,`,,a,r,`,`,h,,h,`,`,r,a,,d,,d,,a,r,`,`,h,,h,`,`,r,a,,`,`
+,`,`,,,,d,,,,,,d,,,,`,`,`,,,,d,,,,,,d,,,,`,`
+,`,`,d,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`,d,`,`
+,`,`,,s,`,`,s,`,`,s,`,`,s,,`,`,`,`,`,,s,`,`,s,`,`,s,`,`,s,,`,`
+,`,`,d,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`,d,`,`
+,`,`,,,,d,,,,,,d,,,,`,`,`,,,,d,,,,,,d,,,,`,`
+,`,`,,a,r,`,`,h,,h,`,`,r,a,,d,,d,,a,r,`,`,h,,h,`,`,r,a,,`,`
+,`,`,,`,`,`,`,h,,h,`,`,`,`,,`,s,`,,`,`,`,`,h,,h,`,`,`,`,,`,`
+,`,`,d,`,`,b,`,`,,`,`,b,`,`,d,`,`,`,d,`,`,b,`,`,,`,`,b,`,`,d,`,`
+,`,`,,c,`,`,`,f,,f,`,`,`,c,,`,`,`,,c,`,`,`,f,,f,`,`,`,c,,`,`
+,`,`,,t,`,s,`,n,,n,`,s,`,t,,`,s,`,,t,`,s,`,n,,n,`,s,`,t,,`,`
+,`,`,,,,,,,,,,,,,,`,`,`,,,,,,,,,,,,,,`,`
+,`,`,,t,`,s,`,n,,n,`,s,`,t,,`,`,`,,t,`,s,`,n,,n,`,s,`,t,,`,`
+,`,`,,c,`,`,`,f,,f,`,`,`,c,,`,s,`,,c,`,`,`,f,,f,`,`,`,c,,`,`
+,`,`,d,`,`,b,`,`,,`,`,b,`,`,d,`,`,`,d,`,`,b,`,`,,`,`,b,`,`,d,`,`
+,`,`,,`,`,`,`,h,,h,`,`,`,`,,`,`,`,,`,`,`,`,h,,h,`,`,`,`,,`,`
+,`,`,,a,r,`,`,h,,h,`,`,r,a,,`,s,`,,a,r,`,`,h,,h,`,`,r,a,,`,`
+,`,`,,,,d,,,,,,d,,,,d,,d,,,,d,,,,,,d,,,,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+
+#meta label(apartments_stack) start(staircase center) digs 6 layers of apartments - enough for 200 dwarves
+/apartments1
+#>
+/apartments1
+#>
+/apartments1
+#>
+/apartments1
+#>
+/apartments1
+#>
+/apartments1
+
+"#dig label(apartments1) start(18; 18; staircase center) message(This would be a good time to enqueue manager orders for /apartments2. Once the area is dug out, continue with /apartments2.)"
+
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,,,d,,,,d,,,,d,,,d,,d,,,d,,,,d,,,,d,,,d,d
+,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d
+,d,d,,,d,,,,d,,,,d,,,d,d,d,,,d,,,,d,,,,d,,,d,d
+,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d
+,d,d,,,d,,,,d,,,,d,,,d,d,d,,,d,,,,d,,,,d,,,d,d
+,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,,d,d,d,,d,d,d,,d,d,d,,d,,d,,d,d,d,,d,d,d,,d,d,d,,d,d
+,d,d,,,d,,,,d,,,,d,,,d,d,d,,,d,,,,d,,,,d,,,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,i,i,i,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,,d,d,d,d,d,d,d,d,d,d,,d,i,i,i,d,,d,d,d,d,d,d,d,d,d,d,,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,i,i,i,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,,,d,,,,d,,,,d,,,d,d,d,,,d,,,,d,,,,d,,,d,d
+,d,d,,d,d,d,,d,d,d,,d,d,d,,d,,d,,d,d,d,,d,d,d,,d,d,d,,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d
+,d,d,,,d,,,,d,,,,d,,,d,d,d,,,d,,,,d,,,,d,,,d,d
+,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d
+,d,d,,,d,,,,d,,,,d,,,d,d,d,,,d,,,,d,,,,d,,,d,d
+,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d,d,,d,d
+,d,d,,,d,,,,d,,,,d,,,d,,d,,,d,,,,d,,,,d,,,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+
+"#build label(apartments2) start(18; 18; staircase center) message(Once beds have been placed, continue with /apartments3.)"
+
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,,,d,,,,d,,,,d,,,d,,d,,,d,,,,d,,,,d,,,`,`
+,`,`,,f,`,n,,f,`,n,,f,`,n,,`,s,`,,n,`,f,,n,`,f,,n,`,f,,`,`
+,`,`,d,`,b,`,d,`,b,`,d,`,b,`,d,`,`,`,d,`,b,`,d,`,b,`,d,`,b,`,d,`,`
+,`,`,,h,`,n,,h,`,n,,h,`,n,,`,`,`,,n,`,h,,n,`,h,,n,`,h,,`,`
+,`,`,,,d,,,,d,,,,d,,,`,s,`,,,d,,,,d,,,,d,,,`,`
+,`,`,,f,`,n,,f,`,n,,f,`,n,,`,`,`,,n,`,f,,n,`,f,,n,`,f,,`,`
+,`,`,d,`,b,`,d,`,b,`,d,`,b,`,d,`,`,`,d,`,b,`,d,`,b,`,d,`,b,`,d,`,`
+,`,`,,h,`,n,,h,`,n,,h,`,n,,`,s,`,,n,`,h,,n,`,h,,n,`,h,,`,`
+,`,`,,,d,,,,d,,,,d,,,`,`,`,,,d,,,,d,,,,d,,,`,`
+,`,`,,f,`,n,,f,`,n,,f,`,n,,`,`,`,,n,`,f,,n,`,f,,n,`,f,,`,`
+,`,`,d,`,b,`,d,`,b,`,d,`,b,`,d,`,s,`,d,`,b,`,d,`,b,`,d,`,b,`,d,`,`
+,`,`,,h,`,n,,h,`,n,,h,`,n,,d,,d,,n,`,h,,n,`,h,,n,`,h,,`,`
+,`,`,,,d,,,,d,,,,d,,,`,`,`,,,d,,,,d,,,,d,,,`,`
+,`,`,d,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`,d,`,`
+,`,`,,s,`,`,s,`,`,s,`,`,s,,`,`,`,`,`,,s,`,`,s,`,`,s,`,`,s,,`,`
+,`,`,d,`,`,`,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,`,`,`,d,`,`
+,`,`,,,d,,,,d,,,,d,,,`,`,`,,,d,,,,d,,,,d,,,`,`
+,`,`,,h,`,n,,h,`,n,,h,`,n,,d,,d,,n,`,h,,n,`,h,,n,`,h,,`,`
+,`,`,d,`,b,`,d,`,b,`,d,`,b,`,d,`,s,`,d,`,b,`,d,`,b,`,d,`,b,`,d,`,`
+,`,`,,f,`,n,,f,`,n,,f,`,n,,`,`,`,,n,`,f,,n,`,f,,n,`,f,,`,`
+,`,`,,,d,,,,d,,,,d,,,`,`,`,,,d,,,,d,,,,d,,,`,`
+,`,`,,h,`,n,,h,`,n,,h,`,n,,`,s,`,,n,`,h,,n,`,h,,n,`,h,,`,`
+,`,`,d,`,b,`,d,`,b,`,d,`,b,`,d,`,`,`,d,`,b,`,d,`,b,`,d,`,b,`,d,`,`
+,`,`,,f,`,n,,f,`,n,,f,`,n,,`,`,`,,n,`,f,,n,`,f,,n,`,f,,`,`
+,`,`,,,d,,,,d,,,,d,,,`,s,`,,,d,,,,d,,,,d,,,`,`
+,`,`,,h,`,n,,h,`,n,,h,`,n,,`,`,`,,n,`,h,,n,`,h,,n,`,h,,`,`
+,`,`,d,`,b,`,d,`,b,`,d,`,b,`,d,`,`,`,d,`,b,`,d,`,b,`,d,`,b,`,d,`,`
+,`,`,,f,`,n,,f,`,n,,f,`,n,,`,s,`,,n,`,f,,n,`,f,,n,`,f,,`,`
+,`,`,,,d,,,,d,,,,d,,,d,,d,,,d,,,,d,,,,d,,,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+
+#query label(apartments3) start(18; 18; staircase center) message(Coffins should be configured with DFHack burial script)
+
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,,,`,,,,`,,,,`,,,`,,`,,,`,,,,`,,,,`,,,`,`
+,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`
+,`,`,`,`,r&,`,`,`,r&,`,`,`,r&,`,`,`,`,`,`,`,r&,`,`,`,r&,`,`,`,r&,`,`,`,`
+,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`
+,`,`,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,`,,,`,`
+,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`
+,`,`,`,`,r&,`,`,`,r&,`,`,`,r&,`,`,`,`,`,`,`,r&,`,`,`,r&,`,`,`,r&,`,`,`,`
+,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`
+,`,`,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,`,,,`,`
+,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`
+,`,`,`,`,r&,`,`,`,r&,`,`,`,r&,`,`,`,`,`,`,`,r&,`,`,`,r&,`,`,`,r&,`,`,`,`
+,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,,`,`,`,,`,`,`,,`,`,`,,`,`
+,`,`,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,`,,,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,`,,,`,`
+,`,`,,`,`,`,,`,`,`,,`,`,`,,`,,`,,`,`,`,,`,`,`,,`,`,`,,`,`
+,`,`,`,`,r&,`,`,`,r&,`,`,`,r&,`,`,`,`,`,`,`,r&,`,`,`,r&,`,`,`,r&,`,`,`,`
+,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`
+,`,`,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,`,,,`,`
+,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`
+,`,`,`,`,r&,`,`,`,r&,`,`,`,r&,`,`,`,`,`,`,`,r&,`,`,`,r&,`,`,`,r&,`,`,`,`
+,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`
+,`,`,,,`,,,,`,,,,`,,,`,`,`,,,`,,,,`,,,,`,,,`,`
+,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`
+,`,`,`,`,r&,`,`,`,r&,`,`,`,r&,`,`,`,`,`,`,`,r&,`,`,`,r&,`,`,`,r&,`,`,`,`
+,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`,`,,`,`
+,`,`,,,`,,,,`,,,,`,,,`,,`,,,`,,,,`,,,,`,,,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+
diff --git a/data/blueprints/library/examples/embark.csv b/data/blueprints/library/examples/embark.csv
new file mode 100644
index 000000000..4f374d087
--- /dev/null
+++ b/data/blueprints/library/examples/embark.csv
@@ -0,0 +1,18 @@
+#build start(8;2;center of wagon) basic post embark workshops
+~,~ ,~,~,~ ,~,`,`,`,~,~ ,~,~,~ ,~,#
+~,wc,~,~,wt,~,`,`,`,~,wm,~,~,wr,~,#
+~,~ ,~,~,~ ,~,`,`,`,~,~ ,~,~,~ ,~,#
+#,# ,#,#,# ,#,#,#,#,#,# ,#,#,# ,#,#
+
+#place basic post embark stockpiles
+w(5x10),,,,,s(5x1),,,,,p(5x1),,,,,#
+,,,,,g(5x4),,,,,d(5x1),,,,,#
+,,,,,,,,,,f(5x3),,,,,#
+,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,#
+,,,,,u(10x5),,,,,,,,,,#
+,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
diff --git a/data/blueprints/library/examples/exploratory-mining-100x10.csv b/data/blueprints/library/examples/exploratory-mining-100x10.csv
new file mode 100644
index 000000000..b85d6e247
--- /dev/null
+++ b/data/blueprints/library/examples/exploratory-mining-100x10.csv
@@ -0,0 +1,12 @@
+"#dig exploratory mining, paths every 10 units, 100w x 10h",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,#
+d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,#
+d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,#
+d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,#
+d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,#
+d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,#
+d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,#
+d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,#
+d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
diff --git a/data/blueprints/library/examples/exploratory-mining-50x50-alt.csv b/data/blueprints/library/examples/exploratory-mining-50x50-alt.csv
new file mode 100644
index 000000000..b4969ef10
--- /dev/null
+++ b/data/blueprints/library/examples/exploratory-mining-50x50-alt.csv
@@ -0,0 +1,43 @@
+"#dig exploratory mining complex, using diagonal interconnecting tunnels. repeat down as needed.",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,#
+,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,#
+,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,#
+,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,#
+,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,#
+,,,,,i,,,,,,,,,,i,,,,,,,,,,i,,,,,,,,,,i,,,,,,#
+,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,#
+,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,#
+,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,#
+,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,#
+d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,#
+,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,#
+,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,#
+,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,#
+,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,#
+,,,,,i,,,,,,,,,,i,,,,,,,,,,i,,,,,,,,,,i,,,,,,#
+,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,#
+,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,#
+,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,#
+,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,#
+d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,#
+,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,#
+,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,#
+,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,#
+,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,#
+,,,,,i,,,,,,,,,,i,,,,,,,,,,i,,,,,,,,,,i,,,,,,#
+,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,#
+,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,#
+,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,#
+,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,#
+d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,#
+,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,#
+,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,#
+,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,#
+,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,#
+,,,,,i,,,,,,,,,,i,,,,,,,,,,i,,,,,,,,,,i,,,,,,#
+,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,#
+,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,#
+,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,#
+,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,#
+d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
diff --git a/data/blueprints/library/examples/exploratory-mining-50x50.csv b/data/blueprints/library/examples/exploratory-mining-50x50.csv
new file mode 100644
index 000000000..cbf438b6f
--- /dev/null
+++ b/data/blueprints/library/examples/exploratory-mining-50x50.csv
@@ -0,0 +1,43 @@
+"#dig Exploratory mineshafts, as stairs every 3rd tile.",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
diff --git a/data/blueprints/library/square-dig.csv b/data/blueprints/library/square-dig.csv
deleted file mode 100644
index 548c5c3f2..000000000
--- a/data/blueprints/library/square-dig.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-#dig start(2;2) This is a library placeholder for use during quickfort development
-d,d,d
-d, ,d
-d,d,d

From c1c3b02e8987603a10cb0fa97a677d4b15ad7943 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 16 Aug 2020 20:54:21 -0700
Subject: [PATCH 333/547] make capitalization the same as other blueprints

---
 data/blueprints/library/examples/exploratory-mining-50x50.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/blueprints/library/examples/exploratory-mining-50x50.csv b/data/blueprints/library/examples/exploratory-mining-50x50.csv
index cbf438b6f..67e2bdd1e 100644
--- a/data/blueprints/library/examples/exploratory-mining-50x50.csv
+++ b/data/blueprints/library/examples/exploratory-mining-50x50.csv
@@ -1,4 +1,4 @@
-"#dig Exploratory mineshafts, as stairs every 3rd tile.",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+"#dig exploratory mineshafts, as stairs every 3rd tile",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#

From 8a438c2a5542cf54a2de47e8767d402f50d5b982 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 17 Aug 2020 21:14:05 -0700
Subject: [PATCH 334/547] allow row_height to be set from the ListBox class

---
 library/lua/gui/dialogs.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/library/lua/gui/dialogs.lua b/library/lua/gui/dialogs.lua
index fb9b8fd63..672d502d1 100644
--- a/library/lua/gui/dialogs.lua
+++ b/library/lua/gui/dialogs.lua
@@ -155,6 +155,7 @@ ListBox.ATTRS{
     on_select = DEFAULT_NIL,
     on_select2 = DEFAULT_NIL,
     select2_hint = DEFAULT_NIL,
+    row_height = DEFAULT_NIL,
 }
 
 function ListBox:preinit(info)
@@ -196,6 +197,7 @@ function ListBox:init(info)
             end,
             on_submit2 = on_submit2,
             frame = { l = 0, r = 0 },
+            row_height = info.row_height,
         }
     }
 end

From 9a3e9d5b12a1d9a87087296e749d8333268c42e0 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 17 Aug 2020 21:15:33 -0700
Subject: [PATCH 335/547] listbox filter can match strings after punctuation

---
 library/lua/gui/widgets.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/lua/gui/widgets.lua b/library/lua/gui/widgets.lua
index 67395b688..99733b84b 100644
--- a/library/lua/gui/widgets.lua
+++ b/library/lua/gui/widgets.lua
@@ -792,7 +792,8 @@ function FilteredList:setFilter(filter, pos)
             local ok = true
             local search_key = v.search_key or v.text
             for _,key in ipairs(tokens) do
-                if key ~= '' and not string.match(search_key, '%f[^%s\x00]'..key) then
+                if key ~= '' and
+                        not string.match(search_key, '%f[^%s%p\x00]'..key) then
                     ok = false
                     break
                 end

From 45a0b7b3a6cd45e96f6ab4a6547a6d947fc32204 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 18 Aug 2020 20:56:48 -0400
Subject: [PATCH 336/547] Fix stockpiles crash when building food map

Fixes #1628

Broke due to https://github.com/DFHack/df-structures/commit/ecd6bcc9ed67c62fa605561b27574467df792342
---
 docs/changelog.txt                      | 3 +++
 plugins/stockpiles/OrganicMatLookup.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 9317df86e..7247b665d 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -33,6 +33,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 # Future
 
+## Fixes
+- `stockpiles`: fixed a crash when loading food stockpiles
+
 # 0.47.04-r2
 
 ## New Tweaks
diff --git a/plugins/stockpiles/OrganicMatLookup.cpp b/plugins/stockpiles/OrganicMatLookup.cpp
index 4f1076cd1..09ac9c659 100644
--- a/plugins/stockpiles/OrganicMatLookup.cpp
+++ b/plugins/stockpiles/OrganicMatLookup.cpp
@@ -152,4 +152,4 @@ MaterialInfo OrganicMatLookup::food_mat_by_token ( std::ostream &out, const std:
 }
 
 bool OrganicMatLookup::index_built = false;
-std::vector<OrganicMatLookup::FoodMatMap> OrganicMatLookup::food_index = std::vector<OrganicMatLookup::FoodMatMap> ( 37 );
+std::vector<OrganicMatLookup::FoodMatMap> OrganicMatLookup::food_index = std::vector<OrganicMatLookup::FoodMatMap> ( df::enum_traits< df::organic_mat_category >::last_item_value + 1 );

From 7bac4c89c46df138a47017ece335ae102b0427ea Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 19 Aug 2020 17:12:40 -0400
Subject: [PATCH 337/547] Update API docs for setJobCooldown and removeWorker,
 use "cooldown" for consistency with C++

Ref http://www.bay12forums.com/smf/index.php?topic=164123.msg8180385#msg8180385
---
 docs/Lua API.rst | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 226c93aa2..5450aee45 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -1076,15 +1076,17 @@ Job module
 
   Returns the unit performing the job.
 
-* ``dfhack.job.setJobCooldown(building,worker,timeout)``
+* ``dfhack.job.setJobCooldown(building,worker,cooldown)``
 
-  Prevent the worker from taking jobs at the specified workshop for the specified time.
-  This doesn't decrease the timeout in any circumstances.
+  Prevent the worker from taking jobs at the specified workshop for the
+  specified cooldown period (in ticks). This doesn't decrease the cooldown
+  period in any circumstances.
 
-* ``dfhack.job.removeWorker(job,timeout)``
+* ``dfhack.job.removeWorker(job,cooldown)``
 
-  Removes the worker from the specified workshop job, and sets the cooldown.
-  Returns *true* on success.
+  Removes the worker from the specified workshop job, and sets the cooldown
+  period (using the same logic as ``setJobCooldown``). Returns *true* on
+  success.
 
 * ``dfhack.job.checkBuildingsNow()``
 

From fc77fca3b7f76a7aa4ebb11baa1262ba1b4fdb7b Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 20 Aug 2020 00:33:39 -0400
Subject: [PATCH 338/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 568c586ce..30eecbc8e 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 568c586ce2474af89c64a4cc7c876edb35931d43
+Subproject commit 30eecbc8edd181ff25845b771a7ccd1e9a9b2638

From 5a77c9037ea76d3d3cf7265873a7ddc144534d39 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 21 Aug 2020 19:49:33 -0400
Subject: [PATCH 339/547] Pass CMAKE_GENERATOR_TOOLSET (cmake -T argument) to
 external projects

The dependencies introduced in #1620 cause an error when building natively on Windows, according to @ragundo. CMake is looking for build tools `v100`, which are part of VS2010 and won't work with DF/DFHack, even if they were installed.

Some of the Windows build scripts pass in `-T v140_xp` (from VS2015), so passing this option through to subprojects may help: https://cmake.org/cmake/help/latest/variable/CMAKE_GENERATOR_TOOLSET.html
---
 depends/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 2437794bb..118659b3b 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -19,6 +19,10 @@ add_subdirectory(clsocket)
 ide_folder(clsocket "Depends")
 
 # assemble environment args to pass on to dependency projects
+if (NOT("${CMAKE_GENERATOR_TOOLSET}" STREQUAL ""))
+  list(APPEND CL_ARGS "-T" "${CMAKE_GENERATOR_TOOLSET}")
+endif()
+
 get_cmake_property(vars CACHE_VARIABLES)
 foreach(var ${vars})
   if(var MATCHES "^CMAKE_"

From 94798a3620e7fc758d64e6cd2ab9ecde2eebe9ad Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 22 Aug 2020 10:38:29 -0400
Subject: [PATCH 340/547] Pass CMAKE_GENERATOR_TOOLSET to ExternalProject_Add
 instead

---
 depends/CMakeLists.txt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 118659b3b..b824cebdc 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -19,10 +19,6 @@ add_subdirectory(clsocket)
 ide_folder(clsocket "Depends")
 
 # assemble environment args to pass on to dependency projects
-if (NOT("${CMAKE_GENERATOR_TOOLSET}" STREQUAL ""))
-  list(APPEND CL_ARGS "-T" "${CMAKE_GENERATOR_TOOLSET}")
-endif()
-
 get_cmake_property(vars CACHE_VARIABLES)
 foreach(var ${vars})
   if(var MATCHES "^CMAKE_"
@@ -54,6 +50,8 @@ ExternalProject_Add(libexpat_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libexpat/expat
     INSTALL_DIR ${LIBEXPAT_INSTALL_DIR}
     BUILD_BYPRODUCTS ${LIBEXPAT_LIB}
+    CMAKE_GENERATOR "${CMAKE_GENERATOR}"
+    CMAKE_GENERATOR_TOOLSET "${CMAKE_GENERATOR_TOOLSET}"
     CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBEXPAT_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 )
 
@@ -65,6 +63,8 @@ ExternalProject_Add(libzip_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libzip
     INSTALL_DIR ${LIBZIP_INSTALL_DIR}
     BUILD_BYPRODUCTS ${LIBZIP_LIB}
+    CMAKE_GENERATOR "${CMAKE_GENERATOR}"
+    CMAKE_GENERATOR_TOOLSET "${CMAKE_GENERATOR_TOOLSET}"
     CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBZIP_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_DOC=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REGRESS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DENABLE_BZIP2=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_LZMA=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 )
 
@@ -78,5 +78,7 @@ ExternalProject_Add(xlsxio_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/xlsxio
     INSTALL_DIR ${XLSXIO_INSTALL_DIR}
     BUILD_BYPRODUCTS ${XLSXIO_LIB}
+    CMAKE_GENERATOR "${CMAKE_GENERATOR}"
+    CMAKE_GENERATOR_TOOLSET "${CMAKE_GENERATOR_TOOLSET}"
     CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DEXPAT_LIBRARIES=${LIBEXPAT_LIB} -DEXPAT_INCLUDE_DIRS=${LIBEXPAT_INSTALL_DIR}/include -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_C_FLAGS=${XLSXIO_C_FLAGS}
 )

From 3ebb812cd5ac272a4b851567ba74dac9de4ca7ed Mon Sep 17 00:00:00 2001
From: kristjanmoore <kristjanmoore@gmail.com>
Date: Sun, 23 Aug 2020 13:20:45 +0000
Subject: [PATCH 341/547] Allow searches for higher waterfalls

---
 plugins/embark-assistant/defs.h        | 2 +-
 plugins/embark-assistant/finder_ui.cpp | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/embark-assistant/defs.h b/plugins/embark-assistant/defs.h
index 13494b91e..d22b7436d 100644
--- a/plugins/embark-assistant/defs.h
+++ b/plugins/embark-assistant/defs.h
@@ -318,7 +318,7 @@ namespace embark_assist {
             aquifer_ranges aquifer;
             river_ranges min_river;
             river_ranges max_river;
-            int8_t min_waterfall; // N/A(-1), Absent, 1-9
+            int8_t min_waterfall; // N/A(-1), Absent, 1-50
             yes_no_ranges flat;
             present_absent_ranges clay;
             present_absent_ranges sand;
diff --git a/plugins/embark-assistant/finder_ui.cpp b/plugins/embark-assistant/finder_ui.cpp
index bcd82a3e4..a553144b8 100644
--- a/plugins/embark-assistant/finder_ui.cpp
+++ b/plugins/embark-assistant/finder_ui.cpp
@@ -546,6 +546,9 @@ namespace embark_assist {
                             element->list.push_back({ std::to_string(k), k });
                         }
                     }
+                    for (int16_t k = 10; k <= 50; k+=5) {
+                            element->list.push_back({ std::to_string(k), k });
+                    }
 
                 break;
 

From 293b0253c496dd6d27932c06265b9616ba7bc902 Mon Sep 17 00:00:00 2001
From: kristjanmoore <kristjanmoore@gmail.com>
Date: Sun, 23 Aug 2020 17:35:45 +0000
Subject: [PATCH 342/547] Set min_waterfall special cases outside loop

---
 plugins/embark-assistant/finder_ui.cpp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/plugins/embark-assistant/finder_ui.cpp b/plugins/embark-assistant/finder_ui.cpp
index a553144b8..aaaf8945e 100644
--- a/plugins/embark-assistant/finder_ui.cpp
+++ b/plugins/embark-assistant/finder_ui.cpp
@@ -535,19 +535,16 @@ namespace embark_assist {
                 break;
 
                 case fields::min_waterfall:
-                    for (int16_t k = -1; k <= 9; k++) {
-                        if (k == -1) {
-                            element->list.push_back({ "N/A", k });
-                        }
-                        else if (k == 0) {
-                            element->list.push_back({ "Absent", k });
-                        }
-                        else {
-                            element->list.push_back({ std::to_string(k), k });
-                        }
+
+                    element->list.push_back({ "N/A", -1 });
+                    element->list.push_back({ "Absent", 0 });
+
+                    for (int16_t k = 1; k <= 9; k++) {
+                        element->list.push_back({ std::to_string(k), k });
                     }
+
                     for (int16_t k = 10; k <= 50; k+=5) {
-                            element->list.push_back({ std::to_string(k), k });
+                        element->list.push_back({ std::to_string(k), k });
                     }
 
                 break;

From cb8a90324091716ec3b95d5502dec85e7c470dc8 Mon Sep 17 00:00:00 2001
From: kristjanmoore <kristjanmoore@gmail.com>
Date: Sun, 23 Aug 2020 17:38:27 +0000
Subject: [PATCH 343/547] Update changelog

---
 docs/changelog.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 7247b665d..fb099dc9a 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -36,6 +36,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Fixes
 - `stockpiles`: fixed a crash when loading food stockpiles
 
+## Misc Improvements
+- `embark-assistant`: changed UI to allow users to search for taller waterfalls
+
 # 0.47.04-r2
 
 ## New Tweaks

From 0fa4987edb515d409e4f0997799ed45e40326636 Mon Sep 17 00:00:00 2001
From: kristjanmoore <kristjanmoore@gmail.com>
Date: Sun, 23 Aug 2020 18:01:16 +0000
Subject: [PATCH 344/547] Update authors

---
 docs/Authors.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Authors.rst b/docs/Authors.rst
index 42fda0985..a1cef86a8 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -75,6 +75,7 @@ kane-t                  kane-t
 Kelly Kinkade           ab9rf
 KlonZK                  KlonZK
 Kris Parker             kaypy
+Kristjan Moore          kristjanmoore
 Kromtec                 Kromtec
 Kurik Amudnil
 Lethosor                lethosor

From a84a1f0ee9136556ecf8b39a27429038da33682b Mon Sep 17 00:00:00 2001
From: George Murray <murray.george.m@gmail.com>
Date: Tue, 25 Aug 2020 14:15:41 -0700
Subject: [PATCH 345/547] Switch trade screen search to use
 search_multicolumn_modifiable so that item counts are updated correctly with
 other information

---
 plugins/search.cpp | 88 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 77 insertions(+), 11 deletions(-)

diff --git a/plugins/search.cpp b/plugins/search.cpp
index 7e72c2c1c..6e0b49e16 100644
--- a/plugins/search.cpp
+++ b/plugins/search.cpp
@@ -1214,8 +1214,11 @@ IMPLEMENT_HOOKS_PRIO(df::viewscreen_unitlistst, unitlist_search, 100);
 //
 // START: Trade screen search
 //
-class trade_search_base : public search_twocolumn_modifiable<df::viewscreen_tradegoodsst, df::item*, char>
+class trade_search_base : public search_multicolumn_modifiable<df::viewscreen_tradegoodsst, df::item*>
 {
+protected:
+    virtual vector<char> *get_selected_list() = 0;
+    virtual vector<int32_t> *get_count_list() = 0;
 
 private:
     string get_element_description(df::item *element) const
@@ -1257,6 +1260,59 @@ private:
         clear_search();
         reset_all();
     }
+
+    void do_post_init()
+    {
+        search_multicolumn_modifiable::do_post_init();
+
+        selected = get_selected_list();
+        count = get_count_list();
+    }
+
+    void save_secondary_values()
+    {
+        selected_s = *selected;
+        count_s = *count;
+    }
+
+    void reset_secondary_viewscreen_vectors()
+    {
+        selected = NULL;
+        count = NULL;
+    }
+
+    void update_saved_secondary_list_item(size_t i, size_t j)
+    {
+        selected_s[i] = (*selected)[j];
+        count_s[i] = (*count)[j];
+    }
+
+    void clear_secondary_viewscreen_vectors()
+    {
+        selected->clear();
+        count->clear();
+    }
+
+    void add_to_filtered_secondary_lists(size_t i)
+    {
+        selected->push_back(selected_s[i]);
+        count->push_back(count_s[i]);
+    }
+
+    void clear_secondary_saved_lists()
+    {
+        selected_s.clear();
+        count_s.clear();
+    }
+
+    void restore_secondary_values()
+    {
+        *selected = selected_s;
+        *count = count_s;
+    }
+
+    std::vector<char> *selected, selected_s;
+    std::vector<int32_t> *count, count_s;
 };
 
 
@@ -1286,11 +1342,6 @@ public:
     }
 
 private:
-    vector<char> *get_secondary_list()
-    {
-        return &viewscreen->trader_selected;
-    }
-
     int32_t *get_viewscreen_cursor()
     {
         return &viewscreen->trader_cursor;
@@ -1301,6 +1352,16 @@ private:
         return &viewscreen->trader_items;
     }
 
+    vector<char> *get_selected_list()
+    {
+        return &viewscreen->trader_selected;
+    }
+
+    vector<int32_t> *get_count_list()
+    {
+        return &viewscreen->trader_count;
+    }
+
     char get_search_select_key()
     {
         return 'q';
@@ -1336,11 +1397,6 @@ public:
     }
 
 private:
-    vector<char> *get_secondary_list()
-    {
-        return &viewscreen->broker_selected;
-    }
-
     int32_t *get_viewscreen_cursor()
     {
         return &viewscreen->broker_cursor;
@@ -1351,6 +1407,16 @@ private:
         return &viewscreen->broker_items;
     }
 
+    vector<char> *get_selected_list()
+    {
+        return &viewscreen->broker_selected;
+    }
+
+    vector<int32_t> *get_count_list()
+    {
+        return &viewscreen->broker_count;
+    }
+
     char get_search_select_key()
     {
         return 'w';

From 5d43ba21781d83eb2498516b06ba1909955f3502 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Wed, 26 Aug 2020 19:59:30 -0700
Subject: [PATCH 346/547] quickfort: document marker mode and buildingplan

also a bit of cleanup and reorg
---
 data/blueprints/README.md | 121 +++++++++++++++++++++++++-------------
 1 file changed, 79 insertions(+), 42 deletions(-)

diff --git a/data/blueprints/README.md b/data/blueprints/README.md
index 31c6a171f..7e850c45c 100644
--- a/data/blueprints/README.md
+++ b/data/blueprints/README.md
@@ -25,15 +25,16 @@ Table of Contents
 * [Editing Blueprints](#editing-blueprints)
   * [Area expansion syntax](#area-expansion-syntax)
   * [Automatic area expansion](#automatic-area-expansion)
+  * [Multilevel blueprints](#multilevel-blueprints)
+  * [Marker mode](#marker-mode)
   * [Stockpiles and zones](#stockpiles-and-zones)
   * [Minecart tracks](#minecart-tracks)
-  * [Multilevel blueprints](#multilevel-blueprints)
-  * [Modeline optional markers](modeline-optional-markers)
+  * [Modeline markers](modeline-markers)
   * [Packaging a set of blueprints](#packaging-a-set-of-blueprints)
   * [Meta blueprints](#meta-blueprints)
-* [Troubleshooting](#troubleshooting)
-* [Tips and tricks](#tips-and-tricks)
+* [Buildingplan integration](#buildingplan-integration)
 * [Generating manager orders](#generating-manager-orders)
+* [Tips and tricks](#tips-and-tricks)
 * [Caveats and limitations](#caveats-and-limitations)
 * [Links](#links)
 
@@ -42,36 +43,40 @@ Features
 --------
 
 * General
-  * Manages complete blueprints to handle the four main phases of DF construction
+  * Manages complete blueprints to handle all phases of DF construction
   * Supports .csv and multi-worksheet .xlsx blueprint files
   * Near-instant application, even for very large and complex blueprints
   * Supports multiple blueprints per .csv file/spreadsheet sheet
   * "meta" blueprints that automate the application of sequences of blueprints
   * Blueprints can span multiple z-levels
-  * Undo functionality for dig, build, and place blueprints
+  * Undo functionality for dig, build, place, and zone blueprints
   * Automatic cropping of blueprints so you don't get errors if the blueprint extends off the map
-  * Can generate manager orders for everything required to apply build blueprints
+  * Can generate manager orders for everything required by a build blueprint
   * Library of ready-to-use blueprints included
   * Verbose output mode for debugging
 * Dig mode
-  * Supports all types of designations, including dumping/forbidding items and setting traffic areas
+  * Supports all types of designations, including dumping/forbidding items and setting traffic settings
+  * Supports setting dig priorities
   * Supports applying dig blueprints in marker mode
   * Handles carving arbitrarily complex minecart tracks, including tracks that cross other tracks
-* Build and place modes
-  * Supports stockpiles of all shapes, not just rectangular blocks
-  * Configurable maximums for bins, barrels and wheelbarrows assigned to created stockpiles
+* Build mode
+  * DFHack buildingplan integration
+  * Designate complete constructions at once, without having to wait for each tile to become supported before you can build it
   * Automatic expansion of building footprints to their minimum dimensions, so only the center tile of a multi-tile building needs to be recorded in the blueprint
-  * Designates complete constructions at once, without having to wait for each tile to become supported before you can build it
-  * Automatic splitting of stockpiles and buildings that exceed maximum dimension limits
   * Tile occupancy and validity checking so, for example, buildings that cannot be placed on a certain tile will simply be skipped instead of the blueprint failing to apply. Blueprints that are only partially applied for any reason (for example, you need to dig out some more tiles) can be safely reapplied to build the remaining buildings.
-  * Relaxed rules for farm plot and road placement, allowing tiles that are separated by invalid tiles (e.g. stone tiles for farm plots) to be part of the same structure
+  * Relaxed rules for farm plot and road placement: you can still place the building even if an invalid tile (e.g. stone tiles for farm plots) splits the designated area into two parts
+  * Intelligent boundary detection for adjacent buildings of the same type (e.g. a 6x6 block of `wj` cells will be correctly split into 4 jeweler's workshops)
+* Place and zone modes
+  * Define stockpiles and zones in any shape, not just rectangular blocks
+  * Configurable maximums for bins, barrels and wheelbarrows assigned to created stockpiles
+  * Automatic splitting of stockpiles and zones that exceed maximum dimension limits
 * Query mode
-  * Support sending arbitrary keystroke sequences to the UI -- configure *anything*
+  * Send arbitrary keystroke sequences to the UI -- *anything* you can do through the UI is supported
   * Supports aliases to automate frequent keystroke combos
-  * Supports including aliases in other aliases, and repeating key sequences a specified number of times
   * Includes a library of pre-made and tested aliases to automate most common tasks, such as configuring stockpiles for important item types or creating hauling routes for quantum stockpiles.
-  * Skips sending key sequences when the cursor is over a tile that does not have a stockpile or building
-  * Instant halting of query blueprint application when keystroke errors are detected, such as when a key sequence leaves us stuck in a submenu
+  * Supports including aliases in other aliases, and repeating key sequences a specified number of times
+  * Skips sending key sequences when the cursor is over a tile that does not have a stockpile or building, so missing buildings won't desynchronize your blueprint
+  * Instant halting of query blueprint application when keystroke errors are detected, such as when a key sequence leaves us stuck in a submenu, to make blueprint misconfigurations easier to debug
 
 
 Editing Blueprints
@@ -259,10 +264,48 @@ This style can be convenient for laying out multiple buildings of the same type.
 Quickfort will intelligently break large areas of the same designation into appropriately-sized chunks.
 
 
+Multilevel blueprints
+---------------------
+
+Multilevel blueprints are accommodated by separating Z-levels of the blueprint with `#>` (go down one z-level) or `#<` (go up one z-level) at the end of each floor.
+
+    #dig Stairs leading down to a small room below
+    j  `  `  #
+    `  `  `  #
+    `  `  `  #
+    #> #  #  #
+    u  d  d  #
+    d  d  d  #
+    d  d  d  #
+    #  #  #  #
+
+The marker must appear in the first column of the row to be recognized, just like a modeline.
+
+
+Marker mode
+-----------
+
+Marker mode is useful for when you want to plan out your digging, but you don't want to dig everything just yet. In `#dig` mode, you can add a `m` before any other designation letter to indicate that the tile should be designated in marker mode. For example, to dig out the perimeter of a room, but leave the center of the room marked for digging later:
+
+    #dig
+    d  d  d  d d #
+    d md md md d #
+    d md md md d #
+    d md md md d #
+    d  d  d  d d #
+    #  #  #  # # #
+
+Then you can use "Toggle Standard/Marking" (`d-M`) to convert the center tiles to regular designations at your leisure.
+
+To apply an entire dig blueprint in marker mode, regardless of what the blueprint itself says, you can set the global quickfort setting `force_marker_mode` to `true` before you apply the blueprint.
+
+Note that the in-game UI setting "Standard/Marker Only" (`d-m`) does not have any effect on quickfort.
+
+
 Stockpiles and zones
 --------------------
 
-It is very common to have stockpiles that accept multiple categories of items or zones that permit more than one activity. Although it is perfectly valid to declare a single-purpose stockpile or zone and then modify it with a `#query` blueprint, quickfort also supports directly declaring all the types on the `#place` and `#zone`blueprints. For example, to declare a 10x10 area that is a pasture, a fruit picking area, and a meeting area all at once, you could write:
+It is very common to have stockpiles that accept multiple categories of items or zones that permit more than one activity. Although it is perfectly valid to declare a single-purpose stockpile or zone and then modify it with a `#query` blueprint, quickfort also supports directly declaring all the types on the `#place` and `#zone` blueprints. For example, to declare a 10x10 area that is a pasture, a fruit picking area, and a meeting area all at once, you could write:
 
     #zone main pasture and picnic area
     nmg(10x10) #
@@ -274,7 +317,7 @@ And similarly, to declare a stockpile that accepts both corpses and refuse, you
 
 The order of the individual letters doesn't matter.
 
-To toggle the `active` flag for zones, add an `a` character to the string. For example, to create a *disabled* pit zone (that you later intend to turn into a pond and fill carefully to 3-depth water):
+To toggle the `active` flag for zones, add an `a` character to the string. For example, to create a *disabled* pit zone (that you later intend to turn into a pond and carefully fill to 3-depth water):
 
     #zone disabled future pond zone
     pa(1x3) #
@@ -404,26 +447,8 @@ Which would result in a carved track simliar to a constructed track of the form:
     #        #        #        #
 
 
-Multilevel blueprints
----------------------
-
-Multilevel blueprints are accommodated by separating Z-levels of the blueprint with `#>` (go down one z-level) or `#<` (go up one z-level) at the end of each floor.
-
-    #dig Stairs leading down to a small room below
-    j  `  `  #
-    `  `  `  #
-    `  `  `  #
-    #> #  #  #
-    u  d  d  #
-    d  d  d  #
-    d  d  d  #
-    #  #  #  #
-
-The marker must appear in the first column of the row to be recognized, just like a modeline.
-
-
-Modeline optional markers
--------------------------
+Modeline markers
+----------------
 
 The modeline has some additional optional components that we haven't talked about yet. You can:
 
@@ -543,7 +568,7 @@ Meta blueprints are blueprints that script a series of other blueprints. Many bl
 - Wait for buildings to get built
 - Apply a different query blueprint to configure rooms
 
-Those three "apply"s in the middle might as well get done in one command instead of three. A meta blueprint can encode that sequence. A meta blueprint refers to other blueprints by their label (see the [Modeline optional markers](modeline-optional-markers) section above) in the same format used by the `DFHack#` quickfort command: "<sheet_name>/<label>", or just "/<label>" for blueprints in .csv files or blueprints in the same spreadsheet sheet as the #meta blueprint that references them.
+Those three "apply"s in the middle might as well get done in one command instead of three. A meta blueprint can encode that sequence. A meta blueprint refers to other blueprints by their label (see the [Modeline markers](modeline-markers) section above) in the same format used by the `DFHack#` quickfort command: "<sheet_name>/<label>", or just "/<label>" for blueprints in .csv files or blueprints in the same spreadsheet sheet as the #meta blueprint that references them.
 
 A few examples might make this clearer. Say you have a .csv file with the following blueprints defined:
 
@@ -621,10 +646,22 @@ Note that for blueprints without an explicit label, we still need to address the
 You can then hide the blueprints that you now manage with the `meta`-mode blueprint from `quickfort list` by adding a `hidden()` marker to their modelines. That way the output of `quickfort list` won't be cluttered by blueprints that you don't need to run directly. If you ever *do* need to access the managed blueprints individually, you can still see them with `quickfort list --hidden`.
 
 
+Buildingplan integration
+------------------------
+
+Buildingplan is a DFHack plugin that keeps jobs in a suspended state until the materials required for the job are available. This prevents a building designation from being canceled when a dwarf picks up the job but can't find the materials.
+
+For all types that buildingplan supports, quickfort using buildingplan to manage construction. Buildings are still constructed immediately if you have the materials, but you now have the freedom to apply build blueprints before you manufacture all required materials, and the jobs will be fulfilled as the materials become available.
+
+If a `#build` blueprint only refers to supported types, the buildingplan integration pairs well with the [workflow](https://docs.dfhack.org/en/stable/docs/Plugins.html#workflow) plugin, which can build items a few at a time continuously as long as they are needed. For building types that are not yet supported by buildingplan, a good pattern to follow is to first run `quickfort orders` on the `#build` blueprint to manufacture all the required items, then apply the blueprint itself.
+
+See [buildingplan documentation](https://docs.dfhack.org/en/stable/docs/Plugins.html#buildingplan) for a list of supported types.
+
+
 Generating manager orders
 -------------------------
 
-Quickfort can generate manager orders to make sure you have the proper items in stock to apply a `build`-mode blueprint.
+Quickfort can generate manager orders to make sure you have the proper items in stock to apply a `#build`-mode blueprint.
 
 Many items can be manufactured from different source materials. Orders will always choose rock when it can, then wood, then cloth, then iron. You can always remove orders that don't make sense for your fort and manually enqueue a similar order more to your liking. For example, if you want silk ropes instead of cloth ropes, make a new manager order for silk ropes and then remove the generated cloth rope order.
 

From 3b5a82cc05a02d1df5bdfa2934676f2861aa28ee Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 27 Aug 2020 00:08:28 -0400
Subject: [PATCH 347/547] Change color of ListBox.select2_hint to grey to
 indicate enabled

Ref dfhack/scripts#185
---
 library/lua/gui/dialogs.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/lua/gui/dialogs.lua b/library/lua/gui/dialogs.lua
index 672d502d1..7684d927e 100644
--- a/library/lua/gui/dialogs.lua
+++ b/library/lua/gui/dialogs.lua
@@ -205,7 +205,7 @@ end
 function ListBox:onRenderFrame(dc,rect)
     ListBox.super.onRenderFrame(self,dc,rect)
     if self.select2_hint then
-        dc:seek(rect.x1+2,rect.y2):key('SEC_SELECT'):string(': '..self.select2_hint,COLOR_DARKGREY)
+        dc:seek(rect.x1+2,rect.y2):key('SEC_SELECT'):string(': '..self.select2_hint,COLOR_GREY)
     end
 end
 

From f09b0fa699304d17e3d2a65d16c702ca75e2ebf4 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Wed, 26 Aug 2020 22:38:49 -0700
Subject: [PATCH 348/547] quickfort: define useful aliases for hauling

---
 data/quickfort/aliases-common.txt | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt
index aeed190d6..10ace068b 100644
--- a/data/quickfort/aliases-common.txt
+++ b/data/quickfort/aliases-common.txt
@@ -47,19 +47,31 @@ enablesequence: e{Down}
 # put useful clothes or armor in there!)
 quantum: {linksonly}{nocontainers}{enableanimals}{enablefood}{furnitureprefix}{enablestone}{enableammo}{enablecoins}{enablebars}{enablegems}{enablefinishedgoods}{enableleather}{enablecloth}{enablewood}}{enableweapons}{enablearmor}{enablesheet}
 
+
+##################################
+# hauling aliases
+##################################
+
 # Run one of the quantumstopfrom* aliases over a track stop that is set to dump
 # into a quantum stockpile. The alias will set up the stop to accept all types
 # (the actual types stored in the quantum stockpile is controlled by the feeder
 # stockpile) and link the indicated adjacent feeder stockpile. All you need to
 # do afterwards is assign a vehicle to the stop (and optionally give the route a
-# name). The track stop does not need to be constructed yet, but the stockpile
-# needs to be in place so we can link to it.
+# name --see the namelastroute* aliases below). The track stop does not need to
+# be constructed yet, but the feeder stockpile needs to exist so we can link it.
 quantumstopprefix: ^hrs&xxx&{enablesequence 17}^
 quantumstopfromeast: {quantumstopprefix}s{Right}p^{Left}^q
 quantumstopfromsouth: {quantumstopprefix}s{Down}p^{Up}^q
 quantumstopfromwest: {quantumstopprefix}s{Left}p^{Right}^q
 quantumstopfromnorth: {quantumstopprefix}s{Up}p^{Down}^q
 
+# Give a name to the most recently defined route. Keep in mind that names have
+# a maximum length of 22 characters. It assumes that the route has exactly one
+# stop defined. Use it with the quantumstopfrom* aliases above like this:
+#   {quantumstopfromeast}{namelastrouteprefix}Trash Dumper{namelastroutesuffix}
+namelastrouteprefix: ^h--n
+namelastroutesuffix: &^q
+
 
 ##################################
 # animal stockpile adjustments

From 9598d02593c4131332396108a6b8b494363cd363 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 27 Aug 2020 13:20:27 -0700
Subject: [PATCH 349/547] update quickfort blueprint library

- update dreamfort to use the new hauling route naming aliases
- add strategic whitespace to csv files to make them easier to read
- group related library files into subdirectories
- better filenames for exploratory-mining files
- add set of marker-mode layout helpers (inspired by Salford Sal's DF
  tutorial videos
  https://www.youtube.com/channel/UCVLgfAP_1VOlVLUJMJ7ahhA)
---
 data/blueprints/library/dreamfort.csv         |  96 ++-------
 data/blueprints/library/embark.csv            |  18 ++
 data/blueprints/library/examples/embark.csv   |  18 --
 .../examples/exploratory-mining-100x10.csv    |  12 --
 .../examples/exploratory-mining-50x50-alt.csv |  43 ----
 .../examples/exploratory-mining-50x50.csv     |  43 ----
 .../connected-mineshafts.csv                  |  43 ++++
 .../library/exploratory-mining/tunnels.csv    |  52 +++++
 .../vertical-mineshafts.csv                   |  42 ++++
 .../library/layout-helpers/mark_down_left.csv | 201 ++++++++++++++++++
 .../layout-helpers/mark_down_right.csv        | 201 ++++++++++++++++++
 .../library/layout-helpers/mark_up_left.csv   | 201 ++++++++++++++++++
 .../library/layout-helpers/mark_up_right.csv  | 201 ++++++++++++++++++
 13 files changed, 982 insertions(+), 189 deletions(-)
 create mode 100644 data/blueprints/library/embark.csv
 delete mode 100644 data/blueprints/library/examples/embark.csv
 delete mode 100644 data/blueprints/library/examples/exploratory-mining-100x10.csv
 delete mode 100644 data/blueprints/library/examples/exploratory-mining-50x50-alt.csv
 delete mode 100644 data/blueprints/library/examples/exploratory-mining-50x50.csv
 create mode 100644 data/blueprints/library/exploratory-mining/connected-mineshafts.csv
 create mode 100644 data/blueprints/library/exploratory-mining/tunnels.csv
 create mode 100644 data/blueprints/library/exploratory-mining/vertical-mineshafts.csv
 create mode 100644 data/blueprints/library/layout-helpers/mark_down_left.csv
 create mode 100644 data/blueprints/library/layout-helpers/mark_down_right.csv
 create mode 100644 data/blueprints/library/layout-helpers/mark_up_left.csv
 create mode 100644 data/blueprints/library/layout-helpers/mark_up_right.csv

diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
index 796d948f1..9fb730447 100644
--- a/data/blueprints/library/dreamfort.csv
+++ b/data/blueprints/library/dreamfort.csv
@@ -1,77 +1,27 @@
-"#meta label(dreamfort_help) message(Welcome to the Dreamfort Walkthrough!
-It can be difficult applying a set of blueprints that you did not write yourself. This
-walkthrough will guide you through the high-level steps of building Dreamfort.
+"#meta label(help) message(Welcome to the Dreamfort Walkthrough!
+It can be difficult applying a set of blueprints that you did not write yourself. This walkthrough will guide you through the high-level steps of building Dreamfort.
 
-The final fort will have a walled-in area on the surface for livestock, trading, and
-military. One z-level down is the farming level, with related workshops and vents up
-to the surface for miasma control.
+The final fort will have a walled-in area on the surface for livestock, trading, and military. One z-level down is the farming level, with related workshops and vents up to the surface for miasma control. The farming level also has a miniature dining hall for use until you get the services level set up.
 
-Beyond those two, the other layers can be built in any order, at any z-level
-according to your preference and the layout peculiarities of your embark site:
+Beyond those two, the other layers can be built in any order, at any z-level, according to your preference and the layout peculiarities of your embark site:
  - The industry level has a compact, but complete set of workshops and stockpiles
- - The services level has dining, hospital, and justice services, including a well
-     system. This level is 4 z-levels deep.
- - The guildhall level has many rooms for buildling libraries, temples, and
-     guildhalls
+ - The services level has dining, hospital, and justice services, including a well system. This level is 4 z-levels deep.
+ - The guildhall level has many rooms for buildling libraries, temples, and guildhalls
  - The suites level has fancy rooms for your nobles
- - The apartments level(s) has small but well-furnished bedrooms for your other
-     dwarves
-
-Dreamfort has a central staircase-based design. Choose a tile for your staircase on
-the surface in a nice, flat area. For all blueprints, the cursor will start on this
-tile on the z-level where you want to apply the blueprint.
-
-Blueprints that require manual steps (like 'assign animals to pasture') will leave a
-message telling you so after you apply them. Blueprints will also leave messages with
-hints when you might want to run ""quickfort orders"" on specific blueprints to start
-manufacturing needed items.
-
-Directly after embark, apply /surface1 on a flat area on the surface and /industry1
-somewhere below (but not immediately below the surface -- that will be for the farming
-level). Work your way through the steps for those levels: apply /surface2 when
-/surface1 is done, /industry2 when /industry1 is done, etc. Once you channel out parts
-of the surface with /surface3, you can start the farming sequence with /farming1. You
-can start the services, guildhall, suites, and apartments sequences as your fort needs
-those levels.
-
-This .csv file is generated from source .xlsx files. If you want to look at how these
-blueprints are put together, including full lists of their features, it will be easier
-to look at the .xlsx files than this giant .csv. You can view them online at:
-  https://drive.google.com/drive/folders/1iS90EEVqUkxTeZiiukVj1pLloZqabKuP?usp=sharing
+ - The apartments level(s) has small but well-furnished bedrooms for your other dwarves
+
+Dreamfort has a central staircase-based design. Choose a tile for your staircase on the surface in a nice, flat area. For all blueprints, the cursor will start on this tile on the z-level where you want to apply the blueprint.
+
+Blueprints that require manual steps (like 'assign animals to pasture') will leave a message telling you so after you apply them. Blueprints will also leave messages with hints when you might want to run ""quickfort orders"" on specific blueprints to start manufacturing needed items.
+
+Directly after embark, apply /surface1 on a flat area on the surface and /industry1 somewhere below, underground (but not immediately below the surface -- that will be for the farming level). Work your way through the steps for those levels: apply /surface2 when /surface1 is done, /industry2 when /industry1 is done, etc. Once you channel out parts of the surface with /surface3, you can start the farming sequence with /farming1. You can start the services, guildhall, suites, and apartments sequences as your fort needs those levels.
+
+This .csv file is generated from source .xlsx files. If you want to look at how these blueprints are put together, including full lists of their features, it will be easier to look at the .xlsx files than this giant .csv. You can view them online at:
+  https://drive.google.com/drive/folders/1iS90EEVqUkxTeZiiukVj1pLloZqabKuP
 You are welcome to copy those files and make your own modifications!
 ) run me for help with dreamfort"
 "#dreamfort.csv is generated with the following command:
   for fname in dreamfort*.xlsx; do xlsx2csv -a -E Notes -p '' $fname; done | sed 's/,*$//'"
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
 "#meta label(surface1) start(staircase center)
 message(This would be a good time to start digging the industry level.
 Once the area is clear, continue with /surface2.) clear an area and set up pastures"
@@ -1073,7 +1023,7 @@ query_stockpiles/farming_query_stockpiles
 ,,,,,,,,,,,,,,,,,,,,,bodyparts,linksonly,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,,,,,,,,,,,,,`,`,`,`,give2left,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,,,,,,quantumstopfromnorth,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,{quantumstopfromnorth}{namelastrouteprefix}Trash Dumper{namelastroutesuffix},,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,,,,,,,,,,,,,,quantum,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 
 
@@ -1243,7 +1193,7 @@ query/industry_query
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,{quantum}g{Up}{Left 5}&,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,quantumstopfromsouth,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,{quantumstopfromsouth}{namelastrouteprefix}Stoneworker quantum{namelastroutesuffix},`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,otherstone,,,`,`,`,`,`,`,`,`,`,`,`,`
 ,,miscliquid,`,`,`,`,`,`,`,`,`,`,`,`,`,~,nocontainers,~,`,`,`,`,`,`,`,`,`,`,`,`,`,steelbars
 ,,nocontainers,`,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`,`
@@ -1251,15 +1201,15 @@ query/industry_query
 ,,`,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,`,{cages}{permittraps},,,`,`,`,,,,`,`,`,forbidotherstone,,,`,`,`,`,`,`,`,t{Left 6}{Down}&
-,,`,`,`,`,`,`,{quantum}g{Up 10}{Right 4}&,quantumstopfromeast,~,nocontainers,~,`,,`,,`,,`,,`,~,nocontainers,~,quantumstopfromwest,quantum,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,{tallow}{permitdye},,,`,`,`,,,,`,`,`,~,~,~,`,`,`,`,`,`,`,t{Left 6}{Up}&
+,,`,`,`,`,`,`,{quantum}g{Up 10}{Right 4}&,{quantumstopfromeast}{namelastrouteprefix}Goods/Wood quantum{namelastroutesuffix},~,nocontainers,~,`,,`,,`,,`,,`,~,nocontainers,~,{quantumstopfromwest}{namelastrouteprefix}Metalworker quantum{namelastroutesuffix},quantum,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,{tallow}{permitdye},,,`,`,`,,,,`,`,`,forbidpotash,,,`,`,`,`,`,`,`,t{Left 6}{Up}&
 ,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,craftrefuse,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,~,nocontainers,~,`,`,`,`,`,`,`,`,`,`,`,`,`,coal
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,nocontainers,`,t{Up 7}&,~,~,~,~
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,quantumstopfromnorth,`,`,`,`,`,`,{ironweapons}{permitsteelweapons}{forbidmasterworkweapons}{forbidartifactweapons}
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,{quantumstopfromnorth}{namelastrouteprefix}Clothier/Bones quantum{namelastroutesuffix},`,`,`,`,`,`,{ironweapons}{permitsteelweapons}{forbidmasterworkweapons}{forbidartifactweapons}
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,quantum,`,`,`,`,`,`,{ironarmor}{permitsteelarmor},forbidmasterworkarmor,forbidartifactarmor,~,~,~,~
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,nocontainers,give2up,t{Up 11}&,~,~,~,~
@@ -1804,7 +1754,7 @@ query_stockpiles/services_query_stockpiles
 ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 
-#meta label(apartments_stack) start(staircase center) digs 6 layers of apartments - enough for 200 dwarves
+#meta label(apartments1_stack) start(staircase center) digs 6 layers of apartments - enough for 200 dwarves
 /apartments1
 #>
 /apartments1
@@ -1817,7 +1767,7 @@ query_stockpiles/services_query_stockpiles
 #>
 /apartments1
 
-"#dig label(apartments1) start(18; 18; staircase center) message(This would be a good time to enqueue manager orders for /apartments2. Once the area is dug out, continue with /apartments2.)"
+"#dig label(apartments1) start(18; 18; staircase center) message(This would be a good time to enqueue manager orders for /apartments2. Once the area is dug out, continue with /apartments2.) apartment complex"
 
 ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
 ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
diff --git a/data/blueprints/library/embark.csv b/data/blueprints/library/embark.csv
new file mode 100644
index 000000000..17289dab6
--- /dev/null
+++ b/data/blueprints/library/embark.csv
@@ -0,0 +1,18 @@
+#build start(8;2;center of wagon) basic post embark workshops
+~,~ ,~,~,~ ,~,`,`,`,~,~ ,~,~,~ ,~,#
+~,wc,~,~,wt,~,`,`,`,~,wm,~,~,wr,~,#
+~,~ ,~,~,~ ,~,`,`,`,~,~ ,~,~,~ ,~,#
+#,# ,#,#,# ,#,#,#,#,#,# ,#,#,# ,#,#
+
+#place basic post embark stockpiles
+w(5x10), , , , ,s(5x1) , , , , ,p(5x1), , , , ,#
+       , , , , ,g(5x4) , , , , ,d(5x1), , , , ,#
+       , , , , ,       , , , , ,f(5x3), , , , ,#
+       , , , , ,       , , , , ,      , , , , ,#
+       , , , , ,       , , , , ,      , , , , ,#
+       , , , , ,u(10x5), , , , ,      , , , , ,#
+       , , , , ,       , , , , ,      , , , , ,#
+       , , , , ,       , , , , ,      , , , , ,#
+       , , , , ,       , , , , ,      , , , , ,#
+       , , , , ,       , , , , ,      , , , , ,#
+#      ,#,#,#,#,#      ,#,#,#,#,#     ,#,#,#,#,#
diff --git a/data/blueprints/library/examples/embark.csv b/data/blueprints/library/examples/embark.csv
deleted file mode 100644
index 4f374d087..000000000
--- a/data/blueprints/library/examples/embark.csv
+++ /dev/null
@@ -1,18 +0,0 @@
-#build start(8;2;center of wagon) basic post embark workshops
-~,~ ,~,~,~ ,~,`,`,`,~,~ ,~,~,~ ,~,#
-~,wc,~,~,wt,~,`,`,`,~,wm,~,~,wr,~,#
-~,~ ,~,~,~ ,~,`,`,`,~,~ ,~,~,~ ,~,#
-#,# ,#,#,# ,#,#,#,#,#,# ,#,#,# ,#,#
-
-#place basic post embark stockpiles
-w(5x10),,,,,s(5x1),,,,,p(5x1),,,,,#
-,,,,,g(5x4),,,,,d(5x1),,,,,#
-,,,,,,,,,,f(5x3),,,,,#
-,,,,,,,,,,,,,,,#
-,,,,,,,,,,,,,,,#
-,,,,,u(10x5),,,,,,,,,,#
-,,,,,,,,,,,,,,,#
-,,,,,,,,,,,,,,,#
-,,,,,,,,,,,,,,,#
-,,,,,,,,,,,,,,,#
-#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
diff --git a/data/blueprints/library/examples/exploratory-mining-100x10.csv b/data/blueprints/library/examples/exploratory-mining-100x10.csv
deleted file mode 100644
index b85d6e247..000000000
--- a/data/blueprints/library/examples/exploratory-mining-100x10.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-"#dig exploratory mining, paths every 10 units, 100w x 10h",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
-d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,#
-d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,#
-d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,#
-d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,#
-d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,#
-d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,#
-d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,#
-d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,#
-d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,d,,,,,,,,,,,#
-#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
diff --git a/data/blueprints/library/examples/exploratory-mining-50x50-alt.csv b/data/blueprints/library/examples/exploratory-mining-50x50-alt.csv
deleted file mode 100644
index b4969ef10..000000000
--- a/data/blueprints/library/examples/exploratory-mining-50x50-alt.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-"#dig exploratory mining complex, using diagonal interconnecting tunnels. repeat down as needed.",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,#
-,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,#
-,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,#
-,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,#
-,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,#
-,,,,,i,,,,,,,,,,i,,,,,,,,,,i,,,,,,,,,,i,,,,,,#
-,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,#
-,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,#
-,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,#
-,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,#
-d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,#
-,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,#
-,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,#
-,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,#
-,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,#
-,,,,,i,,,,,,,,,,i,,,,,,,,,,i,,,,,,,,,,i,,,,,,#
-,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,#
-,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,#
-,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,#
-,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,#
-d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,#
-,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,#
-,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,#
-,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,#
-,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,#
-,,,,,i,,,,,,,,,,i,,,,,,,,,,i,,,,,,,,,,i,,,,,,#
-,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,#
-,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,#
-,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,#
-,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,#
-d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,#
-,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,#
-,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,#
-,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,#
-,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,#
-,,,,,i,,,,,,,,,,i,,,,,,,,,,i,,,,,,,,,,i,,,,,,#
-,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,#
-,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,#
-,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,,d,,,,,,d,,,#
-,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,d,,,,,,,,d,,#
-d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,,,,,,,,,,d,#
-#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
diff --git a/data/blueprints/library/examples/exploratory-mining-50x50.csv b/data/blueprints/library/examples/exploratory-mining-50x50.csv
deleted file mode 100644
index 67e2bdd1e..000000000
--- a/data/blueprints/library/examples/exploratory-mining-50x50.csv
+++ /dev/null
@@ -1,43 +0,0 @@
-"#dig exploratory mineshafts, as stairs every 3rd tile",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,i,,,#
-,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
-#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
diff --git a/data/blueprints/library/exploratory-mining/connected-mineshafts.csv b/data/blueprints/library/exploratory-mining/connected-mineshafts.csv
new file mode 100644
index 000000000..3b4d71de2
--- /dev/null
+++ b/data/blueprints/library/exploratory-mining/connected-mineshafts.csv
@@ -0,0 +1,43 @@
+#dig diagonal interconnecting tunnels with stairs at intersections
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d,#
+ ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,#
+ , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , ,#
+ , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , ,#
+ , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , ,#
+ , , , , ,i, , , , , , , , , ,i, , , , , , , , , ,i, , , , , , , , , ,i, , , , , ,#
+ , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , ,#
+ , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , ,#
+ , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , ,#
+ ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,#
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d,#
+ ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,#
+ , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , ,#
+ , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , ,#
+ , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , ,#
+ , , , , ,i, , , , , , , , , ,i, , , , , , , , , ,i, , , , , , , , , ,i, , , , , ,#
+ , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , ,#
+ , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , ,#
+ , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , ,#
+ ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,#
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d,#
+ ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,#
+ , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , ,#
+ , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , ,#
+ , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , ,#
+ , , , , ,i, , , , , , , , , ,i, , , , , , , , , ,i, , , , , , , , , ,i, , , , , ,#
+ , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , ,#
+ , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , ,#
+ , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , ,#
+ ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,#
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d,#
+ ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,#
+ , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , ,#
+ , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , ,#
+ , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , ,#
+ , , , , ,i, , , , , , , , , ,i, , , , , , , , , ,i, , , , , , , , , ,i, , , , , ,#
+ , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , ,#
+ , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , ,#
+ , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , , ,d, , , , , ,d, , ,#
+ ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,d, , , , , , , ,d, ,#
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
diff --git a/data/blueprints/library/exploratory-mining/tunnels.csv b/data/blueprints/library/exploratory-mining/tunnels.csv
new file mode 100644
index 000000000..4af994ede
--- /dev/null
+++ b/data/blueprints/library/exploratory-mining/tunnels.csv
@@ -0,0 +1,52 @@
+#dig paths every 10 units
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d, , , , , , , , , ,d
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d
diff --git a/data/blueprints/library/exploratory-mining/vertical-mineshafts.csv b/data/blueprints/library/exploratory-mining/vertical-mineshafts.csv
new file mode 100644
index 000000000..28b4de563
--- /dev/null
+++ b/data/blueprints/library/exploratory-mining/vertical-mineshafts.csv
@@ -0,0 +1,42 @@
+#dig mineshafts as stairs every 3rd tile
+i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,i, , ,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
diff --git a/data/blueprints/library/layout-helpers/mark_down_left.csv b/data/blueprints/library/layout-helpers/mark_down_left.csv
new file mode 100644
index 000000000..84732ccf6
--- /dev/null
+++ b/data/blueprints/library/layout-helpers/mark_down_left.csv
@@ -0,0 +1,201 @@
+#dig start(200;1) marks a diagonal line down and left starting at the cursor
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,md
+,,,,,,,,,,,,md
+,,,,,,,,,,,md
+,,,,,,,,,,md
+,,,,,,,,,md
+,,,,,,,,md
+,,,,,,,md
+,,,,,,md
+,,,,,md
+,,,,md
+,,,md
+,,md
+,md
+md
diff --git a/data/blueprints/library/layout-helpers/mark_down_right.csv b/data/blueprints/library/layout-helpers/mark_down_right.csv
new file mode 100644
index 000000000..07f6ae1d0
--- /dev/null
+++ b/data/blueprints/library/layout-helpers/mark_down_right.csv
@@ -0,0 +1,201 @@
+#dig start(1;1) marks a diagonal line down and right starting at the cursor
+md
+,md
+,,md
+,,,md
+,,,,md
+,,,,,md
+,,,,,,md
+,,,,,,,md
+,,,,,,,,md
+,,,,,,,,,md
+,,,,,,,,,,md
+,,,,,,,,,,,md
+,,,,,,,,,,,,md
+,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
diff --git a/data/blueprints/library/layout-helpers/mark_up_left.csv b/data/blueprints/library/layout-helpers/mark_up_left.csv
new file mode 100644
index 000000000..a029136cd
--- /dev/null
+++ b/data/blueprints/library/layout-helpers/mark_up_left.csv
@@ -0,0 +1,201 @@
+#dig start(200;200) marks a diagonal line up and left starting at the cursor
+md
+,md
+,,md
+,,,md
+,,,,md
+,,,,,md
+,,,,,,md
+,,,,,,,md
+,,,,,,,,md
+,,,,,,,,,md
+,,,,,,,,,,md
+,,,,,,,,,,,md
+,,,,,,,,,,,,md
+,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
diff --git a/data/blueprints/library/layout-helpers/mark_up_right.csv b/data/blueprints/library/layout-helpers/mark_up_right.csv
new file mode 100644
index 000000000..8f2697d62
--- /dev/null
+++ b/data/blueprints/library/layout-helpers/mark_up_right.csv
@@ -0,0 +1,201 @@
+#dig start(1;200) marks a diagonal line up and right starting at the cursor
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,,md
+,,,,,,,,,,,,,md
+,,,,,,,,,,,,md
+,,,,,,,,,,,md
+,,,,,,,,,,md
+,,,,,,,,,md
+,,,,,,,,md
+,,,,,,,md
+,,,,,,md
+,,,,,md
+,,,,md
+,,,md
+,,md
+,md
+md

From 595e07d4517faffc4bf9198d1cba5db60191335c Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 27 Aug 2020 13:36:47 -0700
Subject: [PATCH 350/547] light proofreading pass of quickfort user guide

---
 data/blueprints/README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/blueprints/README.md b/data/blueprints/README.md
index 7e850c45c..776deba00 100644
--- a/data/blueprints/README.md
+++ b/data/blueprints/README.md
@@ -486,7 +486,7 @@ Start positions specify a cursor offset for a particular blueprint, simplifying
 
 will build the workshop *centered* on the cursor, not down and to the right of the cursor.
 
-The two numbers specify the column and row (or X and Y offset) where the cursor is expected to be when you apply the blueprint. Position 1;1 is the top left cell. The optional comment will show up in the `quickfort list` output and should contain information about where to position the cursor. If the start position is 1;1, you can omit the numbers and just add a comment describing where to put the cursor. This is useful for meta blueprints that refer to other blueprints that have fully-specified start() markers. For example, a meta blueprint that refers to the `masonw` blueprint above could look like this:
+The two numbers specify the column and row (or X and Y offset) where the cursor is expected to be when you apply the blueprint. Position 1;1 is the top left cell. The optional comment will show up in the `quickfort list` output and should contain information about where to position the cursor. If the start position is 1;1, you can omit the numbers and just add a comment describing where to put the cursor. This is useful for meta blueprints that refer to other blueprints that have fully-specified `start()` markers. For example, a meta blueprint that refers to the `masonw` blueprint above could look like this:
 
     #meta start(center of workshop) a mason workshop
     /masonw
@@ -583,11 +583,11 @@ A few examples might make this clearer. Say you have a .csv file with the follow
     #query label(makeroombedroom)
     ...
 
-Note how I've given them all labels so we can address them safely. If I hadn't given them labels, they would receive default labels of "1", "2", "3", etc, but those labels would change if I ever add more blueprints at the top. This is not a problem if we're just running the blueprints from the `quickfort list` command, but meta blueprints need a label that isn't going to change over time.
+Note how I've given them all labels so we can address them safely. If I hadn't given them labels, they would receive default labels of "1", "2", "3", etc, but those labels would change if I ever add more blueprints at the top. This is not a problem if we're just running the blueprints individually from the `quickfort list` command, but meta blueprints need a label name that isn't going to change over time.
 
 So let's add a meta blueprint to this file that will combine the middle three blueprints into one:
 
-    #meta plan bedroom: combines build, place, and stockpile config blueprints
+    "#meta plan bedroom: combines build, place, and stockpile config blueprints"
     /buildbedroom
     /placebedroom
     /querystockpilesbedroom
@@ -643,7 +643,7 @@ We can add a sheet named "dig_all" with the following contents (we're expecting
 
 Note that for blueprints without an explicit label, we still need to address them by their auto-generated numerical label.
 
-You can then hide the blueprints that you now manage with the `meta`-mode blueprint from `quickfort list` by adding a `hidden()` marker to their modelines. That way the output of `quickfort list` won't be cluttered by blueprints that you don't need to run directly. If you ever *do* need to access the managed blueprints individually, you can still see them with `quickfort list --hidden`.
+You can then hide the blueprints that you now manage with the `#meta`-mode blueprint from `quickfort list` by adding a `hidden()` marker to their modelines. That way the output of `quickfort list` won't be cluttered by blueprints that you don't need to run directly. If you ever *do* need to access the managed blueprints individually, you can still see them with `quickfort list --hidden`.
 
 
 Buildingplan integration
@@ -663,7 +663,7 @@ Generating manager orders
 
 Quickfort can generate manager orders to make sure you have the proper items in stock to apply a `#build`-mode blueprint.
 
-Many items can be manufactured from different source materials. Orders will always choose rock when it can, then wood, then cloth, then iron. You can always remove orders that don't make sense for your fort and manually enqueue a similar order more to your liking. For example, if you want silk ropes instead of cloth ropes, make a new manager order for silk ropes and then remove the generated cloth rope order.
+Many items can be manufactured from different source materials. Orders will always choose rock when it can, then wood, then cloth, then iron. You can always remove orders that don't make sense for your fort and manually enqueue a similar order more to your liking. For example, if you want silk ropes instead of cloth ropes, make a new manager order for an appropriate quantity of silk ropes, and then remove the generated cloth rope order.
 
 Anything that requires generic building materials (workshops, constructions, etc.) will result in an order for a rock block. One "Make rock blocks" job produces four blocks per input boulder, so the number of jobs ordered will be the number of blocks you need divided by four (rounded up). You might end up with a few extra blocks, but not too many.
 
@@ -673,7 +673,7 @@ There are a few building types that will generate extra manager orders for relat
 
 - Track stops will generate an order for a minecart
 - Traction benches will generate orders for a table, mechanism, and rope
-- Levers will generate orders for extra two mechanisms for connecting the lever to a target
+- Levers will generate an order for an extra two mechanisms for connecting the lever to a target
 - Cage traps will generate an order for a cage
 
 
@@ -684,7 +684,7 @@ Tips and tricks
 
 * After digging out an area, you may wish to smooth and/or engrave the area before starting the build phase, as dwarves may be unable to access walls or floors that are behind/under built objects.
 
-* If you are designating more than one level for digging at a time, you can make your miners more efficient by using marker mode (`dM`) on all levels but one. This prevents your miners from digging out a few tiles on one level, then running down/up the stairs to do a few tiles on an adjacent level. With only one level "live" and all other levels in marker mode, your miners can concentrate on one level at a time. You just have to rememer to "unmark" a new level when your miners are done with their current one.
+* If you are designating more than one level for digging at a time, you can make your miners more efficient by using marker mode on all levels but one. This prevents your miners from digging out a few tiles on one level, then running down/up the stairs to do a few tiles on an adjacent level. With only one level "live" and all other levels in marker mode, your miners can concentrate on one level at a time. You just have to rememer to "unmark" a new level when your miners are done with their current one.
 
 * As of DF 0.34.x, it is no longer possible to build doors (d) at the same time that you build adjacent walls (Cw). Doors must now be built *after* walls are constructed for them to be next to. This does not affect the more common case where walls exist as a side-effect of having dug-out a room in a #dig blueprint.
 

From 100ba998a17edf7273370586ed1761c4568cfc98 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 28 Aug 2020 18:44:16 -0400
Subject: [PATCH 351/547] Update changelog, authors (#1633)

---
 docs/Authors.rst   | 1 +
 docs/changelog.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/Authors.rst b/docs/Authors.rst
index 42fda0985..2c943c3f5 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -52,6 +52,7 @@ expwnent                expwnent
 Feng
 figment                 figment
 gchristopher            gchristopher
+George Murray           GitOnUp
 grubsteak               grubsteak
 Harlan Playford         playfordh
 Hayati Ayguen           hayguen
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 7247b665d..ee264f743 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -34,6 +34,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 # Future
 
 ## Fixes
+- `search`: fixed an issue causing item counts on the trade screen to display inconsistently when searching
 - `stockpiles`: fixed a crash when loading food stockpiles
 
 # 0.47.04-r2

From d571f90f8874b025cb4503305a1e8e6cc31e4c3e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 29 Aug 2020 17:29:33 -0400
Subject: [PATCH 352/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 30eecbc8e..e7ff317cf 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 30eecbc8edd181ff25845b771a7ccd1e9a9b2638
+Subproject commit e7ff317cf993291178b4c9b005638f3c0d96a4e6

From 5aca88ef0397f03be9cfbe21389fa816934f30d5 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 29 Aug 2020 20:02:33 -0400
Subject: [PATCH 353/547] Update submodules

---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index 036b662a1..5756bf859 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 036b662a1bbc96b4911f3cbe74dfa1243b6459bc
+Subproject commit 5756bf8599630891fc460b1509bd0660b71c0809
diff --git a/scripts b/scripts
index e7ff317cf..913e4c329 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit e7ff317cf993291178b4c9b005638f3c0d96a4e6
+Subproject commit 913e4c329bf815c55a7e471690b7cb3746227df8

From 09b018bea6c36878431bdc34dbc93e3398bfeb24 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 29 Aug 2020 20:04:09 -0400
Subject: [PATCH 354/547] stockpiles: remove sand_bags field

Fixes #1013
---
 plugins/stockpiles/StockpileSerializer.cpp | 6 ------
 plugins/stockpiles/proto/stockpiles.proto  | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/plugins/stockpiles/StockpileSerializer.cpp b/plugins/stockpiles/StockpileSerializer.cpp
index e5873988f..b6511d759 100644
--- a/plugins/stockpiles/StockpileSerializer.cpp
+++ b/plugins/stockpiles/StockpileSerializer.cpp
@@ -828,7 +828,6 @@ void StockpileSerializer::furniture_setup_other_mats()
 void StockpileSerializer::write_furniture()
 {
     StockpileSettings::FurnitureSet *furniture= mBuffer.mutable_furniture();
-    furniture->set_sand_bags ( mPile->settings.furniture.sand_bags );
 
     // FURNITURE type
     using df::enums::furniture_type::furniture_type;
@@ -880,11 +879,6 @@ void StockpileSerializer::read_furniture()
         const StockpileSettings::FurnitureSet furniture = mBuffer.furniture();
         debug() << "furniture:" <<endl;
 
-        if ( mBuffer.furniture().has_sand_bags() )
-            mPile->settings.furniture.sand_bags = mBuffer.furniture().sand_bags();
-        else
-            mPile->settings.furniture.sand_bags = false;
-
         // type
         using df::enums::furniture_type::furniture_type;
         df::enum_traits<furniture_type> type_traits;
diff --git a/plugins/stockpiles/proto/stockpiles.proto b/plugins/stockpiles/proto/stockpiles.proto
index 59e905031..5868586f4 100644
--- a/plugins/stockpiles/proto/stockpiles.proto
+++ b/plugins/stockpiles/proto/stockpiles.proto
@@ -39,7 +39,7 @@ message StockpileSettings {
       repeated string mats = 3;
       repeated string quality_core = 4;
       repeated string quality_total = 5;
-      optional bool sand_bags = 6;
+      // UNUSED: optional bool sand_bags = 6;
   }
   message RefuseSet {
       repeated string type = 1;

From 8728056674c7249f1a15f80c62e3ded16507bb56 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 1 Sep 2020 00:17:32 -0400
Subject: [PATCH 355/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 913e4c329..070e8d221 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 913e4c329bf815c55a7e471690b7cb3746227df8
+Subproject commit 070e8d221a1de3c0c5a0fa4ae80a9c86e7e510fc

From e0fec78481cfc8b94ff3d0490e4537a1ec0c943f Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 1 Sep 2020 19:48:10 -0700
Subject: [PATCH 356/547] final cleanup pass; add docs for dig priorities

---
 data/blueprints/README.md | 124 ++++++++++++++++++++++++--------------
 1 file changed, 78 insertions(+), 46 deletions(-)

diff --git a/data/blueprints/README.md b/data/blueprints/README.md
index 776deba00..80023d313 100644
--- a/data/blueprints/README.md
+++ b/data/blueprints/README.md
@@ -7,11 +7,11 @@
 DFHack Quickfort User Manual
 ============================
 
-DFHack Quickfort is a DFHack script that helps you build fortresses from "blueprint" .csv and .xlsx files. Many applications exist to edit these files, such as MS Excel and [Google Sheets](https://sheets.new). You can also build your plan "for real" in Dwarf Fortress, and then export your map using DFHack's [blueprint](https://docs.dfhack.org/en/stable/docs/Plugins.html#blueprint) plugin. Most layout and building-oriented DF commands are supported through the use of multiple files or spreadsheets, each describing a different phase of DF construction: designation, building, placing stockpiles, and setting configuration.
+DFHack Quickfort is a DFHack script that helps you build fortresses from "blueprint" .csv and .xlsx files. Many applications exist to edit these files, such as MS Excel and [Google Sheets](https://sheets.new). You can also build your plan "for real" in Dwarf Fortress, and then export your map using DFHack's [blueprint](https://docs.dfhack.org/en/stable/docs/Plugins.html#blueprint) plugin. Most layout and building-oriented DF commands are supported through the use of multiple files or spreadsheets, each describing a different phase of DF construction: designation, building, placing stockpiles/zones, and setting configuration.
 
 The original idea and 1.0 codebase came from [Valdemar's](https://dwarffortresswiki.org/index.php/User:Valdemar) auto-designation macro. Joel Thornton (joelpt) reimplemented the core logic in Python and extended its functionality with [Quickfort 2.0](https://github.com/joelpt/quickfort). This DFHack-native implementation, called "DFHack Quickfort" or just "quickfort", builds upon Quickfort 2.0's formats and features. DFHack Quickfort is written in Lua and interacts with Dwarf Fortress memory structures directly, allowing for instantaneous blueprint application, error checking and recovery, and many other advanced features.
 
-This document focuses on DFHack Quickfort's capabilities and teaches players how to understand and build blueprint files.  Much of the text was originally written by Joel Thornton, reused here with his permission.
+This document focuses on DFHack Quickfort's capabilities and teaches players how to understand and build blueprint files.  Some of the text was originally written by Joel Thornton, reused here with his permission.
 
 For those just looking to apply blueprints, check out the [quickfort command syntax](https://docs.dfhack.org/en/stable/docs/_auto/base.html#quickfort) in the DFHack Scripts documentation. There are also many ready-to-use blueprints available in the `blueprints/library` subfolder in your DFHack installation. Browse them on your computer or [online](https://github.com/DFHack/dfhack/tree/develop/data/blueprints/library), or run `quickfort list -l` at the `DFHack#` prompt to list them, and then `quickfort run` to apply them to your fort!
 
@@ -27,6 +27,7 @@ Table of Contents
   * [Automatic area expansion](#automatic-area-expansion)
   * [Multilevel blueprints](#multilevel-blueprints)
   * [Marker mode](#marker-mode)
+  * [Dig priorities](#dig-priorities)
   * [Stockpiles and zones](#stockpiles-and-zones)
   * [Minecart tracks](#minecart-tracks)
   * [Modeline markers](modeline-markers)
@@ -43,12 +44,12 @@ Features
 --------
 
 * General
-  * Manages complete blueprints to handle all phases of DF construction
+  * Manages blueprints to handle all phases of DF construction
   * Supports .csv and multi-worksheet .xlsx blueprint files
   * Near-instant application, even for very large and complex blueprints
+  * Blueprints can span multiple z-levels
   * Supports multiple blueprints per .csv file/spreadsheet sheet
   * "meta" blueprints that automate the application of sequences of blueprints
-  * Blueprints can span multiple z-levels
   * Undo functionality for dig, build, place, and zone blueprints
   * Automatic cropping of blueprints so you don't get errors if the blueprint extends off the map
   * Can generate manager orders for everything required by a build blueprint
@@ -67,13 +68,13 @@ Features
   * Relaxed rules for farm plot and road placement: you can still place the building even if an invalid tile (e.g. stone tiles for farm plots) splits the designated area into two parts
   * Intelligent boundary detection for adjacent buildings of the same type (e.g. a 6x6 block of `wj` cells will be correctly split into 4 jeweler's workshops)
 * Place and zone modes
-  * Define stockpiles and zones in any shape, not just rectangular blocks
+  * Define stockpiles and zones in any continguous shape, not just rectangular blocks
   * Configurable maximums for bins, barrels and wheelbarrows assigned to created stockpiles
   * Automatic splitting of stockpiles and zones that exceed maximum dimension limits
 * Query mode
   * Send arbitrary keystroke sequences to the UI -- *anything* you can do through the UI is supported
   * Supports aliases to automate frequent keystroke combos
-  * Includes a library of pre-made and tested aliases to automate most common tasks, such as configuring stockpiles for important item types or creating hauling routes for quantum stockpiles.
+  * Includes a library of pre-made and tested aliases to automate most common tasks, such as configuring stockpiles for important item types or creating named hauling routes for quantum stockpiles.
   * Supports including aliases in other aliases, and repeating key sequences a specified number of times
   * Skips sending key sequences when the cursor is over a tile that does not have a stockpile or building, so missing buildings won't desynchronize your blueprint
   * Instant halting of query blueprint application when keystroke errors are detected, such as when a key sequence leaves us stuck in a submenu, to make blueprint misconfigurations easier to debug
@@ -82,11 +83,9 @@ Features
 Editing Blueprints
 ------------------
 
-The format of Quickfort-compatible blueprint files is straightforward.
-
-It is recommended to use a spreadsheet editor such as Excel, [Google Sheets](https://sheets.new), or [LibreOffice](https://www.libreoffice.org) to edit these files, but any text editor will do.
+We recommend using a spreadsheet editor such as Excel, [Google Sheets](https://sheets.new), or [LibreOffice](https://www.libreoffice.org) to edit blueprint files, but any text editor will do.
 
-The first line (or upper-left cell) of the spreadsheet should look like this:
+The format of Quickfort-compatible blueprint files is straightforward. The first line (or upper-left cell) of the spreadsheet should look like this:
 
     #dig This is a decription.
 
@@ -111,7 +110,7 @@ Below this line begin entering the keys you want sent in each cell. For example,
     d d d d #
     # # # # #
 
-Note the # symbols at the right end of each row and below the last row. These are completely optional, but can be helpful when visualizing the layout.
+Note the # symbols at the right end of each row and below the last row. These are completely optional, but can be helpful to make the row and column positions clear.
 
 Once the dwarves have that dug out, let's build a walled-in bedroom within our dug-out area:
 
@@ -122,7 +121,7 @@ Once the dwarves have that dug out, let's build a walled-in bedroom within our d
     Cw Cw    Cw #
     #  #  #  #  #
 
-Note my generosity - in addition to the bed (b) I've built a chest (h) here for the dwarf as well. Note that you must use the full series of keys needed to build something in each cell, e.g. 'Cw' enters DF's constructions submenu (C) and selects walls (w).
+Note my generosity - in addition to the bed (b) I've built a chest (h) here for the dwarf as well. You must use the full series of keys needed to build something in each cell, e.g. 'Cw' enters DF's constructions submenu (C) and selects walls (w).
 
 I'd also like to place a booze stockpile in the 2 unoccupied tiles in the room.
 
@@ -181,7 +180,7 @@ In Quickfort, the following blueprints are equivalent:
 
 The second example uses Quickfort's "area expansion syntax", which takes the form:
 
-    cmds(WxH)
+    keys(WxH)
 
 In Quickfort the above two examples of specifying a contiguous 3x3 area produce identical output: a single 3x3 designation will be performed, rather than nine 1x1 designations as the first example might suggest.
 
@@ -282,6 +281,36 @@ Multilevel blueprints are accommodated by separating Z-levels of the blueprint w
 The marker must appear in the first column of the row to be recognized, just like a modeline.
 
 
+Dig priorities
+--------------
+
+DF designation priorities are supported for `#dig` blueprints. The full syntax is `[letter][number][expansion]`, where if the `letter` is not specified, `d` is assumed, and if `number` is not specified, `4` is assumed (the default priority). So each of these blueprints is equivalent:
+
+    #dig dig the interior of the room at high priority
+    d  d  d  d  d  #
+    d  d1 d1 d1 d  #
+    d  d1 d1 d1 d  #
+    d  d1 d1 d1 d  #
+    d  d  d  d  d  #
+    #  #  #  #  #  #
+
+    #dig dig the interior of the room at high priority
+    d  d  d  d  d  #
+    d  d1(3x3)  d  #
+    d  `  `  `  d  #
+    d  `  `  `  d  #
+    d  d  d  d  d  #
+    #  #  #  #  #  #
+
+    #dig dig the interior of the room at high priority
+    4  4  4  4  4  #
+    4  1  1  1  4  #
+    4  1  1  1  4  #
+    4  1  1  1  4  #
+    4  4  4  4  4  #
+    #  #  #  #  #  #
+
+
 Marker mode
 -----------
 
@@ -308,19 +337,19 @@ Stockpiles and zones
 It is very common to have stockpiles that accept multiple categories of items or zones that permit more than one activity. Although it is perfectly valid to declare a single-purpose stockpile or zone and then modify it with a `#query` blueprint, quickfort also supports directly declaring all the types on the `#place` and `#zone` blueprints. For example, to declare a 10x10 area that is a pasture, a fruit picking area, and a meeting area all at once, you could write:
 
     #zone main pasture and picnic area
-    nmg(10x10) #
+    nmg(10x10)
 
 And similarly, to declare a stockpile that accepts both corpses and refuse, you could write:
 
     #place refuse heap
-    yr(20x10) #
+    yr(20x10)
 
 The order of the individual letters doesn't matter.
 
 To toggle the `active` flag for zones, add an `a` character to the string. For example, to create a *disabled* pit zone (that you later intend to turn into a pond and carefully fill to 3-depth water):
 
     #zone disabled future pond zone
-    pa(1x3) #
+    pa(1x3)
 
 Note that while this notation covers most use cases, tweaking low-level zone parameters, like hospital supply levels or converting between pits and ponds, must still be done manually or with a `#query` blueprint.
 
@@ -330,9 +359,9 @@ Minecart tracks
 
 There are two ways to produce minecart tracks, and they are handled very differently by the game. You can carve them into hard natural floors or you can construct them out of building materials. Constructed tracks are conceptually simpler, so we'll start with them.
 
-### Constructed Tracks ###
+### Constructed tracks ###
 
-Quickfort supports the designation of track stops and rollers through the normal mechanisms: a #build blueprint with `CS` and some number of 'd' and 'a' characters (for selecting dump direction and friction) in a cell designates a track stop and a #build blueprint with `Mr` and some number of 's' and 'q' characters (for direction and speed) designates a roller. This can get confusing very quickly and is very difficult to read in a blueprint. Constructed track segments don't even have keys associated with them at all!
+Quickfort supports the designation of track stops and rollers through the normal mechanisms: a `#build` blueprint with `CS` and some number of `d` and `a` characters (for selecting dump direction and friction) in a cell designates a track stop and a `#build` blueprint with `Mr` and some number of `s` and `q` characters (for direction and speed) designates a roller. This can get confusing very quickly and is very difficult to read in a blueprint. Constructed track segments don't even have keys associated with them at all!
 
 To solve this problem, Quickfort provides the following keywords for use in build blueprints:
 
@@ -398,21 +427,23 @@ As an example, you can create an E-W track with stops at each end that dump to t
     #build Example track
     trackstopW trackEW trackEW trackEW trackstopE
 
-Note that the **only** way to build track and track/ramp segments is with the keywords. The UI method of using "+" and "-" keys to select the track type from a list does not work since DFHack Quickfort doesn't actually send keys to the UI in order to build buildings. The text in your spreadsheet cells is mapped directly into DFHack API calls. Only query-mode blueprints still send actual keycodes to the UI.
+Note that the **only** way to build track and track/ramp segments is with the keywords. The UI method of using "+" and "-" keys to select the track type from a list does not work since DFHack Quickfort doesn't actually send keys to the UI to build buildings. The text in your spreadsheet cells is mapped directly into DFHack API calls. Only `#query` blueprints still send actual keycodes to the UI.
 
-### Carved Tracks ###
+### Carved tracks ###
 
 In the game, you carve a minecart track by specifying a beginning and ending tile and the game "adds" the designation to the tiles. You cannot designate single tiles. For example to carve two track segments that cross each other, you might use the cursor to designate a line of three vertical tiles like this:
 
     `  start here  `  #
     `  `           `  #
     `  end here    `  #
+    #  #           #  #
 
 Then to carve the cross, you'd do a horizonal segment:
 
     `           `  `         #
     start here  `  end here  #
     `           `  `         #
+    #           #  #         #
 
 This will result in a carved track that would be equivalent to a constructed track of the form:
 
@@ -422,7 +453,7 @@ This will result in a carved track that would be equivalent to a constructed tra
     `       trackN     `       #
     #       #          #       #
 
-To carve this same track with a dig blueprint, you'd use area expansion syntax with a height or width of 1 to indicate the segments to designate:
+To carve this same track with a `#dig` blueprint, you'd use area expansion syntax with a height or width of 1 to indicate the segments to designate:
 
     #dig
     `       T(1x3)  `  #
@@ -454,7 +485,7 @@ The modeline has some additional optional components that we haven't talked abou
 
 * give a blueprint a label by adding a `label()` marker
 * set a cursor offset and/or start hint by adding a `start()` marker
-* hide a blueprint with a `hidden()` marker
+* hide a blueprint from being listed with a `hidden()` marker
 * register a message to be displayed after the blueprint is successfully applied
 
 The full modeline syntax, when everything is specified, is:
@@ -465,7 +496,7 @@ Note that all elements are optional except for the initial `#mode`. Here are a f
 
     #dig start(3; 3; Center tile of a 5-tile square) Regular blueprint comment
     #build label(noblebedroom) start(10;15)
-    #query label(configstockpiles) No explicit start()  means cursor is at upper left corner
+    #query label(configstockpiles) No explicit start() means cursor is at upper left corner
     #meta label(digwholefort) start(center of stairs on surface)
     #dig label(digdining) hidden() managed by the digwholefort meta blueprint
     #zone label(pastures) message(remember to assign animals to the new pastures)
@@ -486,7 +517,7 @@ Start positions specify a cursor offset for a particular blueprint, simplifying
 
 will build the workshop *centered* on the cursor, not down and to the right of the cursor.
 
-The two numbers specify the column and row (or X and Y offset) where the cursor is expected to be when you apply the blueprint. Position 1;1 is the top left cell. The optional comment will show up in the `quickfort list` output and should contain information about where to position the cursor. If the start position is 1;1, you can omit the numbers and just add a comment describing where to put the cursor. This is useful for meta blueprints that refer to other blueprints that have fully-specified `start()` markers. For example, a meta blueprint that refers to the `masonw` blueprint above could look like this:
+The two numbers specify the column and row (or X and Y offset) where the cursor is expected to be when you apply the blueprint. Position 1;1 is the top left cell. The optional comment will show up in the `quickfort list` output and should contain information about where to position the cursor. If the start position is 1;1, you can omit the numbers and just add a comment describing where to put the cursor. This is also useful for meta blueprints that don't actually care where the cursor is, but that refer to other blueprints that have fully-specified `start()` markers. For example, a meta blueprint that refers to the `masonw` blueprint above could look like this:
 
     #meta start(center of workshop) a mason workshop
     /masonw
@@ -497,7 +528,7 @@ A blueprint with a `hidden()` marker won't appear in `quickfort list` output unl
 
 ### Messages ###
 
-A blueprint with a `message()` marker will display a message after the blueprint is applied with `quickfort run`. This is useful for reminding players to take manual steps that cannot be automated, like assigning animals to a pasture or assigning minecarts to a route, or listing the next step in a series of blueprints. For long or multi-part messages, it is fine to embed newlines:
+A blueprint with a `message()` marker will display a message after the blueprint is applied with `quickfort run`. This is useful for reminding players to take manual steps that cannot be automated, like assigning animals to a pasture or assigning minecarts to a route, or listing the next step in a series of blueprints. For long or multi-part messages, you can embed newlines:
 
     "#meta label(surface1) message(This would be a good time to start digging the industry level.
     Once the area is clear, continue with /surface2.) clear the embark site and set up pastures"
@@ -513,31 +544,31 @@ For both .csv files and .xlsx spreadsheets you can also add as many blueprints a
 
 For example, you can store multiple blueprints together like this:
 
-    #dig label(digbed)
+    #dig label(bed1)
     d d d d #
     d d d d #
     d d d d #
     d d d d #
     # # # # #
-    #build label(buildbed)
+    #build label(bed2)
     b   f h #
             #
             #
     n       #
     # # # # #
-    #place label(placebed)
+    #place label(bed3)
             #
     f(2x2)  #
             #
             #
     # # # # #
-    #query label(boozebed)
+    #query label(bed4)
             #
     booze   #
             #
             #
     # # # # #
-    #query label(roombed)
+    #query label(bed5)
     r{+ 3}& #
             #
             #
@@ -551,6 +582,7 @@ Of course, you could still choose to keep your blueprints in single-sheet .csv f
     bedroom.2.build.csv
     bedroom.3.place.csv
     bedroom.4.query.csv
+    bedroom.5.query2.csv
 
 But the naming and organization is completely up to you.
 
@@ -570,17 +602,17 @@ Meta blueprints are blueprints that script a series of other blueprints. Many bl
 
 Those three "apply"s in the middle might as well get done in one command instead of three. A meta blueprint can encode that sequence. A meta blueprint refers to other blueprints by their label (see the [Modeline markers](modeline-markers) section above) in the same format used by the `DFHack#` quickfort command: "<sheet_name>/<label>", or just "/<label>" for blueprints in .csv files or blueprints in the same spreadsheet sheet as the #meta blueprint that references them.
 
-A few examples might make this clearer. Say you have a .csv file with the following blueprints defined:
+A few examples might make this clearer. Say you have a .csv file with the "bed" blueprints in the previous section:
 
-    #dig label(digbedroom)
+    #dig label(bed1)
     ...
-    #build label(buildbedroom)
+    #build label(bed2)
     ...
-    #place label(placebedroom)
+    #place label(bed3)
     ...
-    #query label(querystockpilesbedroom)
+    #query label(bed4)
     ...
-    #query label(makeroombedroom)
+    #query label(bed5)
     ...
 
 Note how I've given them all labels so we can address them safely. If I hadn't given them labels, they would receive default labels of "1", "2", "3", etc, but those labels would change if I ever add more blueprints at the top. This is not a problem if we're just running the blueprints individually from the `quickfort list` command, but meta blueprints need a label name that isn't going to change over time.
@@ -588,9 +620,9 @@ Note how I've given them all labels so we can address them safely. If I hadn't g
 So let's add a meta blueprint to this file that will combine the middle three blueprints into one:
 
     "#meta plan bedroom: combines build, place, and stockpile config blueprints"
-    /buildbedroom
-    /placebedroom
-    /querystockpilesbedroom
+    /bed2
+    /bed3
+    /bed4
 
 Now your sequence is shortened to:
 
@@ -661,11 +693,11 @@ See [buildingplan documentation](https://docs.dfhack.org/en/stable/docs/Plugins.
 Generating manager orders
 -------------------------
 
-Quickfort can generate manager orders to make sure you have the proper items in stock to apply a `#build`-mode blueprint.
+Quickfort can generate manager orders to make sure you have the proper items in stock to apply a `#build` blueprint.
 
 Many items can be manufactured from different source materials. Orders will always choose rock when it can, then wood, then cloth, then iron. You can always remove orders that don't make sense for your fort and manually enqueue a similar order more to your liking. For example, if you want silk ropes instead of cloth ropes, make a new manager order for an appropriate quantity of silk ropes, and then remove the generated cloth rope order.
 
-Anything that requires generic building materials (workshops, constructions, etc.) will result in an order for a rock block. One "Make rock blocks" job produces four blocks per input boulder, so the number of jobs ordered will be the number of blocks you need divided by four (rounded up). You might end up with a few extra blocks, but not too many.
+Anything that requires generic building materials (workshops, constructions, etc.) will result in an order for a rock block. One "Make rock blocks" job produces four blocks per boulder, so the number of jobs ordered will be the number of blocks you need divided by four (rounded up). You might end up with a few extra blocks, but not too many.
 
 If you want your constructions to be in a consistent color, be sure to choose a rock type for all of your 'Make rock blocks' orders by selecting the order and hitting `d`. You might want to set the rock type for other non-block orders to something different if you fear running out of the type of rock that you want to use for blocks.
 
@@ -684,7 +716,7 @@ Tips and tricks
 
 * After digging out an area, you may wish to smooth and/or engrave the area before starting the build phase, as dwarves may be unable to access walls or floors that are behind/under built objects.
 
-* If you are designating more than one level for digging at a time, you can make your miners more efficient by using marker mode on all levels but one. This prevents your miners from digging out a few tiles on one level, then running down/up the stairs to do a few tiles on an adjacent level. With only one level "live" and all other levels in marker mode, your miners can concentrate on one level at a time. You just have to rememer to "unmark" a new level when your miners are done with their current one.
+* If you are designating more than one level for digging at a time, you can make your miners more efficient by using marker mode on all levels but one. This prevents your miners from digging out a few tiles on one level, then running down/up the stairs to do a few tiles on an adjacent level. With only one level "live" and all other levels in marker mode, your miners can concentrate on one level at a time. You just have to remember to "unmark" a new level when your miners are done with their current one.
 
 * As of DF 0.34.x, it is no longer possible to build doors (d) at the same time that you build adjacent walls (Cw). Doors must now be built *after* walls are constructed for them to be next to. This does not affect the more common case where walls exist as a side-effect of having dug-out a room in a #dig blueprint.
 
@@ -692,15 +724,15 @@ Tips and tricks
 Caveats and limitations
 -----------------------
 
-* Buildings will be designated regardless of whether you have the required materials, but if materials are not available when the construction job is picked up by a dwarf, the buildings will be canceled and the designations will disappear. Until the buildingplan plugin can be extended to support all building types, you should use `quickfort orders` to pre-manufacture all the materials you need for a `#build`-mode blueprint before you apply it.
+* Buildings will be designated regardless of whether you have the required materials, but if materials are not available when the construction job is picked up by a dwarf, the buildings will be canceled and the designations will disappear. Until the buildingplan plugin can be extended to support all building types, you should use `quickfort orders` to pre-manufacture all the materials you need for a `#build` blueprint before you apply it.
 
 * If you use the `jugs` alias in your `#query`-mode blueprints, be aware that there is no way to differentiate jugs from other types of tools in the game. Therefore, `jugs` stockpiles will also take nest boxes and other tools. The only workaround is not to have other tools lying around in your fort.
 
-* Likewise for bags. The game does not differentiate between empty and full bags, so you'll get gabs of gypsum power and sand in your bags stockpile unless you avoid collecting sand and are careful to assign all your gypsum to your hospital.
+* Likewise for bags. The game does not differentiate between empty and full bags, so you'll get bags of gypsum power and sand in your bags stockpile unless you avoid collecting sand and are careful to assign all your gypsum to your hospital.
 
-* Weapon traps and upright spear/spikes can currently only be built with a single weapon.
+* Weapon traps and upright spear/spike traps can currently only be built with a single weapon.
 
-* Pressure plates can be built, but they cannot be configured yet.
+* Pressure plates can be built, but they cannot be usefully configured yet.
 
 * Building instruments, bookcases, display furniture, and offering places are not yet supported by DFHack.
 

From da020c72deb5b4b427b71e90768a611404f1867d Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Wed, 2 Sep 2020 16:53:32 -0700
Subject: [PATCH 357/547] quickfort: refresh aliases docs and doc r+ -> r+&

---
 data/quickfort/aliases-common.txt   | 18 ++++++++----
 dfhack-config/quickfort/aliases.txt | 44 +++++++++++++++++------------
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt
index 10ace068b..ed9a34393 100644
--- a/data/quickfort/aliases-common.txt
+++ b/data/quickfort/aliases-common.txt
@@ -7,7 +7,7 @@
 # The aliases in this file were tested in DF 0.47.04 on 2020 Jul 18.
 #
 # The aliases are generally split into three categories:
-# 1) The aliases that name a type disables everything else for that stockpile
+# 1) The aliases that name a type disable everything else for that stockpile
 #    category and enable only that type. For example, "preparedfood" enables
 #    prepared food and disables all other types of food.
 # 2) The aliases that start with "forbid" only forbid (or toggle) the named type
@@ -17,6 +17,10 @@
 #
 # Aliases that don't fit into those two categories have comments explaining
 # their usage.
+#
+# There is also a non-alphanumeric alias built into the code for the common
+# shorthand for "make room":
+#   r+   expands to r+&
 
 
 ########################################
@@ -55,10 +59,12 @@ quantum: {linksonly}{nocontainers}{enableanimals}{enablefood}{furnitureprefix}{e
 # Run one of the quantumstopfrom* aliases over a track stop that is set to dump
 # into a quantum stockpile. The alias will set up the stop to accept all types
 # (the actual types stored in the quantum stockpile is controlled by the feeder
-# stockpile) and link the indicated adjacent feeder stockpile. All you need to
-# do afterwards is assign a vehicle to the stop (and optionally give the route a
-# name --see the namelastroute* aliases below). The track stop does not need to
-# be constructed yet, but the feeder stockpile needs to exist so we can link it.
+# stockpile) and link the indicated adjacent feeder stockpile (for example, the
+# quantumstopfromsouth alias will link to a feeder stockpile to the South). All
+# you need to do afterwards is assign a vehicle to the stop (and optionally
+# give the route a name --see the namelastroute* aliases below). The track stop
+# does not need to be constructed yet, but the feeder stockpile needs to exist
+# so we can link it.
 quantumstopprefix: ^hrs&xxx&{enablesequence 17}^
 quantumstopfromeast: {quantumstopprefix}s{Right}p^{Left}^q
 quantumstopfromsouth: {quantumstopprefix}s{Down}p^{Up}^q
@@ -130,7 +136,7 @@ permitmiscliquid:     {foodprefix}{Right}{Down 18}p^
 noseeds: {disablefood}{enablefood}{forbidseeds}
 
 # enables all food except for the types listed above
-food:    {noseeds}{forbidpreparedfood}{forbidunpreparedfish}{forbidplants}{forbidbooze}{forbiddye}{forbidtallow}{forbidmiscliquid}
+food: {noseeds}{forbidpreparedfood}{forbidunpreparedfish}{forbidplants}{forbidbooze}{forbiddye}{forbidtallow}{forbidmiscliquid}
 
 
 ##################################
diff --git a/dfhack-config/quickfort/aliases.txt b/dfhack-config/quickfort/aliases.txt
index c2de28897..c5d34ec39 100644
--- a/dfhack-config/quickfort/aliases.txt
+++ b/dfhack-config/quickfort/aliases.txt
@@ -3,7 +3,7 @@
 # This file defines custom keycode shortcuts for query mode blueprints.
 # Definitions in this file take precedence over any definitions in the baseline
 # aliases configuration file at hack/data/quickfort/aliases-common.txt. See that
-# file for aliases that are already defined.
+# file for the many useful aliases that are already defined.
 #
 # If possible, build on the baseline aliases when defining your own aliases. If
 # the DF UI screens change, updated baseline aliases may allow your aliases to
@@ -18,36 +18,42 @@
 # matter of mimicking the keys used to navigate through the menus and select
 # options. Use the aliases in your blueprint spreadsheets by writing an alias by
 # itself in a cell, like "nocontainers", or reference an alias in a larger
-# sequence by enclosing in in curly brackets, like "{nocontainers}{linksonly}"
+# sequence by enclosing it in curly brackets, like "{nocontainers}{linksonly}"
 #
 # For example, say you have the following build and place blueprints:
 #
-# #build start(4;1;upper left corner of stockpile) mason stockpile
-# ~,  ~, ~, `, `, `
-# ~, wm, ~, `, `, `
-# ~,  ~, ~, `, `, `
+# #build start(4;1;upper left corner of stockpile) build masonry workshop
+# ~, ~,~,`,`,`
+# ~,wm,~,`,`,`
+# ~, ~,~,`,`,`
 #
-# #place start(4;1;upper left corner of stockpile) build mason
-# ~, ~, ~, s, s, s
-# ~, ~, ~, s, s, s
-# ~, ~, ~, s, s, s
+# #place start(4;1;upper left corner of stockpile) place stockpile for mason
+# ~,~,~,s,s,s
+# ~,~,~,s,s,s
+# ~,~,~,s,s,s
 #
 # and you want to configure the stockpile to hold only non-economic ("other")
 # stone and to give to the adjacent mason workshop. You could write the
 # keystrokes directly:
 #
 # #query start(4;1;upper left corner of stockpile) configure mason
-# ~, ~, ~, s{Down 5}deb{Right}{Down 2}p^, `, `
-# ~, ~, ~, g{Left 2}&, `, `
-# ~, ~, ~, `, `, `
+# ~,~,~,s{Down 5}deb{Right}{Down 2}p^,`,`
+# ~,~,~,g{Left 2}&,                   `,`
+# ~,~,~,`,                            `,`
 #
 # or you could use alias names:
 #
 # #query start(4;1;upper left corner of stockpile) configure mason
-# ~, ~, ~, otherstone, `, `
-# ~, ~, ~, give2left,  `, `
-# ~, ~, ~, `,          `, `
+# ~,~,~,otherstone,`,`
+# ~,~,~,give2left, `,`
+# ~,~,~,`,         `,`
 #
+# you can combine the two aliases above into a single cell as well, if desired:
+#
+# #query start(4;1;upper left corner of stockpile) configure mason
+# ~,~,~,{otherstone}{give2left},`,`
+# ~,~,~,`,                      `,`
+# ~,~,~,`,                      `,`
 #
 # The syntax for defining aliases is:
 #   aliasname: keystrokes
@@ -63,10 +69,10 @@
 #
 # Anything enclosed within curly brackets can also have a number after it,
 # indicating how many times that alias or keycode should be repeated. For
-# example: "{buildblocks 9}" or "{Down 5}".
+# example: "{togglesequence 9}" or "{Down 5}".
 #
 # Ctrl, Alt, and Shift modifiers can be specified for the next keycode by adding
-# them as keycodes. For example, Alt-h is written as "{Alt}h".
+# them into the key sequence. For example, Alt-h is written as "{Alt}h".
 #
 # Some frequently-used keystrokes are assigned shorthand characters. Think of
 # them as single-character aliases that don't need to be surrounded in curly
@@ -80,3 +86,5 @@
 # If you need literal verisons of the shorthand characters, surround them in
 # curly brackets, for example: "{~}"
 #
+#
+# Add your custom aliases here:

From f3da131db7a8ec41389342eaf44bfe85a4f281d2 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 8 Sep 2020 00:17:56 -0700
Subject: [PATCH 358/547] reorganize buildingplan code - no logic changes

- no API or logic changes, just moving code around
- split buildingplan-lib into planner and rooms files
- move business logic from .h files to .cpp files
---
 plugins/CMakeLists.txt           |   2 +-
 plugins/buildingplan-lib.cpp     | 688 +------------------------------
 plugins/buildingplan-lib.h       | 507 +----------------------
 plugins/buildingplan-planner.cpp | 552 +++++++++++++++++++++++++
 plugins/buildingplan-planner.h   | 108 +++++
 plugins/buildingplan-rooms.cpp   | 227 ++++++++++
 plugins/buildingplan-rooms.h     |  51 +++
 plugins/buildingplan.cpp         | 311 +++++++++++++-
 plugins/fortplan.cpp             |  20 +-
 9 files changed, 1257 insertions(+), 1209 deletions(-)
 create mode 100644 plugins/buildingplan-planner.cpp
 create mode 100644 plugins/buildingplan-planner.h
 create mode 100644 plugins/buildingplan-rooms.cpp
 create mode 100644 plugins/buildingplan-rooms.h

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 07e14fa11..8301d05db 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -74,7 +74,7 @@ add_custom_target(generate_proto DEPENDS ${PROJECT_PROTO_TMP_FILES})
 
 set_source_files_properties( Brushes.h PROPERTIES HEADER_FILE_ONLY TRUE )
 
-add_library(buildingplan-lib STATIC buildingplan-lib.cpp)
+add_library(buildingplan-lib STATIC buildingplan-lib.cpp buildingplan-planner.cpp buildingplan-rooms.cpp)
 target_link_libraries(buildingplan-lib dfhack)
 
 # xlsxreader deps
diff --git a/plugins/buildingplan-lib.cpp b/plugins/buildingplan-lib.cpp
index e21c843aa..215dbb900 100644
--- a/plugins/buildingplan-lib.cpp
+++ b/plugins/buildingplan-lib.cpp
@@ -1,690 +1,16 @@
 #include "buildingplan-lib.h"
 
-#define PLUGIN_VERSION 0.00
-void debug(const string &msg)
-{
-    if (!show_debugging)
-        return;
-
-    color_ostream_proxy out(Core::getInstance().getConsole());
-    out << "DEBUG (" << PLUGIN_VERSION << "): " << msg << endl;
-}
-
-void enable_quickfort_fn(pair<const df::building_type, bool>& pair) { pair.second = true; }
-
-/*
- * Material Choice Screen
- */
-
-std::string material_to_string_fn(DFHack::MaterialInfo m) { return m.toString(); }
-
-bool ItemFilter::matchesMask(DFHack::MaterialInfo &mat)
-{
-    return (mat_mask.whole) ? mat.matches(mat_mask) : true;
-}
-
-bool ItemFilter::matches(const df::dfhack_material_category mask) const
-{
-    return mask.whole & mat_mask.whole;
-}
-
-bool ItemFilter::matches(DFHack::MaterialInfo &material) const
-{
-    for (auto it = materials.begin(); it != materials.end(); ++it)
-        if (material.matches(*it))
-            return true;
-    return false;
-}
-
-bool ItemFilter::matches(df::item *item)
-{
-    if (item->getQuality() < min_quality || item->getQuality() > max_quality)
-        return false;
-
-    if (decorated_only && !item->hasImprovements())
-        return false;
-
-    auto imattype = item->getActualMaterial();
-    auto imatindex = item->getActualMaterialIndex();
-    auto item_mat = DFHack::MaterialInfo(imattype, imatindex);
-
-    return (materials.size() == 0) ? matchesMask(item_mat) : matches(item_mat);
-}
-
-std::vector<std::string> ItemFilter::getMaterialFilterAsVector()
-{
-    std::vector<std::string> descriptions;
-
-    transform_(materials, descriptions, material_to_string_fn);
-
-    if (descriptions.size() == 0)
-        bitfield_to_string(&descriptions, mat_mask);
-
-    if (descriptions.size() == 0)
-        descriptions.push_back("any");
+#include "Core.h"
 
-    return descriptions;
-}
-
-std::string ItemFilter::getMaterialFilterAsSerial()
-{
-    std::string str;
-
-    str.append(bitfield_to_string(mat_mask, ","));
-    str.append("/");
-    if (materials.size() > 0)
-    {
-        for (size_t i = 0; i < materials.size(); i++)
-            str.append(materials[i].getToken() + ",");
-
-        if (str[str.size()-1] == ',')
-            str.resize(str.size () - 1);
-    }
-
-    return str;
-}
-
-bool ItemFilter::parseSerializedMaterialTokens(std::string str)
-{
-    valid = false;
-    std::vector<std::string> tokens;
-    split_string(&tokens, str, "/");
+using namespace DFHack;
 
-    if (tokens.size() > 0 && !tokens[0].empty())
-    {
-        if (!parseJobMaterialCategory(&mat_mask, tokens[0]))
-            return false;
-    }
-
-    if (tokens.size() > 1 && !tokens[1].empty())
-    {
-        std::vector<std::string> mat_names;
-        split_string(&mat_names, tokens[1], ",");
-        for (auto m = mat_names.begin(); m != mat_names.end(); m++)
-        {
-            DFHack::MaterialInfo material;
-            if (!material.find(*m) || !material.isValid())
-                return false;
-
-            materials.push_back(material);
-        }
-    }
-
-    valid = true;
-    return true;
-}
-
-std::string ItemFilter::getMinQuality()
-{
-    return ENUM_KEY_STR(item_quality, min_quality);
-}
-
-std::string ItemFilter::getMaxQuality()
-{
-    return ENUM_KEY_STR(item_quality, max_quality);
-}
-
-bool ItemFilter::isValid()
-{
-    return valid;
-}
-
-void ItemFilter::clear()
-{
-    mat_mask.whole = 0;
-    materials.clear();
-}
-
-DFHack::MaterialInfo &material_info_identity_fn(DFHack::MaterialInfo &m) { return m; }
-
-ViewscreenChooseMaterial::ViewscreenChooseMaterial(ItemFilter *filter)
-{
-    selected_column = 0;
-    masks_column.setTitle("Type");
-    masks_column.multiselect = true;
-    masks_column.allow_search = false;
-    masks_column.left_margin = 2;
-    materials_column.left_margin = MAX_MASK + 3;
-    materials_column.setTitle("Material");
-    materials_column.multiselect = true;
-    this->filter = filter;
-
-    masks_column.changeHighlight(0);
-
-    populateMasks();
-    populateMaterials();
-
-    masks_column.selectDefaultEntry();
-    materials_column.selectDefaultEntry();
-    materials_column.changeHighlight(0);
-}
-
-void ViewscreenChooseMaterial::feed(set<df::interface_key> *input)
-{
-    bool key_processed = false;
-    switch (selected_column)
-    {
-    case 0:
-        key_processed = masks_column.feed(input);
-        if (input->count(interface_key::SELECT))
-            populateMaterials(); // Redo materials lists based on category selection
-        break;
-    case 1:
-        key_processed = materials_column.feed(input);
-        break;
-    }
-
-    if (key_processed)
-        return;
-
-    if (input->count(interface_key::LEAVESCREEN))
-    {
-        input->clear();
-        Screen::dismiss(this);
-        return;
-    }
-    if (input->count(interface_key::CUSTOM_SHIFT_C))
-    {
-        filter->clear();
-        masks_column.clearSelection();
-        materials_column.clearSelection();
-        populateMaterials();
-    }
-    else if  (input->count(interface_key::SEC_SELECT))
-    {
-        // Convert list selections to material filters
-
-
-        filter->mat_mask.whole = 0;
-        filter->materials.clear();
-
-        // Category masks
-        auto masks = masks_column.getSelectedElems();
-        for (auto it = masks.begin(); it != masks.end(); ++it)
-            filter->mat_mask.whole |= it->whole;
-
-        // Specific materials
-        auto materials = materials_column.getSelectedElems();
-        transform_(materials, filter->materials, material_info_identity_fn);
-
-        Screen::dismiss(this);
-    }
-    else if  (input->count(interface_key::CURSOR_LEFT))
-    {
-        --selected_column;
-        validateColumn();
-    }
-    else if  (input->count(interface_key::CURSOR_RIGHT))
-    {
-        selected_column++;
-        validateColumn();
-    }
-    else if (enabler->tracking_on && enabler->mouse_lbut)
-    {
-        if (masks_column.setHighlightByMouse())
-            selected_column = 0;
-        else if (materials_column.setHighlightByMouse())
-            selected_column = 1;
-
-        enabler->mouse_lbut = enabler->mouse_rbut = 0;
-    }
-}
-
-void ViewscreenChooseMaterial::render()
-{
-    if (Screen::isDismissed(this))
-        return;
-
-    dfhack_viewscreen::render();
-
-    Screen::clear();
-    Screen::drawBorder("  Building Material  ");
-
-    masks_column.display(selected_column == 0);
-    materials_column.display(selected_column == 1);
-
-    int32_t y = gps->dimy - 3;
-    int32_t x = 2;
-    OutputHotkeyString(x, y, "Toggle", interface_key::SELECT);
-    x += 3;
-    OutputHotkeyString(x, y, "Save", interface_key::SEC_SELECT);
-    x += 3;
-    OutputHotkeyString(x, y, "Clear", interface_key::CUSTOM_SHIFT_C);
-    x += 3;
-    OutputHotkeyString(x, y, "Cancel", interface_key::LEAVESCREEN);
-}
-
-// START Room Reservation
-ReservedRoom::ReservedRoom(df::building *building, std::string noble_code)
-{
-    this->building = building;
-    config = DFHack::World::AddPersistentData("buildingplan/reservedroom");
-    config.val() = noble_code;
-    config.ival(1) = building->id;
-    pos = df::coord(building->centerx, building->centery, building->z);
-}
-
-ReservedRoom::ReservedRoom(PersistentDataItem &config, color_ostream &out)
-{
-    this->config = config;
-
-    building = df::building::find(config.ival(1));
-    if (!building)
-        return;
-    pos = df::coord(building->centerx, building->centery, building->z);
-}
-
-bool ReservedRoom::checkRoomAssignment()
-{
-    if (!isValid())
-        return false;
-
-    auto np = getOwnersNobleCode();
-    bool correctOwner = false;
-    for (auto iter = np.begin(); iter != np.end(); iter++)
-    {
-        if (iter->position->code == getCode())
-        {
-            correctOwner = true;
-            break;
-        }
-    }
-
-    if (correctOwner)
-        return true;
-
-    for (auto iter = world->units.active.begin(); iter != world->units.active.end(); iter++)
-    {
-        df::unit* unit = *iter;
-        if (!Units::isCitizen(unit))
-            continue;
-
-        if (!Units::isActive(unit))
-            continue;
-
-        np = getUniqueNoblePositions(unit);
-        for (auto iter = np.begin(); iter != np.end(); iter++)
-        {
-            if (iter->position->code == getCode())
-            {
-                Buildings::setOwner(building, unit);
-                break;
-            }
-        }
-    }
-
-    return true;
-}
-
-std::string RoomMonitor::getReservedNobleCode(int32_t buildingId)
-{
-    for (auto iter = reservedRooms.begin(); iter != reservedRooms.end(); iter++)
-    {
-        if (buildingId == iter->getId())
-            return iter->getCode();
-    }
-
-    return "";
-}
-
-void RoomMonitor::toggleRoomForPosition(int32_t buildingId, std::string noble_code)
-{
-    bool found = false;
-    for (auto iter = reservedRooms.begin(); iter != reservedRooms.end(); iter++)
-    {
-        if (buildingId != iter->getId())
-        {
-            continue;
-        }
-        else
-        {
-            if (noble_code == iter->getCode())
-            {
-                iter->remove();
-                reservedRooms.erase(iter);
-            }
-            else
-            {
-                iter->setCode(noble_code);
-            }
-            found = true;
-            break;
-        }
-    }
-
-    if (!found)
-    {
-        ReservedRoom room(df::building::find(buildingId), noble_code);
-        reservedRooms.push_back(room);
-    }
-}
-
-void RoomMonitor::doCycle()
-{
-    for (auto iter = reservedRooms.begin(); iter != reservedRooms.end();)
-    {
-        if (iter->checkRoomAssignment())
-        {
-            ++iter;
-        }
-        else
-        {
-            iter->remove();
-            iter = reservedRooms.erase(iter);
-        }
-    }
-}
-
-void RoomMonitor::reset(color_ostream &out)
-{
-    reservedRooms.clear();
-    std::vector<PersistentDataItem> items;
-    DFHack::World::GetPersistentData(&items, "buildingplan/reservedroom");
-
-    for (auto i = items.begin(); i != items.end(); i++)
-    {
-        ReservedRoom rr(*i, out);
-        if (rr.isValid())
-            addRoom(rr);
-    }
-}
-
-
-void delete_item_fn(df::job_item *x) { delete x; }
-
-// START Planning
-
-PlannedBuilding::PlannedBuilding(df::building *building, ItemFilter *filter)
-{
-    this->building = building;
-    this->filter = *filter;
-    pos = df::coord(building->centerx, building->centery, building->z);
-    config = DFHack::World::AddPersistentData("buildingplan/constraints");
-    config.val() = filter->getMaterialFilterAsSerial();
-    config.ival(1) = building->id;
-    config.ival(2) = filter->min_quality + 1;
-    config.ival(3) = static_cast<int>(filter->decorated_only) + 1;
-    config.ival(4) = filter->max_quality + 1;
-}
-
-PlannedBuilding::PlannedBuilding(PersistentDataItem &config, color_ostream &out)
-{
-    this->config = config;
-
-    if (!filter.parseSerializedMaterialTokens(config.val()))
-    {
-        out.printerr("Buildingplan: Cannot parse filter: %s\nDiscarding.", config.val().c_str());
-        return;
-    }
-
-    building = df::building::find(config.ival(1));
-    if (!building)
-        return;
-
-    pos = df::coord(building->centerx, building->centery, building->z);
-    filter.min_quality = static_cast<df::item_quality>(config.ival(2) - 1);
-    filter.max_quality = static_cast<df::item_quality>(config.ival(4) - 1);
-    filter.decorated_only = config.ival(3) - 1;
-}
-
-bool PlannedBuilding::assignClosestItem(std::vector<df::item *> *items_vector)
-{
-    decltype(items_vector->begin()) closest_item;
-    int32_t closest_distance = -1;
-    for (auto item_iter = items_vector->begin(); item_iter != items_vector->end(); item_iter++)
-    {
-        auto item = *item_iter;
-        if (!filter.matches(item))
-            continue;
-
-        auto pos = item->pos;
-        auto distance = abs(pos.x - building->centerx) +
-            abs(pos.y - building->centery) +
-            abs(pos.z - building->z) * 50;
-
-        if (closest_distance > -1 && distance >= closest_distance)
-            continue;
-
-        closest_distance = distance;
-        closest_item = item_iter;
-    }
-
-    if (closest_distance > -1 && assignItem(*closest_item))
-    {
-        debug("Item assigned");
-        items_vector->erase(closest_item);
-        remove();
-        return true;
-    }
-
-    return false;
-}
-
-bool PlannedBuilding::assignItem(df::item *item)
-{
-    auto ref = df::allocate<df::general_ref_building_holderst>();
-    if (!ref)
-    {
-        Core::printerr("Could not allocate general_ref_building_holderst\n");
-        return false;
-    }
-
-    ref->building_id = building->id;
-
-    if (building->jobs.size() != 1)
-        return false;
-
-    auto job = building->jobs[0];
-
-    for_each_(job->job_items, delete_item_fn);
-    job->job_items.clear();
-    job->flags.bits.suspend = false;
-
-    bool rough = false;
-    Job::attachJobItem(job, item, df::job_item_ref::Hauled);
-    if (item->getType() == item_type::BOULDER)
-        rough = true;
-    building->mat_type = item->getMaterial();
-    building->mat_index = item->getMaterialIndex();
-
-    job->mat_type = building->mat_type;
-    job->mat_index = building->mat_index;
-
-    if (building->needsDesign())
-    {
-        auto act = (df::building_actual *) building;
-        act->design = new df::building_design();
-        act->design->flags.bits.rough = rough;
-    }
-
-    return true;
-}
-
-bool PlannedBuilding::isValid()
-{
-    bool valid = filter.isValid() &&
-        building && Buildings::findAtTile(pos) == building &&
-        building->getBuildStage() == 0;
-
-    if (!valid)
-        remove();
-
-    return valid;
-}
-
-void Planner::reset(color_ostream &out)
-{
-    planned_buildings.clear();
-    std::vector<PersistentDataItem> items;
-    DFHack::World::GetPersistentData(&items, "buildingplan/constraints");
-
-    for (auto i = items.begin(); i != items.end(); i++)
-    {
-        PlannedBuilding pb(*i, out);
-        if (pb.isValid())
-            planned_buildings.push_back(pb);
-    }
-}
-
-void Planner::initialize()
-{
-#define add_building_type(btype, itype) \
-    item_for_building_type[df::building_type::btype] = df::item_type::itype; \
-    default_item_filters[df::building_type::btype] =  ItemFilter(); \
-    available_item_vectors[df::item_type::itype] = std::vector<df::item *>(); \
-    is_relevant_item_type[df::item_type::itype] = true; \
-    if (planmode_enabled.find(df::building_type::btype) == planmode_enabled.end()) \
-        planmode_enabled[df::building_type::btype] = false
-
-    FOR_ENUM_ITEMS(item_type, it)
-        is_relevant_item_type[it] = false;
-
-    add_building_type(Armorstand, ARMORSTAND);
-    add_building_type(Bed, BED);
-    add_building_type(Chair, CHAIR);
-    add_building_type(Coffin, COFFIN);
-    add_building_type(Door, DOOR);
-    add_building_type(Floodgate, FLOODGATE);
-    add_building_type(Hatch, HATCH_COVER);
-    add_building_type(GrateWall, GRATE);
-    add_building_type(GrateFloor, GRATE);
-    add_building_type(BarsVertical, BAR);
-    add_building_type(BarsFloor, BAR);
-    add_building_type(Cabinet, CABINET);
-    add_building_type(Box, BOX);
-    // skip kennels, farm plot
-    add_building_type(Weaponrack, WEAPONRACK);
-    add_building_type(Statue, STATUE);
-    add_building_type(Slab, SLAB);
-    add_building_type(Table, TABLE);
-    // skip roads ... furnaces
-    add_building_type(WindowGlass, WINDOW);
-    // skip gem window ... support
-    add_building_type(AnimalTrap, ANIMALTRAP);
-    add_building_type(Chain, CHAIN);
-    add_building_type(Cage, CAGE);
-    // skip archery target
-    add_building_type(TractionBench, TRACTION_BENCH);
-    // skip nest box, hive (tools)
-
-#undef add_building_type
-}
+bool show_debugging = false;
 
-void Planner::doCycle()
+void debug(const std::string &msg)
 {
-    debug("Running Cycle");
-    if (planned_buildings.size() == 0)
+    if (!show_debugging)
         return;
 
-    debug("Planned count: " + int_to_string(planned_buildings.size()));
-
-    gather_available_items();
-    for (auto building_iter = planned_buildings.begin(); building_iter != planned_buildings.end();)
-    {
-        if (building_iter->isValid())
-        {
-            if (show_debugging)
-                debug(std::string("Trying to allocate ") + enum_item_key_str(building_iter->getType()));
-
-            auto required_item_type = item_for_building_type[building_iter->getType()];
-            auto items_vector = &available_item_vectors[required_item_type];
-            if (items_vector->size() == 0 || !building_iter->assignClosestItem(items_vector))
-            {
-                debug("Unable to allocate an item");
-                ++building_iter;
-                continue;
-            }
-        }
-        debug("Removing building plan");
-        building_iter = planned_buildings.erase(building_iter);
-    }
-}
-
-bool Planner::allocatePlannedBuilding(df::building_type type)
-{
-    coord32_t cursor;
-    if (!DFHack::Gui::getCursorCoords(cursor.x, cursor.y, cursor.z))
-        return false;
-
-    auto newinst = Buildings::allocInstance(cursor.get_coord16(), type);
-    if (!newinst)
-        return false;
-
-    df::job_item *filter = new df::job_item();
-    filter->item_type = item_type::NONE;
-    filter->mat_index = 0;
-    filter->flags2.bits.building_material = true;
-    std::vector<df::job_item*> filters;
-    filters.push_back(filter);
-
-    if (!Buildings::constructWithFilters(newinst, filters))
-    {
-        delete newinst;
-        return false;
-    }
-
-    if (type == building_type::Door)
-    {
-        auto door = virtual_cast<df::building_doorst>(newinst);
-        if (door)
-            door->door_flags.bits.pet_passable = true;
-    }
-
-    addPlannedBuilding(newinst);
-
-    return true;
-}
-
-PlannedBuilding *Planner::getSelectedPlannedBuilding()
-{
-    for (auto building_iter = planned_buildings.begin(); building_iter != planned_buildings.end(); building_iter++)
-    {
-        if (building_iter->isCurrentlySelectedBuilding())
-        {
-            return &(*building_iter);
-        }
-    }
-
-    return nullptr;
-}
-
-void Planner::adjustMinQuality(df::building_type type, int amount)
-{
-    auto min_quality = &getDefaultItemFilterForType(type)->min_quality;
-    *min_quality = static_cast<df::item_quality>(*min_quality + amount);
-
-    boundsCheckItemQuality(min_quality);
-    auto max_quality = &getDefaultItemFilterForType(type)->max_quality;
-    if (*min_quality > *max_quality)
-        (*max_quality) = *min_quality;
-
-}
-
-void Planner::adjustMaxQuality(df::building_type type, int amount)
-{
-    auto max_quality = &getDefaultItemFilterForType(type)->max_quality;
-    *max_quality = static_cast<df::item_quality>(*max_quality + amount);
-
-    boundsCheckItemQuality(max_quality);
-    auto min_quality = &getDefaultItemFilterForType(type)->min_quality;
-    if (*max_quality < *min_quality)
-        (*min_quality) = *max_quality;
-}
-
-void Planner::boundsCheckItemQuality(item_quality::item_quality *quality)
-{
-    *quality = static_cast<df::item_quality>(*quality);
-    if (*quality > item_quality::Artifact)
-        (*quality) = item_quality::Artifact;
-    if (*quality < item_quality::Ordinary)
-        (*quality) = item_quality::Ordinary;
+    color_ostream_proxy out(Core::getInstance().getConsole());
+    out << "DEBUG: " << msg << endl;
 }
-
-map<df::building_type, bool> planmode_enabled, saved_planmodes;
-
-bool show_debugging = false;
-bool show_help = false;
-
-Planner planner;
-
-RoomMonitor roomMonitor;
diff --git a/plugins/buildingplan-lib.h b/plugins/buildingplan-lib.h
index d8d276a55..61a00e796 100644
--- a/plugins/buildingplan-lib.h
+++ b/plugins/buildingplan-lib.h
@@ -1,509 +1,8 @@
-#ifndef BUILDINGPLAN_H
-#define BUILDINGPLAN_H
+#pragma once
 
-#include "uicommon.h"
-#include "listcolumn.h"
-
-#include <functional>
-
-// DF data structure definition headers
-#include "DataDefs.h"
-#include "Types.h"
-#include "df/build_req_choice_genst.h"
-#include "df/build_req_choice_specst.h"
-#include "df/item.h"
-#include "df/ui.h"
-#include "df/ui_build_selector.h"
-#include "df/viewscreen_dwarfmodest.h"
-#include "df/items_other_id.h"
-#include "df/job.h"
-#include "df/world.h"
-#include "df/building_constructionst.h"
-#include "df/building_design.h"
-#include "df/entity_position.h"
-
-#include "modules/Buildings.h"
-#include "modules/Maps.h"
-#include "modules/Items.h"
-#include "modules/Units.h"
-#include "modules/Gui.h"
-
-#include "TileTypes.h"
-#include "df/job_item.h"
-#include "df/dfhack_material_category.h"
-#include "df/general_ref_building_holderst.h"
-#include "modules/Job.h"
-#include "df/building_design.h"
-#include "df/buildings_other_id.h"
-#include "modules/World.h"
-#include "df/building.h"
-#include "df/building_doorst.h"
-
-using df::global::ui;
-using df::global::ui_build_selector;
-using df::global::world;
-
-struct MaterialDescriptor
-{
-    df::item_type item_type;
-    int16_t item_subtype;
-    int16_t type;
-    int32_t index;
-    bool valid;
-
-    bool matches(const MaterialDescriptor &a) const
-    {
-        return a.valid && valid &&
-            a.type == type &&
-            a.index == index &&
-            a.item_type == item_type &&
-            a.item_subtype == item_subtype;
-    }
-};
-
-#define MAX_MASK 10
-#define MAX_MATERIAL 21
-#define SIDEBAR_WIDTH 30
-
-static inline bool canReserveRoom(df::building *building)
-{
-    if (!building)
-        return false;
-
-    if (building->jobs.size() > 0 && building->jobs[0]->job_type == job_type::DestroyBuilding)
-        return false;
-
-    return building->is_room;
-}
-
-static inline std::vector<Units::NoblePosition> getUniqueNoblePositions(df::unit *unit)
-{
-    std::vector<Units::NoblePosition> np;
-    Units::getNoblePositions(&np, unit);
-    for (auto iter = np.begin(); iter != np.end(); iter++)
-    {
-        if (iter->position->code == "MILITIA_CAPTAIN")
-        {
-            np.erase(iter);
-            break;
-        }
-    }
-
-    return np;
-}
-
-void delete_item_fn(df::job_item *x);
-
-MaterialInfo &material_info_identity_fn(MaterialInfo &m);
-
-extern map<df::building_type, bool> planmode_enabled, saved_planmodes;
-
-void enable_quickfort_fn(pair<const df::building_type, bool>& pair);
+#include "buildingplan-planner.h"
+#include "buildingplan-rooms.h"
 
 void debug(const std::string &msg);
-std::string material_to_string_fn(MaterialInfo m);
 
 extern bool show_debugging;
-extern bool show_help;
-
-struct ItemFilter
-{
-    df::dfhack_material_category mat_mask;
-    std::vector<DFHack::MaterialInfo> materials;
-    df::item_quality min_quality;
-    df::item_quality max_quality;
-
-    bool decorated_only;
-
-    ItemFilter() : min_quality(df::item_quality::Ordinary), max_quality(df::item_quality::Artifact), decorated_only(false), valid(true)
-    {
-        clear(); // mat_mask is not cleared by default (see issue #1047)
-    }
-
-    bool matchesMask(DFHack::MaterialInfo &mat);
-
-    bool matches(const df::dfhack_material_category mask) const;
-
-    bool matches(DFHack::MaterialInfo &material) const;
-
-    bool matches(df::item *item);
-
-    std::vector<std::string> getMaterialFilterAsVector();
-
-    std::string getMaterialFilterAsSerial();
-
-    bool parseSerializedMaterialTokens(std::string str);
-
-    std::string getMinQuality();
-    std::string getMaxQuality();
-
-    bool isValid();
-
-    void clear();
-
-private:
-    bool valid;
-};
-
-class ViewscreenChooseMaterial : public dfhack_viewscreen
-{
-public:
-    ViewscreenChooseMaterial(ItemFilter *filter);
-
-    void feed(set<df::interface_key> *input);
-
-    void render();
-
-    std::string getFocusString() { return "buildingplan_choosemat"; }
-
-private:
-    ListColumn<df::dfhack_material_category> masks_column;
-    ListColumn<MaterialInfo> materials_column;
-    int selected_column;
-    ItemFilter *filter;
-
-    df::building_type btype;
-
-    void addMaskEntry(df::dfhack_material_category &mask, const std::string &text)
-    {
-        auto entry = ListEntry<df::dfhack_material_category>(pad_string(text, MAX_MASK, false), mask);
-        if (filter->matches(mask))
-            entry.selected = true;
-
-        masks_column.add(entry);
-    }
-
-    void populateMasks()
-    {
-        masks_column.clear();
-        df::dfhack_material_category mask;
-
-        mask.whole = 0;
-        mask.bits.stone = true;
-        addMaskEntry(mask, "Stone");
-
-        mask.whole = 0;
-        mask.bits.wood = true;
-        addMaskEntry(mask, "Wood");
-
-        mask.whole = 0;
-        mask.bits.metal = true;
-        addMaskEntry(mask, "Metal");
-
-        mask.whole = 0;
-        mask.bits.soap = true;
-        addMaskEntry(mask, "Soap");
-
-        masks_column.filterDisplay();
-    }
-
-    void populateMaterials()
-    {
-        materials_column.clear();
-        df::dfhack_material_category selected_category;
-        std::vector<df::dfhack_material_category> selected_masks = masks_column.getSelectedElems();
-        if (selected_masks.size() == 1)
-            selected_category = selected_masks[0];
-        else if (selected_masks.size() > 1)
-            return;
-
-        df::world_raws &raws = world->raws;
-        for (int i = 1; i < DFHack::MaterialInfo::NUM_BUILTIN; i++)
-        {
-            auto obj = raws.mat_table.builtin[i];
-            if (obj)
-            {
-                MaterialInfo material;
-                material.decode(i, -1);
-                addMaterialEntry(selected_category, material, material.toString());
-            }
-        }
-
-        for (size_t i = 0; i < raws.inorganics.size(); i++)
-        {
-            df::inorganic_raw *p = raws.inorganics[i];
-            MaterialInfo material;
-            material.decode(0, i);
-            addMaterialEntry(selected_category, material, material.toString());
-        }
-
-        decltype(selected_category) wood_flag;
-        wood_flag.bits.wood = true;
-        if (!selected_category.whole || selected_category.bits.wood)
-        {
-            for (size_t i = 0; i < raws.plants.all.size(); i++)
-            {
-                df::plant_raw *p = raws.plants.all[i];
-                for (size_t j = 0; p->material.size() > 1 && j < p->material.size(); j++)
-                {
-                    auto t = p->material[j];
-                    if (p->material[j]->id != "WOOD")
-                        continue;
-
-                    MaterialInfo material;
-                    material.decode(DFHack::MaterialInfo::PLANT_BASE+j, i);
-                    auto name = material.toString();
-                    ListEntry<MaterialInfo> entry(pad_string(name, MAX_MATERIAL, false), material);
-                    if (filter->matches(material))
-                        entry.selected = true;
-
-                    materials_column.add(entry);
-                }
-            }
-        }
-        materials_column.sort();
-    }
-
-    void addMaterialEntry(df::dfhack_material_category &selected_category,
-                          MaterialInfo &material, std::string name)
-    {
-        if (!selected_category.whole || material.matches(selected_category))
-        {
-            ListEntry<MaterialInfo> entry(pad_string(name, MAX_MATERIAL, false), material);
-            if (filter->matches(material))
-                entry.selected = true;
-
-            materials_column.add(entry);
-        }
-    }
-
-    void validateColumn()
-    {
-        set_to_limit(selected_column, 1);
-    }
-
-    void resize(int32_t x, int32_t y)
-    {
-        dfhack_viewscreen::resize(x, y);
-        masks_column.resize();
-        materials_column.resize();
-    }
-};
-
-class ReservedRoom
-{
-public:
-    ReservedRoom(df::building *building, std::string noble_code);
-
-    ReservedRoom(PersistentDataItem &config, color_ostream &out);
-
-    bool checkRoomAssignment();
-
-    void remove() { DFHack::World::DeletePersistentData(config); }
-
-    bool isValid()
-    {
-        if (!building)
-            return false;
-
-        if (Buildings::findAtTile(pos) != building)
-            return false;
-
-        return canReserveRoom(building);
-    }
-
-    int32_t getId()
-    {
-        if (!isValid())
-            return 0;
-
-        return building->id;
-    }
-
-    std::string getCode() { return config.val(); }
-
-    void setCode(const std::string &noble_code) { config.val() = noble_code; }
-
-private:
-    df::building *building;
-    PersistentDataItem config;
-    df::coord pos;
-
-    std::vector<Units::NoblePosition> getOwnersNobleCode()
-    {
-        if (!building->owner)
-            return std::vector<Units::NoblePosition> ();
-
-        return getUniqueNoblePositions(building->owner);
-    }
-};
-
-class RoomMonitor
-{
-public:
-    RoomMonitor() { }
-
-    std::string getReservedNobleCode(int32_t buildingId);
-
-    void toggleRoomForPosition(int32_t buildingId, std::string noble_code);
-
-    void doCycle();
-
-    void reset(color_ostream &out);
-
-private:
-    std::vector<ReservedRoom> reservedRooms;
-
-    void addRoom(ReservedRoom &rr)
-    {
-        for (auto iter = reservedRooms.begin(); iter != reservedRooms.end(); iter++)
-        {
-            if (iter->getId() == rr.getId())
-                return;
-        }
-
-        reservedRooms.push_back(rr);
-    }
-};
-
-// START Planning
-class PlannedBuilding
-{
-public:
-    PlannedBuilding(df::building *building, ItemFilter *filter);
-
-    PlannedBuilding(PersistentDataItem &config, color_ostream &out);
-
-    bool assignClosestItem(std::vector<df::item *> *items_vector);
-
-    bool assignItem(df::item *item);
-
-    bool isValid();
-
-    df::building_type getType() { return building->getType(); }
-
-    bool isCurrentlySelectedBuilding() { return isValid() && (building == world->selected_building); }
-
-    ItemFilter *getFilter() { return &filter; }
-
-    void remove() { DFHack::World::DeletePersistentData(config); }
-
-private:
-    df::building *building;
-    PersistentDataItem config;
-    df::coord pos;
-    ItemFilter filter;
-};
-
-class Planner
-{
-public:
-    bool in_dummmy_screen;
-
-    Planner() : in_dummmy_screen(false), quickfort_mode(false) { }
-
-    bool isPlanableBuilding(const df::building_type type) const
-    {
-        return item_for_building_type.find(type) != item_for_building_type.end();
-    }
-
-    void reset(color_ostream &out);
-
-    void initialize();
-
-    void addPlannedBuilding(df::building *bld)
-    {
-        for (auto iter = bld->jobs.begin(); iter != bld->jobs.end(); iter++)
-        {
-            (*iter)->flags.bits.suspend = true;
-        }
-
-        PlannedBuilding pb(bld, &default_item_filters[bld->getType()]);
-        planned_buildings.push_back(pb);
-    }
-
-    void doCycle();
-
-    bool allocatePlannedBuilding(df::building_type type);
-
-    PlannedBuilding *getSelectedPlannedBuilding();
-
-    void removeSelectedPlannedBuilding() { getSelectedPlannedBuilding()->remove(); }
-
-    ItemFilter *getDefaultItemFilterForType(df::building_type type) { return &default_item_filters[type]; }
-
-    void adjustMinQuality(df::building_type type, int amount);
-    void adjustMaxQuality(df::building_type type, int amount);
-
-    void enableQuickfortMode()
-    {
-        saved_planmodes = planmode_enabled;
-        for_each_(planmode_enabled, enable_quickfort_fn);
-
-        quickfort_mode = true;
-    }
-
-    void disableQuickfortMode()
-    {
-        planmode_enabled = saved_planmodes;
-        quickfort_mode = false;
-    }
-
-    bool inQuickFortMode() { return quickfort_mode; }
-
-private:
-    map<df::building_type, df::item_type> item_for_building_type;
-    map<df::building_type, ItemFilter> default_item_filters;
-    map<df::item_type, std::vector<df::item *>> available_item_vectors;
-    map<df::item_type, bool> is_relevant_item_type; //Needed for fast check when looping over all items
-    bool quickfort_mode;
-
-    std::vector<PlannedBuilding> planned_buildings;
-
-    void boundsCheckItemQuality(item_quality::item_quality *quality);
-
-    void gather_available_items()
-    {
-        debug("Gather available items");
-        for (auto iter = available_item_vectors.begin(); iter != available_item_vectors.end(); iter++)
-        {
-            iter->second.clear();
-        }
-
-        // Precompute a bitmask with the bad flags
-        df::item_flags bad_flags;
-        bad_flags.whole = 0;
-
-#define F(x) bad_flags.bits.x = true;
-        F(dump); F(forbid); F(garbage_collect);
-        F(hostile); F(on_fire); F(rotten); F(trader);
-        F(in_building); F(construction); F(artifact);
-#undef F
-
-        std::vector<df::item*> &items = world->items.other[items_other_id::IN_PLAY];
-
-        for (size_t i = 0; i < items.size(); i++)
-        {
-            df::item *item = items[i];
-
-            if (item->flags.whole & bad_flags.whole)
-                continue;
-
-            df::item_type itype = item->getType();
-            if (!is_relevant_item_type[itype])
-                continue;
-
-            if (itype == item_type::BOX && item->isBag())
-                continue; //Skip bags
-
-            if (item->flags.bits.artifact)
-                continue;
-
-            if (item->flags.bits.in_job ||
-                item->isAssignedToStockpile() ||
-                item->flags.bits.owned ||
-                item->flags.bits.in_chest)
-            {
-                continue;
-            }
-
-            available_item_vectors[itype].push_back(item);
-        }
-    }
-};
-
-extern Planner planner;
-
-extern RoomMonitor roomMonitor;
-
-#endif
diff --git a/plugins/buildingplan-planner.cpp b/plugins/buildingplan-planner.cpp
new file mode 100644
index 000000000..31caf995e
--- /dev/null
+++ b/plugins/buildingplan-planner.cpp
@@ -0,0 +1,552 @@
+#include "df/general_ref_building_holderst.h"
+#include "df/job_item.h"
+#include "df/building_doorst.h"
+#include "df/building_design.h"
+
+#include "modules/Job.h"
+#include "modules/Buildings.h"
+#include "modules/Gui.h"
+
+#include "buildingplan-planner.h"
+#include "buildingplan-lib.h"
+#include "uicommon.h"
+
+/*
+* ItemFilter
+*/
+
+ItemFilter::ItemFilter() :
+        min_quality(df::item_quality::Ordinary),
+        max_quality(df::item_quality::Artifact),
+        decorated_only(false),
+        valid(true)
+{
+    clear(); // mat_mask is not cleared by default (see issue #1047)
+}
+
+bool ItemFilter::matchesMask(DFHack::MaterialInfo &mat)
+{
+    return (mat_mask.whole) ? mat.matches(mat_mask) : true;
+}
+
+bool ItemFilter::matches(const df::dfhack_material_category mask) const
+{
+    return mask.whole & mat_mask.whole;
+}
+
+bool ItemFilter::matches(DFHack::MaterialInfo &material) const
+{
+    for (auto it = materials.begin(); it != materials.end(); ++it)
+        if (material.matches(*it))
+            return true;
+    return false;
+}
+
+bool ItemFilter::matches(df::item *item)
+{
+    if (item->getQuality() < min_quality || item->getQuality() > max_quality)
+        return false;
+
+    if (decorated_only && !item->hasImprovements())
+        return false;
+
+    auto imattype = item->getActualMaterial();
+    auto imatindex = item->getActualMaterialIndex();
+    auto item_mat = DFHack::MaterialInfo(imattype, imatindex);
+
+    return (materials.size() == 0) ? matchesMask(item_mat) : matches(item_mat);
+}
+
+std::string material_to_string_fn(DFHack::MaterialInfo m) { return m.toString(); }
+
+std::vector<std::string> ItemFilter::getMaterialFilterAsVector()
+{
+    std::vector<std::string> descriptions;
+
+    transform_(materials, descriptions, material_to_string_fn);
+
+    if (descriptions.size() == 0)
+        bitfield_to_string(&descriptions, mat_mask);
+
+    if (descriptions.size() == 0)
+        descriptions.push_back("any");
+
+    return descriptions;
+}
+
+std::string ItemFilter::getMaterialFilterAsSerial()
+{
+    std::string str;
+
+    str.append(bitfield_to_string(mat_mask, ","));
+    str.append("/");
+    if (materials.size() > 0)
+    {
+        for (size_t i = 0; i < materials.size(); i++)
+            str.append(materials[i].getToken() + ",");
+
+        if (str[str.size()-1] == ',')
+            str.resize(str.size () - 1);
+    }
+
+    return str;
+}
+
+bool ItemFilter::parseSerializedMaterialTokens(std::string str)
+{
+    valid = false;
+    std::vector<std::string> tokens;
+    split_string(&tokens, str, "/");
+
+    if (tokens.size() > 0 && !tokens[0].empty())
+    {
+        if (!parseJobMaterialCategory(&mat_mask, tokens[0]))
+            return false;
+    }
+
+    if (tokens.size() > 1 && !tokens[1].empty())
+    {
+        std::vector<std::string> mat_names;
+        split_string(&mat_names, tokens[1], ",");
+        for (auto m = mat_names.begin(); m != mat_names.end(); m++)
+        {
+            DFHack::MaterialInfo material;
+            if (!material.find(*m) || !material.isValid())
+                return false;
+
+            materials.push_back(material);
+        }
+    }
+
+    valid = true;
+    return true;
+}
+
+std::string ItemFilter::getMinQuality()
+{
+    return ENUM_KEY_STR(item_quality, min_quality);
+}
+
+std::string ItemFilter::getMaxQuality()
+{
+    return ENUM_KEY_STR(item_quality, max_quality);
+}
+
+bool ItemFilter::isValid()
+{
+    return valid;
+}
+
+void ItemFilter::clear()
+{
+    mat_mask.whole = 0;
+    materials.clear();
+}
+
+/*
+* PlannedBuilding
+*/
+
+PlannedBuilding::PlannedBuilding(df::building *building, ItemFilter *filter)
+{
+    this->building = building;
+    this->filter = *filter;
+    pos = df::coord(building->centerx, building->centery, building->z);
+    config = DFHack::World::AddPersistentData("buildingplan/constraints");
+    config.val() = filter->getMaterialFilterAsSerial();
+    config.ival(1) = building->id;
+    config.ival(2) = filter->min_quality + 1;
+    config.ival(3) = static_cast<int>(filter->decorated_only) + 1;
+    config.ival(4) = filter->max_quality + 1;
+}
+
+PlannedBuilding::PlannedBuilding(PersistentDataItem &config, color_ostream &out)
+{
+    this->config = config;
+
+    if (!filter.parseSerializedMaterialTokens(config.val()))
+    {
+        out.printerr("Buildingplan: Cannot parse filter: %s\nDiscarding.", config.val().c_str());
+        return;
+    }
+
+    building = df::building::find(config.ival(1));
+    if (!building)
+        return;
+
+    pos = df::coord(building->centerx, building->centery, building->z);
+    filter.min_quality = static_cast<df::item_quality>(config.ival(2) - 1);
+    filter.max_quality = static_cast<df::item_quality>(config.ival(4) - 1);
+    filter.decorated_only = config.ival(3) - 1;
+}
+
+bool PlannedBuilding::assignClosestItem(std::vector<df::item *> *items_vector)
+{
+    decltype(items_vector->begin()) closest_item;
+    int32_t closest_distance = -1;
+    for (auto item_iter = items_vector->begin(); item_iter != items_vector->end(); item_iter++)
+    {
+        auto item = *item_iter;
+        if (!filter.matches(item))
+            continue;
+
+        auto pos = item->pos;
+        auto distance = abs(pos.x - building->centerx) +
+            abs(pos.y - building->centery) +
+            abs(pos.z - building->z) * 50;
+
+        if (closest_distance > -1 && distance >= closest_distance)
+            continue;
+
+        closest_distance = distance;
+        closest_item = item_iter;
+    }
+
+    if (closest_distance > -1 && assignItem(*closest_item))
+    {
+        debug("Item assigned");
+        items_vector->erase(closest_item);
+        remove();
+        return true;
+    }
+
+    return false;
+}
+
+void delete_item_fn(df::job_item *x) { delete x; }
+
+bool PlannedBuilding::assignItem(df::item *item)
+{
+    auto ref = df::allocate<df::general_ref_building_holderst>();
+    if (!ref)
+    {
+        Core::printerr("Could not allocate general_ref_building_holderst\n");
+        return false;
+    }
+
+    ref->building_id = building->id;
+
+    if (building->jobs.size() != 1)
+        return false;
+
+    auto job = building->jobs[0];
+
+    for_each_(job->job_items, delete_item_fn);
+    job->job_items.clear();
+    job->flags.bits.suspend = false;
+
+    bool rough = false;
+    Job::attachJobItem(job, item, df::job_item_ref::Hauled);
+    if (item->getType() == item_type::BOULDER)
+        rough = true;
+    building->mat_type = item->getMaterial();
+    building->mat_index = item->getMaterialIndex();
+
+    job->mat_type = building->mat_type;
+    job->mat_index = building->mat_index;
+
+    if (building->needsDesign())
+    {
+        auto act = (df::building_actual *) building;
+        act->design = new df::building_design();
+        act->design->flags.bits.rough = rough;
+    }
+
+    return true;
+}
+
+bool PlannedBuilding::isValid()
+{
+    bool valid = filter.isValid() &&
+        building && Buildings::findAtTile(pos) == building &&
+        building->getBuildStage() == 0;
+
+    if (!valid)
+        remove();
+
+    return valid;
+}
+
+df::building_type PlannedBuilding::getType()
+{
+    return building->getType();
+}
+
+bool PlannedBuilding::isCurrentlySelectedBuilding()
+{
+    return isValid() && (building == df::global::world->selected_building);
+}
+
+ItemFilter *PlannedBuilding::getFilter()
+{
+    return &filter;
+}
+
+void PlannedBuilding::remove()
+{
+    DFHack::World::DeletePersistentData(config);
+}
+
+/*
+* Planner
+*/
+
+Planner::Planner() : in_dummmy_screen(false), quickfort_mode(false) { }
+
+void enable_quickfort_fn(pair<const df::building_type, bool>& pair) { pair.second = true; }
+
+bool Planner::isPlanableBuilding(const df::building_type type) const
+{
+    return item_for_building_type.find(type) != item_for_building_type.end();
+}
+
+void Planner::reset(color_ostream &out)
+{
+    planned_buildings.clear();
+    std::vector<PersistentDataItem> items;
+    DFHack::World::GetPersistentData(&items, "buildingplan/constraints");
+
+    for (auto i = items.begin(); i != items.end(); i++)
+    {
+        PlannedBuilding pb(*i, out);
+        if (pb.isValid())
+            planned_buildings.push_back(pb);
+    }
+}
+
+void Planner::initialize()
+{
+#define add_building_type(btype, itype) \
+    item_for_building_type[df::building_type::btype] = df::item_type::itype; \
+    default_item_filters[df::building_type::btype] =  ItemFilter(); \
+    available_item_vectors[df::item_type::itype] = std::vector<df::item *>(); \
+    is_relevant_item_type[df::item_type::itype] = true; \
+    if (planmode_enabled.find(df::building_type::btype) == planmode_enabled.end()) \
+        planmode_enabled[df::building_type::btype] = false
+
+    FOR_ENUM_ITEMS(item_type, it)
+        is_relevant_item_type[it] = false;
+
+    add_building_type(Armorstand, ARMORSTAND);
+    add_building_type(Bed, BED);
+    add_building_type(Chair, CHAIR);
+    add_building_type(Coffin, COFFIN);
+    add_building_type(Door, DOOR);
+    add_building_type(Floodgate, FLOODGATE);
+    add_building_type(Hatch, HATCH_COVER);
+    add_building_type(GrateWall, GRATE);
+    add_building_type(GrateFloor, GRATE);
+    add_building_type(BarsVertical, BAR);
+    add_building_type(BarsFloor, BAR);
+    add_building_type(Cabinet, CABINET);
+    add_building_type(Box, BOX);
+    // skip kennels, farm plot
+    add_building_type(Weaponrack, WEAPONRACK);
+    add_building_type(Statue, STATUE);
+    add_building_type(Slab, SLAB);
+    add_building_type(Table, TABLE);
+    // skip roads ... furnaces
+    add_building_type(WindowGlass, WINDOW);
+    // skip gem window ... support
+    add_building_type(AnimalTrap, ANIMALTRAP);
+    add_building_type(Chain, CHAIN);
+    add_building_type(Cage, CAGE);
+    // skip archery target
+    add_building_type(TractionBench, TRACTION_BENCH);
+    // skip nest box, hive (tools)
+
+#undef add_building_type
+}
+
+void Planner::addPlannedBuilding(df::building *bld)
+{
+    for (auto iter = bld->jobs.begin(); iter != bld->jobs.end(); iter++)
+    {
+        (*iter)->flags.bits.suspend = true;
+    }
+
+    PlannedBuilding pb(bld, &default_item_filters[bld->getType()]);
+    planned_buildings.push_back(pb);
+}
+
+void Planner::doCycle()
+{
+    debug("Running Cycle");
+    if (planned_buildings.size() == 0)
+        return;
+
+    debug("Planned count: " + int_to_string(planned_buildings.size()));
+
+    gather_available_items();
+    for (auto building_iter = planned_buildings.begin(); building_iter != planned_buildings.end();)
+    {
+        if (building_iter->isValid())
+        {
+            if (show_debugging)
+                debug(std::string("Trying to allocate ") + enum_item_key_str(building_iter->getType()));
+
+            auto required_item_type = item_for_building_type[building_iter->getType()];
+            auto items_vector = &available_item_vectors[required_item_type];
+            if (items_vector->size() == 0 || !building_iter->assignClosestItem(items_vector))
+            {
+                debug("Unable to allocate an item");
+                ++building_iter;
+                continue;
+            }
+        }
+        debug("Removing building plan");
+        building_iter = planned_buildings.erase(building_iter);
+    }
+}
+
+bool Planner::allocatePlannedBuilding(df::building_type type)
+{
+    coord32_t cursor;
+    if (!DFHack::Gui::getCursorCoords(cursor.x, cursor.y, cursor.z))
+        return false;
+
+    auto newinst = Buildings::allocInstance(cursor.get_coord16(), type);
+    if (!newinst)
+        return false;
+
+    df::job_item *filter = new df::job_item();
+    filter->item_type = item_type::NONE;
+    filter->mat_index = 0;
+    filter->flags2.bits.building_material = true;
+    std::vector<df::job_item*> filters;
+    filters.push_back(filter);
+
+    if (!Buildings::constructWithFilters(newinst, filters))
+    {
+        delete newinst;
+        return false;
+    }
+
+    if (type == building_type::Door)
+    {
+        auto door = virtual_cast<df::building_doorst>(newinst);
+        if (door)
+            door->door_flags.bits.pet_passable = true;
+    }
+
+    addPlannedBuilding(newinst);
+
+    return true;
+}
+
+PlannedBuilding *Planner::getSelectedPlannedBuilding()
+{
+    for (auto building_iter = planned_buildings.begin(); building_iter != planned_buildings.end(); building_iter++)
+    {
+        if (building_iter->isCurrentlySelectedBuilding())
+        {
+            return &(*building_iter);
+        }
+    }
+
+    return nullptr;
+}
+
+void Planner::removeSelectedPlannedBuilding() { getSelectedPlannedBuilding()->remove(); }
+
+ItemFilter *Planner::getDefaultItemFilterForType(df::building_type type) { return &default_item_filters[type]; }
+
+void Planner::adjustMinQuality(df::building_type type, int amount)
+{
+    auto min_quality = &getDefaultItemFilterForType(type)->min_quality;
+    *min_quality = static_cast<df::item_quality>(*min_quality + amount);
+
+    boundsCheckItemQuality(min_quality);
+    auto max_quality = &getDefaultItemFilterForType(type)->max_quality;
+    if (*min_quality > *max_quality)
+        (*max_quality) = *min_quality;
+
+}
+
+void Planner::adjustMaxQuality(df::building_type type, int amount)
+{
+    auto max_quality = &getDefaultItemFilterForType(type)->max_quality;
+    *max_quality = static_cast<df::item_quality>(*max_quality + amount);
+
+    boundsCheckItemQuality(max_quality);
+    auto min_quality = &getDefaultItemFilterForType(type)->min_quality;
+    if (*max_quality < *min_quality)
+        (*min_quality) = *max_quality;
+}
+
+void Planner::enableQuickfortMode()
+{
+    saved_planmodes = planmode_enabled;
+    for_each_(planmode_enabled, enable_quickfort_fn);
+
+    quickfort_mode = true;
+}
+
+void Planner::disableQuickfortMode()
+{
+    planmode_enabled = saved_planmodes;
+    quickfort_mode = false;
+}
+
+bool Planner::inQuickFortMode() { return quickfort_mode; }
+
+void Planner::boundsCheckItemQuality(item_quality::item_quality *quality)
+{
+    *quality = static_cast<df::item_quality>(*quality);
+    if (*quality > item_quality::Artifact)
+        (*quality) = item_quality::Artifact;
+    if (*quality < item_quality::Ordinary)
+        (*quality) = item_quality::Ordinary;
+}
+
+void Planner::gather_available_items()
+{
+    debug("Gather available items");
+    for (auto iter = available_item_vectors.begin(); iter != available_item_vectors.end(); iter++)
+    {
+        iter->second.clear();
+    }
+
+    // Precompute a bitmask with the bad flags
+    df::item_flags bad_flags;
+    bad_flags.whole = 0;
+
+    #define F(x) bad_flags.bits.x = true;
+    F(dump); F(forbid); F(garbage_collect);
+    F(hostile); F(on_fire); F(rotten); F(trader);
+    F(in_building); F(construction); F(artifact);
+    #undef F
+
+        std::vector<df::item*> &items = df::global::world->items.other[df::items_other_id::IN_PLAY];
+
+    for (size_t i = 0; i < items.size(); i++)
+    {
+        df::item *item = items[i];
+
+        if (item->flags.whole & bad_flags.whole)
+            continue;
+
+        df::item_type itype = item->getType();
+        if (!is_relevant_item_type[itype])
+            continue;
+
+        if (itype == df::item_type::BOX && item->isBag())
+            continue; //Skip bags
+
+        if (item->flags.bits.artifact)
+            continue;
+
+        if (item->flags.bits.in_job ||
+            item->isAssignedToStockpile() ||
+            item->flags.bits.owned ||
+            item->flags.bits.in_chest)
+        {
+            continue;
+        }
+
+        available_item_vectors[itype].push_back(item);
+    }
+}
+
+std::map<df::building_type, bool> planmode_enabled, saved_planmodes;
+Planner planner;
diff --git a/plugins/buildingplan-planner.h b/plugins/buildingplan-planner.h
new file mode 100644
index 000000000..b073e96b8
--- /dev/null
+++ b/plugins/buildingplan-planner.h
@@ -0,0 +1,108 @@
+#pragma once
+
+#include "df/item_quality.h"
+#include "df/dfhack_material_category.h"
+#include "modules/Materials.h"
+#include "modules/Persistence.h"
+
+struct ItemFilter
+{
+    df::dfhack_material_category mat_mask;
+    std::vector<DFHack::MaterialInfo> materials;
+    df::item_quality min_quality;
+    df::item_quality max_quality;
+    bool decorated_only;
+
+    ItemFilter();
+
+    bool matchesMask(DFHack::MaterialInfo &mat);
+    bool matches(const df::dfhack_material_category mask) const;
+    bool matches(DFHack::MaterialInfo &material) const;
+    bool matches(df::item *item);
+
+    std::vector<std::string> getMaterialFilterAsVector();
+    std::string getMaterialFilterAsSerial();
+    bool parseSerializedMaterialTokens(std::string str);
+
+    std::string getMinQuality();
+    std::string getMaxQuality();
+
+    bool isValid();
+    void clear();
+
+private:
+    bool valid;
+};
+
+class PlannedBuilding
+{
+public:
+    PlannedBuilding(df::building *building, ItemFilter *filter);
+    PlannedBuilding(DFHack::PersistentDataItem &config, DFHack::color_ostream &out);
+
+    bool assignClosestItem(std::vector<df::item *> *items_vector);
+    bool assignItem(df::item *item);
+
+    bool isValid();
+    void remove();
+
+    df::building_type getType();
+    bool isCurrentlySelectedBuilding();
+
+    ItemFilter *getFilter();
+
+private:
+    df::building *building;
+    DFHack::PersistentDataItem config;
+    df::coord pos;
+    ItemFilter filter;
+};
+
+class Planner
+{
+public:
+    bool in_dummmy_screen;
+
+    Planner();
+
+    bool isPlanableBuilding(const df::building_type type) const;
+
+    void reset(DFHack::color_ostream &out);
+
+    void initialize();
+
+    void addPlannedBuilding(df::building *bld);
+
+    void doCycle();
+
+    bool allocatePlannedBuilding(df::building_type type);
+
+    PlannedBuilding *getSelectedPlannedBuilding();
+
+    void removeSelectedPlannedBuilding();
+
+    ItemFilter *getDefaultItemFilterForType(df::building_type type);
+
+    void adjustMinQuality(df::building_type type, int amount);
+    void adjustMaxQuality(df::building_type type, int amount);
+
+    void enableQuickfortMode();
+    void disableQuickfortMode();
+    bool inQuickFortMode();
+
+private:
+    std::map<df::building_type, df::item_type> item_for_building_type;
+    std::map<df::building_type, ItemFilter> default_item_filters;
+    std::map<df::item_type, std::vector<df::item *>> available_item_vectors;
+    std::map<df::item_type, bool> is_relevant_item_type; //Needed for fast check when looping over all items
+    bool quickfort_mode;
+
+    std::vector<PlannedBuilding> planned_buildings;
+
+    void boundsCheckItemQuality(df::enums::item_quality::item_quality *quality);
+
+    void gather_available_items();
+};
+
+extern std::map<df::building_type, bool> planmode_enabled, saved_planmodes;
+extern Planner planner;
diff --git a/plugins/buildingplan-rooms.cpp b/plugins/buildingplan-rooms.cpp
new file mode 100644
index 000000000..87cd413d8
--- /dev/null
+++ b/plugins/buildingplan-rooms.cpp
@@ -0,0 +1,227 @@
+#include "buildingplan-rooms.h"
+#include "buildingplan-lib.h"
+
+#include <df/entity_position.h>
+#include <df/job_type.h>
+#include <df/world.h>
+
+#include <modules/World.h>
+#include <modules/Units.h>
+#include <modules/Buildings.h>
+
+using namespace DFHack;
+
+bool canReserveRoom(df::building *building)
+{
+    if (!building)
+        return false;
+
+    if (building->jobs.size() > 0 && building->jobs[0]->job_type == df::job_type::DestroyBuilding)
+        return false;
+
+    return building->is_room;
+}
+
+std::vector<Units::NoblePosition> getUniqueNoblePositions(df::unit *unit)
+{
+    std::vector<Units::NoblePosition> np;
+    Units::getNoblePositions(&np, unit);
+    for (auto iter = np.begin(); iter != np.end(); iter++)
+    {
+        if (iter->position->code == "MILITIA_CAPTAIN")
+        {
+            np.erase(iter);
+            break;
+        }
+    }
+
+    return np;
+}
+
+/*
+ * ReservedRoom
+ */
+
+ReservedRoom::ReservedRoom(df::building *building, std::string noble_code)
+{
+    this->building = building;
+    config = DFHack::World::AddPersistentData("buildingplan/reservedroom");
+    config.val() = noble_code;
+    config.ival(1) = building->id;
+    pos = df::coord(building->centerx, building->centery, building->z);
+}
+
+ReservedRoom::ReservedRoom(PersistentDataItem &config, color_ostream &)
+{
+    this->config = config;
+
+    building = df::building::find(config.ival(1));
+    if (!building)
+        return;
+    pos = df::coord(building->centerx, building->centery, building->z);
+}
+
+bool ReservedRoom::checkRoomAssignment()
+{
+    if (!isValid())
+        return false;
+
+    auto np = getOwnersNobleCode();
+    bool correctOwner = false;
+    for (auto iter = np.begin(); iter != np.end(); iter++)
+    {
+        if (iter->position->code == getCode())
+        {
+            correctOwner = true;
+            break;
+        }
+    }
+
+    if (correctOwner)
+        return true;
+
+    for (auto iter = df::global::world->units.active.begin(); iter != df::global::world->units.active.end(); iter++)
+    {
+        df::unit* unit = *iter;
+        if (!Units::isCitizen(unit))
+            continue;
+
+        if (!Units::isActive(unit))
+            continue;
+
+        np = getUniqueNoblePositions(unit);
+        for (auto iter = np.begin(); iter != np.end(); iter++)
+        {
+            if (iter->position->code == getCode())
+            {
+                Buildings::setOwner(building, unit);
+                break;
+            }
+        }
+    }
+
+    return true;
+}
+
+void ReservedRoom::remove() { DFHack::World::DeletePersistentData(config); }
+
+bool ReservedRoom::isValid()
+{
+    if (!building)
+        return false;
+
+    if (Buildings::findAtTile(pos) != building)
+        return false;
+
+    return canReserveRoom(building);
+}
+
+int32_t ReservedRoom::getId()
+{
+    if (!isValid())
+        return 0;
+
+    return building->id;
+}
+
+std::string ReservedRoom::getCode() { return config.val(); }
+
+void ReservedRoom::setCode(const std::string &noble_code) { config.val() = noble_code; }
+
+std::vector<Units::NoblePosition> ReservedRoom::getOwnersNobleCode()
+{
+    if (!building->owner)
+        return std::vector<Units::NoblePosition> ();
+
+    return getUniqueNoblePositions(building->owner);
+}
+
+/*
+ * RoomMonitor
+ */
+
+std::string RoomMonitor::getReservedNobleCode(int32_t buildingId)
+{
+    for (auto iter = reservedRooms.begin(); iter != reservedRooms.end(); iter++)
+    {
+        if (buildingId == iter->getId())
+            return iter->getCode();
+    }
+
+    return "";
+}
+
+void RoomMonitor::toggleRoomForPosition(int32_t buildingId, std::string noble_code)
+{
+    bool found = false;
+    for (auto iter = reservedRooms.begin(); iter != reservedRooms.end(); iter++)
+    {
+        if (buildingId != iter->getId())
+        {
+            continue;
+        }
+        else
+        {
+            if (noble_code == iter->getCode())
+            {
+                iter->remove();
+                reservedRooms.erase(iter);
+            }
+            else
+            {
+                iter->setCode(noble_code);
+            }
+            found = true;
+            break;
+        }
+    }
+
+    if (!found)
+    {
+        ReservedRoom room(df::building::find(buildingId), noble_code);
+        reservedRooms.push_back(room);
+    }
+}
+
+void RoomMonitor::doCycle()
+{
+    for (auto iter = reservedRooms.begin(); iter != reservedRooms.end();)
+    {
+        if (iter->checkRoomAssignment())
+        {
+            ++iter;
+        }
+        else
+        {
+            iter->remove();
+            iter = reservedRooms.erase(iter);
+        }
+    }
+}
+
+void RoomMonitor::reset(color_ostream &out)
+{
+    reservedRooms.clear();
+    std::vector<PersistentDataItem> items;
+    DFHack::World::GetPersistentData(&items, "buildingplan/reservedroom");
+
+    for (auto i = items.begin(); i != items.end(); i++)
+    {
+        ReservedRoom rr(*i, out);
+        if (rr.isValid())
+            addRoom(rr);
+    }
+}
+
+void RoomMonitor::addRoom(ReservedRoom &rr)
+{
+    for (auto iter = reservedRooms.begin(); iter != reservedRooms.end(); iter++)
+    {
+        if (iter->getId() == rr.getId())
+            return;
+    }
+
+    reservedRooms.push_back(rr);
+}
+
+RoomMonitor roomMonitor;
diff --git a/plugins/buildingplan-rooms.h b/plugins/buildingplan-rooms.h
new file mode 100644
index 000000000..3880dbe06
--- /dev/null
+++ b/plugins/buildingplan-rooms.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include "modules/Persistence.h"
+#include "modules/Units.h"
+
+class ReservedRoom
+{
+public:
+    ReservedRoom(df::building *building, std::string noble_code);
+
+    ReservedRoom(DFHack::PersistentDataItem &config, DFHack::color_ostream &out);
+
+    bool checkRoomAssignment();
+    void remove();
+    bool isValid();
+
+    int32_t getId();
+    std::string getCode();
+    void setCode(const std::string &noble_code);
+
+private:
+    df::building *building;
+    DFHack::PersistentDataItem config;
+    df::coord pos;
+
+    std::vector<DFHack::Units::NoblePosition> getOwnersNobleCode();
+};
+
+class RoomMonitor
+{
+public:
+    RoomMonitor() { }
+
+    std::string getReservedNobleCode(int32_t buildingId);
+
+    void toggleRoomForPosition(int32_t buildingId, std::string noble_code);
+
+    void doCycle();
+
+    void reset(DFHack::color_ostream &out);
+
+private:
+    std::vector<ReservedRoom> reservedRooms;
+
+    void addRoom(ReservedRoom &rr);
+};
+
+bool canReserveRoom(df::building *building);
+std::vector<DFHack::Units::NoblePosition> getUniqueNoblePositions(df::unit *unit);
+
+extern RoomMonitor roomMonitor;
diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index c42aeac53..ae8ce8c8d 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -1,41 +1,297 @@
-#include "LuaTools.h"
 #include "buildingplan-lib.h"
+    
+#include "df/entity_position.h"
+#include "df/interface_key.h"
+#include "df/ui_build_selector.h"
+#include "df/viewscreen_dwarfmodest.h"
+
+#include "modules/Gui.h"
+#include "modules/Maps.h"
+#include "modules/World.h"
+
+#include "LuaTools.h"
+#include "PluginManager.h"
+
+#include "uicommon.h"
+#include "listcolumn.h"
 
 DFHACK_PLUGIN("buildingplan");
-#define PLUGIN_VERSION 0.14
+#define PLUGIN_VERSION 0.15
 REQUIRE_GLOBAL(ui);
 REQUIRE_GLOBAL(ui_build_selector);
 REQUIRE_GLOBAL(world);
 
-DFhackCExport command_result plugin_shutdown ( color_ostream &out )
-{
-    return CR_OK;
-}
+#define MAX_MASK 10
+#define MAX_MATERIAL 21
 
+using namespace DFHack;
+using namespace df::enums;
 
-static bool is_planmode_enabled(df::building_type type)
+bool show_help = false;
+
+class ViewscreenChooseMaterial : public dfhack_viewscreen
 {
-    if (planmode_enabled.find(type) == planmode_enabled.end())
+public:
+    ViewscreenChooseMaterial(ItemFilter *filter);
+
+    void feed(set<df::interface_key> *input);
+
+    void render();
+
+    std::string getFocusString() { return "buildingplan_choosemat"; }
+
+private:
+    ListColumn<df::dfhack_material_category> masks_column;
+    ListColumn<MaterialInfo> materials_column;
+    int selected_column;
+    ItemFilter *filter;
+
+    df::building_type btype;
+
+    void addMaskEntry(df::dfhack_material_category &mask, const std::string &text)
     {
-        return false;
+        auto entry = ListEntry<df::dfhack_material_category>(pad_string(text, MAX_MASK, false), mask);
+        if (filter->matches(mask))
+            entry.selected = true;
+
+        masks_column.add(entry);
     }
 
-    return planmode_enabled[type];
+    void populateMasks()
+    {
+        masks_column.clear();
+        df::dfhack_material_category mask;
+
+        mask.whole = 0;
+        mask.bits.stone = true;
+        addMaskEntry(mask, "Stone");
+
+        mask.whole = 0;
+        mask.bits.wood = true;
+        addMaskEntry(mask, "Wood");
+
+        mask.whole = 0;
+        mask.bits.metal = true;
+        addMaskEntry(mask, "Metal");
+
+        mask.whole = 0;
+        mask.bits.soap = true;
+        addMaskEntry(mask, "Soap");
+
+        masks_column.filterDisplay();
+    }
+
+    void populateMaterials()
+    {
+        materials_column.clear();
+        df::dfhack_material_category selected_category;
+        std::vector<df::dfhack_material_category> selected_masks = masks_column.getSelectedElems();
+        if (selected_masks.size() == 1)
+            selected_category = selected_masks[0];
+        else if (selected_masks.size() > 1)
+            return;
+
+        df::world_raws &raws = world->raws;
+        for (int i = 1; i < DFHack::MaterialInfo::NUM_BUILTIN; i++)
+        {
+            auto obj = raws.mat_table.builtin[i];
+            if (obj)
+            {
+                MaterialInfo material;
+                material.decode(i, -1);
+                addMaterialEntry(selected_category, material, material.toString());
+            }
+        }
+
+        for (size_t i = 0; i < raws.inorganics.size(); i++)
+        {
+            df::inorganic_raw *p = raws.inorganics[i];
+            MaterialInfo material;
+            material.decode(0, i);
+            addMaterialEntry(selected_category, material, material.toString());
+        }
+
+        decltype(selected_category) wood_flag;
+        wood_flag.bits.wood = true;
+        if (!selected_category.whole || selected_category.bits.wood)
+        {
+            for (size_t i = 0; i < raws.plants.all.size(); i++)
+            {
+                df::plant_raw *p = raws.plants.all[i];
+                for (size_t j = 0; p->material.size() > 1 && j < p->material.size(); j++)
+                {
+                    auto t = p->material[j];
+                    if (p->material[j]->id != "WOOD")
+                        continue;
+
+                    MaterialInfo material;
+                    material.decode(DFHack::MaterialInfo::PLANT_BASE+j, i);
+                    auto name = material.toString();
+                    ListEntry<MaterialInfo> entry(pad_string(name, MAX_MATERIAL, false), material);
+                    if (filter->matches(material))
+                        entry.selected = true;
+
+                    materials_column.add(entry);
+                }
+            }
+        }
+        materials_column.sort();
+    }
+
+    void addMaterialEntry(df::dfhack_material_category &selected_category,
+                          MaterialInfo &material, std::string name)
+    {
+        if (!selected_category.whole || material.matches(selected_category))
+        {
+            ListEntry<MaterialInfo> entry(pad_string(name, MAX_MATERIAL, false), material);
+            if (filter->matches(material))
+                entry.selected = true;
+
+            materials_column.add(entry);
+        }
+    }
+
+    void validateColumn()
+    {
+        set_to_limit(selected_column, 1);
+    }
+
+    void resize(int32_t x, int32_t y)
+    {
+        dfhack_viewscreen::resize(x, y);
+        masks_column.resize();
+        materials_column.resize();
+    }
+};
+
+DFHack::MaterialInfo &material_info_identity_fn(DFHack::MaterialInfo &m) { return m; }
+
+ViewscreenChooseMaterial::ViewscreenChooseMaterial(ItemFilter *filter)
+{
+    selected_column = 0;
+    masks_column.setTitle("Type");
+    masks_column.multiselect = true;
+    masks_column.allow_search = false;
+    masks_column.left_margin = 2;
+    materials_column.left_margin = MAX_MASK + 3;
+    materials_column.setTitle("Material");
+    materials_column.multiselect = true;
+    this->filter = filter;
+
+    masks_column.changeHighlight(0);
+
+    populateMasks();
+    populateMaterials();
+
+    masks_column.selectDefaultEntry();
+    materials_column.selectDefaultEntry();
+    materials_column.changeHighlight(0);
 }
 
-#define DAY_TICKS 1200
-DFhackCExport command_result plugin_onupdate(color_ostream &out)
+void ViewscreenChooseMaterial::feed(set<df::interface_key> *input)
 {
-    if (Maps::IsValid() && !World::ReadPauseState() && world->frame_counter % (DAY_TICKS/2) == 0)
+    bool key_processed = false;
+    switch (selected_column)
     {
-        planner.doCycle();
-        roomMonitor.doCycle();
+    case 0:
+        key_processed = masks_column.feed(input);
+        if (input->count(interface_key::SELECT))
+            populateMaterials(); // Redo materials lists based on category selection
+        break;
+    case 1:
+        key_processed = materials_column.feed(input);
+        break;
     }
 
-    return CR_OK;
+    if (key_processed)
+        return;
+
+    if (input->count(interface_key::LEAVESCREEN))
+    {
+        input->clear();
+        Screen::dismiss(this);
+        return;
+    }
+    if (input->count(interface_key::CUSTOM_SHIFT_C))
+    {
+        filter->clear();
+        masks_column.clearSelection();
+        materials_column.clearSelection();
+        populateMaterials();
+    }
+    else if (input->count(interface_key::SEC_SELECT))
+    {
+        // Convert list selections to material filters
+        filter->mat_mask.whole = 0;
+        filter->materials.clear();
+
+        // Category masks
+        auto masks = masks_column.getSelectedElems();
+        for (auto it = masks.begin(); it != masks.end(); ++it)
+            filter->mat_mask.whole |= it->whole;
+
+        // Specific materials
+        auto materials = materials_column.getSelectedElems();
+        transform_(materials, filter->materials, material_info_identity_fn);
+
+        Screen::dismiss(this);
+    }
+    else if (input->count(interface_key::CURSOR_LEFT))
+    {
+        --selected_column;
+        validateColumn();
+    }
+    else if (input->count(interface_key::CURSOR_RIGHT))
+    {
+        selected_column++;
+        validateColumn();
+    }
+    else if (enabler->tracking_on && enabler->mouse_lbut)
+    {
+        if (masks_column.setHighlightByMouse())
+            selected_column = 0;
+        else if (materials_column.setHighlightByMouse())
+            selected_column = 1;
+
+        enabler->mouse_lbut = enabler->mouse_rbut = 0;
+    }
+}
+
+void ViewscreenChooseMaterial::render()
+{
+    if (Screen::isDismissed(this))
+        return;
+
+    dfhack_viewscreen::render();
+
+    Screen::clear();
+    Screen::drawBorder("  Building Material  ");
+
+    masks_column.display(selected_column == 0);
+    materials_column.display(selected_column == 1);
+
+    int32_t y = gps->dimy - 3;
+    int32_t x = 2;
+    OutputHotkeyString(x, y, "Toggle", interface_key::SELECT);
+    x += 3;
+    OutputHotkeyString(x, y, "Save", interface_key::SEC_SELECT);
+    x += 3;
+    OutputHotkeyString(x, y, "Clear", interface_key::CUSTOM_SHIFT_C);
+    x += 3;
+    OutputHotkeyString(x, y, "Cancel", interface_key::LEAVESCREEN);
 }
 
 //START Viewscreen Hook
+static bool is_planmode_enabled(df::building_type type)
+{
+    if (planmode_enabled.find(type) == planmode_enabled.end())
+    {
+        return false;
+    }
+
+    return planmode_enabled[type];
+}
+
 struct buildingplan_hook : public df::viewscreen_dwarfmodest
 {
     //START UI Methods
@@ -58,8 +314,8 @@ struct buildingplan_hook : public df::viewscreen_dwarfmodest
     bool isInPlannedBuildingPlacementMode()
     {
         return ui->main.mode == ui_sidebar_mode::Build &&
-            ui_build_selector &&
-            ui_build_selector->stage < 2 &&
+            df::global::ui_build_selector &&
+            df::global::ui_build_selector->stage < 2 &&
             planner.isPlanableBuilding(ui_build_selector->building_type);
     }
 
@@ -350,7 +606,6 @@ struct buildingplan_hook : public df::viewscreen_dwarfmodest
 IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_hook, feed);
 IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_hook, render);
 
-
 static command_result buildingplan_cmd(color_ostream &out, vector <string> & parameters)
 {
     if (!parameters.empty())
@@ -401,7 +656,6 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
     return CR_OK;
 }
 
-
 DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_change_event event)
 {
     switch (event) {
@@ -416,6 +670,23 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
     return CR_OK;
 }
 
+#define DAY_TICKS 1200
+DFhackCExport command_result plugin_onupdate(color_ostream &)
+{
+    if (Maps::IsValid() && !World::ReadPauseState() && world->frame_counter % (DAY_TICKS/2) == 0)
+    {
+        planner.doCycle();
+        roomMonitor.doCycle();
+    }
+
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_shutdown(color_ostream &)
+{
+    return CR_OK;
+}
+
 // Lua API section
 
 static bool isPlannableBuilding(df::building_type type) {
diff --git a/plugins/fortplan.cpp b/plugins/fortplan.cpp
index 5dceb35c9..ccaab18c3 100644
--- a/plugins/fortplan.cpp
+++ b/plugins/fortplan.cpp
@@ -1,11 +1,25 @@
-#include "buildingplan-lib.h"
 #include <fstream>
 #include <vector>
+
+#include "df/world.h"
+#include "df/trap_type.h"
+
 #include "modules/Filesystem.h"
+#include "modules/Gui.h"
+#include "modules/Maps.h"
+#include "modules/World.h"
+
+#include "PluginManager.h"
+
+#include "buildingplan-lib.h"
+#include "uicommon.h"
 
 DFHACK_PLUGIN("fortplan");
 #define PLUGIN_VERSION 0.15
 
+using namespace std;
+using namespace DFHack;
+
 command_result fortplan(color_ostream &out, vector<string> & params);
 
 struct BuildingInfo {
@@ -88,7 +102,7 @@ DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCom
 #define DAY_TICKS 1200
 DFhackCExport command_result plugin_onupdate(color_ostream &out)
 {
-    if (Maps::IsValid() && !World::ReadPauseState() && world->frame_counter % (DAY_TICKS/2) == 0)
+    if (Maps::IsValid() && !World::ReadPauseState() && df::global::world->frame_counter % (DAY_TICKS/2) == 0)
     {
         planner.doCycle();
     }
@@ -100,7 +114,7 @@ DFHACK_PLUGIN_IS_ENABLED(is_enabled);
 
 DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
 {
-    if (!gps)
+    if (!df::global::gps )
         return CR_FAILURE;
 
     if (enable != is_enabled)

From 3b362294b95241511adfe221c968fa8a92515753 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 8 Sep 2020 17:34:11 -0700
Subject: [PATCH 359/547] move quickfort logic from Planner to buildingplan

where all the other gui-related logic is.
---
 plugins/buildingplan-planner.cpp | 27 +++------------------
 plugins/buildingplan-planner.h   | 10 +-------
 plugins/buildingplan.cpp         | 41 ++++++++++++++++----------------
 3 files changed, 25 insertions(+), 53 deletions(-)

diff --git a/plugins/buildingplan-planner.cpp b/plugins/buildingplan-planner.cpp
index 31caf995e..6923570c2 100644
--- a/plugins/buildingplan-planner.cpp
+++ b/plugins/buildingplan-planner.cpp
@@ -291,11 +291,9 @@ void PlannedBuilding::remove()
 * Planner
 */
 
-Planner::Planner() : in_dummmy_screen(false), quickfort_mode(false) { }
+Planner::Planner() { }
 
-void enable_quickfort_fn(pair<const df::building_type, bool>& pair) { pair.second = true; }
-
-bool Planner::isPlanableBuilding(const df::building_type type) const
+bool Planner::isPlannableBuilding(const df::building_type type) const
 {
     return item_for_building_type.find(type) != item_for_building_type.end();
 }
@@ -321,8 +319,6 @@ void Planner::initialize()
     default_item_filters[df::building_type::btype] =  ItemFilter(); \
     available_item_vectors[df::item_type::itype] = std::vector<df::item *>(); \
     is_relevant_item_type[df::item_type::itype] = true; \
-    if (planmode_enabled.find(df::building_type::btype) == planmode_enabled.end()) \
-        planmode_enabled[df::building_type::btype] = false
 
     FOR_ENUM_ITEMS(item_type, it)
         is_relevant_item_type[it] = false;
@@ -474,22 +470,6 @@ void Planner::adjustMaxQuality(df::building_type type, int amount)
         (*min_quality) = *max_quality;
 }
 
-void Planner::enableQuickfortMode()
-{
-    saved_planmodes = planmode_enabled;
-    for_each_(planmode_enabled, enable_quickfort_fn);
-
-    quickfort_mode = true;
-}
-
-void Planner::disableQuickfortMode()
-{
-    planmode_enabled = saved_planmodes;
-    quickfort_mode = false;
-}
-
-bool Planner::inQuickFortMode() { return quickfort_mode; }
-
 void Planner::boundsCheckItemQuality(item_quality::item_quality *quality)
 {
     *quality = static_cast<df::item_quality>(*quality);
@@ -517,7 +497,7 @@ void Planner::gather_available_items()
     F(in_building); F(construction); F(artifact);
     #undef F
 
-        std::vector<df::item*> &items = df::global::world->items.other[df::items_other_id::IN_PLAY];
+    std::vector<df::item*> &items = df::global::world->items.other[df::items_other_id::IN_PLAY];
 
     for (size_t i = 0; i < items.size(); i++)
     {
@@ -548,5 +528,4 @@ void Planner::gather_available_items()
     }
 }
 
-std::map<df::building_type, bool> planmode_enabled, saved_planmodes;
 Planner planner;
diff --git a/plugins/buildingplan-planner.h b/plugins/buildingplan-planner.h
index b073e96b8..67eeb9bff 100644
--- a/plugins/buildingplan-planner.h
+++ b/plugins/buildingplan-planner.h
@@ -61,11 +61,9 @@ private:
 class Planner
 {
 public:
-    bool in_dummmy_screen;
-
     Planner();
 
-    bool isPlanableBuilding(const df::building_type type) const;
+    bool isPlannableBuilding(const df::building_type type) const;
 
     void reset(DFHack::color_ostream &out);
 
@@ -86,16 +84,11 @@ public:
     void adjustMinQuality(df::building_type type, int amount);
     void adjustMaxQuality(df::building_type type, int amount);
 
-    void enableQuickfortMode();
-    void disableQuickfortMode();
-    bool inQuickFortMode();
-
 private:
     std::map<df::building_type, df::item_type> item_for_building_type;
     std::map<df::building_type, ItemFilter> default_item_filters;
     std::map<df::item_type, std::vector<df::item *>> available_item_vectors;
     std::map<df::item_type, bool> is_relevant_item_type; //Needed for fast check when looping over all items
-    bool quickfort_mode;
 
     std::vector<PlannedBuilding> planned_buildings;
 
@@ -104,5 +97,4 @@ private:
     void gather_available_items();
 };
 
-extern std::map<df::building_type, bool> planmode_enabled, saved_planmodes;
 extern Planner planner;
diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index ae8ce8c8d..2ba8f982e 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -28,6 +28,9 @@ using namespace DFHack;
 using namespace df::enums;
 
 bool show_help = false;
+bool quickfort_mode = false;
+bool in_dummy_screen = false;
+std::map<df::building_type, bool> planmode_enabled;
 
 class ViewscreenChooseMaterial : public dfhack_viewscreen
 {
@@ -316,7 +319,7 @@ struct buildingplan_hook : public df::viewscreen_dwarfmodest
         return ui->main.mode == ui_sidebar_mode::Build &&
             df::global::ui_build_selector &&
             df::global::ui_build_selector->stage < 2 &&
-            planner.isPlanableBuilding(ui_build_selector->building_type);
+            planner.isPlannableBuilding(ui_build_selector->building_type);
     }
 
     std::vector<Units::NoblePosition> getNoblePositionOfSelectedBuildingOwner()
@@ -357,11 +360,16 @@ struct buildingplan_hook : public df::viewscreen_dwarfmodest
             auto type = ui_build_selector->building_type;
             if (input->count(interface_key::CUSTOM_SHIFT_P))
             {
+                if (planmode_enabled.find(type) == planmode_enabled.end())
+                {
+                    planmode_enabled[type] = false;
+                }
+
                 planmode_enabled[type] = !planmode_enabled[type];
                 if (!planmode_enabled[type])
                 {
                     Gui::refreshSidebar();
-                    planner.in_dummmy_screen = false;
+                    in_dummy_screen = false;
                 }
                 return true;
             }
@@ -375,12 +383,12 @@ struct buildingplan_hook : public df::viewscreen_dwarfmodest
 
             if (is_planmode_enabled(type))
             {
-                if (planner.inQuickFortMode() && planner.in_dummmy_screen)
+                if (quickfort_mode && in_dummy_screen)
                 {
                     if (input->count(interface_key::SELECT) || input->count(interface_key::SEC_SELECT)
                          || input->count(interface_key::LEAVESCREEN))
                     {
-                        planner.in_dummmy_screen = false;
+                        in_dummy_screen = false;
                         send_key(interface_key::LEAVESCREEN);
                     }
 
@@ -392,9 +400,9 @@ struct buildingplan_hook : public df::viewscreen_dwarfmodest
                     if (ui_build_selector->errors.size() == 0 && planner.allocatePlannedBuilding(type))
                     {
                         Gui::refreshSidebar();
-                        if (planner.inQuickFortMode())
+                        if (quickfort_mode)
                         {
-                            planner.in_dummmy_screen = true;
+                            in_dummy_screen = true;
                         }
                     }
 
@@ -402,14 +410,7 @@ struct buildingplan_hook : public df::viewscreen_dwarfmodest
                 }
                 else if (input->count(interface_key::CUSTOM_SHIFT_F))
                 {
-                    if (!planner.inQuickFortMode())
-                    {
-                        planner.enableQuickfortMode();
-                    }
-                    else
-                    {
-                        planner.disableQuickfortMode();
-                    }
+                    quickfort_mode = !quickfort_mode;
                 }
                 else if (input->count(interface_key::CUSTOM_SHIFT_M))
                 {
@@ -509,7 +510,7 @@ struct buildingplan_hook : public df::viewscreen_dwarfmodest
         auto type = ui_build_selector->building_type;
         if (plannable)
         {
-            if (planner.inQuickFortMode() && planner.in_dummmy_screen)
+            if (quickfort_mode && in_dummy_screen)
             {
                 Screen::Pen pen(' ',COLOR_BLACK);
                 int y = dims.y1 + 1;
@@ -533,7 +534,7 @@ struct buildingplan_hook : public df::viewscreen_dwarfmodest
 
                 if (is_planmode_enabled(type))
                 {
-                    OutputToggleString(x, y, "Quickfort Mode", "F", planner.inQuickFortMode(), true, left_margin);
+                    OutputToggleString(x, y, "Quickfort Mode", "F", quickfort_mode, true, left_margin);
 
                     auto filter = planner.getDefaultItemFilterForType(type);
 
@@ -552,13 +553,13 @@ struct buildingplan_hook : public df::viewscreen_dwarfmodest
                 }
                 else
                 {
-                    planner.in_dummmy_screen = false;
+                    in_dummy_screen = false;
                 }
             }
         }
         else if (isInPlannedBuildingQueryMode())
         {
-            planner.in_dummmy_screen = false;
+            in_dummy_screen = false;
 
             // Hide suspend toggle option
             int y = 20;
@@ -597,7 +598,7 @@ struct buildingplan_hook : public df::viewscreen_dwarfmodest
         }
         else
         {
-            planner.in_dummmy_screen = false;
+            in_dummy_screen = false;
             show_help = false;
         }
     }
@@ -690,7 +691,7 @@ DFhackCExport command_result plugin_shutdown(color_ostream &)
 // Lua API section
 
 static bool isPlannableBuilding(df::building_type type) {
-    return planner.isPlanableBuilding(type);
+    return planner.isPlannableBuilding(type);
 }
 
 static void addPlannedBuilding(df::building *bld) {

From 8660355838ea954a38dca49ca1c1a18bc5e231ac Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 8 Sep 2020 21:30:12 -0700
Subject: [PATCH 360/547] formally declare used globals in fortplan

---
 plugins/fortplan.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/fortplan.cpp b/plugins/fortplan.cpp
index ccaab18c3..72d11b78a 100644
--- a/plugins/fortplan.cpp
+++ b/plugins/fortplan.cpp
@@ -15,6 +15,9 @@
 #include "uicommon.h"
 
 DFHACK_PLUGIN("fortplan");
+REQUIRE_GLOBAL(gps);
+REQUIRE_GLOBAL(world);
+
 #define PLUGIN_VERSION 0.15
 
 using namespace std;

From f837532b42b5a27952ba13d142ff1c513deb899b Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 13 Sep 2020 17:12:29 -0700
Subject: [PATCH 361/547] use more precise item vectors for bld item filters

---
 library/lua/dfhack/buildings.lua | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/library/lua/dfhack/buildings.lua b/library/lua/dfhack/buildings.lua
index 49e1bd09e..995f90972 100644
--- a/library/lua/dfhack/buildings.lua
+++ b/library/lua/dfhack/buildings.lua
@@ -73,13 +73,13 @@ local building_inputs = {
         {
             item_type=df.item_type.SMALLGEM,
             quantity=3,
-            vector_id=df.job_item_vector_id.ANY_GENERIC35
+            vector_id=df.job_item_vector_id.SMALLGEM
         }
     },
     [df.building_type.Well] = {
         {
             item_type=df.item_type.BLOCKS,
-            vector_id=df.job_item_vector_id.ANY_GENERIC35
+            vector_id=df.job_item_vector_id.BLOCKS
         },
         {
             name='bucket',
@@ -116,7 +116,7 @@ local building_inputs = {
     [df.building_type.ScrewPump] = {
         {
             item_type=df.item_type.BLOCKS,
-            vector_id=df.job_item_vector_id.ANY_GENERIC35
+            vector_id=df.job_item_vector_id.BLOCKS
         },
         {
             name='screw',
@@ -140,10 +140,10 @@ local building_inputs = {
     [df.building_type.GrateWall] = { { item_type=df.item_type.GRATE, vector_id=df.job_item_vector_id.GRATE } },
     [df.building_type.GrateFloor] = { { item_type=df.item_type.GRATE, vector_id=df.job_item_vector_id.GRATE } },
     [df.building_type.BarsVertical] = {
-        { item_type=df.item_type.BAR, vector_id=df.job_item_vector_id.ANY_GENERIC35 }
+        { item_type=df.item_type.BAR, vector_id=df.job_item_vector_id.BAR }
     },
     [df.building_type.BarsFloor] = {
-        { item_type=df.item_type.BAR, vector_id=df.job_item_vector_id.ANY_GENERIC35 }
+        { item_type=df.item_type.BAR, vector_id=df.job_item_vector_id.BAR }
     },
     [df.building_type.GearAssembly] = {
         {
@@ -176,9 +176,9 @@ local building_inputs = {
             vector_id=df.job_item_vector_id.TRACTION_BENCH
         }
     },
-    [df.building_type.Slab] = { { item_type=df.item_type.SLAB } },
-    [df.building_type.NestBox] = { { has_tool_use=df.tool_uses.NEST_BOX, item_type=df.item_type.TOOL } },
-    [df.building_type.Hive] = { { has_tool_use=df.tool_uses.HIVE, item_type=df.item_type.TOOL } },
+    [df.building_type.Slab] = { { item_type=df.item_type.SLAB, vector_id=df.job_item_vector_id.SLAB } },
+    [df.building_type.NestBox] = { { has_tool_use=df.tool_uses.NEST_BOX, item_type=df.item_type.TOOL, vector_id=df.job_item_vector_id.TOOL } },
+    [df.building_type.Hive] = { { has_tool_use=df.tool_uses.HIVE, item_type=df.item_type.TOOL, vector_id=df.job_item_vector_id.TOOL } },
     [df.building_type.Rollers] = {
         {
             name='mechanism',
@@ -248,7 +248,7 @@ local workshop_inputs = {
     [df.workshop_type.Ashery] = {
         {
             item_type=df.item_type.BLOCKS,
-            vector_id=df.job_item_vector_id.ANY_GENERIC35
+            vector_id=df.job_item_vector_id.BLOCKS
         },
         {
             name='barrel',
@@ -514,4 +514,4 @@ function buildings.constructBuilding(info)
     )
 end
 
-return buildings
\ No newline at end of file
+return buildings

From 1efa09582a5d58987845b4f9555f6558a2368ed1 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 17 Sep 2020 00:25:50 -0400
Subject: [PATCH 362/547] Change libexpat to be included with
 add_subdirectory()

- Confirmed that libexpat is built statically and linked with xlsxreader
- May need https://github.com/libexpat/libexpat/commit/da7cda3a8579e86bb553e331cc4747075307f907 for Windows
- Although libexpat's CMake options are all prefixed with LIBEXPAT_, it also adds some cache entries like SIZE_T (from expat/ConfigureChecks.cmake). Unsure if these affect other libs.
- xlsxio may need additional reconfiguration after moving to add_subdirectory() to find libexpat/libzip on non-Linux platforms.
---
 depends/CMakeLists.txt | 26 ++++++++++----------------
 plugins/CMakeLists.txt |  2 --
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index b824cebdc..db3b939e8 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -35,25 +35,19 @@ endforeach()
 include(ExternalProject)
 
 if(WIN32)
-  set(EXPAT_LIB_NAME_SUFFIX "MD")
   set(XLSXIO_C_FLAGS "${CMAKE_C_FLAGS} /DXML_STATIC")
 else()
-  set(EXPAT_LIB_NAME_SUFFIX "")
   set(XLSXIO_C_FLAGS "${CMAKE_C_FLAGS} -DXML_STATIC")
 endif()
 
-set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat)
-set(LIBEXPAT_LIB ${LIBEXPAT_INSTALL_DIR}/lib/libexpat${EXPAT_LIB_NAME_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
-set(LIBEXPAT_LIB ${LIBEXPAT_LIB} PARENT_SCOPE)
-ExternalProject_Add(libexpat_project
-    PREFIX      libexpat
-    SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libexpat/expat
-    INSTALL_DIR ${LIBEXPAT_INSTALL_DIR}
-    BUILD_BYPRODUCTS ${LIBEXPAT_LIB}
-    CMAKE_GENERATOR "${CMAKE_GENERATOR}"
-    CMAKE_GENERATOR_TOOLSET "${CMAKE_GENERATOR_TOOLSET}"
-    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBEXPAT_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-)
+# set the default values of libexpat options - the descriptions are left empty
+# because later option() calls *do* override those
+set(EXPAT_BUILD_EXAMPLES OFF CACHE BOOL "")
+set(EXPAT_BUILD_TESTS OFF CACHE BOOL "")
+set(EXPAT_BUILD_TOOLS OFF CACHE BOOL "")
+set(EXPAT_SHARED_LIBS OFF CACHE BOOL "")
+set(EXPAT_BUILD_DOCS OFF CACHE BOOL "")
+add_subdirectory(libexpat/expat)
 
 set(LIBZIP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzip)
 set(LIBZIP_LIB ${LIBZIP_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}zip${CMAKE_STATIC_LIBRARY_SUFFIX})
@@ -74,11 +68,11 @@ set(XLSXIO_LIB ${XLSXIO_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}xlsxio_re
 set(XLSXIO_LIB ${XLSXIO_LIB} PARENT_SCOPE)
 ExternalProject_Add(xlsxio_project
     PREFIX      xlsxio
-    DEPENDS     libexpat_project libzip_project
+    DEPENDS     libzip_project
     SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/xlsxio
     INSTALL_DIR ${XLSXIO_INSTALL_DIR}
     BUILD_BYPRODUCTS ${XLSXIO_LIB}
     CMAKE_GENERATOR "${CMAKE_GENERATOR}"
     CMAKE_GENERATOR_TOOLSET "${CMAKE_GENERATOR_TOOLSET}"
-    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DEXPAT_DIR=${LIBEXPAT_INSTALL_DIR} -DEXPAT_LIBRARIES=${LIBEXPAT_LIB} -DEXPAT_INCLUDE_DIRS=${LIBEXPAT_INSTALL_DIR}/include -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_C_FLAGS=${XLSXIO_C_FLAGS}
+    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_C_FLAGS=${XLSXIO_C_FLAGS}
 )
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 07e14fa11..dc71b6e0d 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -82,8 +82,6 @@ add_library(xlsxio_read STATIC IMPORTED)
 set_target_properties(xlsxio_read PROPERTIES IMPORTED_LOCATION ${XLSXIO_LIB})
 add_library(zip STATIC IMPORTED)
 set_target_properties(zip PROPERTIES IMPORTED_LOCATION ${LIBZIP_LIB})
-add_library(expat STATIC IMPORTED)
-set_target_properties(expat PROPERTIES IMPORTED_LOCATION ${LIBEXPAT_LIB})
 
 if(WIN32)
   set(LIB_Z_LIB "depends/zlib/lib/zlib")

From 42d4d33571b2ad8279a5299936a16a1077247fee Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 17 Sep 2020 15:41:29 -0400
Subject: [PATCH 363/547] Only modify xlsxreader target if it was created

Ref #1620
---
 plugins/CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 07e14fa11..77ab97f89 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -191,9 +191,10 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(workNow workNow.cpp)
     dfhack_plugin(xlsxreader xlsxreader.cpp LINK_LIBRARIES lua xlsxio_read zip expat ${LIB_Z_LIB})
     dfhack_plugin(zone zone.cpp LINK_LIBRARIES lua)
+
+    target_include_directories(xlsxreader PRIVATE ${XLSXIO_INSTALL_DIR}/include)
+    add_dependencies(xlsxreader xlsxio_project)
 endif()
-target_include_directories(xlsxreader PRIVATE ${XLSXIO_INSTALL_DIR}/include)
-add_dependencies(xlsxreader xlsxio_project)
 
 # this is the skeleton plugin. If you want to make your own, make a copy and then change it
 option(BUILD_SKELETON "Build the skeleton plugin." OFF)

From b47710ae6f4cbf904d4cbd7bc4f535cff5119067 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 17 Sep 2020 20:09:13 -0400
Subject: [PATCH 364/547] Upgrade libexpat

Needed for a consistent target name: https://github.com/libexpat/libexpat/commit/da7cda3a8579e86bb553e331cc4747075307f907
This commit is likely close to 2.2.10 anyway
---
 depends/libexpat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/libexpat b/depends/libexpat
index a7bc26b69..d8daead33 160000
--- a/depends/libexpat
+++ b/depends/libexpat
@@ -1 +1 @@
-Subproject commit a7bc26b69768f7fb24f0c7976fae24b157b85b13
+Subproject commit d8daead33ee76a29f5184d35b13672b6ce14b4a2

From f354f7800f6e1d9268570c7067ef7996a2c6500f Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 17 Sep 2020 21:00:16 -0400
Subject: [PATCH 365/547] Switch to DFHack forks of lipzip and xlsxio, and
 update

libzip: upgraded to 1.7.3 (was between 1.7.1 and 1.7.2)
xlsxio: downgraded to latest release (0.2.29), which should be inconsequential: https://github.com/brechtsanders/xlsxio/compare/0.2.29...2d12a88
---
 .gitmodules    | 4 ++--
 depends/libzip | 2 +-
 depends/xlsxio | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index e24bfb707..97d01c993 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,11 +18,11 @@
 	url = ../../DFHack/jsoncpp.git
 [submodule "depends/xlsxio"]
 	path = depends/xlsxio
-	url = ../../brechtsanders/xlsxio.git
+	url = ../../DFHack/xlsxio.git
 	shallow = true
 [submodule "depends/libzip"]
 	path = depends/libzip
-	url = ../../nih-at/libzip.git
+	url = ../../DFHack/libzip.git
 	shallow = true
 [submodule "depends/libexpat"]
 	path = depends/libexpat
diff --git a/depends/libzip b/depends/libzip
index 29b881d28..66e496489 160000
--- a/depends/libzip
+++ b/depends/libzip
@@ -1 +1 @@
-Subproject commit 29b881d286f43189ff7392f609da78daa80c0606
+Subproject commit 66e496489bdae81bfda8b0088172871d8fda0032
diff --git a/depends/xlsxio b/depends/xlsxio
index 261d56815..cfd9ed517 160000
--- a/depends/xlsxio
+++ b/depends/xlsxio
@@ -1 +1 @@
-Subproject commit 261d56815b29908fc960fecb9cb3143db4b485ad
+Subproject commit cfd9ed517417000f5ffce428f2a4a7da0847c145

From b85759620f6d5c41fc6ef210ca0bff99cd603c9a Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 18 Sep 2020 00:33:41 -0400
Subject: [PATCH 366/547] Switch libzip and xlsxio to be included with
 add_subdirectory(), disable xlsxio installation

---
 CMakeLists.txt         |  1 +
 depends/CMakeLists.txt | 53 +++++++++++++++++++++---------------------
 depends/libzip         |  2 +-
 depends/xlsxio         |  2 +-
 plugins/CMakeLists.txt | 10 +-------
 5 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83eca71af..526cb9f7a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -406,6 +406,7 @@ endif()
 include_directories(depends/tthread)
 include_directories(${ZLIB_INCLUDE_DIRS})
 include_directories(depends/clsocket/src)
+include_directories(depends/xlsxio/include)
 add_subdirectory(depends)
 
 find_package(Git REQUIRED)
diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index db3b939e8..de0683427 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -47,32 +47,33 @@ set(EXPAT_BUILD_TESTS OFF CACHE BOOL "")
 set(EXPAT_BUILD_TOOLS OFF CACHE BOOL "")
 set(EXPAT_SHARED_LIBS OFF CACHE BOOL "")
 set(EXPAT_BUILD_DOCS OFF CACHE BOOL "")
+set(EXPAT_ENABLE_INSTALL OFF CACHE BOOL "")
 add_subdirectory(libexpat/expat)
 
-set(LIBZIP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzip)
-set(LIBZIP_LIB ${LIBZIP_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}zip${CMAKE_STATIC_LIBRARY_SUFFIX})
-set(LIBZIP_LIB ${LIBZIP_LIB} PARENT_SCOPE)
-ExternalProject_Add(libzip_project
-    PREFIX      libzip
-    SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/libzip
-    INSTALL_DIR ${LIBZIP_INSTALL_DIR}
-    BUILD_BYPRODUCTS ${LIBZIP_LIB}
-    CMAKE_GENERATOR "${CMAKE_GENERATOR}"
-    CMAKE_GENERATOR_TOOLSET "${CMAKE_GENERATOR_TOOLSET}"
-    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBZIP_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_DOC=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REGRESS=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DENABLE_BZIP2=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_LZMA=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-)
+set(LIBZIP_BUILD_DOC OFF CACHE BOOL "")
+set(LIBZIP_BUILD_EXAMPLES OFF CACHE BOOL "")
+set(LIBZIP_BUILD_REGRESS OFF CACHE BOOL "")
+set(LIBZIP_BUILD_SHARED_LIBS OFF CACHE BOOL "")
+set(LIBZIP_BUILD_TOOLS OFF CACHE BOOL "")
+set(LIBZIP_ENABLE_BZIP2 OFF CACHE BOOL "")
+set(LIBZIP_ENABLE_COMMONCRYPTO OFF CACHE BOOL "")
+set(LIBZIP_ENABLE_GNUTLS OFF CACHE BOOL "")
+set(LIBZIP_ENABLE_LZMA OFF CACHE BOOL "")
+set(LIBZIP_ENABLE_MBEDTLS OFF CACHE BOOL "")
+set(LIBZIP_ENABLE_OPENSSL OFF CACHE BOOL "")
+set(LIBZIP_ENABLE_WINDOWS_CRYPTO OFF CACHE BOOL "")
+set(LIBZIP_DO_INSTALL OFF CACHE BOOL "")
+add_subdirectory(libzip)
 
-set(XLSXIO_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/xlsxio)
-set(XLSXIO_INSTALL_DIR ${XLSXIO_INSTALL_DIR} PARENT_SCOPE)
-set(XLSXIO_LIB ${XLSXIO_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}xlsxio_read${CMAKE_STATIC_LIBRARY_SUFFIX})
-set(XLSXIO_LIB ${XLSXIO_LIB} PARENT_SCOPE)
-ExternalProject_Add(xlsxio_project
-    PREFIX      xlsxio
-    DEPENDS     libzip_project
-    SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR}/xlsxio
-    INSTALL_DIR ${XLSXIO_INSTALL_DIR}
-    BUILD_BYPRODUCTS ${XLSXIO_LIB}
-    CMAKE_GENERATOR "${CMAKE_GENERATOR}"
-    CMAKE_GENERATOR_TOOLSET "${CMAKE_GENERATOR_TOOLSET}"
-    CMAKE_ARGS  ${CL_ARGS} -DCMAKE_INSTALL_PREFIX=${XLSXIO_INSTALL_DIR} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_LIBZIP=ON -DZLIB_DIR=${ZLIB_DIR} -DLIBZIP_DIR=${LIBZIP_INSTALL_DIR} -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_C_FLAGS=${XLSXIO_C_FLAGS}
-)
+set(XLSXIO_USE_DFHACK_LIBS ON CACHE BOOL "")
+set(XLSXIO_BUILD_STATIC ON CACHE BOOL "")
+set(XLSXIO_BUILD_SHARED OFF CACHE BOOL "")
+set(XLSXIO_BUILD_DOCUMENTATION OFF CACHE BOOL "")
+set(XLSXIO_BUILD_EXAMPLES OFF CACHE BOOL "")
+set(XLSXIO_BUILD_TOOLS OFF CACHE BOOL "")
+set(XLSXIO_WITH_LIBZIP ON CACHE BOOL "")
+set(XLSXIO_ZLIB_DIR "${ZLIB_DIR}" CACHE PATH "")
+set(XLSXIO_LIBZIP_DIR "${CMAKE_CURRENT_BINARY_DIR}/libzip" CACHE PATH "")
+set(XLSXIO_EXPAT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libexpat" CACHE PATH "")
+set(XLSXIO_ENABLE_INSTALL OFF CACHE BOOL "")
+add_subdirectory(xlsxio)
diff --git a/depends/libzip b/depends/libzip
index 66e496489..2dec33677 160000
--- a/depends/libzip
+++ b/depends/libzip
@@ -1 +1 @@
-Subproject commit 66e496489bdae81bfda8b0088172871d8fda0032
+Subproject commit 2dec336772bf401e86ff7cf15647709e6697f84a
diff --git a/depends/xlsxio b/depends/xlsxio
index cfd9ed517..f801aeeb7 160000
--- a/depends/xlsxio
+++ b/depends/xlsxio
@@ -1 +1 @@
-Subproject commit cfd9ed517417000f5ffce428f2a4a7da0847c145
+Subproject commit f801aeeb71e6ad70c0c59b8c35ebde47b1eb610e
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index dc71b6e0d..424f9eef7 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -77,12 +77,6 @@ set_source_files_properties( Brushes.h PROPERTIES HEADER_FILE_ONLY TRUE )
 add_library(buildingplan-lib STATIC buildingplan-lib.cpp)
 target_link_libraries(buildingplan-lib dfhack)
 
-# xlsxreader deps
-add_library(xlsxio_read STATIC IMPORTED)
-set_target_properties(xlsxio_read PROPERTIES IMPORTED_LOCATION ${XLSXIO_LIB})
-add_library(zip STATIC IMPORTED)
-set_target_properties(zip PROPERTIES IMPORTED_LOCATION ${LIBZIP_LIB})
-
 if(WIN32)
   set(LIB_Z_LIB "depends/zlib/lib/zlib")
 else()
@@ -187,11 +181,9 @@ if(BUILD_SUPPORTED)
     add_subdirectory(tweak)
     dfhack_plugin(workflow workflow.cpp LINK_LIBRARIES lua)
     dfhack_plugin(workNow workNow.cpp)
-    dfhack_plugin(xlsxreader xlsxreader.cpp LINK_LIBRARIES lua xlsxio_read zip expat ${LIB_Z_LIB})
+    dfhack_plugin(xlsxreader xlsxreader.cpp LINK_LIBRARIES lua xlsxio_read_STATIC zip expat ${LIB_Z_LIB})
     dfhack_plugin(zone zone.cpp LINK_LIBRARIES lua)
 endif()
-target_include_directories(xlsxreader PRIVATE ${XLSXIO_INSTALL_DIR}/include)
-add_dependencies(xlsxreader xlsxio_project)
 
 # this is the skeleton plugin. If you want to make your own, make a copy and then change it
 option(BUILD_SKELETON "Build the skeleton plugin." OFF)

From 7efadc85a65c1cbaad8f69d08f40a2ba2f18d627 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 18 Sep 2020 00:36:47 -0400
Subject: [PATCH 367/547] Remove some unused config

---
 depends/CMakeLists.txt | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index de0683427..566a4d57f 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -18,28 +18,6 @@ option(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependenc
 add_subdirectory(clsocket)
 ide_folder(clsocket "Depends")
 
-# assemble environment args to pass on to dependency projects
-get_cmake_property(vars CACHE_VARIABLES)
-foreach(var ${vars})
-  if(var MATCHES "^CMAKE_"
-     AND NOT var MATCHES "^CMAKE_CACHE"
-     AND NOT var MATCHES "^CMAKE_HOME"
-     AND NOT var MATCHES "^CMAKE_PROJECT")
-    list(APPEND CL_ARGS "-D${var}=${${var}}")
-  endif()
-  if(var MATCHES "^ZLIB")
-    list(APPEND CL_ARGS "-D${var}=${${var}}")
-  endif()
-endforeach()
-
-include(ExternalProject)
-
-if(WIN32)
-  set(XLSXIO_C_FLAGS "${CMAKE_C_FLAGS} /DXML_STATIC")
-else()
-  set(XLSXIO_C_FLAGS "${CMAKE_C_FLAGS} -DXML_STATIC")
-endif()
-
 # set the default values of libexpat options - the descriptions are left empty
 # because later option() calls *do* override those
 set(EXPAT_BUILD_EXAMPLES OFF CACHE BOOL "")

From a4254a4d2cec12fe6c53ff4a6949dcc769976f04 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 18 Sep 2020 15:04:06 -0400
Subject: [PATCH 368/547] xlsxreader: Don't link to zlib directly

It's complicated on Windows, and xlsxio already links to it directly
---
 plugins/CMakeLists.txt | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 424f9eef7..4998bd798 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -77,12 +77,6 @@ set_source_files_properties( Brushes.h PROPERTIES HEADER_FILE_ONLY TRUE )
 add_library(buildingplan-lib STATIC buildingplan-lib.cpp)
 target_link_libraries(buildingplan-lib dfhack)
 
-if(WIN32)
-  set(LIB_Z_LIB "depends/zlib/lib/zlib")
-else()
-  set(LIB_Z_LIB "z")
-endif()
-
 # Plugins
 option(BUILD_SUPPORTED "Build the supported plugins (reveal, probe, etc.)." ON)
 if(BUILD_SUPPORTED)
@@ -181,7 +175,7 @@ if(BUILD_SUPPORTED)
     add_subdirectory(tweak)
     dfhack_plugin(workflow workflow.cpp LINK_LIBRARIES lua)
     dfhack_plugin(workNow workNow.cpp)
-    dfhack_plugin(xlsxreader xlsxreader.cpp LINK_LIBRARIES lua xlsxio_read_STATIC zip expat ${LIB_Z_LIB})
+    dfhack_plugin(xlsxreader xlsxreader.cpp LINK_LIBRARIES lua xlsxio_read_STATIC zip expat)
     dfhack_plugin(zone zone.cpp LINK_LIBRARIES lua)
 endif()
 

From 65b8071941f60b4a4dbb83c0e91c028c4da71225 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 18 Sep 2020 15:05:17 -0400
Subject: [PATCH 369/547] Use typedefs from xlsxio in PluginStatics.h

The typedefs in the header foward-declared new structs of the same names in the DFHack namespace, e.g. DFHack::xlsxio_read_struct. Apparently the constructors that used these typedefs are not inlined on Windows, so libdfhack was compiled with a constructor taking a "DFHack::xlsxio_read_sheet_struct", and xlsxreader was looking for a constructor taking just a "xlsxio_read_sheet_struct", which didn't exist.
---
 library/include/PluginStatics.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/include/PluginStatics.h b/library/include/PluginStatics.h
index 061fd3a21..5665fb9e6 100644
--- a/library/include/PluginStatics.h
+++ b/library/include/PluginStatics.h
@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <xlsxio_read.h>
+
 #include "DataIdentity.h"
 
 namespace DFHack {
@@ -26,14 +28,12 @@ struct DFHACK_EXPORT xlsx_sheet_handle_identity : public compound_identity {
 };
 
 struct DFHACK_EXPORT xlsx_file_handle {
-    typedef struct xlsxio_read_struct* xlsxioreader;
     const xlsxioreader handle;
     xlsx_file_handle(xlsxioreader handle): handle(handle) {}
     static xlsx_file_handle_identity _identity;
 };
 
 struct DFHACK_EXPORT xlsx_sheet_handle {
-    typedef struct xlsxio_read_sheet_struct* xlsxioreadersheet;
     const xlsxioreadersheet handle;
     xlsx_sheet_handle(xlsxioreadersheet handle): handle(handle) {}
     static xlsx_sheet_handle_identity _identity;

From 650ab3a87ac926defd89a2e75ce4d7367e1cd438 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 18 Sep 2020 15:43:03 -0400
Subject: [PATCH 370/547] Update libzip for older CMake (on Buildmaster)

---
 depends/libzip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/libzip b/depends/libzip
index 2dec33677..5422cd24f 160000
--- a/depends/libzip
+++ b/depends/libzip
@@ -1 +1 @@
-Subproject commit 2dec336772bf401e86ff7cf15647709e6697f84a
+Subproject commit 5422cd24f6b254b67b519f437df730e187173ed9

From 89210eaf29801d1234e4b88f04b269a1c1f76e8e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 18 Sep 2020 17:01:30 -0400
Subject: [PATCH 371/547] Update libzip (static lib)

---
 depends/libzip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/depends/libzip b/depends/libzip
index 5422cd24f..33c059d22 160000
--- a/depends/libzip
+++ b/depends/libzip
@@ -1 +1 @@
-Subproject commit 5422cd24f6b254b67b519f437df730e187173ed9
+Subproject commit 33c059d2217de6a5271e9ecbf19908e6efbf0e79

From 64b12021193ba662ef79cedc3527e6f0ad27483e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 19 Sep 2020 01:17:25 -0400
Subject: [PATCH 372/547] Fix some CMake warnings and extraneous output

---
 .gitmodules      | 2 +-
 CMakeLists.txt   | 1 +
 depends/libexpat | 2 +-
 depends/xlsxio   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 97d01c993..e548e27f9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -26,5 +26,5 @@
 	shallow = true
 [submodule "depends/libexpat"]
 	path = depends/libexpat
-	url = ../../libexpat/libexpat.git
+	url = ../../DFHack/libexpat.git
 	shallow = true
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 526cb9f7a..ce3104bca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@
 
 ## some generic CMake magic
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+cmake_policy(SET CMP0048 NEW)
 project(dfhack)
 
 if("${CMAKE_GENERATOR}" STREQUAL Ninja)
diff --git a/depends/libexpat b/depends/libexpat
index d8daead33..26839cce4 160000
--- a/depends/libexpat
+++ b/depends/libexpat
@@ -1 +1 @@
-Subproject commit d8daead33ee76a29f5184d35b13672b6ce14b4a2
+Subproject commit 26839cce4534ea4ee70ba992a6d7a774c624d584
diff --git a/depends/xlsxio b/depends/xlsxio
index f801aeeb7..4056226fe 160000
--- a/depends/xlsxio
+++ b/depends/xlsxio
@@ -1 +1 @@
-Subproject commit f801aeeb71e6ad70c0c59b8c35ebde47b1eb610e
+Subproject commit 4056226fe0df6bff4593ee2353cca07c2b7f327e

From 11ee3a223da9ea34602f71b5a3f8dc3708d93f00 Mon Sep 17 00:00:00 2001
From: PassionateAngler <ptom82@gmail.com>
Date: Thu, 17 Sep 2020 17:00:15 +0200
Subject: [PATCH 373/547] enumnick: command added to 'zone' plugin and other
 QoL improvements

zone: enumnick command create nick for creature from given prefix and number
      uinfo displays "Matched creatures" i.e number of creatures matched by filter
      maxage, and minage filters accept float now
      slaughter flag displayed on uinfo cretures list
---
 plugins/zone.cpp | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/plugins/zone.cpp b/plugins/zone.cpp
index 071d67a23..c32122241 100644
--- a/plugins/zone.cpp
+++ b/plugins/zone.cpp
@@ -133,6 +133,7 @@ const string zone_help =
     "                 with filters named units are ignored unless specified.\n"
     "  unassign     - unassign selected creature(s) from zone or cage\n"
     "  nick         - give unit(s) nicknames (e.g. all units in a cage)\n"
+    "  enumnick     - give unit(s) enumerated nicknames (e.g Hen 1, Hen 2)\n"
     "  remnick      - remove nicknames\n"
     "  tocages      - assign to (multiple) built cages inside a pen/pasture\n"
     "                 spreads creatures evenly among cages for faster hauling.\n"
@@ -427,6 +428,7 @@ void unitInfo(color_ostream & out, df::unit* unit, bool verbose = false)
     out << ")";
     out << ", age: " << getAge(unit, true);
 
+
     if(isTame(unit))
         out << ", tame";
     if(isOwnCiv(unit))
@@ -445,7 +447,9 @@ void unitInfo(color_ostream & out, df::unit* unit, bool verbose = false)
         out << ", grazer";
     if(isMilkable(unit))
         out << ", milkable";
-
+    if(unit->flags2.bits.slaughter)
+        out << ", slaughter";
+    
     if(verbose)
     {
         out << ". Pos: ("<<unit->pos.x << "/"<< unit->pos.y << "/" << unit->pos.z << ") " << endl;
@@ -1398,7 +1402,7 @@ pair<string, function<bool(df::unit*)>> createAgeFilter(vector<string> &filter_a
 
 pair<string, function<bool(df::unit*)>> createMinAgeFilter(vector<string> &filter_args)
 {
-    int min_age;
+    double min_age;
     stringstream ss(filter_args[0]);
 
     ss >> min_age;
@@ -1424,7 +1428,7 @@ pair<string, function<bool(df::unit*)>> createMinAgeFilter(vector<string> &filte
 
 pair<string, function<bool(df::unit*)>> createMaxAgeFilter(vector<string> &filter_args)
 {
-    int max_age;
+    double max_age;
     stringstream ss(filter_args[0]);
 
     ss >> max_age;
@@ -1489,6 +1493,8 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
     bool cagezone_assign = false;
     bool nick_set = false;
     string target_nick;
+    bool enum_nick = true;
+    string enum_prefix;
 
     bool verbose = false;
 
@@ -1694,6 +1700,18 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
             start_index = 2;
             out << "Set nickname to: " << target_nick << endl;
         }
+        else if(p0 == "enumnick")
+        {
+            if(parameters.size() <= 2)
+            {
+                out.printerr("No prefix specified! Use 'remnick' to remove nicknames!\n");
+                return CR_WRONG_USAGE;
+            }
+            enum_nick = true;
+            enum_prefix = parameters[1];
+            start_index = 2;
+            out << "Set nickname to: " << enum_prefix <<" <N>" << endl;
+        }
         else if(p0 == "remnick")
         {
             nick_set = true;
@@ -2070,6 +2088,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
     {
         vector <df::unit*> units_for_cagezone;
         int count = 0;
+        int matchedCount = 0;
         for(auto unit_it = world->units.all.begin(); unit_it != world->units.all.end(); ++unit_it)
         {
             df::unit *unit = *unit_it;
@@ -2108,6 +2127,8 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
                 }
                 continue;
             }
+            
+            matchedCount++;
 
             if(unit_info)
             {
@@ -2118,6 +2139,12 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
             {
                 Units::setNickname(unit, target_nick);
             }
+            else if(enum_nick)
+            {
+                std::stringstream ss;
+                ss << enum_prefix << " " << matchedCount;
+                Units::setNickname(unit, ss.str());
+            }
             else if(cagezone_assign)
             {
                 units_for_cagezone.push_back(unit);
@@ -2181,6 +2208,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
         }
 
         out.color(COLOR_BLUE);
+        out << "Matched creatures: " << matchedCount << endl;
         out << "Processed creatures: " << count << endl;
         out.reset_color();
     }

From 8df8eb0c5d6b30a9faa760773fcf069c5e9b657e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 19 Sep 2020 16:23:21 -0400
Subject: [PATCH 374/547] Remove obsolete xlsxio_project dependency

---
 plugins/CMakeLists.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 973d0a37c..4998bd798 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -177,9 +177,6 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(workNow workNow.cpp)
     dfhack_plugin(xlsxreader xlsxreader.cpp LINK_LIBRARIES lua xlsxio_read_STATIC zip expat)
     dfhack_plugin(zone zone.cpp LINK_LIBRARIES lua)
-
-    target_include_directories(xlsxreader PRIVATE ${XLSXIO_INSTALL_DIR}/include)
-    add_dependencies(xlsxreader xlsxio_project)
 endif()
 
 # this is the skeleton plugin. If you want to make your own, make a copy and then change it

From 7cb77e80668d1cef05e17d3bb5c6c513a71a72d9 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 19 Sep 2020 15:40:30 -0700
Subject: [PATCH 375/547] update dreamfort.csv

- use #notes blueprints instead of "invisible" "Notes" sheets
- remove smoothing guildhall blueprint
- rearrange statues in guildhall so no pre-smoothing is required
---
 data/blueprints/library/dreamfort.csv | 243 ++++++++++++++++----------
 1 file changed, 153 insertions(+), 90 deletions(-)

diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
index 9fb730447..2eb98607f 100644
--- a/data/blueprints/library/dreamfort.csv
+++ b/data/blueprints/library/dreamfort.csv
@@ -1,27 +1,45 @@
-"#meta label(help) message(Welcome to the Dreamfort Walkthrough!
+#notes label(help) run me for the dreamfort walkthrough
+Welcome to the Dreamfort Walkthrough!
 It can be difficult applying a set of blueprints that you did not write yourself. This walkthrough will guide you through the high-level steps of building Dreamfort.
-
-The final fort will have a walled-in area on the surface for livestock, trading, and military. One z-level down is the farming level, with related workshops and vents up to the surface for miasma control. The farming level also has a miniature dining hall for use until you get the services level set up.
-
-Beyond those two, the other layers can be built in any order, at any z-level, according to your preference and the layout peculiarities of your embark site:
- - The industry level has a compact, but complete set of workshops and stockpiles
- - The services level has dining, hospital, and justice services, including a well system. This level is 4 z-levels deep.
- - The guildhall level has many rooms for buildling libraries, temples, and guildhalls
- - The suites level has fancy rooms for your nobles
- - The apartments level(s) has small but well-furnished bedrooms for your other dwarves
-
-Dreamfort has a central staircase-based design. Choose a tile for your staircase on the surface in a nice, flat area. For all blueprints, the cursor will start on this tile on the z-level where you want to apply the blueprint.
-
-Blueprints that require manual steps (like 'assign animals to pasture') will leave a message telling you so after you apply them. Blueprints will also leave messages with hints when you might want to run ""quickfort orders"" on specific blueprints to start manufacturing needed items.
-
-Directly after embark, apply /surface1 on a flat area on the surface and /industry1 somewhere below, underground (but not immediately below the surface -- that will be for the farming level). Work your way through the steps for those levels: apply /surface2 when /surface1 is done, /industry2 when /industry1 is done, etc. Once you channel out parts of the surface with /surface3, you can start the farming sequence with /farming1. You can start the services, guildhall, suites, and apartments sequences as your fort needs those levels.
-
-This .csv file is generated from source .xlsx files. If you want to look at how these blueprints are put together, including full lists of their features, it will be easier to look at the .xlsx files than this giant .csv. You can view them online at:
-  https://drive.google.com/drive/folders/1iS90EEVqUkxTeZiiukVj1pLloZqabKuP
+""
+"The final fort will have a walled-in area on the surface for livestock, trading, and military. Be sure to bring some blocks with you for the initial set of workshops! One z-level down is the farming level, with related workshops and vents up to the surface for miasma control. The farming level also has a miniature dining hall and dormitory for use until you get the services and apartment levels set up."
+""
+"Beyond those two, the other layers can be built in any order, at any z-level, according to your preference and the layout peculiarities of your embark site:"
+"- The industry level has a compact, but complete set of workshops and stockpiles (minus what is already provided on the farming level)"
+"- The services level has dining, hospital, and justice services, including a well system. This level is 4 z-levels deep."
+"- The guildhall level has many rooms for building libraries, temples, and guildhalls"
+- The suites level has fancy rooms for your nobles
+- The apartments level(s) has small but well-furnished bedrooms for your other dwarves
+""
+"Dreamfort has a central staircase-based design. Choose a tile for your staircase on the surface in a nice, flat area. For all blueprints, the cursor will start on this tile on the z-level where you want to apply the blueprint."
+""
+"Blueprints that require manual steps (like 'assign animals to pasture') will leave a message telling you so after you apply them. Blueprints will also leave messages with hints when you might want to run ""quickfort orders"" on specific blueprints to start manufacturing needed items."
+""
+"Directly after embark, apply /surface1 on a flat area on the surface and /industry1 somewhere underground (but not immediately below the surface -- that will be for the farming level). Work your way through the steps for those levels: apply /surface2 when /surface1 is done, /industry2 when /industry1 is done, etc. Once you channel out parts of the surface with /surface3, you can start the farming sequence with /farming1. You can start the services, guildhall, suites, and apartments sequences as your fort needs those levels."
+""
+"This .csv file is generated from source .xlsx files. If you want to look at how these blueprints are put together, including full lists of their features, it will be easier to look at the .xlsx files than this giant .csv. You can view them online at: https://drive.google.com/drive/folders/1iS90EEVqUkxTeZiiukVj1pLloZqabKuP"
 You are welcome to copy those files and make your own modifications!
-) run me for help with dreamfort"
 "#dreamfort.csv is generated with the following command:
-  for fname in dreamfort*.xlsx; do xlsx2csv -a -E Notes -p '' $fname; done | sed 's/,*$//'"
+  for fname in dreamfort*.xlsx; do xlsx2csv -a -p '' $fname; done | sed 's/,*$//'"
+#notes label(surface_readme)
+"Sets up a large, protected entrance to your fort in a flat area on the surface."
+""
+Features:
+A starting set of workshops and stockpiles (which you can later remove once you establish your permanent workshops and storage)
+Walls and lever-controlled gates for security
+Trap-filled hallways for invaders
+Livestock grazing area with nestbox zones and beehives
+A grid of 1x1 farm plots (meant to be managed with DFHack autofarm)
+An extra room near the entrance for a barracks (once you get your military going)
+Miasma vents for the farming level that is intended to be built in the layer directly beneath the surface
+""
+Manual steps you have to take:
+Assign grazing livestock to the large pasture and dogs to the pasture over the stairwell (DFHack's autonestbox will manage the nestbox zones)
+Connect levers to the gates
+""
+"All blueprints are managed by the meta blueprints in the ""meta"" sheet. Each stage is meant to be applied after the previous stage is completely finished. For example, you can't build furniture until all the flooring has been constructed."
+""
+Be sure to choose an embark site that has an area flat enough to use these blueprints!
 "#meta label(surface1) start(staircase center)
 message(This would be a good time to start digging the industry level.
 Once the area is clear, continue with /surface2.) clear an area and set up pastures"
@@ -36,7 +54,7 @@ query_start/surface_query_start
 clear/surface_clear
 pick/surface_pick
 ""
-"#meta label(surface3) start(staircase center) message(Once the channels are dug out and you have around 650 blocks, continue with /surface4. You can also start digging out the sub-surface farming level once the channels are done.) channel to prevent miasma in the sub-surface level"
+"#meta label(surface3) start(staircase center) message(Once the channels are dug out and you have around 650 blocks, continue with /surface4. You can also start digging out the sub-surface farming level once the channels are done.) channel to prevent miasma in the sub-surface farming level"
 dig/surface_channel
 ""
 "#meta label(surface4) start(staircase center) message(Once floors and walls are built and you have completed the manager orders for /surface5, continue with /surface5.) cover up the holes with flooring and build walls"
@@ -802,6 +820,31 @@ p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,
 
 
 
+#notes label(farming_readme)
+"Sets up farming, food storage, and related industries. Also provides post-embark necessities that can later be disassembed."
+""
+Features:
+Pairs with the surface blueprints to provide miasma vents
+Farm plots (intended to be managed by DFHack autofarm)
+Plentiful food storage
+Refuse stockpile and quantum dump for useless body parts
+Small dormitory and dining room for post-embark needs
+Small office for your manager
+""
+Workshops:
+Kitchen
+Brewery
+Butcher
+Fishery
+Tannery
+Farmer's Workshop
+Quern
+Screw Press
+""
+Manual steps you have to take:
+Assign the office to your manager
+Assign a minecart to your quantum garbage stockpile hauling route
+"if the industry level is already built, configure the jugs, pots, and bags stockpiles to take from the ""Goods"" quantum stockpile on the industry level"
 "#dig label(farming1) start(23; 25; staircase center) message(This would be a good time to queue up manager orders for /farming2. Once the area is dug out, continue with /farming2.)"
 
 
@@ -983,7 +1026,9 @@ query_stockpiles/farming_query_stockpiles
 ,,,,,,,,,,,,,,,,,,,,,,ry(1x1),,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 
 
-#query label(farming_query_stockpiles) start(23; 25) hidden() message(remember to assign a minecart to the garbage quantum stockpile) use the meta blueprints for normal application
+"#query label(farming_query_stockpiles) start(23; 25) hidden() message(remember to:
+- assign a minecart to the garbage quantum stockpile
+- if the industry level is already built, configure the jugs, pots, and bags stockpiles to take from the ""Goods"" quantum stockpile on the industry level) use the meta blueprints for normal application"
 
 
 ,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,,`,,`,,forbidplants,`,`,`,`,`,`,`,`,`,`,`,`,`
@@ -1017,7 +1062,7 @@ query_stockpiles/farming_query_stockpiles
 ,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,,,,,`,,,,,`
 ,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,,give2up,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,`,`,`,,booze,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,,booze,`,`,`,`,`,`,,`,`,`,,forbidcraftrefuse,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,,,,,,,,,,,,,bodyparts,linksonly,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
@@ -1071,6 +1116,42 @@ query_stockpiles/farming_query_stockpiles
 ,,,,,,,,,,,,,,,,,,,,,,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 
 
+#notes label(industry_readme)
+Sets up workshops for all non-farming industries
+""
+Features:
+Quantum stockpiles
+Space-efficient layout for all workshops
+with separate stockpiles for:
+A reserve of uncut gems for strange moods that the jeweler's workshop cannot take from
+Steel bars and coal so you can see at a glance if you're low on either
+Liquids that cannot be quantum stockpiled (e.g. lye)
+Meltable weapons and armor
+""
+Workshops:
+3x Mason
+4x Craftsdwarf
+1x Jeweler
+1x Mechanic
+4x Smelter
+1x Forge
+1x Glassmaker
+1x Kiln
+4x Wood furnace
+1x Ashery
+1x Soap maker
+1x Carpenter
+1x Siege workshop
+1x Bowyer
+1x Dyer
+1x Loom
+1x Clothier
+""
+""
+Manual steps you have to take:
+Assign minecarts to your quantum stockpile hauling routes
+"Give from the ""Goods"" quantum stockpile to the jugs, pots, and bags stockpiles on the farming level"
+"If desired, set the stockpiles in the bottom right to auto-melt. This results in melting all weapons and armor that are not masterwork steel. This is great for your military, but it takes a *lot* of fuel. If you enable this, be sure you're in a heavily forested area, enable auto-chop, and set up manager orders to keep your coal stocks high."
 "#dig label(industry1) start(18; 18; staircase center) message(This would be a good time to queue manager orders for /industry2. Once the area is dug out, continue with /industry2.)"
 
 
@@ -1183,7 +1264,10 @@ query/industry_query
 ,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
 
 
-#query label(industry_query) start(18; 18) hidden() message(remember to assign minecarts to to your quantum stockpile hauling routes) use the meta blueprints for normal application
+"#query label(industry_query) start(18; 18) hidden() message(remember to:
+- assign minecarts to to your quantum stockpile hauling routes
+- if the farming level is already built, give from the ""Goods"" quantum stockpile to the jugs, pots, and bags stockpiles on the farming level
+- if you want to automatically melt goblinite and other low-quality weapons and armor, mark the south-east stockpiles for auto-melt) use the meta blueprints for normal application"
 
 
 ,,,,,,,,,,,roughgems,nocontainers,`,`,`,`,t{Down 6}&,`,`,`,`,`,`
@@ -1219,7 +1303,24 @@ query/industry_query
 ,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
 
 
-"#dig label(services1) start(23; 22; staircase center) message(This would be a good time to queue manager orders for /services2. Reapply this dig blueprint after digging to clear cistern ramps. Once the area is dug out, continue with /services2.)"
+#notes label(services_readme)
+"Sets up public services (dining, hospital, etc.)"
+""
+Features:
+Spacious dining room (can be declared a tavern)
+Food and drink stockpiles
+Well system (bring your own water)
+Public baths with soap stockpiles
+Three well-appointed jail cells
+Hospital with beds and storage
+Garbage dump
+""
+Manual steps you have to take:
+"If you want to declare the dining room as a tavern, the bedrooms at the top can be assigned to the tavern as rented rooms."
+"Configure the soap stockpiles to take from the industry level ""Metalworker"" quantum stockpile (which holds all the bars)"
+"Convert the bath pit zones to pond zones when you are ready to fill them with 3-depth water. This is the only really fiddly bit, since you have to carefully disable the pond zone again when the final bucket to bring the water to an even 3-depth is on the way."
+"Fill the cisterns with water, either with a bucket brigade or by plumbing flowing water. Fill so that there are two z-levels of 7-depth water. If you want to fill with buckets, designate a pond zone on the level below the main floor. If you feel adventurous and are experience with water pressure, you can instead route (depressurized!) water to the second-to-bottom level (the one above the up staircases)."
+"#dig label(services1) start(23; 22; staircase center) message(This would be a good time to queue manager orders for /services2. Once the area is dug out, continue with /services2.)"
 
 
 ,,d,d,d,,,d,d,d,,,d,d,d
@@ -1294,13 +1395,13 @@ query/industry_query
 
 
 
-,,,i,h,i,,i,h,i,,i,h,i,,,,,i,h,i,i,h,i,i,h,i
+,,,i,h5,i,,i,h5,i,,i,h5,i,,,,,i,h5,i,i,h5,i,i,h5,i
 
 
 
 ,,,,,,,,,,,,,,,,,,,,d,d,d,d,d
 ,,,,,,,,,,,,,,,,,,,,d,i,i,i,d
-,,,,,,,,,,,,,,,,,,,,d,i,i,i,d,,,,,,,,,i,h,i
+,,,,,,,,,,,,,,,,,,,,d,i,i,i,d,,,,,,,,,i,h5,i
 ,,,,,,,,,,,,,,,,,,,,d,i,i,i,d
 ,,,,,,,,,,,,,,,,,,,,d,d,d,d,d
 #>
@@ -1319,13 +1420,13 @@ query/industry_query
 
 
 
-,,,u,z,u,,u,z,u,,u,z,u,,,,,u,z,u,u,z,u,u,z,u
+,,,u,d,u,,u,d,u,,u,d,u,,,,,u,d,u,u,d,u,u,d,u
 
 
 
 ,,,,,,,,,,,,,,,,,,,,d,d,d,d,d
 ,,,,,,,,,,,,,,,,,,,,d,i,i,i,d
-,,,,,,,,,,,,,,,,,,,,d,i,i,i,d,,,,,,,,,u,z,u
+,,,,,,,,,,,,,,,,,,,,d,i,i,i,d,,,,,,,,,u,d,u
 ,,,,,,,,,,,,,,,,,,,,d,i,i,i,d
 ,,,,,,,,,,,,,,,,,,,,d,d,d,d,d
 
@@ -1464,7 +1565,7 @@ query_stockpiles/services_query_stockpiles
 ,,`,`,`,`,`,`,,`,`,`,`,`,`
 
 
-#query label(services_query_stockpiles) start(23; 22) hidden() use the meta blueprints for normal application
+"#query label(services_query_stockpiles) start(23; 22) hidden() message(remember to configure the soap stockpiles to take from the ""Metalworker"" quantum stockpile on the industry level (where all bars are stored)) use the meta blueprints for normal application"
 
 
 ,,`,`,`,,,`,`,`,,,`,`,`
@@ -1532,7 +1633,12 @@ query_stockpiles/services_query_stockpiles
 ,,`,`,`,`,`,`,,`,`,`,`,`,`
 
 
-"#dig label(guildhall1) start(25; 25; staircase center) message(This would be a good time to queue manager orders for /guildhall3. Once the area is dug out, continue with /guildhall2.)"
+#notes label(guildhall_readme)
+"Multiple 7x7 rooms for guildhalls, temples, libraries, etc."
+""
+Features:
+"Big empty rooms. Double-thick walls to ensure engravings are on the ""correct"" side. Fill with furniture and assign as needed."
+"#dig label(guildhall1) start(25; 25; staircase center) message(This would be a good time to queue manager orders for /guildhall2. Once the area is dug out, continue with /guildhall2.)"
 
 
 ,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d,,,,,,,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d
@@ -1582,69 +1688,19 @@ query_stockpiles/services_query_stockpiles
 ,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d,,,,,,,,d,d,d,d,d,d,d,,,,,,d,d,d,d,d,d,d
 
 
-"#dig label(guildhall2) start(25; 25; staircase center) message(Once tiles are smoothed, continue with /guildhall3.) smooth tiles that will be made inaccessible by furniture"
+#build label(guildhall2) start(25; 25; staircase center) message(Smooth tiles and furnish/declare locations as required.) build basic furniture
 
 
 ,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,s,s,s,,`,`,`,`,`,`,`,,s,,,,s,,`,`,`,`,`,`,`,,s,s,s,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,s,,,`,`,`,`,`,`,`,,,s,`,s,,,`,`,`,`,`,`,`,,,s,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
-,,,,,,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`
-,,,,,s,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`,,s
-,,,,,s,s,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,s,s
-,,,,,s,,,,,,`,,,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,,,,,s
-,,,,,,,,,,,`,,,,,,,,,,,,`,`,`,,,,,,,,,,,,`
-,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,s,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
-,,,,,,,`,,,,`,,,,,,,,`,,,,`,,`,,,,`,,,,,,,,`,,,,`
-,,,,,s,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`,,s
-,,,,,,s,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,s
-,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,s,,`,,`,,`,,s,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,s,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,s
-,,,,,s,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`,,s
-,,,,,,,`,,,,`,,,,,,,,`,,,,`,,`,,,,`,,,,,,,,`,,,,`
-,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,s,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
-,,,,,,,,,,,`,,,,,,,,,,,,`,`,`,,,,,,,,,,,,`
-,,,,,s,,,,,,`,,,,,,,,,,,,`,`,`,,,,,,,,,,,,`,,,,,,s
-,,,,,s,s,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,s,s
-,,,,,s,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`,,s
-,,,,,,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`
-,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,s,,,`,`,`,`,`,`,`,,,s,`,s,,,`,`,`,`,`,`,`,,,s,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,s,s,s,,`,`,`,`,`,`,`,,s,,,,s,,`,`,`,`,`,`,`,,s,s,s,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
-
-
-#build label(guildhall3) start(25; 25; staircase center) message(Smooth the remaining tiles and furnish/declare locations as required.) build basic furniture
-
-
-,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,s,,,`,`,`,`,`,`,`,,,s,t,s,,,`,`,`,`,`,`,`,,,s,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,t,,,`,`,`,`,`,`,`,,,t,s,t,,,`,`,`,`,`,`,`,,,t,,,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,d,`,`,,,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,,,`,`,d,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
 ,,,,,,,d,,,,`,,,,,,,,d,,,,`,`,`,,,,d,,,,,,,,`,,,,d
 ,,,,,,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`
-,,,,,,s,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,s
+,,,,,,t,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,t
 ,,,,,,,,,,,`,,,,,,,,,,,,`,`,`,,,,,,,,,,,,`
 ,,,,,,,,,,,`,,,,,,,,,,,,`,`,`,,,,,,,,,,,,`
 ,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
@@ -1656,9 +1712,9 @@ query_stockpiles/services_query_stockpiles
 ,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,s,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
 ,,,,,,,d,,,,`,,,,,,,,d,,,,`,,`,,,,d,,,,,,,,`,,,,d
 ,,,,,,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`
-,,,,,,s,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,s
-,,,,,,t,`,`,`,`,`,`,`,`,`,`,`,`,`,s,,`,,`,,`,,s,`,`,`,`,`,`,`,`,`,`,`,`,`,t
-,,,,,,s,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,s
+,,,,,,t,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,t
+,,,,,,s,`,`,`,`,`,`,`,`,`,`,`,`,`,s,,`,,`,,`,,s,`,`,`,`,`,`,`,`,`,`,`,`,`,s
+,,,,,,t,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,t
 ,,,,,,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`
 ,,,,,,,d,,,,`,,,,,,,,d,,,,`,,`,,,,d,,,,,,,,`,,,,d
 ,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,s,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
@@ -1670,18 +1726,25 @@ query_stockpiles/services_query_stockpiles
 ,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
 ,,,,,,,,,,,`,,,,,,,,,,,,`,`,`,,,,,,,,,,,,`
 ,,,,,,,,,,,`,,,,,,,,,,,,`,`,`,,,,,,,,,,,,`
-,,,,,,s,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,s
+,,,,,,t,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,t
 ,,,,,,,`,,,,`,,,,,,,,`,,,,`,`,`,,,,`,,,,,,,,`,,,,`
 ,,,,,,,d,,,,`,,,,,,,,d,,,,`,`,`,,,,d,,,,,,,,`,,,,d
 ,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`,,,`,`,`,,,`,`,`,`,`,`,`,,,`,,,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,d,`,`,,,`,`,`,`,`,`,`,d,`,`,`,`,`,d,`,`,`,`,`,`,`,,,`,`,d,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,,,s,,,`,`,`,`,`,`,`,,,s,t,s,,,`,`,`,`,`,`,`,,,s,,,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,,,t,,,`,`,`,`,`,`,`,,,t,s,t,,,`,`,`,`,`,`,`,,,t,,,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
 
 
+#notes label(beds_readme)
+Suites for nobles and apartments for the teeming masses
+""
+Features:
+Well-appointed suites to satisfy most nobles
+Apartments with beds and storage to keep dwarves happy
+Meta blueprint included for designating 6 levels of apartments for a full 200+ dwarves
 "#dig label(suites1) start(18; 18; staircase center) message(This would be a good time to queue manager orders for /suites2. Once the area is dug out, continue with /suites2) noble suites"
 
 ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d

From 9c37a3a068d49a3e50efa023595b0a4666ce87f4 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 19 Sep 2020 20:33:47 -0400
Subject: [PATCH 376/547] Add "createitem inspect" subcommand

---
 docs/Plugins.rst       | 25 +++++++++++++++++--------
 docs/changelog.txt     |  1 +
 plugins/createitem.cpp | 21 +++++++++++++++++++--
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index e98e46073..55ec4c040 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -2635,25 +2635,34 @@ Usage:
 
 createitem
 ==========
-Allows creating new items of arbitrary types and made of arbitrary materials.
-By default, items created are spawned at the feet of the selected unit.
+Allows creating new items of arbitrary types and made of arbitrary materials. A
+unit must be selected in-game to use this command. By default, items created are
+spawned at the feet of the selected unit.
 
 Specify the item and material information as you would indicate them in
 custom reaction raws, with the following differences:
 
 * Separate the item and material with a space rather than a colon
-* If the item has no subtype, omit the :NONE
-* If the item is REMAINS, FISH, FISH_RAW, VERMIN, PET, or EGG,
-  specify a CREATURE:CASTE pair instead of a material token.
+* If the item has no subtype, the ``:NONE`` can be omitted
+* If the item is ``REMAINS``, ``FISH``, ``FISH_RAW``, ``VERMIN``, ``PET``, or ``EGG``,
+  specify a ``CREATURE:CASTE`` pair instead of a material token.
 
 Corpses, body parts, and prepared meals cannot be created using this tool.
 
-Examples::
+To obtain the item and material tokens of an existing item, run
+``createitem inspect``. Its output can be passed directly as arguments to
+``createitem`` to create new matching items, as long as the item type is
+supported.
+
+Examples:
+
+* Create 2 pairs of steel gauntlets::
 
     createitem GLOVES:ITEM_GLOVES_GAUNTLETS INORGANIC:STEEL 2
-            Create 2 pairs of steel gauntlets.
+
+* Create tower-cap logs::
+
     createitem WOOD PLANT_MAT:TOWER_CAP:WOOD
-            Create tower-cap logs.
 
 For more examples, :wiki:`see this wiki page <Utility:DFHack/createitem>`.
 
diff --git a/docs/changelog.txt b/docs/changelog.txt
index e15fbb232..88834c886 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -38,6 +38,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `stockpiles`: fixed a crash when loading food stockpiles
 
 ## Misc Improvements
+- `createitem`: added an ``inspect`` subcommand to print the item and material tokens of existing items, which can be used to create additional matching items
 - `embark-assistant`: added support for searching for taller waterfalls (up to 50 z-levels tall)
 
 # 0.47.04-r2
diff --git a/plugins/createitem.cpp b/plugins/createitem.cpp
index 4ef1c853c..6032383d7 100644
--- a/plugins/createitem.cpp
+++ b/plugins/createitem.cpp
@@ -53,9 +53,12 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector<Plugin
         "                 PET, and EGG, replace this with a creature ID and caste.\n"
         "    [count] - How many of the item you wish to create.\n"
         "\n"
+        "To obtain the item and material of an existing item, run \n"
+        "'createitem inspect' with that item selected in-game.\n"
+        "\n"
         "To use this command, you must select which unit will create the items.\n"
         "By default, items created will be placed at that unit's feet.\n"
-        "To change this, type 'createitem <destination>'.\n"
+        "To change this, run 'createitem <destination>'.\n"
         "Valid destinations:\n"
         "* floor - Place items on floor beneath maker's feet.\n"
         "* item - Place items inside selected container.\n"
@@ -142,7 +145,21 @@ command_result df_createitem (color_ostream &out, vector <string> & parameters)
 
     if (parameters.size() == 1)
     {
-        if (parameters[0] == "floor")
+        if (parameters[0] == "inspect")
+        {
+            CoreSuspender suspend;
+            df::item *item = Gui::getSelectedItem(out);
+            if (!item)
+            {
+                return CR_FAILURE;
+            }
+
+            ItemTypeInfo iinfo(item->getType(), item->getSubtype());
+            MaterialInfo minfo(item->getMaterial(), item->getMaterialIndex());
+            out.print("%s %s\n", iinfo.getToken().c_str(), minfo.getToken().c_str());
+            return CR_OK;
+        }
+        else if (parameters[0] == "floor")
         {
             dest_container = -1;
             dest_building = -1;

From 9d3a168cc3c42f29c282e370a5d4db3a7b64b9c2 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 19 Sep 2020 20:34:10 -0400
Subject: [PATCH 377/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 070e8d221..403f9adc6 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 070e8d221a1de3c0c5a0fa4ae80a9c86e7e510fc
+Subproject commit 403f9adc690b73ca6879458dce32dc40d3f4c371

From 0e6e00af5ed29eaaf74cdc4b7d7f18e87dd4b7da Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 20 Sep 2020 01:24:46 -0400
Subject: [PATCH 378/547] getplants: fix crash when world_object_data is not
 present for certain blocks

---
 docs/changelog.txt    | 1 +
 plugins/getplants.cpp | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 88834c886..c7ab70b8e 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -34,6 +34,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 # Future
 
 ## Fixes
+- `getplants`: fixed a crash that could occur on some maps
 - `search`: fixed an issue causing item counts on the trade screen to display inconsistently when searching
 - `stockpiles`: fixed a crash when loading food stockpiles
 
diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp
index cfe499a9b..242f56c3f 100644
--- a/plugins/getplants.cpp
+++ b/plugins/getplants.cpp
@@ -247,6 +247,9 @@ bool picked(const df::plant *plant, int32_t growth_subtype) {
     int32_t pos_y = site->global_min_y + plant->pos.y / 48;
     size_t id = pos_x + pos_y * 16 * world_data->world_width;
     df::world_object_data *object_data = df::world_object_data::find(id);
+    if (!object_data) {
+        return false;
+    }
     df::map_block_column *column = world->map.map_block_columns[(plant->pos.x / 16) * world->map.x_count_block + (plant->pos.y / 16)];
 
     for (size_t i = 0; i < object_data->picked_growths.x.size(); i++) {

From 9cf0508b9063e69a4f96332b71e17e97ab289a1a Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 20 Sep 2020 11:33:37 -0400
Subject: [PATCH 379/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 403f9adc6..d069acb3a 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 403f9adc690b73ca6879458dce32dc40d3f4c371
+Subproject commit d069acb3ab7660c18cbb789070186f0757775462

From d3520a2f5f64870b3cef88d0acb757f1f0263d67 Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Sun, 20 Sep 2020 16:11:41 -0600
Subject: [PATCH 380/547] Fix createitem to properly create plant growths
 (#898)

---
 plugins/createitem.cpp | 86 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 83 insertions(+), 3 deletions(-)

diff --git a/plugins/createitem.cpp b/plugins/createitem.cpp
index 6032383d7..f32c51c03 100644
--- a/plugins/createitem.cpp
+++ b/plugins/createitem.cpp
@@ -26,6 +26,9 @@
 #include "df/reaction_reagent.h"
 #include "df/reaction_product_itemst.h"
 #include "df/tool_uses.h"
+#include "df/item_plant_growthst.h"
+#include "df/plant_growth.h"
+#include "df/plant_growth_print.h"
 
 using std::string;
 using std::vector;
@@ -37,6 +40,7 @@ REQUIRE_GLOBAL(cursor);
 REQUIRE_GLOBAL(world);
 REQUIRE_GLOBAL(ui);
 REQUIRE_GLOBAL(gametype);
+REQUIRE_GLOBAL(cur_year_tick);
 
 int dest_container = -1, dest_building = -1;
 
@@ -51,6 +55,7 @@ DFhackCExport command_result plugin_init (color_ostream &out, std::vector<Plugin
         "    <material> - The material you want the item to be made of, as specified\n"
         "                 in custom reactions. For REMAINS, FISH, FISH_RAW, VERMIN,\n"
         "                 PET, and EGG, replace this with a creature ID and caste.\n"
+        "                 For PLANT_GROWTH, replace this with a plant ID and growth ID.\n"
         "    [count] - How many of the item you wish to create.\n"
         "\n"
         "To obtain the item and material of an existing item, run \n"
@@ -72,7 +77,7 @@ DFhackCExport command_result plugin_shutdown ( color_ostream &out )
     return CR_OK;
 }
 
-bool makeItem (df::reaction_product_itemst *prod, df::unit *unit, bool second_item = false, bool move_to_cursor = false)
+bool makeItem (df::reaction_product_itemst *prod, df::unit *unit, bool second_item = false, bool move_to_cursor = false, int32_t growth_print = -1)
 {
     vector<df::reaction_product*> out_products;
     vector<df::item *> out_items;
@@ -118,6 +123,8 @@ bool makeItem (df::reaction_product_itemst *prod, df::unit *unit, bool second_it
             out_items[i]->moveToGround(cursor->x, cursor->y, cursor->z);
         else
             out_items[i]->moveToGround(unit->pos.x, unit->pos.y, unit->pos.z);
+
+        // Special logic for making gloves
         if (is_gloves)
         {
             // if the reaction creates gloves without handedness, then create 2 sets (left and right)
@@ -126,9 +133,14 @@ bool makeItem (df::reaction_product_itemst *prod, df::unit *unit, bool second_it
             else
                 out_items[i]->setGloveHandedness(second_item ? 2 : 1);
         }
+
+        // Special logic for making plant growths
+        auto growth = virtual_cast<df::item_plant_growthst>(out_items[i]);
+        if (growth)
+            growth->growth_print = growth_print;
     }
     if ((is_gloves || is_shoes) && !second_item)
-        return makeItem(prod, unit, true, move_to_cursor);
+        return makeItem(prod, unit, true, move_to_cursor, growth_print);
 
     return true;
 }
@@ -140,6 +152,7 @@ command_result df_createitem (color_ostream &out, vector <string> & parameters)
     int16_t item_subtype = -1;
     int16_t mat_type = -1;
     int32_t mat_index = -1;
+    int32_t growth_print = -1;
     int count = 1;
     bool move_to_cursor = false;
 
@@ -370,6 +383,73 @@ command_result df_createitem (color_ostream &out, vector <string> & parameters)
         }
         break;
 
+    case item_type::PLANT_GROWTH:
+        split_string(&tokens, material_str, ":");
+        if (tokens.size() == 1)
+        {
+            // default to empty to display a list of valid growths later
+            tokens.push_back("");
+        }
+        else if (tokens.size() != 2)
+        {
+            out.printerr("You must specify a plant and growth ID for this item type!\n");
+            return CR_FAILURE;
+        }
+
+        for (size_t i = 0; i < world->raws.plants.all.size(); i++)
+        {
+            string growths = "";
+            df::plant_raw *plant = world->raws.plants.all[i];
+            if (plant->id != tokens[0])
+                continue;
+
+            for (size_t j = 0; j < plant->growths.size(); j++)
+            {
+                df::plant_growth *growth = plant->growths[j];
+                growths += " " + growth->id;
+                if (growth->id != tokens[1])
+                    continue;
+
+                // Plant growths specify the actual item type/subtype
+                // so that certain growths can drop as SEEDS items
+                item_type = growth->item_type;
+                item_subtype = growth->item_subtype;
+                mat_type = growth->mat_type;
+                mat_index = growth->mat_index;
+
+                // Try and find a growth print matching the current time
+                // (in practice, only tree leaves use this for autumn color changes)
+                for (size_t k = 0; k < growth->prints.size(); k++)
+                {
+                    df::plant_growth_print *print = growth->prints[k];
+                    if (print->timing_start <= *cur_year_tick && *cur_year_tick <= print->timing_end)
+                    {
+                        growth_print = k;
+                        break;
+                    }
+                }
+                // If we didn't find one, then pick the first one (if it exists)
+                if (growth_print == -1 && growth->prints.size() > 0)
+                    growth_print = 0;
+                break;
+            }
+            if (mat_type == -1)
+            {
+                if (tokens[1].empty())
+                    out.printerr("You must also specify a growth ID.\n");
+                else
+                    out.printerr("The plant you specified has no such growth!\n");
+                out.printerr("Valid growths:%s\n", growths.c_str());
+                return CR_FAILURE;
+            }
+        }
+        if (mat_type == -1)
+        {
+            out.printerr("Unrecognized plant ID!\n");
+            return CR_FAILURE;
+        }
+        break;
+
     case item_type::CORPSE:
     case item_type::CORPSEPIECE:
     case item_type::FOOD:
@@ -449,7 +529,7 @@ command_result df_createitem (color_ostream &out, vector <string> & parameters)
         out.printerr("Previously selected building no longer exists - item will be placed on the floor.\n");
     }
 
-    bool result = makeItem(prod, unit, false, move_to_cursor);
+    bool result = makeItem(prod, unit, false, move_to_cursor, growth_print);
     delete prod;
     if (!result)
     {

From c6111ba0172da91dbcc8c70dc723378e31bf4593 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 20 Sep 2020 16:38:26 -0700
Subject: [PATCH 381/547] expose if buildingplan is enabled to lua

---
 docs/Lua API.rst             | 5 +++--
 plugins/buildingplan.cpp     | 5 +++++
 plugins/lua/buildingplan.lua | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 633ae2278..31e48015a 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3616,8 +3616,9 @@ buildingplan
 
 Native functions:
 
-* ``bool isPlannableBuilding(df::building_type type)`` returns whether the building type is handled by buildingplan
-* ``void addPlannedBuilding(df::building *bld)`` suspends the building jobs and adds the building to the monitor list
+* ``bool isEnabled()`` returns whether the plugin is enabled.
+* ``bool isPlannableBuilding(df::building_type type)`` returns whether the building type is handled by buildingplan.
+* ``void addPlannedBuilding(df::building *bld)`` suspends the building jobs and adds the building to the monitor list.
 * ``void doCycle()`` runs a check for whether buildlings in the monitor list can be assigned items and unsuspended. This method runs automatically twice a game day, so you only need to call it directly if you want buildingplan to do a check right now.
 
 burrows
diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index c42aeac53..4b91d0f84 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -418,6 +418,10 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 
 // Lua API section
 
+static bool isEnabled() {
+    return is_enabled;
+}
+
 static bool isPlannableBuilding(df::building_type type) {
     return planner.isPlanableBuilding(type);
 }
@@ -431,6 +435,7 @@ static void doCycle() {
 }
 
 DFHACK_PLUGIN_LUA_FUNCTIONS {
+    DFHACK_LUA_FUNCTION(isEnabled),
     DFHACK_LUA_FUNCTION(isPlannableBuilding),
     DFHACK_LUA_FUNCTION(addPlannedBuilding),
     DFHACK_LUA_FUNCTION(doCycle),
diff --git a/plugins/lua/buildingplan.lua b/plugins/lua/buildingplan.lua
index 071c07395..6bf60f4b8 100644
--- a/plugins/lua/buildingplan.lua
+++ b/plugins/lua/buildingplan.lua
@@ -4,6 +4,7 @@ local _ENV = mkmodule('plugins.buildingplan')
 
  Native functions:
 
+ * bool isEnabled()
  * bool isPlannableBuilding(df::building_type type)
  * void addPlannedBuilding(df::building *bld)
  * void doCycle()

From d43bf0ce4474a8e994d59d552469d16dbd79f4a6 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 21 Sep 2020 12:27:27 -0400
Subject: [PATCH 382/547] Update dependencies

---
 depends/libexpat | 2 +-
 depends/libzip   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/depends/libexpat b/depends/libexpat
index 26839cce4..3c0f2e86c 160000
--- a/depends/libexpat
+++ b/depends/libexpat
@@ -1 +1 @@
-Subproject commit 26839cce4534ea4ee70ba992a6d7a774c624d584
+Subproject commit 3c0f2e86ce4e7a3a3b30e765087d02a68bba7e6f
diff --git a/depends/libzip b/depends/libzip
index 33c059d22..be76fa508 160000
--- a/depends/libzip
+++ b/depends/libzip
@@ -1 +1 @@
-Subproject commit 33c059d2217de6a5271e9ecbf19908e6efbf0e79
+Subproject commit be76fa5086bfe6b1a5e83c9855e39f98edc1f066

From 12769de232df8616bd2af9b4dbd9fe9efe972db1 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 22 Sep 2020 23:24:20 -0700
Subject: [PATCH 383/547] revert dup isEnabled and document real isEnabled

---
 docs/Lua API.rst             | 12 +++++++++---
 plugins/buildingplan.cpp     |  5 -----
 plugins/lua/buildingplan.lua |  1 -
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 31e48015a..038ccb30f 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3596,6 +3596,13 @@ to lua contexts. They are automatically imported by
 ``mkmodule('plugins.<name>')``; this means that a lua
 module file is still necessary for ``require`` to read.
 
+In addition to any native functions documented here, plugins that can be
+disabled (that is, plugins that support the enable/disable API) will have the
+following functions defined:
+
+* ``isEnabled()`` returns whether the plugin is enabled.
+* ``setEnabled(boolean)`` sets whether the plugin is enabled.
+
 The following plugins have lua support.
 
 blueprint
@@ -3616,9 +3623,8 @@ buildingplan
 
 Native functions:
 
-* ``bool isEnabled()`` returns whether the plugin is enabled.
-* ``bool isPlannableBuilding(df::building_type type)`` returns whether the building type is handled by buildingplan.
-* ``void addPlannedBuilding(df::building *bld)`` suspends the building jobs and adds the building to the monitor list.
+* ``bool isPlannableBuilding(df::building_type type)`` returns whether the building type is handled by buildingplan
+* ``void addPlannedBuilding(df::building *bld)`` suspends the building jobs and adds the building to the monitor list
 * ``void doCycle()`` runs a check for whether buildlings in the monitor list can be assigned items and unsuspended. This method runs automatically twice a game day, so you only need to call it directly if you want buildingplan to do a check right now.
 
 burrows
diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index 4b91d0f84..c42aeac53 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -418,10 +418,6 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 
 // Lua API section
 
-static bool isEnabled() {
-    return is_enabled;
-}
-
 static bool isPlannableBuilding(df::building_type type) {
     return planner.isPlanableBuilding(type);
 }
@@ -435,7 +431,6 @@ static void doCycle() {
 }
 
 DFHACK_PLUGIN_LUA_FUNCTIONS {
-    DFHACK_LUA_FUNCTION(isEnabled),
     DFHACK_LUA_FUNCTION(isPlannableBuilding),
     DFHACK_LUA_FUNCTION(addPlannedBuilding),
     DFHACK_LUA_FUNCTION(doCycle),
diff --git a/plugins/lua/buildingplan.lua b/plugins/lua/buildingplan.lua
index 6bf60f4b8..071c07395 100644
--- a/plugins/lua/buildingplan.lua
+++ b/plugins/lua/buildingplan.lua
@@ -4,7 +4,6 @@ local _ENV = mkmodule('plugins.buildingplan')
 
  Native functions:
 
- * bool isEnabled()
  * bool isPlannableBuilding(df::building_type type)
  * void addPlannedBuilding(df::building *bld)
  * void doCycle()

From b1f80b6d26df0fc9622524396055c93e5c0af535 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 23 Sep 2020 20:05:45 -0400
Subject: [PATCH 384/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index d069acb3a..436b98f6b 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit d069acb3ab7660c18cbb789070186f0757775462
+Subproject commit 436b98f6b2dd8a8a845e5eccaeaecd5024dc1b9f

From dfac5bc143a0fa77e29b1ebd645a0cb08e3e4926 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 23 Sep 2020 22:00:19 -0400
Subject: [PATCH 385/547] Update gui.Painter docs, add sections to
 dfhack.screen, add more links, etc

---
 docs/Lua API.rst    | 103 ++++++++++++++++++++++++++++++++++++--------
 library/lua/gui.lua |   8 ++--
 2 files changed, 88 insertions(+), 23 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 633ae2278..f31bb5469 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -1831,9 +1831,27 @@ Screen API
 
 The screen module implements support for drawing to the tiled screen of the game.
 Note that drawing only has any effect when done from callbacks, so it can only
-be feasibly used in the core context.
+be feasibly used in the `core context <lua-core-context>`.
 
-Basic painting functions:
+.. contents::
+  :local:
+
+Basic painting functions
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Common parameters to these functions include:
+
+* ``x``, ``y``: screen coordinates in tiles; the upper left corner of the screen
+  is ``x = 0, y = 0``
+* ``pen``: a `pen object <lua-screen-pen>`
+* ``map``: a boolean indicating whether to draw to a separate map buffer
+  (defaults to false, which is suitable for off-map text or a screen that hides
+  the map entirely). Note that only third-party plugins like TWBT currently
+  implement a separate map buffer. If no such plugins are enabled, passing
+  ``true`` has no effect. However, this parameter should still be used to ensure
+  that scripts work properly with such plugins.
+
+Functions:
 
 * ``dfhack.screen.getWindowSize()``
 
@@ -1849,25 +1867,25 @@ Basic painting functions:
 
 * ``dfhack.screen.paintTile(pen,x,y[,char,tile,map])``
 
-  Paints a tile using given parameters. See below for a description of pen.
+  Paints a tile using given parameters. `See below <lua-screen-pen>` for a description of ``pen``.
 
-  Returns *false* if coordinates out of bounds, or other error.
+  Returns *false* on error, e.g. if coordinates are out of bounds
 
 * ``dfhack.screen.readTile(x,y[,map])``
 
   Retrieves the contents of the specified tile from the screen buffers.
-  Returns a pen object, or *nil* if invalid or TrueType.
+  Returns a `pen object <lua-screen-pen>`, or *nil* if invalid or TrueType.
 
 * ``dfhack.screen.paintString(pen,x,y,text[,map])``
 
   Paints the string starting at *x,y*. Uses the string characters
-  in sequence to override the ``ch`` field of pen.
+  in sequence to override the ``ch`` field of `pen <lua-screen-pen>`.
 
   Returns *true* if painting at least one character succeeded.
 
 * ``dfhack.screen.fillRect(pen,x1,y1,x2,y2[,map])``
 
-  Fills the rectangle specified by the coordinates with the given pen.
+  Fills the rectangle specified by the coordinates with the given `pen <lua-screen-pen>`.
   Returns *true* if painting at least one character succeeded.
 
 * ``dfhack.screen.findGraphicsTile(pagename,x,y)``
@@ -1903,7 +1921,12 @@ Basic painting functions:
   Returns the keybinding representing the given string input
   character, or *nil* if impossible.
 
-The "pen" argument used by functions above may be represented by
+.. _lua-screen-pen:
+
+Pen API
+~~~~~~~
+
+The ``pen`` argument used by ``dfhack.screen`` functions may be represented by
 a table with the following possible fields:
 
   ``ch``
@@ -1958,6 +1981,9 @@ Alternatively, it may be a pre-parsed native object with the following API:
   assigning to ``pen.tile_color`` also resets ``pen.tile_fg`` and
   ``pen.tile_bg`` to *nil*.
 
+Screen management
+~~~~~~~~~~~~~~~~~
+
 In order to actually be able to paint to the screen, it is necessary
 to create and register a viewscreen (basically a modal dialog) with
 the game.
@@ -1986,7 +2012,11 @@ Apart from a native viewscreen object, these functions accept a table
 as a screen. In this case, ``show`` creates a new native viewscreen
 that delegates all processing to methods stored in that table.
 
-.. note:: Lua-implemented screens are only supported in the core context.
+.. note::
+
+  * The `gui.Screen class <lua-gui-screen>` provides stubs for all of the
+    functions listed below, and its use is recommended
+  * Lua-implemented screens are only supported in the `core context <lua-core-context>`.
 
 Supported callbacks and fields are:
 
@@ -2314,11 +2344,13 @@ and are only documented here for completeness:
 
   Returns a numeric identifier of the current thread.
 
+.. _lua-core-context:
+
 Core interpreter context
 ========================
 
 While plugins can create any number of interpreter instances,
-there is one special context managed by dfhack core. It is the
+there is one special context managed by the DFHack core. It is the
 only context that can receive events from DF and plugins.
 
 Core context specific functions:
@@ -2348,7 +2380,8 @@ Core context specific functions:
 
 * ``dfhack.onStateChange.foo = function(code)``
 
-  Event. Receives the same codes as plugin_onstatechange in C++.
+  Creates a handler for state change events. Receives the same
+  `SC_ codes <lua-globals>` as ``plugin_onstatechange()`` in C++.
 
 
 Event type
@@ -2360,7 +2393,7 @@ through the table with next and calls all contained values.
 This is intended as an extensible way to add listeners.
 
 This type itself is available in any context, but only the
-core context has the actual events defined by C++ code.
+`core context <lua-core-context>` has the actual events defined by C++ code.
 
 Features:
 
@@ -2427,6 +2460,8 @@ The following module management functions are provided:
   should be kept limited to the standard Lua library and API described
   in this document.
 
+.. _lua-globals:
+
 Global environment
 ==================
 
@@ -2443,9 +2478,9 @@ environment by the mandatory init file dfhack.lua:
     COLOR_LIGHTBLUE, COLOR_LIGHTGREEN, COLOR_LIGHTCYAN, COLOR_LIGHTRED,
     COLOR_LIGHTMAGENTA, COLOR_YELLOW, COLOR_WHITE
 
-* ``dfhack.onStateChange`` event codes
+* State change event codes, used by ``dfhack.onStateChange``
 
-  Available only in the core context, as is the event itself:
+  Available only in the `core context <lua-core-context>`, as is the event itself:
 
   SC_WORLD_LOADED, SC_WORLD_UNLOADED, SC_MAP_LOADED,
   SC_MAP_UNLOADED, SC_VIEWSCREEN_CHANGED, SC_CORE_INITIALIZED
@@ -2964,7 +2999,9 @@ The painting natives in ``dfhack.screen`` apply to the whole screen, are
 completely stateless and don't implement clipping.
 
 The Painter class inherits from ViewRect to provide clipping and local
-coordinates, and tracks current cursor position and current pen.
+coordinates, and tracks current cursor position and current pen. It also
+supports drawing to a separate map buffer if applicable (see ``map()`` below
+for details).
 
 * ``Painter{ ..., pen = ..., key_pen = ... }``
 
@@ -2989,7 +3026,15 @@ coordinates, and tracks current cursor position and current pen.
 
 * ``painter:cursor()``
 
-  Returns the current cursor *x,y* in local coordinates.
+  Returns the current cursor *x,y* in screen coordinates.
+
+* ``painter:cursorX()``
+
+  Returns just the current *x* cursor coordinate
+
+* ``painter:cursorY()``
+
+  Returns just the current *y* cursor coordinate
 
 * ``painter:seek(x,y)``
 
@@ -3009,10 +3054,22 @@ coordinates, and tracks current cursor position and current pen.
 
   Sets the current pen to ``dfhack.pen.parse(old_pen,...)``, and returns *self*.
 
+* ``painter:color(fg[,bold[,bg]])``
+
+  Sets the specified colors of the current pen and returns *self*.
+
 * ``painter:key_pen(...)``
 
   Sets the current keybinding pen to ``dfhack.pen.parse(old_pen,...)``, and returns *self*.
 
+* ``painter:map(to_map)``
+
+  Enables or disables drawing to a separate map buffer. ``to_map`` is a boolean
+  that will be passed as the ``map`` parameter to any ``dfhack.screen`` functions
+  that accept it. Note that only third-party plugins like TWBT currently implement
+  a separate map buffer; if none are enabled, this function has no effect (but
+  should still be used to ensure proper support for such plugins). Returns *self*.
+
 * ``painter:clear()``
 
   Fills the whole clip rectangle with ``CLEAR_PEN``, and returns *self*.
@@ -3029,7 +3086,7 @@ coordinates, and tracks current cursor position and current pen.
 
 * ``painter:tile([char, tile[, ...]])``
 
-  Like above, but also allows overriding the ``tile`` property on ad-hoc basis.
+  Like ``char()`` above, but also allows overriding the ``tile`` property on ad-hoc basis.
 
 * ``painter:string(text[, ...])``
 
@@ -3039,7 +3096,13 @@ coordinates, and tracks current cursor position and current pen.
 
   Paints the description of the keycode using ``dfhack.pen.parse(cur_key_pen,...)``; returns *self*.
 
-As noted above, all painting methods return *self*, in order to allow chaining them like this::
+* ``painter:key_string(keycode, text, ...)``
+
+  A convenience wrapper around both ``key()`` and ``string()`` that prints both
+  the specified keycode description and text, separated by ``:``. Any extra
+  arguments are passed directly to ``string()``. Returns *self*.
+
+Unless specified otherwise above, all Painter methods return *self*, in order to allow chaining them like this::
 
   painter:pen(foo):seek(x,y):char(1):advance(1):string('bar')...
 
@@ -3160,6 +3223,8 @@ The class has the following methods:
   Returns *true* if any of the subviews handled the event.
 
 
+.. _lua-gui-screen:
+
 Screen class
 ------------
 
@@ -4193,7 +4258,7 @@ Arguments are passed in to the scripts via the **...** built-in
 quasi-variable; when the script is called by the DFHack core,
 they are all guaranteed to be non-nil strings.
 
-DFHack core invokes the scripts in the *core context* (see above);
+DFHack core invokes the scripts in the `core context <lua-core-context>`;
 however it is possible to call them from any lua code (including
 from other scripts) in any context, via the same function the core uses:
 
diff --git a/library/lua/gui.lua b/library/lua/gui.lua
index e92ef4d26..b7f2e8ce9 100644
--- a/library/lua/gui.lua
+++ b/library/lua/gui.lua
@@ -355,15 +355,15 @@ function Painter:string(text,pen,...)
     return self:advance(#text, nil)
 end
 
-function Painter:key(code,pen,...)
+function Painter:key(keycode,pen,...)
     return self:string(
-        getKeyDisplay(code),
+        getKeyDisplay(keycode),
         to_pen(self.cur_key_pen, pen, ...)
     )
 end
 
-function Painter:key_string(code, text, ...)
-    return self:key(code):string(': '):string(text, ...)
+function Painter:key_string(keycode, text, ...)
+    return self:key(keycode):string(': '):string(text, ...)
 end
 
 --------------------------

From 1c2761f90384e4eeedd4364cc4a012be2512fce1 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Wed, 23 Sep 2020 20:00:04 -0700
Subject: [PATCH 386/547] enable all in quickfort mode

and simplify logic since new bool map values are already initialized to
false
---
 plugins/buildingplan.cpp | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index 2ba8f982e..93d5ff4e4 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -287,12 +287,7 @@ void ViewscreenChooseMaterial::render()
 //START Viewscreen Hook
 static bool is_planmode_enabled(df::building_type type)
 {
-    if (planmode_enabled.find(type) == planmode_enabled.end())
-    {
-        return false;
-    }
-
-    return planmode_enabled[type];
+    return planmode_enabled[type] || quickfort_mode;
 }
 
 struct buildingplan_hook : public df::viewscreen_dwarfmodest
@@ -360,13 +355,8 @@ struct buildingplan_hook : public df::viewscreen_dwarfmodest
             auto type = ui_build_selector->building_type;
             if (input->count(interface_key::CUSTOM_SHIFT_P))
             {
-                if (planmode_enabled.find(type) == planmode_enabled.end())
-                {
-                    planmode_enabled[type] = false;
-                }
-
                 planmode_enabled[type] = !planmode_enabled[type];
-                if (!planmode_enabled[type])
+                if (!is_planmode_enabled(type))
                 {
                     Gui::refreshSidebar();
                     in_dummy_screen = false;

From 3c037ef52a4c3b0d761fec38f1a7b7b55aee8e30 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 24 Sep 2020 00:16:32 -0400
Subject: [PATCH 387/547] Clean up plugin mkmodule/require explanation

---
 docs/Lua API.rst | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 1aaf73eda..8707a0d99 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3656,19 +3656,22 @@ Plugins
 .. contents::
    :local:
 
-DFHack plugins may export native functions and events
-to lua contexts. They are automatically imported by
-``mkmodule('plugins.<name>')``; this means that a lua
-module file is still necessary for ``require`` to read.
+DFHack plugins may export native functions and events to Lua contexts. These are
+exposed as ``plugins.<name>`` modules, which can be imported with
+``require('plugins.<name>')``. The plugins listed in this section expose
+functions and/or data to Lua in this way.
 
 In addition to any native functions documented here, plugins that can be
-disabled (that is, plugins that support the enable/disable API) will have the
-following functions defined:
+enabled (that is, plugins that support the `enable/disable API <enable>`) will
+have the following functions defined:
 
 * ``isEnabled()`` returns whether the plugin is enabled.
 * ``setEnabled(boolean)`` sets whether the plugin is enabled.
 
-The following plugins have lua support.
+For plugin developers, note that a Lua file in ``plugins/lua`` is required for
+``require()`` to work, even if it contains no pure-Lua functions. This file must
+contain ``mkmodule('plugins.<name>')`` to import any native functions defined in
+the plugin. See existing files in ``plugins/lua`` for examples.
 
 blueprint
 =========

From a3c565b2435919c701f1db8095ca372794734579 Mon Sep 17 00:00:00 2001
From: George Murray <murray.george.m@gmail.com>
Date: Thu, 24 Sep 2020 07:31:10 -0700
Subject: [PATCH 388/547] Add to_search_normalized to search for characters
 with accents

---
 library/MiscUtils.cpp       | 39 +++++++++++++++++++++++++++++++++++++
 library/include/MiscUtils.h |  1 +
 plugins/search.cpp          |  4 ++--
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/library/MiscUtils.cpp b/library/MiscUtils.cpp
index 84dddbbd6..018ddd6c3 100644
--- a/library/MiscUtils.cpp
+++ b/library/MiscUtils.cpp
@@ -128,6 +128,45 @@ std::string toLower(const std::string &str)
     return rv;
 }
 
+static const char *normalized_table[256] = {
+        //.0  .1    .2    .3    .4    .5    .6    .7    .8    .9    .A    .B    .C    .D    .E    .F
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 0.
+        NULL, NULL, NULL, NULL, NULL, "S", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 1.
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 2.
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 3.
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 4.
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 5.
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 6.
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 7.
+        "C", "u", "e", "a", "a", "a", "a", "c", "e", "e", "e", "i", "i", "i", "A", "A", // 8.
+        "E", "ae", "Ae", "o", "o", "o", "u", "u", "y", "O", "U", "c", "L", "Y", NULL, "f", // 9.
+        "a", "i", "o", "u", "n", "N", "a", "o", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // A.
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // B.
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // C.
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // D.
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // E.
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // F.
+};
+
+std::string to_search_normalized(const std::string &str)
+{
+    std::stringbuf result;
+    for (char c : str)
+    {
+        const char *mapped = normalized_table[(uint8_t)c];
+        if (mapped == NULL)
+            result.sputc(tolower(c));
+        else
+            while (*mapped != '\0')
+            {
+                result.sputc(tolower(c));
+                ++mapped;
+            }
+    }
+
+    return result.str();
+}
+
 bool word_wrap(std::vector<std::string> *out, const std::string &str, size_t line_length)
 {
     out->clear();
diff --git a/library/include/MiscUtils.h b/library/include/MiscUtils.h
index 35f8be73b..4249abeef 100644
--- a/library/include/MiscUtils.h
+++ b/library/include/MiscUtils.h
@@ -366,6 +366,7 @@ DFHACK_EXPORT std::string join_strings(const std::string &separator, const std::
 
 DFHACK_EXPORT std::string toUpper(const std::string &str);
 DFHACK_EXPORT std::string toLower(const std::string &str);
+DFHACK_EXPORT std::string to_search_normalized(const std::string &str);
 
 DFHACK_EXPORT bool word_wrap(std::vector<std::string> *out,
                              const std::string &str,
diff --git a/plugins/search.cpp b/plugins/search.cpp
index 6e0b49e16..f053967d8 100644
--- a/plugins/search.cpp
+++ b/plugins/search.cpp
@@ -396,7 +396,7 @@ protected:
 
         clear_viewscreen_vectors();
 
-        string search_string_l = toLower(search_string);
+        string search_string_l = to_search_normalized(search_string);
         for (size_t i = 0; i < saved_list1.size(); i++ )
         {
             if (force_in_search(i))
@@ -409,7 +409,7 @@ protected:
                 continue;
 
             T element = saved_list1[i];
-            string desc = toLower(get_element_description(element));
+            string desc = to_search_normalized(get_element_description(element));
             if (desc.find(search_string_l) != string::npos)
             {
                 add_to_filtered_list(i);

From 38c9c2825012b5700a5e477f3e9e2e38e9a1c7ef Mon Sep 17 00:00:00 2001
From: George Murray <murray.george.m@gmail.com>
Date: Thu, 24 Sep 2020 10:52:03 -0700
Subject: [PATCH 389/547] Fix wrong variable usage in to_search_normalized

---
 library/MiscUtils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/MiscUtils.cpp b/library/MiscUtils.cpp
index 018ddd6c3..893c27b2c 100644
--- a/library/MiscUtils.cpp
+++ b/library/MiscUtils.cpp
@@ -159,7 +159,7 @@ std::string to_search_normalized(const std::string &str)
         else
             while (*mapped != '\0')
             {
-                result.sputc(tolower(c));
+                result.sputc(tolower(*mapped));
                 ++mapped;
             }
     }

From f5c3712778bb9021c2b3792cd88417ec6bbdb357 Mon Sep 17 00:00:00 2001
From: George Murray <murray.george.m@gmail.com>
Date: Thu, 24 Sep 2020 14:32:58 -0700
Subject: [PATCH 390/547] Nicer formatting for the normalized character mapping
 table

---
 library/MiscUtils.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/library/MiscUtils.cpp b/library/MiscUtils.cpp
index 893c27b2c..2659d5d43 100644
--- a/library/MiscUtils.cpp
+++ b/library/MiscUtils.cpp
@@ -129,23 +129,23 @@ std::string toLower(const std::string &str)
 }
 
 static const char *normalized_table[256] = {
-        //.0  .1    .2    .3    .4    .5    .6    .7    .8    .9    .A    .B    .C    .D    .E    .F
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 0.
-        NULL, NULL, NULL, NULL, NULL, "S", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 1.
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 2.
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 3.
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 4.
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 5.
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 6.
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 7.
-        "C", "u", "e", "a", "a", "a", "a", "c", "e", "e", "e", "i", "i", "i", "A", "A", // 8.
-        "E", "ae", "Ae", "o", "o", "o", "u", "u", "y", "O", "U", "c", "L", "Y", NULL, "f", // 9.
-        "a", "i", "o", "u", "n", "N", "a", "o", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // A.
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // B.
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // C.
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // D.
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // E.
-        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // F.
+    //.0  .1    .2    .3    .4    .5    .6    .7    .8    .9    .A    .B    .C    .D    .E    .F
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 0.
+    NULL, NULL, NULL, NULL, NULL,  "S", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 1.
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 2.
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 3.
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 4.
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 5.
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 6.
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // 7.
+     "C",  "u",  "e",  "a",  "a",  "a",  "a",  "c",  "e",  "e",  "e",  "i",  "i",  "i",  "A",  "A", // 8.
+     "E", "ae", "Ae",  "o",  "o",  "o",  "u",  "u",  "y",  "O",  "U",  "c",  "L",  "Y", NULL,  "f", // 9.
+     "a",  "i",  "o",  "u",  "n",  "N",  "a",  "o", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // A.
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // B.
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // C.
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // D.
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // E.
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, // F.
 };
 
 std::string to_search_normalized(const std::string &str)

From 74a3e0eddf360534a028b29d7076cf65212b940b Mon Sep 17 00:00:00 2001
From: George Murray <murray.george.m@gmail.com>
Date: Thu, 24 Sep 2020 15:22:58 -0700
Subject: [PATCH 391/547] Use a string and .reserve for normalizing instead of
 stringbuf

---
 library/MiscUtils.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/library/MiscUtils.cpp b/library/MiscUtils.cpp
index 2659d5d43..56af85afe 100644
--- a/library/MiscUtils.cpp
+++ b/library/MiscUtils.cpp
@@ -150,21 +150,22 @@ static const char *normalized_table[256] = {
 
 std::string to_search_normalized(const std::string &str)
 {
-    std::stringbuf result;
+    std::string result;
+    result.reserve(str.size());
     for (char c : str)
     {
         const char *mapped = normalized_table[(uint8_t)c];
         if (mapped == NULL)
-            result.sputc(tolower(c));
+            result += tolower(c);
         else
             while (*mapped != '\0')
             {
-                result.sputc(tolower(*mapped));
+                result += tolower(*mapped);
                 ++mapped;
             }
     }
 
-    return result.str();
+    return result;
 }
 
 bool word_wrap(std::vector<std::string> *out, const std::string &str, size_t line_length)

From 3c51bb51ab21d3b72c6827446768df9f2e6e037c Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 28 Sep 2020 23:14:13 -0700
Subject: [PATCH 392/547] remove references to non-existent vector ids

---
 library/lua/dfhack/buildings.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/lua/dfhack/buildings.lua b/library/lua/dfhack/buildings.lua
index 995f90972..54f6fa19c 100644
--- a/library/lua/dfhack/buildings.lua
+++ b/library/lua/dfhack/buildings.lua
@@ -176,9 +176,9 @@ local building_inputs = {
             vector_id=df.job_item_vector_id.TRACTION_BENCH
         }
     },
-    [df.building_type.Slab] = { { item_type=df.item_type.SLAB, vector_id=df.job_item_vector_id.SLAB } },
-    [df.building_type.NestBox] = { { has_tool_use=df.tool_uses.NEST_BOX, item_type=df.item_type.TOOL, vector_id=df.job_item_vector_id.TOOL } },
-    [df.building_type.Hive] = { { has_tool_use=df.tool_uses.HIVE, item_type=df.item_type.TOOL, vector_id=df.job_item_vector_id.TOOL } },
+    [df.building_type.Slab] = { { item_type=df.item_type.SLAB } },
+    [df.building_type.NestBox] = { { has_tool_use=df.tool_uses.NEST_BOX, item_type=df.item_type.TOOL } },
+    [df.building_type.Hive] = { { has_tool_use=df.tool_uses.HIVE, item_type=df.item_type.TOOL } },
     [df.building_type.Rollers] = {
         {
             name='mechanism',

From c73b1f03afaa0bb9cb4a8e07807894bd982c6c07 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 29 Sep 2020 00:22:16 -0700
Subject: [PATCH 393/547] buckets can be lye- and milk-free

otherwise the bucket for wells can never be matched
---
 library/modules/Items.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/modules/Items.cpp b/library/modules/Items.cpp
index 0e02043dc..3d35edb29 100644
--- a/library/modules/Items.cpp
+++ b/library/modules/Items.cpp
@@ -379,6 +379,7 @@ bool ItemTypeInfo::matches(const df::job_item &item, MaterialInfo *mat, bool ski
         break;
 
     case BUCKET:
+        OK(2,lye_milk_free);
     case FLASK:
         OK(1,milk);
         xmask1.bits.cookable = true;

From 93d43ba9e3099f3238491ec0b75a7b6d7bea5d2c Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 29 Sep 2020 20:08:35 -0400
Subject: [PATCH 394/547] Update changelog (#1620, #1660)

---
 docs/changelog.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index c7ab70b8e..f3d5cc1ed 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -33,7 +33,11 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 # Future
 
+## New Plugins
+- `xlsxreader`: provides an API for Lua scripts to read Excel spreadsheets
+
 ## Fixes
+- `buildingplan`: fixed handling of buildings that require buckets
 - `getplants`: fixed a crash that could occur on some maps
 - `search`: fixed an issue causing item counts on the trade screen to display inconsistently when searching
 - `stockpiles`: fixed a crash when loading food stockpiles

From 4e7ca99db189f7ee06c95b10ed3cb50dccb73785 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 1 Oct 2020 21:31:59 -0400
Subject: [PATCH 395/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 436b98f6b..0d7fbec48 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 436b98f6b2dd8a8a845e5eccaeaecd5024dc1b9f
+Subproject commit 0d7fbec48e959ba88c885975aecbb034fa5f5c57

From 5d98193c54a33cf3f210092a501018963d7edad6 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 1 Oct 2020 21:46:07 -0400
Subject: [PATCH 396/547] Convert quickfort user guide to RST using pandoc

Unchanged. First pass of dfhack#1653
---
 docs/tools/quickfort-user-guide.rst | 1138 +++++++++++++++++++++++++++
 1 file changed, 1138 insertions(+)
 create mode 100644 docs/tools/quickfort-user-guide.rst

diff --git a/docs/tools/quickfort-user-guide.rst b/docs/tools/quickfort-user-guide.rst
new file mode 100644
index 000000000..e0be9147a
--- /dev/null
+++ b/docs/tools/quickfort-user-guide.rst
@@ -0,0 +1,1138 @@
+DFHack Quickfort User Manual
+============================
+
+DFHack Quickfort is a DFHack script that helps you build fortresses from
+"blueprint" .csv and .xlsx files. Many applications exist to edit these files,
+such as MS Excel and `Google Sheets <https://sheets.new>`__. You can also build
+your plan "for real" in Dwarf Fortress, and then export your map using DFHack's
+`blueprint <https://docs.dfhack.org/en/stable/docs/Plugins.html#blueprint>`__
+plugin. Most layout and building-oriented DF commands are supported through the
+use of multiple files or spreadsheets, each describing a different phase of DF
+construction: designation, building, placing stockpiles/zones, and setting
+configuration.
+
+The original idea and 1.0 codebase came from
+`Valdemar's <https://dwarffortresswiki.org/index.php/User:Valdemar>`__
+auto-designation macro. Joel Thornton (joelpt) reimplemented the core logic in
+Python and extended its functionality with `Quickfort
+2.0 <https://github.com/joelpt/quickfort>`__. This DFHack-native implementation,
+called "DFHack Quickfort" or just "quickfort", builds upon Quickfort 2.0's
+formats and features. DFHack Quickfort is written in Lua and interacts with
+Dwarf Fortress memory structures directly, allowing for instantaneous blueprint
+application, error checking and recovery, and many other advanced features.
+
+This document focuses on DFHack Quickfort's capabilities and teaches players how
+to understand and build blueprint files. Some of the text was originally written
+by Joel Thornton, reused here with his permission.
+
+For those just looking to apply blueprints, check out the `quickfort command
+syntax <https://docs.dfhack.org/en/stable/docs/_auto/base.html#quickfort>`__ in
+the DFHack Scripts documentation. There are also many ready-to-use blueprints
+available in the ``blueprints/library`` subfolder in your DFHack installation.
+Browse them on your computer or
+`online <https://github.com/DFHack/dfhack/tree/develop/data/blueprints/library>`__,
+or run ``quickfort list -l`` at the ``DFHack#`` prompt to list them, and then
+``quickfort run`` to apply them to your fort!
+
+See the `Links section <#links>`__ for more information and online resources.
+
+Table of Contents
+-----------------
+
+-  `Features <#features>`__
+-  `Editing Blueprints <#editing-blueprints>`__
+
+   -  `Area expansion syntax <#area-expansion-syntax>`__
+   -  `Automatic area expansion <#automatic-area-expansion>`__
+   -  `Multilevel blueprints <#multilevel-blueprints>`__
+   -  `Marker mode <#marker-mode>`__
+   -  `Dig priorities <#dig-priorities>`__
+   -  `Stockpiles and zones <#stockpiles-and-zones>`__
+   -  `Minecart tracks <#minecart-tracks>`__
+   -  `Modeline markers <modeline-markers>`__
+   -  `Packaging a set of blueprints <#packaging-a-set-of-blueprints>`__
+   -  `Meta blueprints <#meta-blueprints>`__
+
+-  `Buildingplan integration <#buildingplan-integration>`__
+-  `Generating manager orders <#generating-manager-orders>`__
+-  `Tips and tricks <#tips-and-tricks>`__
+-  `Caveats and limitations <#caveats-and-limitations>`__
+-  `Links <#links>`__
+
+Features
+--------
+
+-  General
+
+   -  Manages blueprints to handle all phases of DF construction
+   -  Supports .csv and multi-worksheet .xlsx blueprint files
+   -  Near-instant application, even for very large and complex blueprints
+   -  Blueprints can span multiple z-levels
+   -  Supports multiple blueprints per .csv file/spreadsheet sheet
+   -  "meta" blueprints that automate the application of sequences of blueprints
+   -  Undo functionality for dig, build, place, and zone blueprints
+   -  Automatic cropping of blueprints so you don't get errors if the blueprint
+      extends off the map
+   -  Can generate manager orders for everything required by a build blueprint
+   -  Library of ready-to-use blueprints included
+   -  Verbose output mode for debugging
+
+-  Dig mode
+
+   -  Supports all types of designations, including dumping/forbidding items and
+      setting traffic settings
+   -  Supports setting dig priorities
+   -  Supports applying dig blueprints in marker mode
+   -  Handles carving arbitrarily complex minecart tracks, including tracks that
+      cross other tracks
+
+-  Build mode
+
+   -  DFHack buildingplan integration
+   -  Designate complete constructions at once, without having to wait for each
+      tile to become supported before you can build it
+   -  Automatic expansion of building footprints to their minimum dimensions, so
+      only the center tile of a multi-tile building needs to be recorded in the
+      blueprint
+   -  Tile occupancy and validity checking so, for example, buildings that
+      cannot be placed on a certain tile will simply be skipped instead of the
+      blueprint failing to apply. Blueprints that are only partially applied for
+      any reason (for example, you need to dig out some more tiles) can be
+      safely reapplied to build the remaining buildings.
+   -  Relaxed rules for farm plot and road placement: you can still place the
+      building even if an invalid tile (e.g. stone tiles for farm plots) splits
+      the designated area into two parts
+   -  Intelligent boundary detection for adjacent buildings of the same type
+      (e.g. a 6x6 block of ``wj`` cells will be correctly split into 4 jeweler's
+      workshops)
+
+-  Place and zone modes
+
+   -  Define stockpiles and zones in any continguous shape, not just rectangular
+      blocks
+   -  Configurable maximums for bins, barrels and wheelbarrows assigned to
+      created stockpiles
+   -  Automatic splitting of stockpiles and zones that exceed maximum dimension
+      limits
+
+-  Query mode
+
+   -  Send arbitrary keystroke sequences to the UI -- *anything* you can do
+      through the UI is supported
+   -  Supports aliases to automate frequent keystroke combos
+   -  Includes a library of pre-made and tested aliases to automate most common
+      tasks, such as configuring stockpiles for important item types or creating
+      named hauling routes for quantum stockpiles.
+   -  Supports including aliases in other aliases, and repeating key sequences a
+      specified number of times
+   -  Skips sending key sequences when the cursor is over a tile that does not
+      have a stockpile or building, so missing buildings won't desynchronize
+      your blueprint
+   -  Instant halting of query blueprint application when keystroke errors are
+      detected, such as when a key sequence leaves us stuck in a submenu, to
+      make blueprint misconfigurations easier to debug
+
+Editing Blueprints
+------------------
+
+We recommend using a spreadsheet editor such as Excel, `Google
+Sheets <https://sheets.new>`__, or `LibreOffice <https://www.libreoffice.org>`__
+to edit blueprint files, but any text editor will do.
+
+The format of Quickfort-compatible blueprint files is straightforward. The first
+line (or upper-left cell) of the spreadsheet should look like this:
+
+::
+
+   #dig This is a decription.
+
+The keyword "dig" tells Quickfort we are going to be using the Designations menu
+in DF. The following "mode" keywords are understood:
+
+::
+
+   dig     Designations menu (d)
+   build   Build menu (b)
+   place   Place stockpiles menu (p)
+   zone    Activity zones menu (i)
+   query   Set building tasks/prefs menu (q)
+
+There are also "meta" blueprints, but we'll talk about those
+`later <#meta-blueprints>`__.
+
+Optionally following this keyword and a space, you may enter a comment. This
+comment will appear in the output of ``quickfort list`` when run from the
+``DFHack#`` prompt. You can use this space for explanations, attribution, etc.
+
+Below this line begin entering the keys you want sent in each cell. For example,
+we could dig out a 4x4 room like so (spaces are used as column separators here
+for clarity, but a real .csv file would have commas):
+
+::
+
+   #dig
+   d d d d #
+   d d d d #
+   d d d d #
+   d d d d #
+   # # # # #
+
+Note the # symbols at the right end of each row and below the last row. These
+are completely optional, but can be helpful to make the row and column positions
+clear.
+
+Once the dwarves have that dug out, let's build a walled-in bedroom within our
+dug-out area:
+
+::
+
+   #build
+   Cw Cw Cw Cw #
+   Cw b  h  Cw #
+   Cw       Cw #
+   Cw Cw    Cw #
+   #  #  #  #  #
+
+Note my generosity - in addition to the bed (b) I've built a chest (h) here for
+the dwarf as well. You must use the full series of keys needed to build
+something in each cell, e.g. 'Cw' enters DF's constructions submenu (C) and
+selects walls (w).
+
+I'd also like to place a booze stockpile in the 2 unoccupied tiles in the room.
+
+::
+
+   #place Place a food stockpile
+   ` ` ` ` #
+   ` ` ` ` #
+   ` f(2x1)#
+   ` ` ` ` #
+   # # # # #
+
+This illustration may be a little hard to understand. The f(2x1) is in column 2,
+row 3. All the other cells are empty. QF considers both "`" (backtick -- the
+character under the tilde) and "~" (tilde) characters within cells to be empty
+cells; this can help with multilayer or fortress-wide blueprint layouts as
+'chalk lines'.
+
+With f(2x1), we've asked QF to place a food stockpile 2 units wide by 1 high
+unit. Note that the f(2x1) syntax isn't actually necessary here; we could have
+just used:
+
+::
+
+   #place Place a food stockpile
+   ` ` ` ` #
+   ` ` ` ` #
+   ` f f ` #
+   ` ` ` ` #
+   # # # # #
+
+QF is smart enough to recognize this as a 2x1 food stockpile, and creates it as
+such rather than as two 1x1 food stockpiles. Quickfort recognizes any connected
+region of identical designations as a single stockpile. The tiles can be
+connected orthogonally or diagonally, just as long as they are touching somehow.
+
+Lastly, let's turn the bed into a bedroom and set the food stockpile to hold
+only booze.
+
+::
+
+   #query
+   ` ` ` ` #
+   ` r&  ` #
+   ` booze #
+   ` ` ` ` #
+   # # # # #
+
+In column 2, row 2 we have "r&". This sends the "r" key to DF when the cursor is
+over the bed, causing us to 'make room' and "&", which is a special symbol that
+expands to "{Enter}", to indicate that we're done.
+
+In column 2, row 3 we have "booze". This is one of many alias keywords defined
+in the included `baseline aliases
+file <https://github.com/DFHack/dfhack/tree/develop/data/quickfort/aliases-common.txt>`__.
+This particular alias sets a food stockpile to carry booze only. It sends the
+keys needed to navigate DF's stockpile settings menu, and then sends an Escape
+character ("^" or "{ESC}") to exit back to the map. It is important to exit out
+of any menus that you enter while in query mode so that the cursor can move to
+the next tile when it is done configuring the current tile.
+
+Check out the included `blueprint
+library <https://github.com/DFHack/dfhack/tree/develop/data/blueprints/library>`__
+to see many more examples. Read the baseline aliases file for helpful
+pre-packaged aliases, or create your own in
+`dfhack-config/quickfort/aliases.txt <https://github.com/DFHack/dfhack/tree/develop/dfhack-config/quickfort/aliases.txt>`__
+in your DFHack installation.
+
+Area expansion syntax
+---------------------
+
+In Quickfort, the following blueprints are equivalent:
+
+::
+
+   #dig a 3x3 area
+   d d d #
+   d d d #
+   d d d #
+   # # # #
+
+   #dig the same area with d(3x3) specified in row 1, col 1
+   d(3x3)#
+   ` ` ` #
+   ` ` ` #
+   # # # #
+
+The second example uses Quickfort's "area expansion syntax", which takes the
+form:
+
+::
+
+   keys(WxH)
+
+In Quickfort the above two examples of specifying a contiguous 3x3 area produce
+identical output: a single 3x3 designation will be performed, rather than nine
+1x1 designations as the first example might suggest.
+
+Area expansion syntax can only specify rectangular areas. If you want to create
+extent-based structures (e.g. farm plots or stockpiles) in different shapes, use
+the first format above. For example:
+
+::
+
+   #place L shaped food stockpile
+   f f ` ` #
+   f f ` ` #
+   f f f f #
+   f f f f #
+   # # # # #
+
+Area expansion syntax also sets boundaries, which can be useful if you want
+adjacent, but separate, stockpiles of the same type:
+
+::
+
+   #place Two touching but separate food stockpiles
+   f(4x2)  #
+   ~ ~ ~ ~ #
+   f(4x2)  #
+   ~ ~ ~ ~ #
+   # # # # #
+
+As mentioned previously, "~" characters are ignored as comment characters and
+can be used for visualizing the blueprint layout. The blueprint can be
+equivalently written as:
+
+::
+
+   #place Two touching but separate food stockpiles
+   f(4x2)  #
+   ~ ~ ~ ~ #
+   f f f f #
+   f f f f #
+   # # # # #
+
+since the area expansion syntax of the upper stockpile prevents it from
+combining with the lower, freeform syntax stockpile.
+
+Area expansion syntax can also be used for buildings which have an adjustable
+size, like bridges. The following blueprints are equivalent:
+
+::
+
+   #build a 4x2 bridge from row 1, col 1
+   ga(4x2)  `  #
+   `  `  `  `  #
+   #  #  #  #  #
+
+   #build a 4x2 bridge from row 1, col 1
+   ga ga ga ga #
+   ga ga ga ga #
+   #  #  #  #  #
+
+Automatic area expansion
+------------------------
+
+Buildings larger than 1x1, like workshops, can be represented in any of three
+ways. You can designate just their center tile with empty cells around it to
+leave room for the footprint, like this:
+
+::
+
+   #build a mason workshop in row 2, col 2 that will occupy the 3x3 area
+   `  `  `  #
+   `  wm `  #
+   `  `  `  #
+   #  #  #  #
+
+Or you can fill out the entire footprint like this:
+
+::
+
+   #build a mason workshop
+   wm wm wm #
+   wm wm wm #
+   wm wm wm #
+   #  #  #  #
+
+This format may be verbose for regular workshops, but it can be very helpful for
+laying out structures like screw pump towers and waterwheels, whose "center
+point" can be non-obvious.
+
+Finally, you can use area expansion syntax to represent the workshop:
+
+::
+
+   #build a mason workshop
+   wm(3x3)  #
+   `  `  `  #
+   `  `  `  #
+   #  #  #  #
+
+This style can be convenient for laying out multiple buildings of the same type.
+If you are building a large-scale block factory, for example, this will create
+20 mason workshops all in a row:
+
+::
+
+   #build line of 20 mason workshops
+   wm(60x3) #
+
+Quickfort will intelligently break large areas of the same designation into
+appropriately-sized chunks.
+
+Multilevel blueprints
+---------------------
+
+Multilevel blueprints are accommodated by separating Z-levels of the blueprint
+with ``#>`` (go down one z-level) or ``#<`` (go up one z-level) at the end of
+each floor.
+
+::
+
+   #dig Stairs leading down to a small room below
+   j  `  `  #
+   `  `  `  #
+   `  `  `  #
+   #> #  #  #
+   u  d  d  #
+   d  d  d  #
+   d  d  d  #
+   #  #  #  #
+
+The marker must appear in the first column of the row to be recognized, just
+like a modeline.
+
+Dig priorities
+--------------
+
+DF designation priorities are supported for ``#dig`` blueprints. The full syntax
+is ``[letter][number][expansion]``, where if the ``letter`` is not specified,
+``d`` is assumed, and if ``number`` is not specified, ``4`` is assumed (the
+default priority). So each of these blueprints is equivalent:
+
+::
+
+   #dig dig the interior of the room at high priority
+   d  d  d  d  d  #
+   d  d1 d1 d1 d  #
+   d  d1 d1 d1 d  #
+   d  d1 d1 d1 d  #
+   d  d  d  d  d  #
+   #  #  #  #  #  #
+
+   #dig dig the interior of the room at high priority
+   d  d  d  d  d  #
+   d  d1(3x3)  d  #
+   d  `  `  `  d  #
+   d  `  `  `  d  #
+   d  d  d  d  d  #
+   #  #  #  #  #  #
+
+   #dig dig the interior of the room at high priority
+   4  4  4  4  4  #
+   4  1  1  1  4  #
+   4  1  1  1  4  #
+   4  1  1  1  4  #
+   4  4  4  4  4  #
+   #  #  #  #  #  #
+
+Marker mode
+-----------
+
+Marker mode is useful for when you want to plan out your digging, but you don't
+want to dig everything just yet. In ``#dig`` mode, you can add a ``m`` before
+any other designation letter to indicate that the tile should be designated in
+marker mode. For example, to dig out the perimeter of a room, but leave the
+center of the room marked for digging later:
+
+::
+
+   #dig
+   d  d  d  d d #
+   d md md md d #
+   d md md md d #
+   d md md md d #
+   d  d  d  d d #
+   #  #  #  # # #
+
+Then you can use "Toggle Standard/Marking" (``d-M``) to convert the center tiles
+to regular designations at your leisure.
+
+To apply an entire dig blueprint in marker mode, regardless of what the
+blueprint itself says, you can set the global quickfort setting
+``force_marker_mode`` to ``true`` before you apply the blueprint.
+
+Note that the in-game UI setting "Standard/Marker Only" (``d-m``) does not have
+any effect on quickfort.
+
+Stockpiles and zones
+--------------------
+
+It is very common to have stockpiles that accept multiple categories of items or
+zones that permit more than one activity. Although it is perfectly valid to
+declare a single-purpose stockpile or zone and then modify it with a ``#query``
+blueprint, quickfort also supports directly declaring all the types on the
+``#place`` and ``#zone`` blueprints. For example, to declare a 10x10 area that
+is a pasture, a fruit picking area, and a meeting area all at once, you could
+write:
+
+::
+
+   #zone main pasture and picnic area
+   nmg(10x10)
+
+And similarly, to declare a stockpile that accepts both corpses and refuse, you
+could write:
+
+::
+
+   #place refuse heap
+   yr(20x10)
+
+The order of the individual letters doesn't matter.
+
+To toggle the ``active`` flag for zones, add an ``a`` character to the string.
+For example, to create a *disabled* pit zone (that you later intend to turn into
+a pond and carefully fill to 3-depth water):
+
+::
+
+   #zone disabled future pond zone
+   pa(1x3)
+
+Note that while this notation covers most use cases, tweaking low-level zone
+parameters, like hospital supply levels or converting between pits and ponds,
+must still be done manually or with a ``#query`` blueprint.
+
+Minecart tracks
+---------------
+
+There are two ways to produce minecart tracks, and they are handled very
+differently by the game. You can carve them into hard natural floors or you can
+construct them out of building materials. Constructed tracks are conceptually
+simpler, so we'll start with them.
+
+Constructed tracks
+~~~~~~~~~~~~~~~~~~
+
+Quickfort supports the designation of track stops and rollers through the normal
+mechanisms: a ``#build`` blueprint with ``CS`` and some number of ``d`` and
+``a`` characters (for selecting dump direction and friction) in a cell
+designates a track stop and a ``#build`` blueprint with ``Mr`` and some number
+of ``s`` and ``q`` characters (for direction and speed) designates a roller.
+This can get confusing very quickly and is very difficult to read in a
+blueprint. Constructed track segments don't even have keys associated with them
+at all!
+
+To solve this problem, Quickfort provides the following keywords for use in
+build blueprints:
+
+::
+
+   -- Track segments --
+   trackN
+   trackS
+   trackE
+   trackW
+   trackNS
+   trackNE
+   trackNW
+   trackSE
+   trackSW
+   trackEW
+   trackNSE
+   trackNSW
+   trackNEW
+   trackSEW
+   trackNSEW
+
+   -- Track/ramp segments --
+   trackrampN
+   trackrampS
+   trackrampE
+   trackrampW
+   trackrampNS
+   trackrampNE
+   trackrampNW
+   trackrampSE
+   trackrampSW
+   trackrampEW
+   trackrampNSE
+   trackrampNSW
+   trackrampNEW
+   trackrampSEW
+   trackrampNSEW
+
+   -- Horizontal and vertical roller segments --
+   rollerH
+   rollerV
+   rollerNS
+   rollerSN
+   rollerEW
+   rollerWE
+
+   Note: append up to four 'q' characters to roller keywords to set roller
+   speed. E.g. a roller that propels from East to West at the slowest speed can
+   be specified with 'rollerEWqqqq'.
+
+   -- Track stops that (optionally) dump to the N/S/E/W --
+   trackstop
+   trackstopN
+   trackstopS
+   trackstopE
+   trackstopW
+
+   Note: append up to four 'a' characters to trackstop keywords to set friction
+   amount. E.g. a stop that applies the smallest amount of friction can be
+   specified with 'trackstopaaaa'.
+
+As an example, you can create an E-W track with stops at each end that dump to
+their outside directions with the following blueprint:
+
+::
+
+   #build Example track
+   trackstopW trackEW trackEW trackEW trackstopE
+
+Note that the **only** way to build track and track/ramp segments is with the
+keywords. The UI method of using "+" and "-" keys to select the track type from
+a list does not work since DFHack Quickfort doesn't actually send keys to the UI
+to build buildings. The text in your spreadsheet cells is mapped directly into
+DFHack API calls. Only ``#query`` blueprints still send actual keycodes to the
+UI.
+
+Carved tracks
+~~~~~~~~~~~~~
+
+In the game, you carve a minecart track by specifying a beginning and ending
+tile and the game "adds" the designation to the tiles. You cannot designate
+single tiles. For example to carve two track segments that cross each other, you
+might use the cursor to designate a line of three vertical tiles like this:
+
+::
+
+   `  start here  `  #
+   `  `           `  #
+   `  end here    `  #
+   #  #           #  #
+
+Then to carve the cross, you'd do a horizonal segment:
+
+::
+
+   `           `  `         #
+   start here  `  end here  #
+   `           `  `         #
+   #           #  #         #
+
+This will result in a carved track that would be equivalent to a constructed
+track of the form:
+
+::
+
+   #build
+   `       trackS     `       #
+   trackE  trackNSEW  trackW  #
+   `       trackN     `       #
+   #       #          #       #
+
+To carve this same track with a ``#dig`` blueprint, you'd use area expansion
+syntax with a height or width of 1 to indicate the segments to designate:
+
+::
+
+   #dig
+   `       T(1x3)  `  #
+   T(3x1)  `       `  #
+   `       `       `  #
+   #       #       #  #
+
+"But wait!", I can hear you say, "How do you designate a track corner that opens
+to the South and East? You can't put both T(1xH) and T(Wx1) in the same cell!"
+This is true, but you can specify both width and height, and for tracks, QF
+interprets it as an upper-left corner extending to the right W tiles and down H
+tiles. For example, to carve a track in a closed ring, you'd write:
+
+::
+
+   #dig
+   T(3x3)  `  T(1x3)  #
+   `       `  `       #
+   T(3x1)  `  `       #
+   #       #  #       #
+
+Which would result in a carved track simliar to a constructed track of the form:
+
+::
+
+   #build
+   trackSE  trackEW  trackSW  #
+   trackNS  `        trackNS  #
+   trackNE  trackEW  trackNW  #
+   #        #        #        #
+
+Modeline markers
+----------------
+
+The modeline has some additional optional components that we haven't talked
+about yet. You can:
+
+-  give a blueprint a label by adding a ``label()`` marker
+-  set a cursor offset and/or start hint by adding a ``start()`` marker
+-  hide a blueprint from being listed with a ``hidden()`` marker
+-  register a message to be displayed after the blueprint is successfully
+   applied
+
+The full modeline syntax, when everything is specified, is:
+
+::
+
+   #mode label(mylabel) start(X;Y;STARTCOMMENT) hidden() message(mymessage) comment
+
+Note that all elements are optional except for the initial ``#mode``. Here are a
+few examples of modelines with optional elements before we discuss them in more
+detail:
+
+::
+
+   #dig start(3; 3; Center tile of a 5-tile square) Regular blueprint comment
+   #build label(noblebedroom) start(10;15)
+   #query label(configstockpiles) No explicit start() means cursor is at upper left corner
+   #meta label(digwholefort) start(center of stairs on surface)
+   #dig label(digdining) hidden() managed by the digwholefort meta blueprint
+   #zone label(pastures) message(remember to assign animals to the new pastures)
+
+Blueprint labels
+~~~~~~~~~~~~~~~~
+
+Labels are displayed in the ``quickfort list`` output and are used for
+addressing specific blueprints when there are multiple blueprints in a single
+file or spreadsheet sheet (see `Packaging a set of
+blueprints <#packaging-a-set-of-blueprints>`__ below). If a blueprint has no
+label, the label becomes the ordinal of the blueprint's position in the file or
+sheet. For example, the label of the first blueprint will be "1" if it is not
+otherwise set, the label of the second blueprint will be "2" if it is not
+otherwise set, etc. Labels that are explicitly defined must start with a letter
+to ensure the auto-generated labels don't conflict with user-defined labels.
+
+Start positions
+~~~~~~~~~~~~~~~
+
+Start positions specify a cursor offset for a particular blueprint, simplifying
+the task of blueprint alignment. This is very helpful for blueprints that are
+based on a central staircase, but it helps whenever a blueprint has an obvious
+"center". For example:
+
+::
+
+   #build start(2;2;center of workshop) label(masonw) a mason workshop
+   wm wm wm #
+   wm wm wm #
+   wm wm wm #
+   #  #  #  #
+
+will build the workshop *centered* on the cursor, not down and to the right of
+the cursor.
+
+The two numbers specify the column and row (or X and Y offset) where the cursor
+is expected to be when you apply the blueprint. Position 1;1 is the top left
+cell. The optional comment will show up in the ``quickfort list`` output and
+should contain information about where to position the cursor. If the start
+position is 1;1, you can omit the numbers and just add a comment describing
+where to put the cursor. This is also useful for meta blueprints that don't
+actually care where the cursor is, but that refer to other blueprints that have
+fully-specified ``start()`` markers. For example, a meta blueprint that refers
+to the ``masonw`` blueprint above could look like this:
+
+::
+
+   #meta start(center of workshop) a mason workshop
+   /masonw
+
+Hiding blueprints
+~~~~~~~~~~~~~~~~~
+
+A blueprint with a ``hidden()`` marker won't appear in ``quickfort list`` output
+unless the ``--hidden`` flag is specified. The primary reason for hiding a
+blueprint (rather than, say, deleting it or moving it out of the ``blueprints/``
+folder) is if a blueprint is intended to be run as part of a larger sequence
+managed by a `meta blueprint <#meta-blueprints>`__.
+
+Messages
+~~~~~~~~
+
+A blueprint with a ``message()`` marker will display a message after the
+blueprint is applied with ``quickfort run``. This is useful for reminding
+players to take manual steps that cannot be automated, like assigning animals to
+a pasture or assigning minecarts to a route, or listing the next step in a
+series of blueprints. For long or multi-part messages, you can embed newlines:
+
+::
+
+   "#meta label(surface1) message(This would be a good time to start digging the industry level.
+   Once the area is clear, continue with /surface2.) clear the embark site and set up pastures"
+
+Packaging a set of blueprints
+-----------------------------
+
+A complete specification for a section of your fortress may contain 5 or more
+separate blueprints, one for each "phase" of construction (dig, build, place
+stockpiles, designate zones, query building adjustments).
+
+To manage all the separate blueprints, it is often convenient to keep related
+blueprints in a single file. For .xlsx spreadsheets, you can keep each blueprint
+in a separate sheet. Online spreadsheet applications like `Google
+Sheets <https://sheets.new>`__ make it easy to work with multiple related
+blueprints, and, as a bonus, they retain any formatting you've set, like column
+sizes and coloring.
+
+For both .csv files and .xlsx spreadsheets you can also add as many blueprints
+as you want in a single file or sheet. Just add a modeline in the first column
+to indicate the start of a new blueprint. Instead of multiple .csv files, you
+can concatenate them into one single file.
+
+For example, you can store multiple blueprints together like this:
+
+::
+
+   #dig label(bed1)
+   d d d d #
+   d d d d #
+   d d d d #
+   d d d d #
+   # # # # #
+   #build label(bed2)
+   b   f h #
+           #
+           #
+   n       #
+   # # # # #
+   #place label(bed3)
+           #
+   f(2x2)  #
+           #
+           #
+   # # # # #
+   #query label(bed4)
+           #
+   booze   #
+           #
+           #
+   # # # # #
+   #query label(bed5)
+   r{+ 3}& #
+           #
+           #
+           #
+   # # # # #
+
+Of course, you could still choose to keep your blueprints in single-sheet .csv
+files and just give related blueprints similar names:
+
+::
+
+   bedroom.1.dig.csv
+   bedroom.2.build.csv
+   bedroom.3.place.csv
+   bedroom.4.query.csv
+   bedroom.5.query2.csv
+
+But the naming and organization is completely up to you.
+
+Meta blueprints
+---------------
+
+Meta blueprints are blueprints that script a series of other blueprints. Many
+blueprint packages follow this pattern:
+
+-  Apply dig blueprint to designate dig areas
+-  Wait for miners to dig
+-  **Apply build buildprint** to designate buildings
+-  **Apply place buildprint** to designate stockpiles
+-  **Apply query blueprint** to configure stockpiles
+-  Wait for buildings to get built
+-  Apply a different query blueprint to configure rooms
+
+Those three "apply"s in the middle might as well get done in one command instead
+of three. A meta blueprint can encode that sequence. A meta blueprint refers to
+other blueprints by their label (see the `Modeline markers <modeline-markers>`__
+section above) in the same format used by the ``DFHack#`` quickfort command:
+"/", or just "/" for blueprints in .csv files or blueprints in the same
+spreadsheet sheet as the #meta blueprint that references them.
+
+A few examples might make this clearer. Say you have a .csv file with the "bed"
+blueprints in the previous section:
+
+::
+
+   #dig label(bed1)
+   ...
+   #build label(bed2)
+   ...
+   #place label(bed3)
+   ...
+   #query label(bed4)
+   ...
+   #query label(bed5)
+   ...
+
+Note how I've given them all labels so we can address them safely. If I hadn't
+given them labels, they would receive default labels of "1", "2", "3", etc, but
+those labels would change if I ever add more blueprints at the top. This is not
+a problem if we're just running the blueprints individually from the
+``quickfort list`` command, but meta blueprints need a label name that isn't
+going to change over time.
+
+So let's add a meta blueprint to this file that will combine the middle three
+blueprints into one:
+
+::
+
+   "#meta plan bedroom: combines build, place, and stockpile config blueprints"
+   /bed2
+   /bed3
+   /bed4
+
+Now your sequence is shortened to:
+
+-  Apply dig blueprint to designate dig areas
+-  Wait for miners to dig
+-  **Apply meta buildprint** to build buildings and designate/configure
+   stockpiles
+-  Wait for buildings to get built
+-  Apply the final query blueprint to configure the room
+
+You can use meta blueprints to lay out your fortress at a larger scale as well.
+The ``#<`` and ``#>`` notation is valid in meta blueprints, so you can, for
+example, store the dig blueprints for all the levels of your fortress in
+different sheets in a spreadsheet, and then use a meta blueprint to designate
+your entire fortress for digging at once. For example, say you have a
+spreadsheet with the following layout:
+
++-------------------------------------------+----------------------------------+
+| Sheet name                                | contents                         |
++===========================================+==================================+
+| dig_farming                               | one #dig blueprint, no label     |
++-------------------------------------------+----------------------------------+
+| dig_industry                              | one #dig blueprint, no label     |
++-------------------------------------------+----------------------------------+
+| dig_dining                                | four #dig blueprints, with       |
+|                                           | labels "main", "basement",       |
+|                                           | "waterway", and "cistern"        |
++-------------------------------------------+----------------------------------+
+| dig_guildhall                             | one #dig blueprint, no label     |
++-------------------------------------------+----------------------------------+
+| dig_suites                                | one #dig blueprint, no label     |
++-------------------------------------------+----------------------------------+
+| dig_bedrooms                              | one #dig blueprint, no label     |
++-------------------------------------------+----------------------------------+
+
+We can add a sheet named "dig_all" with the following contents (we're expecting
+a big fort, so we're planning for a lot of bedrooms):
+
+::
+
+   #meta dig the whole fortress (remember to set force_marker_mode to true)
+   dig_farming/1
+   #>
+   dig_industry/1
+   #>
+   #>
+   dig_dining/main
+   #>
+   dig_dining/basement
+   #>
+   dig_dining/waterway
+   #>
+   dig_dining/cistern
+   #>
+   dig_guildhall/1
+   #>
+   dig_suites/1
+   #>
+   dig_bedrooms/1
+   #>
+   dig_bedrooms/1
+   #>
+   dig_bedrooms/1
+   #>
+   dig_bedrooms/1
+   #>
+   dig_bedrooms/1
+
+Note that for blueprints without an explicit label, we still need to address
+them by their auto-generated numerical label.
+
+You can then hide the blueprints that you now manage with the ``#meta``-mode
+blueprint from ``quickfort list`` by adding a ``hidden()`` marker to their
+modelines. That way the output of ``quickfort list`` won't be cluttered by
+blueprints that you don't need to run directly. If you ever *do* need to access
+the managed blueprints individually, you can still see them with
+``quickfort list --hidden``.
+
+Buildingplan integration
+------------------------
+
+Buildingplan is a DFHack plugin that keeps jobs in a suspended state until the
+materials required for the job are available. This prevents a building
+designation from being canceled when a dwarf picks up the job but can't find the
+materials.
+
+For all types that buildingplan supports, quickfort using buildingplan to manage
+construction. Buildings are still constructed immediately if you have the
+materials, but you now have the freedom to apply build blueprints before you
+manufacture all required materials, and the jobs will be fulfilled as the
+materials become available.
+
+If a ``#build`` blueprint only refers to supported types, the buildingplan
+integration pairs well with the
+`workflow <https://docs.dfhack.org/en/stable/docs/Plugins.html#workflow>`__
+plugin, which can build items a few at a time continuously as long as they are
+needed. For building types that are not yet supported by buildingplan, a good
+pattern to follow is to first run ``quickfort orders`` on the ``#build``
+blueprint to manufacture all the required items, then apply the blueprint
+itself.
+
+See `buildingplan
+documentation <https://docs.dfhack.org/en/stable/docs/Plugins.html#buildingplan>`__
+for a list of supported types.
+
+Generating manager orders
+-------------------------
+
+Quickfort can generate manager orders to make sure you have the proper items in
+stock to apply a ``#build`` blueprint.
+
+Many items can be manufactured from different source materials. Orders will
+always choose rock when it can, then wood, then cloth, then iron. You can always
+remove orders that don't make sense for your fort and manually enqueue a similar
+order more to your liking. For example, if you want silk ropes instead of cloth
+ropes, make a new manager order for an appropriate quantity of silk ropes, and
+then remove the generated cloth rope order.
+
+Anything that requires generic building materials (workshops, constructions,
+etc.) will result in an order for a rock block. One "Make rock blocks" job
+produces four blocks per boulder, so the number of jobs ordered will be the
+number of blocks you need divided by four (rounded up). You might end up with a
+few extra blocks, but not too many.
+
+If you want your constructions to be in a consistent color, be sure to choose a
+rock type for all of your 'Make rock blocks' orders by selecting the order and
+hitting ``d``. You might want to set the rock type for other non-block orders to
+something different if you fear running out of the type of rock that you want to
+use for blocks.
+
+There are a few building types that will generate extra manager orders for
+related materials:
+
+-  Track stops will generate an order for a minecart
+-  Traction benches will generate orders for a table, mechanism, and rope
+-  Levers will generate an order for an extra two mechanisms for connecting the
+   lever to a target
+-  Cage traps will generate an order for a cage
+
+Tips and tricks
+---------------
+
+-  During blueprint application, especially query blueprints, don't click the
+   mouse on the DF window or type any keys. They can change the state of the
+   game while the blueprint is being applied, resulting in strange errors.
+
+-  After digging out an area, you may wish to smooth and/or engrave the area
+   before starting the build phase, as dwarves may be unable to access walls or
+   floors that are behind/under built objects.
+
+-  If you are designating more than one level for digging at a time, you can
+   make your miners more efficient by using marker mode on all levels but one.
+   This prevents your miners from digging out a few tiles on one level, then
+   running down/up the stairs to do a few tiles on an adjacent level. With only
+   one level "live" and all other levels in marker mode, your miners can
+   concentrate on one level at a time. You just have to remember to "unmark" a
+   new level when your miners are done with their current one.
+
+-  As of DF 0.34.x, it is no longer possible to build doors (d) at the same time
+   that you build adjacent walls (Cw). Doors must now be built *after* walls are
+   constructed for them to be next to. This does not affect the more common case
+   where walls exist as a side-effect of having dug-out a room in a #dig
+   blueprint.
+
+Caveats and limitations
+-----------------------
+
+-  Buildings will be designated regardless of whether you have the required
+   materials, but if materials are not available when the construction job is
+   picked up by a dwarf, the buildings will be canceled and the designations
+   will disappear. Until the buildingplan plugin can be extended to support all
+   building types, you should use ``quickfort orders`` to pre-manufacture all
+   the materials you need for a ``#build`` blueprint before you apply it.
+
+-  If you use the ``jugs`` alias in your ``#query``-mode blueprints, be aware
+   that there is no way to differentiate jugs from other types of tools in the
+   game. Therefore, ``jugs`` stockpiles will also take nest boxes and other
+   tools. The only workaround is not to have other tools lying around in your
+   fort.
+
+-  Likewise for bags. The game does not differentiate between empty and full
+   bags, so you'll get bags of gypsum power and sand in your bags stockpile
+   unless you avoid collecting sand and are careful to assign all your gypsum to
+   your hospital.
+
+-  Weapon traps and upright spear/spike traps can currently only be built with a
+   single weapon.
+
+-  Pressure plates can be built, but they cannot be usefully configured yet.
+
+-  Building instruments, bookcases, display furniture, and offering places are
+   not yet supported by DFHack.
+
+-  This script is relatively new, and there are bound to be bugs! Please report
+   them at the `DFHack issue
+   tracker <https://github.com/DFHack/dfhack/issues>`__ so they can be
+   addressed.
+
+Links
+-----
+
+Quickfort links
+~~~~~~~~~~~~~~~
+
+-  `Quickfort command
+   syntax <https://docs.dfhack.org/en/stable/docs/_auto/base.html#quickfort>`__
+-  `Quickfort forum
+   thread <http://www.bay12forums.com/smf/index.php?topic=176889.0>`__
+-  `Quickfort blueprints
+   library <https://github.com/DFHack/dfhack/tree/develop/data/blueprints/library>`__
+-  `DFHack issue tracker <https://github.com/DFHack/dfhack/issues>`__
+-  `Quickfort source
+   code <https://github.com/DFHack/scripts/tree/master/internal/quickfort>`__
+
+Related tools
+~~~~~~~~~~~~~
+
+-  DFHack's `blueprint
+   plugin <https://docs.dfhack.org/en/stable/docs/Plugins.html#blueprint>`__ can
+   generate blueprints from actual DF maps.
+-  `Python Quickfort <http://joelpt.net/quickfort>`__ is the previous,
+   Python-based implementation that DFHack's quickfort script was inspired by.

From 53b78d5266ff2d67d0ba9139d077fa61b8647e17 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 1 Oct 2020 21:59:48 -0400
Subject: [PATCH 397/547] Convert external docs links to internal links

---
 docs/tools/quickfort-user-guide.rst | 38 ++++++++++++-----------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/docs/tools/quickfort-user-guide.rst b/docs/tools/quickfort-user-guide.rst
index e0be9147a..f3e4e06b7 100644
--- a/docs/tools/quickfort-user-guide.rst
+++ b/docs/tools/quickfort-user-guide.rst
@@ -1,11 +1,10 @@
 DFHack Quickfort User Manual
 ============================
 
-DFHack Quickfort is a DFHack script that helps you build fortresses from
+`Quickfort <quickfort>` is a DFHack script that helps you build fortresses from
 "blueprint" .csv and .xlsx files. Many applications exist to edit these files,
 such as MS Excel and `Google Sheets <https://sheets.new>`__. You can also build
-your plan "for real" in Dwarf Fortress, and then export your map using DFHack's
-`blueprint <https://docs.dfhack.org/en/stable/docs/Plugins.html#blueprint>`__
+your plan "for real" in Dwarf Fortress, and then export your map using the `blueprint`
 plugin. Most layout and building-oriented DF commands are supported through the
 use of multiple files or spreadsheets, each describing a different phase of DF
 construction: designation, building, placing stockpiles/zones, and setting
@@ -25,13 +24,12 @@ This document focuses on DFHack Quickfort's capabilities and teaches players how
 to understand and build blueprint files. Some of the text was originally written
 by Joel Thornton, reused here with his permission.
 
-For those just looking to apply blueprints, check out the `quickfort command
-syntax <https://docs.dfhack.org/en/stable/docs/_auto/base.html#quickfort>`__ in
-the DFHack Scripts documentation. There are also many ready-to-use blueprints
+For those just looking to apply blueprints, check out the `quickfort command's
+documentation <quickfort>` for syntax. There are also many ready-to-use blueprints
 available in the ``blueprints/library`` subfolder in your DFHack installation.
 Browse them on your computer or
 `online <https://github.com/DFHack/dfhack/tree/develop/data/blueprints/library>`__,
-or run ``quickfort list -l`` at the ``DFHack#`` prompt to list them, and then
+or run ``quickfort list -l`` at the ``[DFHack]#`` prompt to list them, and then
 ``quickfort run`` to apply them to your fort!
 
 See the `Links section <#links>`__ for more information and online resources.
@@ -1007,17 +1005,13 @@ manufacture all required materials, and the jobs will be fulfilled as the
 materials become available.
 
 If a ``#build`` blueprint only refers to supported types, the buildingplan
-integration pairs well with the
-`workflow <https://docs.dfhack.org/en/stable/docs/Plugins.html#workflow>`__
-plugin, which can build items a few at a time continuously as long as they are
-needed. For building types that are not yet supported by buildingplan, a good
-pattern to follow is to first run ``quickfort orders`` on the ``#build``
-blueprint to manufacture all the required items, then apply the blueprint
-itself.
-
-See `buildingplan
-documentation <https://docs.dfhack.org/en/stable/docs/Plugins.html#buildingplan>`__
-for a list of supported types.
+integration pairs well with the `workflow` plugin, which can build items a few
+at a time continuously as long as they are needed. For building types that are
+not yet supported by buildingplan, a good pattern to follow is to first run
+``quickfort orders`` on the ``#build`` blueprint to manufacture all the required
+items, then apply the blueprint itself.
+
+See the `buildingplan documentation <buildingplan>` for a list of supported types.
 
 Generating manager orders
 -------------------------
@@ -1118,8 +1112,7 @@ Links
 Quickfort links
 ~~~~~~~~~~~~~~~
 
--  `Quickfort command
-   syntax <https://docs.dfhack.org/en/stable/docs/_auto/base.html#quickfort>`__
+-  `Quickfort command syntax <quickfort>`
 -  `Quickfort forum
    thread <http://www.bay12forums.com/smf/index.php?topic=176889.0>`__
 -  `Quickfort blueprints
@@ -1131,8 +1124,7 @@ Quickfort links
 Related tools
 ~~~~~~~~~~~~~
 
--  DFHack's `blueprint
-   plugin <https://docs.dfhack.org/en/stable/docs/Plugins.html#blueprint>`__ can
-   generate blueprints from actual DF maps.
+-  DFHack's `blueprint plugin <blueprint>` can generate blueprints from actual
+   DF maps.
 -  `Python Quickfort <http://joelpt.net/quickfort>`__ is the previous,
    Python-based implementation that DFHack's quickfort script was inspired by.

From 77c37ebb73d2534da1ee9b5beed6d98183bdc6e9 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 1 Oct 2020 22:08:58 -0400
Subject: [PATCH 398/547] Switch to native RST table of contents

---
 docs/tools/quickfort-user-guide.rst | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/docs/tools/quickfort-user-guide.rst b/docs/tools/quickfort-user-guide.rst
index f3e4e06b7..78bb24ea7 100644
--- a/docs/tools/quickfort-user-guide.rst
+++ b/docs/tools/quickfort-user-guide.rst
@@ -34,28 +34,11 @@ or run ``quickfort list -l`` at the ``[DFHack]#`` prompt to list them, and then
 
 See the `Links section <#links>`__ for more information and online resources.
 
-Table of Contents
------------------
-
--  `Features <#features>`__
--  `Editing Blueprints <#editing-blueprints>`__
-
-   -  `Area expansion syntax <#area-expansion-syntax>`__
-   -  `Automatic area expansion <#automatic-area-expansion>`__
-   -  `Multilevel blueprints <#multilevel-blueprints>`__
-   -  `Marker mode <#marker-mode>`__
-   -  `Dig priorities <#dig-priorities>`__
-   -  `Stockpiles and zones <#stockpiles-and-zones>`__
-   -  `Minecart tracks <#minecart-tracks>`__
-   -  `Modeline markers <modeline-markers>`__
-   -  `Packaging a set of blueprints <#packaging-a-set-of-blueprints>`__
-   -  `Meta blueprints <#meta-blueprints>`__
-
--  `Buildingplan integration <#buildingplan-integration>`__
--  `Generating manager orders <#generating-manager-orders>`__
--  `Tips and tricks <#tips-and-tricks>`__
--  `Caveats and limitations <#caveats-and-limitations>`__
--  `Links <#links>`__
+
+.. contents:: Table of Contents
+   :local:
+   :depth: 2
+
 
 Features
 --------

From 4746e5c046634c7f8632ab612d4f11acf5b28b8b Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 1 Oct 2020 22:10:11 -0400
Subject: [PATCH 399/547] Change/remove headings to match original TOC nesting

---
 docs/tools/quickfort-user-guide.rst | 38 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/docs/tools/quickfort-user-guide.rst b/docs/tools/quickfort-user-guide.rst
index 78bb24ea7..d7835f764 100644
--- a/docs/tools/quickfort-user-guide.rst
+++ b/docs/tools/quickfort-user-guide.rst
@@ -247,7 +247,7 @@ pre-packaged aliases, or create your own in
 in your DFHack installation.
 
 Area expansion syntax
----------------------
+~~~~~~~~~~~~~~~~~~~~~
 
 In Quickfort, the following blueprints are equivalent:
 
@@ -333,7 +333,7 @@ size, like bridges. The following blueprints are equivalent:
    #  #  #  #  #
 
 Automatic area expansion
-------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 Buildings larger than 1x1, like workshops, can be represented in any of three
 ways. You can designate just their center tile with empty cells around it to
@@ -384,7 +384,7 @@ Quickfort will intelligently break large areas of the same designation into
 appropriately-sized chunks.
 
 Multilevel blueprints
----------------------
+~~~~~~~~~~~~~~~~~~~~~
 
 Multilevel blueprints are accommodated by separating Z-levels of the blueprint
 with ``#>`` (go down one z-level) or ``#<`` (go up one z-level) at the end of
@@ -406,7 +406,7 @@ The marker must appear in the first column of the row to be recognized, just
 like a modeline.
 
 Dig priorities
---------------
+~~~~~~~~~~~~~~
 
 DF designation priorities are supported for ``#dig`` blueprints. The full syntax
 is ``[letter][number][expansion]``, where if the ``letter`` is not specified,
@@ -440,7 +440,7 @@ default priority). So each of these blueprints is equivalent:
    #  #  #  #  #  #
 
 Marker mode
------------
+~~~~~~~~~~~
 
 Marker mode is useful for when you want to plan out your digging, but you don't
 want to dig everything just yet. In ``#dig`` mode, you can add a ``m`` before
@@ -469,7 +469,7 @@ Note that the in-game UI setting "Standard/Marker Only" (``d-m``) does not have
 any effect on quickfort.
 
 Stockpiles and zones
---------------------
+~~~~~~~~~~~~~~~~~~~~
 
 It is very common to have stockpiles that accept multiple categories of items or
 zones that permit more than one activity. Although it is perfectly valid to
@@ -508,7 +508,7 @@ parameters, like hospital supply levels or converting between pits and ponds,
 must still be done manually or with a ``#query`` blueprint.
 
 Minecart tracks
----------------
+~~~~~~~~~~~~~~~
 
 There are two ways to produce minecart tracks, and they are handled very
 differently by the game. You can carve them into hard natural floors or you can
@@ -516,7 +516,7 @@ construct them out of building materials. Constructed tracks are conceptually
 simpler, so we'll start with them.
 
 Constructed tracks
-~~~~~~~~~~~~~~~~~~
+``````````````````
 
 Quickfort supports the designation of track stops and rollers through the normal
 mechanisms: a ``#build`` blueprint with ``CS`` and some number of ``d`` and
@@ -605,7 +605,7 @@ DFHack API calls. Only ``#query`` blueprints still send actual keycodes to the
 UI.
 
 Carved tracks
-~~~~~~~~~~~~~
+`````````````
 
 In the game, you carve a minecart track by specifying a beginning and ending
 tile and the game "adds" the designation to the tiles. You cannot designate
@@ -675,7 +675,7 @@ Which would result in a carved track simliar to a constructed track of the form:
    #        #        #        #
 
 Modeline markers
-----------------
+~~~~~~~~~~~~~~~~
 
 The modeline has some additional optional components that we haven't talked
 about yet. You can:
@@ -706,7 +706,7 @@ detail:
    #zone label(pastures) message(remember to assign animals to the new pastures)
 
 Blueprint labels
-~~~~~~~~~~~~~~~~
+````````````````
 
 Labels are displayed in the ``quickfort list`` output and are used for
 addressing specific blueprints when there are multiple blueprints in a single
@@ -719,7 +719,7 @@ otherwise set, etc. Labels that are explicitly defined must start with a letter
 to ensure the auto-generated labels don't conflict with user-defined labels.
 
 Start positions
-~~~~~~~~~~~~~~~
+```````````````
 
 Start positions specify a cursor offset for a particular blueprint, simplifying
 the task of blueprint alignment. This is very helpful for blueprints that are
@@ -753,7 +753,7 @@ to the ``masonw`` blueprint above could look like this:
    /masonw
 
 Hiding blueprints
-~~~~~~~~~~~~~~~~~
+`````````````````
 
 A blueprint with a ``hidden()`` marker won't appear in ``quickfort list`` output
 unless the ``--hidden`` flag is specified. The primary reason for hiding a
@@ -762,7 +762,7 @@ folder) is if a blueprint is intended to be run as part of a larger sequence
 managed by a `meta blueprint <#meta-blueprints>`__.
 
 Messages
-~~~~~~~~
+````````
 
 A blueprint with a ``message()`` marker will display a message after the
 blueprint is applied with ``quickfort run``. This is useful for reminding
@@ -776,7 +776,7 @@ series of blueprints. For long or multi-part messages, you can embed newlines:
    Once the area is clear, continue with /surface2.) clear the embark site and set up pastures"
 
 Packaging a set of blueprints
------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 A complete specification for a section of your fortress may contain 5 or more
 separate blueprints, one for each "phase" of construction (dig, build, place
@@ -843,7 +843,7 @@ files and just give related blueprints similar names:
 But the naming and organization is completely up to you.
 
 Meta blueprints
----------------
+~~~~~~~~~~~~~~~
 
 Meta blueprints are blueprints that script a series of other blueprints. Many
 blueprint packages follow this pattern:
@@ -1092,8 +1092,7 @@ Caveats and limitations
 Links
 -----
 
-Quickfort links
-~~~~~~~~~~~~~~~
+**Quickfort links:**
 
 -  `Quickfort command syntax <quickfort>`
 -  `Quickfort forum
@@ -1104,8 +1103,7 @@ Quickfort links
 -  `Quickfort source
    code <https://github.com/DFHack/scripts/tree/master/internal/quickfort>`__
 
-Related tools
-~~~~~~~~~~~~~
+**Related tools:**
 
 -  DFHack's `blueprint plugin <blueprint>` can generate blueprints from actual
    DF maps.

From 00cd52dca723c3c0c30b2fae6807f90b8a847f02 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 1 Oct 2020 22:17:53 -0400
Subject: [PATCH 400/547] Add user guides section to main toctree

---
 docs/guides/index.rst                           | 11 +++++++++++
 docs/{tools => guides}/quickfort-user-guide.rst |  0
 index.rst                                       |  1 +
 3 files changed, 12 insertions(+)
 create mode 100644 docs/guides/index.rst
 rename docs/{tools => guides}/quickfort-user-guide.rst (100%)

diff --git a/docs/guides/index.rst b/docs/guides/index.rst
new file mode 100644
index 000000000..7208b5276
--- /dev/null
+++ b/docs/guides/index.rst
@@ -0,0 +1,11 @@
+===========
+User Guides
+===========
+
+These pages are detailed guides covering DFHack tools.
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   *
diff --git a/docs/tools/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
similarity index 100%
rename from docs/tools/quickfort-user-guide.rst
rename to docs/guides/quickfort-user-guide.rst
diff --git a/index.rst b/index.rst
index d0e90b741..4df56de58 100644
--- a/index.rst
+++ b/index.rst
@@ -31,5 +31,6 @@ User Manual
    /docs/Core
    /docs/Plugins
    /docs/Scripts
+   /docs/guides/index
    /docs/index-about
    /docs/index-dev

From 90994f2abdec60d4310a00ec9164cd6c825372fe Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 1 Oct 2020 22:19:33 -0400
Subject: [PATCH 401/547] Standardize title

---
 docs/guides/quickfort-user-guide.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index d7835f764..0ca4d67b5 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -1,5 +1,5 @@
-DFHack Quickfort User Manual
-============================
+Quickfort User Guide
+====================
 
 `Quickfort <quickfort>` is a DFHack script that helps you build fortresses from
 "blueprint" .csv and .xlsx files. Many applications exist to edit these files,

From 8dfdf75e7c9557cadd29aee2b56c259443dc8171 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 2 Oct 2020 00:22:11 -0400
Subject: [PATCH 402/547] Add roles for links to source code on GitHub

---
 conf.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf.py b/conf.py
index d6c40b0a7..e1bde4257 100644
--- a/conf.py
+++ b/conf.py
@@ -207,6 +207,8 @@ extlinks = {
     'dffd': ('http://dffd.bay12games.com/file.php?id=%s', 'DFFD file '),
     'bug': ('http://www.bay12games.com/dwarves/mantisbt/view.php?id=%s',
             'Bug '),
+    'source': ('https://github.com/DFHack/dfhack/tree/develop/%s', ''),
+    'source:scripts': ('https://github.com/DFHack/scripts/tree/master/%s', ''),
     'issue': ('https://github.com/DFHack/dfhack/issues/%s', 'Issue '),
     'commit': ('https://github.com/DFHack/dfhack/commit/%s', 'Commit '),
 }

From 5f47491e78d9aaa64604304070dad686f66290bd Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 2 Oct 2020 00:22:35 -0400
Subject: [PATCH 403/547] Use custom link roles when possible

---
 docs/guides/quickfort-user-guide.rst | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 0ca4d67b5..42127daa0 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -27,8 +27,7 @@ by Joel Thornton, reused here with his permission.
 For those just looking to apply blueprints, check out the `quickfort command's
 documentation <quickfort>` for syntax. There are also many ready-to-use blueprints
 available in the ``blueprints/library`` subfolder in your DFHack installation.
-Browse them on your computer or
-`online <https://github.com/DFHack/dfhack/tree/develop/data/blueprints/library>`__,
+Browse them on your computer or :source:`online <data/blueprints/library>`,
 or run ``quickfort list -l`` at the ``[DFHack]#`` prompt to list them, and then
 ``quickfort run`` to apply them to your fort!
 
@@ -231,20 +230,17 @@ over the bed, causing us to 'make room' and "&", which is a special symbol that
 expands to "{Enter}", to indicate that we're done.
 
 In column 2, row 3 we have "booze". This is one of many alias keywords defined
-in the included `baseline aliases
-file <https://github.com/DFHack/dfhack/tree/develop/data/quickfort/aliases-common.txt>`__.
+in the included :source:`baseline aliases file <data/quickfort/aliases-common.txt>`.
 This particular alias sets a food stockpile to carry booze only. It sends the
 keys needed to navigate DF's stockpile settings menu, and then sends an Escape
 character ("^" or "{ESC}") to exit back to the map. It is important to exit out
 of any menus that you enter while in query mode so that the cursor can move to
 the next tile when it is done configuring the current tile.
 
-Check out the included `blueprint
-library <https://github.com/DFHack/dfhack/tree/develop/data/blueprints/library>`__
+Check out the included :source:`blueprint library <data/blueprints/library>`
 to see many more examples. Read the baseline aliases file for helpful
 pre-packaged aliases, or create your own in
-`dfhack-config/quickfort/aliases.txt <https://github.com/DFHack/dfhack/tree/develop/dfhack-config/quickfort/aliases.txt>`__
-in your DFHack installation.
+:source:`dfhack-config/quickfort/aliases.txt` in your DFHack installation.
 
 Area expansion syntax
 ~~~~~~~~~~~~~~~~~~~~~
@@ -1085,9 +1081,7 @@ Caveats and limitations
    not yet supported by DFHack.
 
 -  This script is relatively new, and there are bound to be bugs! Please report
-   them at the `DFHack issue
-   tracker <https://github.com/DFHack/dfhack/issues>`__ so they can be
-   addressed.
+   them at the :issue:`DFHack issue tracker <>` so they can be addressed.
 
 Links
 -----
@@ -1095,13 +1089,10 @@ Links
 **Quickfort links:**
 
 -  `Quickfort command syntax <quickfort>`
--  `Quickfort forum
-   thread <http://www.bay12forums.com/smf/index.php?topic=176889.0>`__
--  `Quickfort blueprints
-   library <https://github.com/DFHack/dfhack/tree/develop/data/blueprints/library>`__
--  `DFHack issue tracker <https://github.com/DFHack/dfhack/issues>`__
--  `Quickfort source
-   code <https://github.com/DFHack/scripts/tree/master/internal/quickfort>`__
+-  :forums:`Quickfort forum thread <176889>`
+-  :source:`Quickfort blueprints library <data/blueprints/library>`
+-  :issue:`DFHack issue tracker <>`
+-  :source:scripts:`Quickfort source code <internal/quickfort>`
 
 **Related tools:**
 

From 2ff4197afe9d7fc185f769b0395a9b687535772a Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 3 Oct 2020 23:56:57 -0400
Subject: [PATCH 404/547] Add anchor

---
 docs/guides/quickfort-user-guide.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 42127daa0..7147c5515 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -1,3 +1,5 @@
+.. _quickfort-user-guide:
+
 Quickfort User Guide
 ====================
 

From 56d4b7241490e85320f1031113f75bee8a391b72 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 3 Oct 2020 23:57:36 -0400
Subject: [PATCH 405/547] Replace blueprints/readme with pointer to docs

---
 data/blueprints/README.md | 758 +-------------------------------------
 1 file changed, 3 insertions(+), 755 deletions(-)

diff --git a/data/blueprints/README.md b/data/blueprints/README.md
index 80023d313..b7f5421c0 100644
--- a/data/blueprints/README.md
+++ b/data/blueprints/README.md
@@ -1,756 +1,4 @@
+This folder contains blueprints used by the `quickfort` script. For more information, see:
 
-[//]: # (The online version of this manual, which may be easier to read, is)
-[//]: # (at https://github.com/DFHack/dfhack/tree/develop/data/blueprints)
-
-[//]: # (Note to editors: don't word wrap -- it breaks the formatting on GitHub)
-
-DFHack Quickfort User Manual
-============================
-
-DFHack Quickfort is a DFHack script that helps you build fortresses from "blueprint" .csv and .xlsx files. Many applications exist to edit these files, such as MS Excel and [Google Sheets](https://sheets.new). You can also build your plan "for real" in Dwarf Fortress, and then export your map using DFHack's [blueprint](https://docs.dfhack.org/en/stable/docs/Plugins.html#blueprint) plugin. Most layout and building-oriented DF commands are supported through the use of multiple files or spreadsheets, each describing a different phase of DF construction: designation, building, placing stockpiles/zones, and setting configuration.
-
-The original idea and 1.0 codebase came from [Valdemar's](https://dwarffortresswiki.org/index.php/User:Valdemar) auto-designation macro. Joel Thornton (joelpt) reimplemented the core logic in Python and extended its functionality with [Quickfort 2.0](https://github.com/joelpt/quickfort). This DFHack-native implementation, called "DFHack Quickfort" or just "quickfort", builds upon Quickfort 2.0's formats and features. DFHack Quickfort is written in Lua and interacts with Dwarf Fortress memory structures directly, allowing for instantaneous blueprint application, error checking and recovery, and many other advanced features.
-
-This document focuses on DFHack Quickfort's capabilities and teaches players how to understand and build blueprint files.  Some of the text was originally written by Joel Thornton, reused here with his permission.
-
-For those just looking to apply blueprints, check out the [quickfort command syntax](https://docs.dfhack.org/en/stable/docs/_auto/base.html#quickfort) in the DFHack Scripts documentation. There are also many ready-to-use blueprints available in the `blueprints/library` subfolder in your DFHack installation. Browse them on your computer or [online](https://github.com/DFHack/dfhack/tree/develop/data/blueprints/library), or run `quickfort list -l` at the `DFHack#` prompt to list them, and then `quickfort run` to apply them to your fort!
-
-See the [Links section](#links) for more information and online resources.
-
-
-Table of Contents
------------------
-
-* [Features](#features)
-* [Editing Blueprints](#editing-blueprints)
-  * [Area expansion syntax](#area-expansion-syntax)
-  * [Automatic area expansion](#automatic-area-expansion)
-  * [Multilevel blueprints](#multilevel-blueprints)
-  * [Marker mode](#marker-mode)
-  * [Dig priorities](#dig-priorities)
-  * [Stockpiles and zones](#stockpiles-and-zones)
-  * [Minecart tracks](#minecart-tracks)
-  * [Modeline markers](modeline-markers)
-  * [Packaging a set of blueprints](#packaging-a-set-of-blueprints)
-  * [Meta blueprints](#meta-blueprints)
-* [Buildingplan integration](#buildingplan-integration)
-* [Generating manager orders](#generating-manager-orders)
-* [Tips and tricks](#tips-and-tricks)
-* [Caveats and limitations](#caveats-and-limitations)
-* [Links](#links)
-
-
-Features
---------
-
-* General
-  * Manages blueprints to handle all phases of DF construction
-  * Supports .csv and multi-worksheet .xlsx blueprint files
-  * Near-instant application, even for very large and complex blueprints
-  * Blueprints can span multiple z-levels
-  * Supports multiple blueprints per .csv file/spreadsheet sheet
-  * "meta" blueprints that automate the application of sequences of blueprints
-  * Undo functionality for dig, build, place, and zone blueprints
-  * Automatic cropping of blueprints so you don't get errors if the blueprint extends off the map
-  * Can generate manager orders for everything required by a build blueprint
-  * Library of ready-to-use blueprints included
-  * Verbose output mode for debugging
-* Dig mode
-  * Supports all types of designations, including dumping/forbidding items and setting traffic settings
-  * Supports setting dig priorities
-  * Supports applying dig blueprints in marker mode
-  * Handles carving arbitrarily complex minecart tracks, including tracks that cross other tracks
-* Build mode
-  * DFHack buildingplan integration
-  * Designate complete constructions at once, without having to wait for each tile to become supported before you can build it
-  * Automatic expansion of building footprints to their minimum dimensions, so only the center tile of a multi-tile building needs to be recorded in the blueprint
-  * Tile occupancy and validity checking so, for example, buildings that cannot be placed on a certain tile will simply be skipped instead of the blueprint failing to apply. Blueprints that are only partially applied for any reason (for example, you need to dig out some more tiles) can be safely reapplied to build the remaining buildings.
-  * Relaxed rules for farm plot and road placement: you can still place the building even if an invalid tile (e.g. stone tiles for farm plots) splits the designated area into two parts
-  * Intelligent boundary detection for adjacent buildings of the same type (e.g. a 6x6 block of `wj` cells will be correctly split into 4 jeweler's workshops)
-* Place and zone modes
-  * Define stockpiles and zones in any continguous shape, not just rectangular blocks
-  * Configurable maximums for bins, barrels and wheelbarrows assigned to created stockpiles
-  * Automatic splitting of stockpiles and zones that exceed maximum dimension limits
-* Query mode
-  * Send arbitrary keystroke sequences to the UI -- *anything* you can do through the UI is supported
-  * Supports aliases to automate frequent keystroke combos
-  * Includes a library of pre-made and tested aliases to automate most common tasks, such as configuring stockpiles for important item types or creating named hauling routes for quantum stockpiles.
-  * Supports including aliases in other aliases, and repeating key sequences a specified number of times
-  * Skips sending key sequences when the cursor is over a tile that does not have a stockpile or building, so missing buildings won't desynchronize your blueprint
-  * Instant halting of query blueprint application when keystroke errors are detected, such as when a key sequence leaves us stuck in a submenu, to make blueprint misconfigurations easier to debug
-
-
-Editing Blueprints
-------------------
-
-We recommend using a spreadsheet editor such as Excel, [Google Sheets](https://sheets.new), or [LibreOffice](https://www.libreoffice.org) to edit blueprint files, but any text editor will do.
-
-The format of Quickfort-compatible blueprint files is straightforward. The first line (or upper-left cell) of the spreadsheet should look like this:
-
-    #dig This is a decription.
-
-The keyword "dig" tells Quickfort we are going to be using the Designations menu in DF. The following "mode" keywords are understood:
-
-    dig     Designations menu (d)
-    build   Build menu (b)
-    place   Place stockpiles menu (p)
-    zone    Activity zones menu (i)
-    query   Set building tasks/prefs menu (q)
-
-There are also "meta" blueprints, but we'll talk about those [later](#meta-blueprints).
-
-Optionally following this keyword and a space, you may enter a comment. This comment will appear in the output of `quickfort list` when run from the `DFHack#` prompt. You can use this space for explanations, attribution, etc.
-
-Below this line begin entering the keys you want sent in each cell. For example, we could dig out a 4x4 room like so (spaces are used as column separators here for clarity, but a real .csv file would have commas):
-
-    #dig
-    d d d d #
-    d d d d #
-    d d d d #
-    d d d d #
-    # # # # #
-
-Note the # symbols at the right end of each row and below the last row. These are completely optional, but can be helpful to make the row and column positions clear.
-
-Once the dwarves have that dug out, let's build a walled-in bedroom within our dug-out area:
-
-    #build
-    Cw Cw Cw Cw #
-    Cw b  h  Cw #
-    Cw       Cw #
-    Cw Cw    Cw #
-    #  #  #  #  #
-
-Note my generosity - in addition to the bed (b) I've built a chest (h) here for the dwarf as well. You must use the full series of keys needed to build something in each cell, e.g. 'Cw' enters DF's constructions submenu (C) and selects walls (w).
-
-I'd also like to place a booze stockpile in the 2 unoccupied tiles in the room.
-
-    #place Place a food stockpile
-    ` ` ` ` #
-    ` ` ` ` #
-    ` f(2x1)#
-    ` ` ` ` #
-    # # # # #
-
-This illustration may be a little hard to understand. The f(2x1) is in column 2, row 3. All the other cells are empty. QF considers both "`" (backtick -- the character under the tilde) and "~" (tilde) characters within cells to be empty cells; this can help with multilayer or fortress-wide blueprint layouts as 'chalk lines'.
-
-With f(2x1), we've asked QF to place a food stockpile 2 units wide by 1 high unit. Note that the f(2x1) syntax isn't actually necessary here; we could have just used:
-
-    #place Place a food stockpile
-    ` ` ` ` #
-    ` ` ` ` #
-    ` f f ` #
-    ` ` ` ` #
-    # # # # #
-
-QF is smart enough to recognize this as a 2x1 food stockpile, and creates it as such rather than as two 1x1 food stockpiles. Quickfort recognizes any connected region of identical designations as a single stockpile. The tiles can be connected orthogonally or diagonally, just as long as they are touching somehow.
-
-Lastly, let's turn the bed into a bedroom and set the food stockpile to hold only booze.
-
-    #query
-    ` ` ` ` #
-    ` r&  ` #
-    ` booze #
-    ` ` ` ` #
-    # # # # #
-
-In column 2, row 2 we have "r&". This sends the "r" key to DF when the cursor is over the bed, causing us to 'make room' and "&", which is a special symbol that expands to "{Enter}", to indicate that we're done.
-
-In column 2, row 3 we have "booze". This is one of many alias keywords defined in the included [baseline aliases file](https://github.com/DFHack/dfhack/tree/develop/data/quickfort/aliases-common.txt). This particular alias sets a food stockpile to carry booze only. It sends the keys needed to navigate DF's stockpile settings menu, and then sends an Escape character ("^" or "{ESC}") to exit back to the map. It is important to exit out of any menus that you enter while in query mode so that the cursor can move to the next tile when it is done configuring the current tile.
-
-Check out the included [blueprint library](https://github.com/DFHack/dfhack/tree/develop/data/blueprints/library) to see many more examples. Read the baseline aliases file for helpful pre-packaged aliases, or create your own in [dfhack-config/quickfort/aliases.txt](https://github.com/DFHack/dfhack/tree/develop/dfhack-config/quickfort/aliases.txt) in your DFHack installation.
-
-
-Area expansion syntax
----------------------
-
-In Quickfort, the following blueprints are equivalent:
-
-    #dig a 3x3 area
-    d d d #
-    d d d #
-    d d d #
-    # # # #
-
-    #dig the same area with d(3x3) specified in row 1, col 1
-    d(3x3)#
-    ` ` ` #
-    ` ` ` #
-    # # # #
-
-The second example uses Quickfort's "area expansion syntax", which takes the form:
-
-    keys(WxH)
-
-In Quickfort the above two examples of specifying a contiguous 3x3 area produce identical output: a single 3x3 designation will be performed, rather than nine 1x1 designations as the first example might suggest.
-
-Area expansion syntax can only specify rectangular areas. If you want to create extent-based structures (e.g. farm plots or stockpiles) in different shapes, use the first format above. For example:
-
-    #place L shaped food stockpile
-    f f ` ` #
-    f f ` ` #
-    f f f f #
-    f f f f #
-    # # # # #
-
-Area expansion syntax also sets boundaries, which can be useful if you want adjacent, but separate, stockpiles of the same type:
-
-    #place Two touching but separate food stockpiles
-    f(4x2)  #
-    ~ ~ ~ ~ #
-    f(4x2)  #
-    ~ ~ ~ ~ #
-    # # # # #
-
-As mentioned previously, "~" characters are ignored as comment characters and can be used for visualizing the blueprint layout. The blueprint can be equivalently written as:
-
-    #place Two touching but separate food stockpiles
-    f(4x2)  #
-    ~ ~ ~ ~ #
-    f f f f #
-    f f f f #
-    # # # # #
-
-since the area expansion syntax of the upper stockpile prevents it from combining with the lower, freeform syntax stockpile.
-
-Area expansion syntax can also be used for buildings which have an adjustable size, like bridges. The following blueprints are equivalent:
-
-    #build a 4x2 bridge from row 1, col 1
-    ga(4x2)  `  #
-    `  `  `  `  #
-    #  #  #  #  #
-
-    #build a 4x2 bridge from row 1, col 1
-    ga ga ga ga #
-    ga ga ga ga #
-    #  #  #  #  #
-
-
-Automatic area expansion
-------------------------
-
-Buildings larger than 1x1, like workshops, can be represented in any of three ways. You can designate just their center tile with empty cells around it to leave room for the footprint, like this:
-
-    #build a mason workshop in row 2, col 2 that will occupy the 3x3 area
-    `  `  `  #
-    `  wm `  #
-    `  `  `  #
-    #  #  #  #
-
-Or you can fill out the entire footprint like this:
-
-    #build a mason workshop
-    wm wm wm #
-    wm wm wm #
-    wm wm wm #
-    #  #  #  #
-
-This format may be verbose for regular workshops, but it can be very helpful for laying out structures like screw pump towers and waterwheels, whose "center point" can be non-obvious.
-
-Finally, you can use area expansion syntax to represent the workshop:
-
-    #build a mason workshop
-    wm(3x3)  #
-    `  `  `  #
-    `  `  `  #
-    #  #  #  #
-
-This style can be convenient for laying out multiple buildings of the same type. If you are building a large-scale block factory, for example, this will create 20 mason workshops all in a row:
-
-    #build line of 20 mason workshops
-    wm(60x3) #
-
-Quickfort will intelligently break large areas of the same designation into appropriately-sized chunks.
-
-
-Multilevel blueprints
----------------------
-
-Multilevel blueprints are accommodated by separating Z-levels of the blueprint with `#>` (go down one z-level) or `#<` (go up one z-level) at the end of each floor.
-
-    #dig Stairs leading down to a small room below
-    j  `  `  #
-    `  `  `  #
-    `  `  `  #
-    #> #  #  #
-    u  d  d  #
-    d  d  d  #
-    d  d  d  #
-    #  #  #  #
-
-The marker must appear in the first column of the row to be recognized, just like a modeline.
-
-
-Dig priorities
---------------
-
-DF designation priorities are supported for `#dig` blueprints. The full syntax is `[letter][number][expansion]`, where if the `letter` is not specified, `d` is assumed, and if `number` is not specified, `4` is assumed (the default priority). So each of these blueprints is equivalent:
-
-    #dig dig the interior of the room at high priority
-    d  d  d  d  d  #
-    d  d1 d1 d1 d  #
-    d  d1 d1 d1 d  #
-    d  d1 d1 d1 d  #
-    d  d  d  d  d  #
-    #  #  #  #  #  #
-
-    #dig dig the interior of the room at high priority
-    d  d  d  d  d  #
-    d  d1(3x3)  d  #
-    d  `  `  `  d  #
-    d  `  `  `  d  #
-    d  d  d  d  d  #
-    #  #  #  #  #  #
-
-    #dig dig the interior of the room at high priority
-    4  4  4  4  4  #
-    4  1  1  1  4  #
-    4  1  1  1  4  #
-    4  1  1  1  4  #
-    4  4  4  4  4  #
-    #  #  #  #  #  #
-
-
-Marker mode
------------
-
-Marker mode is useful for when you want to plan out your digging, but you don't want to dig everything just yet. In `#dig` mode, you can add a `m` before any other designation letter to indicate that the tile should be designated in marker mode. For example, to dig out the perimeter of a room, but leave the center of the room marked for digging later:
-
-    #dig
-    d  d  d  d d #
-    d md md md d #
-    d md md md d #
-    d md md md d #
-    d  d  d  d d #
-    #  #  #  # # #
-
-Then you can use "Toggle Standard/Marking" (`d-M`) to convert the center tiles to regular designations at your leisure.
-
-To apply an entire dig blueprint in marker mode, regardless of what the blueprint itself says, you can set the global quickfort setting `force_marker_mode` to `true` before you apply the blueprint.
-
-Note that the in-game UI setting "Standard/Marker Only" (`d-m`) does not have any effect on quickfort.
-
-
-Stockpiles and zones
---------------------
-
-It is very common to have stockpiles that accept multiple categories of items or zones that permit more than one activity. Although it is perfectly valid to declare a single-purpose stockpile or zone and then modify it with a `#query` blueprint, quickfort also supports directly declaring all the types on the `#place` and `#zone` blueprints. For example, to declare a 10x10 area that is a pasture, a fruit picking area, and a meeting area all at once, you could write:
-
-    #zone main pasture and picnic area
-    nmg(10x10)
-
-And similarly, to declare a stockpile that accepts both corpses and refuse, you could write:
-
-    #place refuse heap
-    yr(20x10)
-
-The order of the individual letters doesn't matter.
-
-To toggle the `active` flag for zones, add an `a` character to the string. For example, to create a *disabled* pit zone (that you later intend to turn into a pond and carefully fill to 3-depth water):
-
-    #zone disabled future pond zone
-    pa(1x3)
-
-Note that while this notation covers most use cases, tweaking low-level zone parameters, like hospital supply levels or converting between pits and ponds, must still be done manually or with a `#query` blueprint.
-
-
-Minecart tracks
----------------
-
-There are two ways to produce minecart tracks, and they are handled very differently by the game. You can carve them into hard natural floors or you can construct them out of building materials. Constructed tracks are conceptually simpler, so we'll start with them.
-
-### Constructed tracks ###
-
-Quickfort supports the designation of track stops and rollers through the normal mechanisms: a `#build` blueprint with `CS` and some number of `d` and `a` characters (for selecting dump direction and friction) in a cell designates a track stop and a `#build` blueprint with `Mr` and some number of `s` and `q` characters (for direction and speed) designates a roller. This can get confusing very quickly and is very difficult to read in a blueprint. Constructed track segments don't even have keys associated with them at all!
-
-To solve this problem, Quickfort provides the following keywords for use in build blueprints:
-
-    -- Track segments --
-    trackN
-    trackS
-    trackE
-    trackW
-    trackNS
-    trackNE
-    trackNW
-    trackSE
-    trackSW
-    trackEW
-    trackNSE
-    trackNSW
-    trackNEW
-    trackSEW
-    trackNSEW
-
-    -- Track/ramp segments --
-    trackrampN
-    trackrampS
-    trackrampE
-    trackrampW
-    trackrampNS
-    trackrampNE
-    trackrampNW
-    trackrampSE
-    trackrampSW
-    trackrampEW
-    trackrampNSE
-    trackrampNSW
-    trackrampNEW
-    trackrampSEW
-    trackrampNSEW
-
-    -- Horizontal and vertical roller segments --
-    rollerH
-    rollerV
-    rollerNS
-    rollerSN
-    rollerEW
-    rollerWE
-
-    Note: append up to four 'q' characters to roller keywords to set roller
-    speed. E.g. a roller that propels from East to West at the slowest speed can
-    be specified with 'rollerEWqqqq'.
-
-    -- Track stops that (optionally) dump to the N/S/E/W --
-    trackstop
-    trackstopN
-    trackstopS
-    trackstopE
-    trackstopW
-
-    Note: append up to four 'a' characters to trackstop keywords to set friction
-    amount. E.g. a stop that applies the smallest amount of friction can be
-    specified with 'trackstopaaaa'.
-
-As an example, you can create an E-W track with stops at each end that dump to their outside directions with the following blueprint:
-
-    #build Example track
-    trackstopW trackEW trackEW trackEW trackstopE
-
-Note that the **only** way to build track and track/ramp segments is with the keywords. The UI method of using "+" and "-" keys to select the track type from a list does not work since DFHack Quickfort doesn't actually send keys to the UI to build buildings. The text in your spreadsheet cells is mapped directly into DFHack API calls. Only `#query` blueprints still send actual keycodes to the UI.
-
-### Carved tracks ###
-
-In the game, you carve a minecart track by specifying a beginning and ending tile and the game "adds" the designation to the tiles. You cannot designate single tiles. For example to carve two track segments that cross each other, you might use the cursor to designate a line of three vertical tiles like this:
-
-    `  start here  `  #
-    `  `           `  #
-    `  end here    `  #
-    #  #           #  #
-
-Then to carve the cross, you'd do a horizonal segment:
-
-    `           `  `         #
-    start here  `  end here  #
-    `           `  `         #
-    #           #  #         #
-
-This will result in a carved track that would be equivalent to a constructed track of the form:
-
-    #build
-    `       trackS     `       #
-    trackE  trackNSEW  trackW  #
-    `       trackN     `       #
-    #       #          #       #
-
-To carve this same track with a `#dig` blueprint, you'd use area expansion syntax with a height or width of 1 to indicate the segments to designate:
-
-    #dig
-    `       T(1x3)  `  #
-    T(3x1)  `       `  #
-    `       `       `  #
-    #       #       #  #
-
-"But wait!", I can hear you say, "How do you designate a track corner that opens to the South and East? You can't put both T(1xH) and T(Wx1) in the same cell!" This is true, but you can specify both width and height, and for tracks, QF interprets it as an upper-left corner extending to the right W tiles and down H tiles. For example, to carve a track in a closed ring, you'd write:
-
-    #dig
-    T(3x3)  `  T(1x3)  #
-    `       `  `       #
-    T(3x1)  `  `       #
-    #       #  #       #
-
-Which would result in a carved track simliar to a constructed track of the form:
-
-    #build
-    trackSE  trackEW  trackSW  #
-    trackNS  `        trackNS  #
-    trackNE  trackEW  trackNW  #
-    #        #        #        #
-
-
-Modeline markers
-----------------
-
-The modeline has some additional optional components that we haven't talked about yet. You can:
-
-* give a blueprint a label by adding a `label()` marker
-* set a cursor offset and/or start hint by adding a `start()` marker
-* hide a blueprint from being listed with a `hidden()` marker
-* register a message to be displayed after the blueprint is successfully applied
-
-The full modeline syntax, when everything is specified, is:
-
-    #mode label(mylabel) start(X;Y;STARTCOMMENT) hidden() message(mymessage) comment
-
-Note that all elements are optional except for the initial `#mode`. Here are a few examples of modelines with optional elements before we discuss them in more detail:
-
-    #dig start(3; 3; Center tile of a 5-tile square) Regular blueprint comment
-    #build label(noblebedroom) start(10;15)
-    #query label(configstockpiles) No explicit start() means cursor is at upper left corner
-    #meta label(digwholefort) start(center of stairs on surface)
-    #dig label(digdining) hidden() managed by the digwholefort meta blueprint
-    #zone label(pastures) message(remember to assign animals to the new pastures)
-
-### Blueprint labels ###
-
-Labels are displayed in the `quickfort list` output and are used for addressing specific blueprints when there are multiple blueprints in a single file or spreadsheet sheet (see [Packaging a set of blueprints](#packaging-a-set-of-blueprints) below). If a blueprint has no label, the label becomes the ordinal of the blueprint's position in the file or sheet. For example, the label of the first blueprint will be "1" if it is not otherwise set, the label of the second blueprint will be "2" if it is not otherwise set, etc. Labels that are explicitly defined must start with a letter to ensure the auto-generated labels don't conflict with user-defined labels.
-
-### Start positions ###
-
-Start positions specify a cursor offset for a particular blueprint, simplifying the task of blueprint alignment. This is very helpful for blueprints that are based on a central staircase, but it helps whenever a blueprint has an obvious "center". For example:
-
-    #build start(2;2;center of workshop) label(masonw) a mason workshop
-    wm wm wm #
-    wm wm wm #
-    wm wm wm #
-    #  #  #  #
-
-will build the workshop *centered* on the cursor, not down and to the right of the cursor.
-
-The two numbers specify the column and row (or X and Y offset) where the cursor is expected to be when you apply the blueprint. Position 1;1 is the top left cell. The optional comment will show up in the `quickfort list` output and should contain information about where to position the cursor. If the start position is 1;1, you can omit the numbers and just add a comment describing where to put the cursor. This is also useful for meta blueprints that don't actually care where the cursor is, but that refer to other blueprints that have fully-specified `start()` markers. For example, a meta blueprint that refers to the `masonw` blueprint above could look like this:
-
-    #meta start(center of workshop) a mason workshop
-    /masonw
-
-### Hiding blueprints ###
-
-A blueprint with a `hidden()` marker won't appear in `quickfort list` output unless the `--hidden` flag is specified. The primary reason for hiding a blueprint (rather than, say, deleting it or moving it out of the `blueprints/` folder) is if a blueprint is intended to be run as part of a larger sequence managed by a [meta blueprint](#meta-blueprints).
-
-### Messages ###
-
-A blueprint with a `message()` marker will display a message after the blueprint is applied with `quickfort run`. This is useful for reminding players to take manual steps that cannot be automated, like assigning animals to a pasture or assigning minecarts to a route, or listing the next step in a series of blueprints. For long or multi-part messages, you can embed newlines:
-
-    "#meta label(surface1) message(This would be a good time to start digging the industry level.
-    Once the area is clear, continue with /surface2.) clear the embark site and set up pastures"
-
-Packaging a set of blueprints
------------------------------
-
-A complete specification for a section of your fortress may contain 5 or more separate blueprints, one for each "phase" of construction (dig, build, place stockpiles, designate zones, query building adjustments).
-
-To manage all the separate blueprints, it is often convenient to keep related blueprints in a single file. For .xlsx spreadsheets, you can keep each blueprint in a separate sheet. Online spreadsheet applications like [Google Sheets](https://sheets.new) make it easy to work with multiple related blueprints, and, as a bonus, they retain any formatting you've set, like column sizes and coloring.
-
-For both .csv files and .xlsx spreadsheets you can also add as many blueprints as you want in a single file or sheet. Just add a modeline in the first column to indicate the start of a new blueprint. Instead of multiple .csv files, you can concatenate them into one single file.
-
-For example, you can store multiple blueprints together like this:
-
-    #dig label(bed1)
-    d d d d #
-    d d d d #
-    d d d d #
-    d d d d #
-    # # # # #
-    #build label(bed2)
-    b   f h #
-            #
-            #
-    n       #
-    # # # # #
-    #place label(bed3)
-            #
-    f(2x2)  #
-            #
-            #
-    # # # # #
-    #query label(bed4)
-            #
-    booze   #
-            #
-            #
-    # # # # #
-    #query label(bed5)
-    r{+ 3}& #
-            #
-            #
-            #
-    # # # # #
-
-
-Of course, you could still choose to keep your blueprints in single-sheet .csv files and just give related blueprints similar names:
-
-    bedroom.1.dig.csv
-    bedroom.2.build.csv
-    bedroom.3.place.csv
-    bedroom.4.query.csv
-    bedroom.5.query2.csv
-
-But the naming and organization is completely up to you.
-
-
-Meta blueprints
----------------
-
-Meta blueprints are blueprints that script a series of other blueprints. Many blueprint packages follow this pattern:
-
-- Apply dig blueprint to designate dig areas
-- Wait for miners to dig
-- **Apply build buildprint** to designate buildings
-- **Apply place buildprint** to designate stockpiles
-- **Apply query blueprint** to configure stockpiles
-- Wait for buildings to get built
-- Apply a different query blueprint to configure rooms
-
-Those three "apply"s in the middle might as well get done in one command instead of three. A meta blueprint can encode that sequence. A meta blueprint refers to other blueprints by their label (see the [Modeline markers](modeline-markers) section above) in the same format used by the `DFHack#` quickfort command: "<sheet_name>/<label>", or just "/<label>" for blueprints in .csv files or blueprints in the same spreadsheet sheet as the #meta blueprint that references them.
-
-A few examples might make this clearer. Say you have a .csv file with the "bed" blueprints in the previous section:
-
-    #dig label(bed1)
-    ...
-    #build label(bed2)
-    ...
-    #place label(bed3)
-    ...
-    #query label(bed4)
-    ...
-    #query label(bed5)
-    ...
-
-Note how I've given them all labels so we can address them safely. If I hadn't given them labels, they would receive default labels of "1", "2", "3", etc, but those labels would change if I ever add more blueprints at the top. This is not a problem if we're just running the blueprints individually from the `quickfort list` command, but meta blueprints need a label name that isn't going to change over time.
-
-So let's add a meta blueprint to this file that will combine the middle three blueprints into one:
-
-    "#meta plan bedroom: combines build, place, and stockpile config blueprints"
-    /bed2
-    /bed3
-    /bed4
-
-Now your sequence is shortened to:
-
-- Apply dig blueprint to designate dig areas
-- Wait for miners to dig
-- **Apply meta buildprint** to build buildings and designate/configure stockpiles
-- Wait for buildings to get built
-- Apply the final query blueprint to configure the room
-
-You can use meta blueprints to lay out your fortress at a larger scale as well. The `#<` and `#>` notation is valid in meta blueprints, so you can, for example, store the dig blueprints for all the levels of your fortress in different sheets in a spreadsheet, and then use a meta blueprint to designate your entire fortress for digging at once. For example, say you have a spreadsheet with the following layout:
-
-Sheet name    | contents
-----------    | --------
-dig_farming   | one #dig blueprint, no label
-dig_industry  | one #dig blueprint, no label
-dig_dining    | four #dig blueprints, with labels "main", "basement", "waterway", and "cistern"
-dig_guildhall | one #dig blueprint, no label
-dig_suites    | one #dig blueprint, no label
-dig_bedrooms  | one #dig blueprint, no label
-
-We can add a sheet named "dig_all" with the following contents (we're expecting a big fort, so we're planning for a lot of bedrooms):
-
-    #meta dig the whole fortress (remember to set force_marker_mode to true)
-    dig_farming/1
-    #>
-    dig_industry/1
-    #>
-    #>
-    dig_dining/main
-    #>
-    dig_dining/basement
-    #>
-    dig_dining/waterway
-    #>
-    dig_dining/cistern
-    #>
-    dig_guildhall/1
-    #>
-    dig_suites/1
-    #>
-    dig_bedrooms/1
-    #>
-    dig_bedrooms/1
-    #>
-    dig_bedrooms/1
-    #>
-    dig_bedrooms/1
-    #>
-    dig_bedrooms/1
-
-Note that for blueprints without an explicit label, we still need to address them by their auto-generated numerical label.
-
-You can then hide the blueprints that you now manage with the `#meta`-mode blueprint from `quickfort list` by adding a `hidden()` marker to their modelines. That way the output of `quickfort list` won't be cluttered by blueprints that you don't need to run directly. If you ever *do* need to access the managed blueprints individually, you can still see them with `quickfort list --hidden`.
-
-
-Buildingplan integration
-------------------------
-
-Buildingplan is a DFHack plugin that keeps jobs in a suspended state until the materials required for the job are available. This prevents a building designation from being canceled when a dwarf picks up the job but can't find the materials.
-
-For all types that buildingplan supports, quickfort using buildingplan to manage construction. Buildings are still constructed immediately if you have the materials, but you now have the freedom to apply build blueprints before you manufacture all required materials, and the jobs will be fulfilled as the materials become available.
-
-If a `#build` blueprint only refers to supported types, the buildingplan integration pairs well with the [workflow](https://docs.dfhack.org/en/stable/docs/Plugins.html#workflow) plugin, which can build items a few at a time continuously as long as they are needed. For building types that are not yet supported by buildingplan, a good pattern to follow is to first run `quickfort orders` on the `#build` blueprint to manufacture all the required items, then apply the blueprint itself.
-
-See [buildingplan documentation](https://docs.dfhack.org/en/stable/docs/Plugins.html#buildingplan) for a list of supported types.
-
-
-Generating manager orders
--------------------------
-
-Quickfort can generate manager orders to make sure you have the proper items in stock to apply a `#build` blueprint.
-
-Many items can be manufactured from different source materials. Orders will always choose rock when it can, then wood, then cloth, then iron. You can always remove orders that don't make sense for your fort and manually enqueue a similar order more to your liking. For example, if you want silk ropes instead of cloth ropes, make a new manager order for an appropriate quantity of silk ropes, and then remove the generated cloth rope order.
-
-Anything that requires generic building materials (workshops, constructions, etc.) will result in an order for a rock block. One "Make rock blocks" job produces four blocks per boulder, so the number of jobs ordered will be the number of blocks you need divided by four (rounded up). You might end up with a few extra blocks, but not too many.
-
-If you want your constructions to be in a consistent color, be sure to choose a rock type for all of your 'Make rock blocks' orders by selecting the order and hitting `d`. You might want to set the rock type for other non-block orders to something different if you fear running out of the type of rock that you want to use for blocks.
-
-There are a few building types that will generate extra manager orders for related materials:
-
-- Track stops will generate an order for a minecart
-- Traction benches will generate orders for a table, mechanism, and rope
-- Levers will generate an order for an extra two mechanisms for connecting the lever to a target
-- Cage traps will generate an order for a cage
-
-
-Tips and tricks
----------------
-
-* During blueprint application, especially query blueprints, don't click the mouse on the DF window or type any keys. They can change the state of the game while the blueprint is being applied, resulting in strange errors.
-
-* After digging out an area, you may wish to smooth and/or engrave the area before starting the build phase, as dwarves may be unable to access walls or floors that are behind/under built objects.
-
-* If you are designating more than one level for digging at a time, you can make your miners more efficient by using marker mode on all levels but one. This prevents your miners from digging out a few tiles on one level, then running down/up the stairs to do a few tiles on an adjacent level. With only one level "live" and all other levels in marker mode, your miners can concentrate on one level at a time. You just have to remember to "unmark" a new level when your miners are done with their current one.
-
-* As of DF 0.34.x, it is no longer possible to build doors (d) at the same time that you build adjacent walls (Cw). Doors must now be built *after* walls are constructed for them to be next to. This does not affect the more common case where walls exist as a side-effect of having dug-out a room in a #dig blueprint.
-
-
-Caveats and limitations
------------------------
-
-* Buildings will be designated regardless of whether you have the required materials, but if materials are not available when the construction job is picked up by a dwarf, the buildings will be canceled and the designations will disappear. Until the buildingplan plugin can be extended to support all building types, you should use `quickfort orders` to pre-manufacture all the materials you need for a `#build` blueprint before you apply it.
-
-* If you use the `jugs` alias in your `#query`-mode blueprints, be aware that there is no way to differentiate jugs from other types of tools in the game. Therefore, `jugs` stockpiles will also take nest boxes and other tools. The only workaround is not to have other tools lying around in your fort.
-
-* Likewise for bags. The game does not differentiate between empty and full bags, so you'll get bags of gypsum power and sand in your bags stockpile unless you avoid collecting sand and are careful to assign all your gypsum to your hospital.
-
-* Weapon traps and upright spear/spike traps can currently only be built with a single weapon.
-
-* Pressure plates can be built, but they cannot be usefully configured yet.
-
-* Building instruments, bookcases, display furniture, and offering places are not yet supported by DFHack.
-
-* This script is relatively new, and there are bound to be bugs! Please report them at the [DFHack issue tracker](https://github.com/DFHack/dfhack/issues) so they can be addressed.
-
-
-Links
------
-
-### Quickfort links ###
-
-* [Quickfort command syntax](https://docs.dfhack.org/en/stable/docs/_auto/base.html#quickfort)
-* [Quickfort forum thread](http://www.bay12forums.com/smf/index.php?topic=176889.0)
-* [Quickfort blueprints library](https://github.com/DFHack/dfhack/tree/develop/data/blueprints/library)
-* [DFHack issue tracker](https://github.com/DFHack/dfhack/issues)
-* [Quickfort source code](https://github.com/DFHack/scripts/tree/master/internal/quickfort)
-
-### Related tools ###
-
-* DFHack's [blueprint plugin](https://docs.dfhack.org/en/stable/docs/Plugins.html#blueprint) can generate blueprints from actual DF maps.
-* [Python Quickfort](http://joelpt.net/quickfort) is the previous, Python-based implementation that DFHack's quickfort script was inspired by.
+* [Quickfort overview](https://docs.dfhack.org/en/stable/docs/_auto/base.html#quickfort)
+* [Quickfort user guide](https://docs.dfhack.org/en/stable/docs/guides/quickfort-user-guide.html)

From 4d7f4d80ad478d2735a815aec5a5edb2dea665d0 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 4 Oct 2020 20:05:08 -0700
Subject: [PATCH 406/547] prep buildingplan for core algorithm changes

player-visible changes
- removed text that showed up if you used the wrong hotkeys. no other
  dfhack screen does this, and it seems unneeded. can add back if others
  think otherwise, though

internal changes
- changed signature of lua-exported isPlannableBuilding to take subtype
  and custom type in addition to building type. this is only used by
  quickfort, and it already sends all three params in preparation for
  this change
- added lua-exported scheduleCycle(), which is like doCycle(), but only
  takes effect on the next non-paused frame. this lets quickfort
  run only one buildingplan cycle regardless of how many #build
  blueprints were run
- declared a few dfhack library methods and params const so buildingplan
  could call them from const methods
- converted buildingplan internal debug logging fn to have a printf api
- reshaped buildingplan-planner API and refactored implementation in
  preparation for upcoming core algorithm changes for supporing all
  building types (no externally-visible functionality changes)
  - changed df::building_type params to type, subtype, custom tuple keys
  - introduced capability to return multiple filters per building type
    (though the current buildings all only have one filter per)
- split monolith hook functions in buildingplan.cpp into one per scope.
  this significantly cleans up the code and preps the hooks to handle
  iterating through multiple item filters.
- got rid of send_key function and replaced with better reporting of
  whether keys have been handled
---
 docs/Lua API.rst                    |   3 +-
 library/include/modules/Materials.h |   4 +-
 library/modules/Materials.cpp       |   4 +-
 plugins/buildingplan-lib.cpp        |  10 +-
 plugins/buildingplan-lib.h          |   2 +-
 plugins/buildingplan-planner.cpp    | 534 ++++++++++++++++-----------
 plugins/buildingplan-planner.h      | 130 ++++---
 plugins/buildingplan.cpp            | 538 +++++++++++++++-------------
 plugins/fortplan.cpp                |   4 +-
 plugins/lua/buildingplan.lua        |   3 +-
 plugins/uicommon.h                  |   2 +-
 11 files changed, 704 insertions(+), 530 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 8707a0d99..19474e4d8 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3691,9 +3691,10 @@ buildingplan
 
 Native functions:
 
-* ``bool isPlannableBuilding(df::building_type type)`` returns whether the building type is handled by buildingplan
+* ``bool isPlannableBuilding(df::building_type type, int16_t subtype, int32_t custom)`` returns whether the building type is handled by buildingplan
 * ``void addPlannedBuilding(df::building *bld)`` suspends the building jobs and adds the building to the monitor list
 * ``void doCycle()`` runs a check for whether buildlings in the monitor list can be assigned items and unsuspended. This method runs automatically twice a game day, so you only need to call it directly if you want buildingplan to do a check right now.
+* ``void scheduleCycle()`` schedules a cycle to be run during the next non-paused game frame. Can be called multiple times while the game is paused and only one cycle will be scheduled.
 
 burrows
 =======
diff --git a/library/include/modules/Materials.h b/library/include/modules/Materials.h
index b326719c6..a3b4204e5 100644
--- a/library/include/modules/Materials.h
+++ b/library/include/modules/Materials.h
@@ -136,8 +136,8 @@ namespace DFHack
             return findProduct(info.material, name);
         }
 
-        std::string getToken();
-        std::string toString(uint16_t temp = 10015, bool named = true);
+        std::string getToken() const;
+        std::string toString(uint16_t temp = 10015, bool named = true) const;
 
         bool isAnyCloth();
 
diff --git a/library/modules/Materials.cpp b/library/modules/Materials.cpp
index c341ea99e..909fa56f9 100644
--- a/library/modules/Materials.cpp
+++ b/library/modules/Materials.cpp
@@ -305,7 +305,7 @@ bool MaterialInfo::findProduct(df::material *material, const std::string &name)
     return decode(-1);
 }
 
-std::string MaterialInfo::getToken()
+std::string MaterialInfo::getToken() const
 {
     if (isNone())
         return "NONE";
@@ -333,7 +333,7 @@ std::string MaterialInfo::getToken()
     }
 }
 
-std::string MaterialInfo::toString(uint16_t temp, bool named)
+std::string MaterialInfo::toString(uint16_t temp, bool named) const
 {
     if (isNone())
         return "any";
diff --git a/plugins/buildingplan-lib.cpp b/plugins/buildingplan-lib.cpp
index 215dbb900..e05d9b9dc 100644
--- a/plugins/buildingplan-lib.cpp
+++ b/plugins/buildingplan-lib.cpp
@@ -1,16 +1,22 @@
 #include "buildingplan-lib.h"
 
+#include <cstdarg>
 #include "Core.h"
 
 using namespace DFHack;
 
 bool show_debugging = false;
 
-void debug(const std::string &msg)
+void debug(const char *fmt, ...)
 {
     if (!show_debugging)
         return;
 
     color_ostream_proxy out(Core::getInstance().getConsole());
-    out << "DEBUG: " << msg << endl;
+    out.print("DEBUG(buildingplan): ");
+    va_list args;
+    va_start(args, fmt);
+    out.vprint(fmt, args);
+    va_end(args);
+    out.print("\n");
 }
diff --git a/plugins/buildingplan-lib.h b/plugins/buildingplan-lib.h
index 61a00e796..e906ef1a7 100644
--- a/plugins/buildingplan-lib.h
+++ b/plugins/buildingplan-lib.h
@@ -3,6 +3,6 @@
 #include "buildingplan-planner.h"
 #include "buildingplan-rooms.h"
 
-void debug(const std::string &msg);
+void debug(const char *fmt, ...) Wformat(printf,1,2);
 
 extern bool show_debugging;
diff --git a/plugins/buildingplan-planner.cpp b/plugins/buildingplan-planner.cpp
index 6923570c2..c367ecc33 100644
--- a/plugins/buildingplan-planner.cpp
+++ b/plugins/buildingplan-planner.cpp
@@ -1,185 +1,265 @@
+#include "df/building_design.h"
+#include "df/building_doorst.h"
 #include "df/general_ref_building_holderst.h"
 #include "df/job_item.h"
-#include "df/building_doorst.h"
-#include "df/building_design.h"
+#include "df/ui_build_selector.h"
 
-#include "modules/Job.h"
 #include "modules/Buildings.h"
 #include "modules/Gui.h"
+#include "modules/Job.h"
+
+#include "uicommon.h"
 
 #include "buildingplan-planner.h"
 #include "buildingplan-lib.h"
-#include "uicommon.h"
 
-/*
-* ItemFilter
-*/
+static const std::string planned_building_persistence_key_v1 = "buildingplan/constraints";
 
-ItemFilter::ItemFilter() :
-        min_quality(df::item_quality::Ordinary),
-        max_quality(df::item_quality::Artifact),
-        decorated_only(false),
-        valid(true)
-{
-    clear(); // mat_mask is not cleared by default (see issue #1047)
-}
+/*
+ * ItemFilter
+ */
 
-bool ItemFilter::matchesMask(DFHack::MaterialInfo &mat)
+ItemFilter::ItemFilter()
 {
-    return (mat_mask.whole) ? mat.matches(mat_mask) : true;
+    clear();
 }
 
-bool ItemFilter::matches(const df::dfhack_material_category mask) const
+void ItemFilter::clear()
 {
-    return mask.whole & mat_mask.whole;
+    min_quality = df::item_quality::Ordinary;
+    max_quality = df::item_quality::Masterful;
+    decorated_only = false;
+    clearMaterialMask();
+    materials.clear();
 }
 
-bool ItemFilter::matches(DFHack::MaterialInfo &material) const
+bool ItemFilter::deserialize(PersistentDataItem &config)
 {
-    for (auto it = materials.begin(); it != materials.end(); ++it)
-        if (material.matches(*it))
-            return true;
-    return false;
-}
+    clear();
 
-bool ItemFilter::matches(df::item *item)
-{
-    if (item->getQuality() < min_quality || item->getQuality() > max_quality)
+    std::vector<std::string> tokens;
+    split_string(&tokens, config.val(), "/");
+    if (tokens.size() != 2)
+    {
+        debug("invalid ItemFilter serialization: '%s'", config.val().c_str());
         return false;
+    }
 
-    if (decorated_only && !item->hasImprovements())
+    if (!deserializeMaterialMask(tokens[0]) || !deserializeMaterials(tokens[1]))
         return false;
 
-    auto imattype = item->getActualMaterial();
-    auto imatindex = item->getActualMaterialIndex();
-    auto item_mat = DFHack::MaterialInfo(imattype, imatindex);
-
-    return (materials.size() == 0) ? matchesMask(item_mat) : matches(item_mat);
+    setMinQuality(config.ival(2) - 1);
+    setMaxQuality(config.ival(4) - 1);
+    decorated_only = config.ival(3) - 1;
+    return true;
 }
 
-std::string material_to_string_fn(DFHack::MaterialInfo m) { return m.toString(); }
+bool ItemFilter::deserializeMaterialMask(std::string ser)
+{
+    if (ser.empty())
+        return true;
 
-std::vector<std::string> ItemFilter::getMaterialFilterAsVector()
+    if (!parseJobMaterialCategory(&mat_mask, ser))
+    {
+        debug("invalid job material category serialization: '%s'", ser.c_str());
+        return false;
+    }
+    return true;
+}
+
+bool ItemFilter::deserializeMaterials(std::string ser)
 {
-    std::vector<std::string> descriptions;
+    if (ser.empty())
+        return true;
 
-    transform_(materials, descriptions, material_to_string_fn);
+    std::vector<std::string> mat_names;
+    split_string(&mat_names, ser, ",");
+    for (auto m = mat_names.begin(); m != mat_names.end(); m++)
+    {
+        DFHack::MaterialInfo material;
+        if (!material.find(*m) || !material.isValid())
+        {
+            debug("invalid material name serialization: '%s'", ser.c_str());
+            return false;
+        }
+        materials.push_back(material);
+    }
+    return true;
+}
 
-    if (descriptions.size() == 0)
-        bitfield_to_string(&descriptions, mat_mask);
+void ItemFilter::serialize(PersistentDataItem &config) const
+{
+    std::ostringstream ser;
+    ser << bitfield_to_string(mat_mask, ",") << "/";
+    if (!materials.empty())
+    {
+        ser << materials[0].getToken();
+        for (size_t i = 1; i < materials.size(); ++i)
+            ser << "," << materials[i].getToken();
+    }
+    config.val() = ser.str();
+    config.ival(2) = min_quality + 1;
+    config.ival(4) = max_quality + 1;
+    config.ival(3) = static_cast<int>(decorated_only) + 1;
+}
 
-    if (descriptions.size() == 0)
-        descriptions.push_back("any");
+void ItemFilter::clearMaterialMask()
+{
+    mat_mask.whole = 0;
+}
 
-    return descriptions;
+void ItemFilter::addMaterialMask(uint32_t mask)
+{
+    mat_mask.whole |= mask;
 }
 
-std::string ItemFilter::getMaterialFilterAsSerial()
+void ItemFilter::setMaterials(std::vector<DFHack::MaterialInfo> materials)
 {
-    std::string str;
+    this->materials = materials;
+}
 
-    str.append(bitfield_to_string(mat_mask, ","));
-    str.append("/");
-    if (materials.size() > 0)
+static void clampItemQuality(df::item_quality *quality)
+{
+    if (*quality > item_quality::Artifact)
     {
-        for (size_t i = 0; i < materials.size(); i++)
-            str.append(materials[i].getToken() + ",");
-
-        if (str[str.size()-1] == ',')
-            str.resize(str.size () - 1);
+        debug("clamping quality to Artifact");
+        *quality = item_quality::Artifact;
     }
+    if (*quality < item_quality::Ordinary)
+    {
+        debug("clamping quality to Ordinary");
+        *quality = item_quality::Ordinary;
+    }
+}
 
-    return str;
+void ItemFilter::setMinQuality(int quality)
+{
+    min_quality = static_cast<df::item_quality>(quality);
+    clampItemQuality(&min_quality);
+    if (max_quality < min_quality)
+        max_quality = min_quality;
 }
 
-bool ItemFilter::parseSerializedMaterialTokens(std::string str)
+void ItemFilter::setMaxQuality(int quality)
 {
-    valid = false;
-    std::vector<std::string> tokens;
-    split_string(&tokens, str, "/");
+    max_quality = static_cast<df::item_quality>(quality);
+    clampItemQuality(&max_quality);
+    if (max_quality < min_quality)
+        min_quality = max_quality;
+}
 
-    if (tokens.size() > 0 && !tokens[0].empty())
-    {
-        if (!parseJobMaterialCategory(&mat_mask, tokens[0]))
-            return false;
-    }
+void ItemFilter::incMinQuality() { setMinQuality(min_quality + 1); }
+void ItemFilter::decMinQuality() { setMinQuality(min_quality - 1); }
+void ItemFilter::incMaxQuality() { setMaxQuality(max_quality + 1); }
+void ItemFilter::decMaxQuality() { setMaxQuality(max_quality - 1); }
 
-    if (tokens.size() > 1 && !tokens[1].empty())
-    {
-        std::vector<std::string> mat_names;
-        split_string(&mat_names, tokens[1], ",");
-        for (auto m = mat_names.begin(); m != mat_names.end(); m++)
-        {
-            DFHack::MaterialInfo material;
-            if (!material.find(*m) || !material.isValid())
-                return false;
+void ItemFilter::toggleDecoratedOnly() { decorated_only = !decorated_only; }
 
-            materials.push_back(material);
-        }
-    }
+static std::string material_to_string_fn(const MaterialInfo &m) { return m.toString(); }
 
-    valid = true;
-    return true;
+uint32_t ItemFilter::getMaterialMask() const { return mat_mask.whole; }
+
+std::vector<std::string> ItemFilter::getMaterials() const
+{
+    std::vector<std::string> descriptions;
+    transform_(materials, descriptions, material_to_string_fn);
+
+    if (descriptions.size() == 0)
+        bitfield_to_string(&descriptions, mat_mask);
+
+    if (descriptions.size() == 0)
+        descriptions.push_back("any");
+
+    return descriptions;
 }
 
-std::string ItemFilter::getMinQuality()
+std::string ItemFilter::getMinQuality() const
 {
     return ENUM_KEY_STR(item_quality, min_quality);
 }
 
-std::string ItemFilter::getMaxQuality()
+std::string ItemFilter::getMaxQuality() const
 {
     return ENUM_KEY_STR(item_quality, max_quality);
 }
 
-bool ItemFilter::isValid()
+bool ItemFilter::getDecoratedOnly() const
 {
-    return valid;
+    return decorated_only;
 }
 
-void ItemFilter::clear()
+bool ItemFilter::matchesMask(DFHack::MaterialInfo &mat) const
 {
-    mat_mask.whole = 0;
-    materials.clear();
+    return mat_mask.whole ? mat.matches(mat_mask) : true;
 }
 
-/*
-* PlannedBuilding
-*/
+bool ItemFilter::matches(df::dfhack_material_category mask) const
+{
+    return mask.whole & mat_mask.whole;
+}
 
-PlannedBuilding::PlannedBuilding(df::building *building, ItemFilter *filter)
+bool ItemFilter::matches(DFHack::MaterialInfo &material) const
 {
-    this->building = building;
-    this->filter = *filter;
-    pos = df::coord(building->centerx, building->centery, building->z);
-    config = DFHack::World::AddPersistentData("buildingplan/constraints");
-    config.val() = filter->getMaterialFilterAsSerial();
-    config.ival(1) = building->id;
-    config.ival(2) = filter->min_quality + 1;
-    config.ival(3) = static_cast<int>(filter->decorated_only) + 1;
-    config.ival(4) = filter->max_quality + 1;
+    for (auto it = materials.begin(); it != materials.end(); ++it)
+        if (material.matches(*it))
+            return true;
+    return false;
 }
 
-PlannedBuilding::PlannedBuilding(PersistentDataItem &config, color_ostream &out)
+bool ItemFilter::matches(df::item *item) const
 {
-    this->config = config;
+    if (item->getQuality() < min_quality || item->getQuality() > max_quality)
+        return false;
 
-    if (!filter.parseSerializedMaterialTokens(config.val()))
-    {
-        out.printerr("Buildingplan: Cannot parse filter: %s\nDiscarding.", config.val().c_str());
-        return;
-    }
+    if (decorated_only && !item->hasImprovements())
+        return false;
 
-    building = df::building::find(config.ival(1));
-    if (!building)
-        return;
+    auto imattype = item->getActualMaterial();
+    auto imatindex = item->getActualMaterialIndex();
+    auto item_mat = DFHack::MaterialInfo(imattype, imatindex);
 
-    pos = df::coord(building->centerx, building->centery, building->z);
-    filter.min_quality = static_cast<df::item_quality>(config.ival(2) - 1);
-    filter.max_quality = static_cast<df::item_quality>(config.ival(4) - 1);
-    filter.decorated_only = config.ival(3) - 1;
+    return (materials.size() == 0) ? matchesMask(item_mat) : matches(item_mat);
 }
 
+
+/*
+ * PlannedBuilding
+ */
+
+static std::vector<ItemFilter> deserializeFilters(PersistentDataItem &config)
+{
+    // simplified implementation while we can assume there is only one filter
+    std::vector<ItemFilter> ret;
+    ItemFilter itemFilter;
+    itemFilter.deserialize(config);
+    ret.push_back(itemFilter);
+    return ret;
+}
+
+static int getNumFilters(BuildingTypeKey key)
+{
+    // TODO: get num filters in Lua when we handle all building types
+    return 1;
+}
+
+PlannedBuilding::PlannedBuilding(df::building *building, const std::vector<ItemFilter> &filters)
+    : building(building),
+      building_id(building->id),
+      filters(filters)
+{
+    config = DFHack::World::AddPersistentData(planned_building_persistence_key_v1);
+    config.ival(1) = building_id;
+    // assume all filter vectors are length 1 for now
+    filters[0].serialize(config);
+}
+
+PlannedBuilding::PlannedBuilding(PersistentDataItem &config)
+    : config(config),
+      building_id(config.ival(1)),
+      building(df::building::find(config.ival(1))),
+      filters(deserializeFilters(config))
+{ }
+
 bool PlannedBuilding::assignClosestItem(std::vector<df::item *> *items_vector)
 {
     decltype(items_vector->begin()) closest_item;
@@ -187,7 +267,7 @@ bool PlannedBuilding::assignClosestItem(std::vector<df::item *> *items_vector)
     for (auto item_iter = items_vector->begin(); item_iter != items_vector->end(); item_iter++)
     {
         auto item = *item_iter;
-        if (!filter.matches(item))
+        if (!filters[0].matches(item))
             continue;
 
         auto pos = item->pos;
@@ -255,68 +335,70 @@ bool PlannedBuilding::assignItem(df::item *item)
     return true;
 }
 
-bool PlannedBuilding::isValid()
+// Ensure the building still exists and is in a valid state. It can disappear
+// for lots of reasons, such as running the game with the buildingplan plugin
+// disabled, manually removing the building, modifying it via the API, etc.
+bool PlannedBuilding::isValid() const
 {
-    bool valid = filter.isValid() &&
-        building && Buildings::findAtTile(pos) == building &&
-        building->getBuildStage() == 0;
-
-    if (!valid)
-        remove();
-
-    return valid;
+    return building && df::building::find(building_id)
+        && building->getBuildStage() == 0;
 }
 
-df::building_type PlannedBuilding::getType()
+void PlannedBuilding::remove()
 {
-    return building->getType();
+    DFHack::World::DeletePersistentData(config);
+    building = NULL;
 }
 
-bool PlannedBuilding::isCurrentlySelectedBuilding()
+df::building * PlannedBuilding::getBuilding()
 {
-    return isValid() && (building == df::global::world->selected_building);
+    return building;
 }
 
-ItemFilter *PlannedBuilding::getFilter()
+const std::vector<ItemFilter> & PlannedBuilding::getFilters() const
 {
-    return &filter;
+    return filters;
 }
 
-void PlannedBuilding::remove()
-{
-    DFHack::World::DeletePersistentData(config);
-}
 
 /*
-* Planner
-*/
+ * BuildingTypeKey
+ */
 
-Planner::Planner() { }
+BuildingTypeKey toBuildingTypeKey(
+    df::building_type btype, int16_t subtype, int32_t custom)
+{
+    return std::make_tuple(btype, subtype, custom);
+}
 
-bool Planner::isPlannableBuilding(const df::building_type type) const
+BuildingTypeKey toBuildingTypeKey(df::building *bld)
 {
-    return item_for_building_type.find(type) != item_for_building_type.end();
+    return std::make_tuple(
+        bld->getType(), bld->getSubtype(), bld->getCustomType());
 }
 
-void Planner::reset(color_ostream &out)
+BuildingTypeKey toBuildingTypeKey(df::ui_build_selector *uibs)
 {
-    planned_buildings.clear();
-    std::vector<PersistentDataItem> items;
-    DFHack::World::GetPersistentData(&items, "buildingplan/constraints");
+    return std::make_tuple(
+        uibs->building_type, uibs->building_subtype, uibs->custom_type);
+}
 
-    for (auto i = items.begin(); i != items.end(); i++)
-    {
-        PlannedBuilding pb(*i, out);
-        if (pb.isValid())
-            planned_buildings.push_back(pb);
-    }
+std::size_t BuildingTypeKeyHash::operator() (const BuildingTypeKey & key) const
+{
+    return std::hash<df::building_type>()(std::get<0>(key))
+        ^ std::hash<int16_t>()(std::get<1>(key))
+        ^ std::hash<int32_t>()(std::get<2>(key));
 }
 
+
+/*
+ * Planner
+ */
+
 void Planner::initialize()
 {
 #define add_building_type(btype, itype) \
     item_for_building_type[df::building_type::btype] = df::item_type::itype; \
-    default_item_filters[df::building_type::btype] =  ItemFilter(); \
     available_item_vectors[df::item_type::itype] = std::vector<df::item *>(); \
     is_relevant_item_type[df::item_type::itype] = true; \
 
@@ -354,53 +436,82 @@ void Planner::initialize()
 #undef add_building_type
 }
 
-void Planner::addPlannedBuilding(df::building *bld)
+void Planner::reset()
 {
-    for (auto iter = bld->jobs.begin(); iter != bld->jobs.end(); iter++)
+    debug("resetting Planner state");
+    item_filters.clear();
+    planned_buildings.clear();
+
+    std::vector<PersistentDataItem> items;
+    DFHack::World::GetPersistentData(&items, planned_building_persistence_key_v1);
+    debug("found data for %zu planned buildings", items.size());
+
+    for (auto i = items.begin(); i != items.end(); i++)
     {
-        (*iter)->flags.bits.suspend = true;
-    }
+        PlannedBuilding pb(*i);
+        if (!pb.isValid())
+        {
+            pb.remove();
+            continue;
+        }
 
-    PlannedBuilding pb(bld, &default_item_filters[bld->getType()]);
-    planned_buildings.push_back(pb);
+        planned_buildings.push_back(pb);
+    }
 }
 
-void Planner::doCycle()
+void Planner::addPlannedBuilding(df::building *bld)
 {
-    debug("Running Cycle");
-    if (planned_buildings.size() == 0)
+    auto item_filters = getItemFilters(toBuildingTypeKey(bld)).get();
+    // not a supported type
+    if (item_filters.empty())
+    {
+        debug("failed to add building: unsupported type");
+        return;
+    }
+
+    // protect against multiple registrations
+    if (getPlannedBuilding(bld))
+    {
+        debug("building already registered");
         return;
+    }
 
-    debug("Planned count: " + int_to_string(planned_buildings.size()));
+    PlannedBuilding pb(bld, item_filters);
+    if (pb.isValid())
+    {
+        for (auto job : bld->jobs)
+            job->flags.bits.suspend = true;
 
-    gather_available_items();
-    for (auto building_iter = planned_buildings.begin(); building_iter != planned_buildings.end();)
+        planned_buildings.push_back(pb);
+    }
+    else
     {
-        if (building_iter->isValid())
-        {
-            if (show_debugging)
-                debug(std::string("Trying to allocate ") + enum_item_key_str(building_iter->getType()));
+        pb.remove();
+    }
+}
 
-            auto required_item_type = item_for_building_type[building_iter->getType()];
-            auto items_vector = &available_item_vectors[required_item_type];
-            if (items_vector->size() == 0 || !building_iter->assignClosestItem(items_vector))
-            {
-                debug("Unable to allocate an item");
-                ++building_iter;
-                continue;
-            }
-        }
-        debug("Removing building plan");
-        building_iter = planned_buildings.erase(building_iter);
+PlannedBuilding * Planner::getPlannedBuilding(df::building *bld)
+{
+    for (auto & pb : planned_buildings)
+    {
+        if (pb.getBuilding() == bld)
+            return &pb;
     }
+    return NULL;
+}
+
+bool Planner::isPlannableBuilding(BuildingTypeKey key)
+{
+    return item_for_building_type.count(std::get<0>(key)) > 0;
 }
 
-bool Planner::allocatePlannedBuilding(df::building_type type)
+bool Planner::allocatePlannedBuilding(BuildingTypeKey key)
 {
     coord32_t cursor;
     if (!DFHack::Gui::getCursorCoords(cursor.x, cursor.y, cursor.z))
         return false;
 
+    auto type = std::get<0>(key);
     auto newinst = Buildings::allocInstance(cursor.get_coord16(), type);
     if (!newinst)
         return false;
@@ -430,53 +541,48 @@ bool Planner::allocatePlannedBuilding(df::building_type type)
     return true;
 }
 
-PlannedBuilding *Planner::getSelectedPlannedBuilding()
+Planner::ItemFiltersWrapper Planner::getItemFilters(BuildingTypeKey key)
 {
-    for (auto building_iter = planned_buildings.begin(); building_iter != planned_buildings.end(); building_iter++)
-    {
-        if (building_iter->isCurrentlySelectedBuilding())
-        {
-            return &(*building_iter);
-        }
-    }
+    static std::vector<ItemFilter> empty_vector;
+    static const ItemFiltersWrapper empty_ret(empty_vector);
 
-    return nullptr;
+    int nfilters = getNumFilters(key);
+    if (nfilters < 1)
+        return empty_ret;
+    std::vector<ItemFilter> ret;
+    ret.push_back(item_filters[std::get<0>(key)]);
+    return ItemFiltersWrapper(ret);
 }
 
-void Planner::removeSelectedPlannedBuilding() { getSelectedPlannedBuilding()->remove(); }
-
-ItemFilter *Planner::getDefaultItemFilterForType(df::building_type type) { return &default_item_filters[type]; }
-
-void Planner::adjustMinQuality(df::building_type type, int amount)
+void Planner::doCycle()
 {
-    auto min_quality = &getDefaultItemFilterForType(type)->min_quality;
-    *min_quality = static_cast<df::item_quality>(*min_quality + amount);
-
-    boundsCheckItemQuality(min_quality);
-    auto max_quality = &getDefaultItemFilterForType(type)->max_quality;
-    if (*min_quality > *max_quality)
-        (*max_quality) = *min_quality;
+    debug("Running Cycle");
+    if (planned_buildings.size() == 0)
+        return;
 
-}
+    debug("Planned count: %zu", planned_buildings.size());
 
-void Planner::adjustMaxQuality(df::building_type type, int amount)
-{
-    auto max_quality = &getDefaultItemFilterForType(type)->max_quality;
-    *max_quality = static_cast<df::item_quality>(*max_quality + amount);
-
-    boundsCheckItemQuality(max_quality);
-    auto min_quality = &getDefaultItemFilterForType(type)->min_quality;
-    if (*max_quality < *min_quality)
-        (*min_quality) = *max_quality;
-}
+    gather_available_items();
+    for (auto building_iter = planned_buildings.begin(); building_iter != planned_buildings.end();)
+    {
+        if (building_iter->isValid())
+        {
+            auto type = building_iter->getBuilding()->getType();
+            debug("Trying to allocate %s", enum_item_key_str(type));
 
-void Planner::boundsCheckItemQuality(item_quality::item_quality *quality)
-{
-    *quality = static_cast<df::item_quality>(*quality);
-    if (*quality > item_quality::Artifact)
-        (*quality) = item_quality::Artifact;
-    if (*quality < item_quality::Ordinary)
-        (*quality) = item_quality::Ordinary;
+            auto required_item_type = item_for_building_type[type];
+            auto items_vector = &available_item_vectors[required_item_type];
+            if (items_vector->size() == 0 || !building_iter->assignClosestItem(items_vector))
+            {
+                debug("Unable to allocate an item");
+                ++building_iter;
+                continue;
+            }
+        }
+        debug("Removing building plan");
+        building_iter->remove();
+        building_iter = planned_buildings.erase(building_iter);
+    }
 }
 
 void Planner::gather_available_items()
diff --git a/plugins/buildingplan-planner.h b/plugins/buildingplan-planner.h
index 67eeb9bff..a1f53dcd2 100644
--- a/plugins/buildingplan-planner.h
+++ b/plugins/buildingplan-planner.h
@@ -1,99 +1,129 @@
 #pragma once
 
-#include "df/item_quality.h"
+#include <unordered_map>
+
+#include "df/building.h"
 #include "df/dfhack_material_category.h"
+#include "df/item_quality.h"
+#include "df/job_item.h"
+
 #include "modules/Materials.h"
 #include "modules/Persistence.h"
 
-struct ItemFilter
+class ItemFilter
 {
+public:
+    ItemFilter();
+
+    void clear();
+    bool deserialize(DFHack::PersistentDataItem &config);
+    void serialize(DFHack::PersistentDataItem &config) const;
+
+    void addMaterialMask(uint32_t mask);
+    void clearMaterialMask();
+    void setMaterials(std::vector<DFHack::MaterialInfo> materials);
+
+    void incMinQuality();
+    void decMinQuality();
+    void incMaxQuality();
+    void decMaxQuality();
+    void toggleDecoratedOnly();
+
+    uint32_t getMaterialMask() const;
+    std::vector<std::string> getMaterials() const;
+    std::string getMinQuality() const;
+    std::string getMaxQuality() const;
+    bool getDecoratedOnly() const;
+
+    bool matches(df::dfhack_material_category mask) const;
+    bool matches(DFHack::MaterialInfo &material) const;
+    bool matches(df::item *item) const;
+
+private:
     df::dfhack_material_category mat_mask;
     std::vector<DFHack::MaterialInfo> materials;
     df::item_quality min_quality;
     df::item_quality max_quality;
     bool decorated_only;
 
-    ItemFilter();
-
-    bool matchesMask(DFHack::MaterialInfo &mat);
-    bool matches(const df::dfhack_material_category mask) const;
-    bool matches(DFHack::MaterialInfo &material) const;
-    bool matches(df::item *item);
-
-    std::vector<std::string> getMaterialFilterAsVector();
-    std::string getMaterialFilterAsSerial();
-    bool parseSerializedMaterialTokens(std::string str);
-
-    std::string getMinQuality();
-    std::string getMaxQuality();
-
-    bool isValid();
-    void clear();
-
-private:
-    bool valid;
+    bool deserializeMaterialMask(std::string ser);
+    bool deserializeMaterials(std::string ser);
+    void setMinQuality(int quality);
+    void setMaxQuality(int quality);
+    bool matchesMask(DFHack::MaterialInfo &mat) const;
 };
 
 class PlannedBuilding
 {
 public:
-    PlannedBuilding(df::building *building, ItemFilter *filter);
-    PlannedBuilding(DFHack::PersistentDataItem &config, DFHack::color_ostream &out);
+    PlannedBuilding(df::building *building, const std::vector<ItemFilter> &filters);
+    PlannedBuilding(DFHack::PersistentDataItem &config);
 
     bool assignClosestItem(std::vector<df::item *> *items_vector);
     bool assignItem(df::item *item);
 
-    bool isValid();
+    bool isValid() const;
     void remove();
 
-    df::building_type getType();
-    bool isCurrentlySelectedBuilding();
-
-    ItemFilter *getFilter();
+    df::building * getBuilding();
+    const std::vector<ItemFilter> & getFilters() const;
 
 private:
-    df::building *building;
     DFHack::PersistentDataItem config;
-    df::coord pos;
-    ItemFilter filter;
+    df::building *building;
+    df::building::key_field_type building_id;
+    std::vector<ItemFilter> filters;
+};
+
+// building type, subtype, custom
+typedef std::tuple<df::building_type, int16_t, int32_t> BuildingTypeKey;
+
+BuildingTypeKey toBuildingTypeKey(
+    df::building_type btype, int16_t subtype, int32_t custom);
+BuildingTypeKey toBuildingTypeKey(df::building *bld);
+BuildingTypeKey toBuildingTypeKey(df::ui_build_selector *uibs);
+
+struct BuildingTypeKeyHash
+{
+    std::size_t operator() (const BuildingTypeKey & key) const;
 };
 
 class Planner
 {
 public:
-    Planner();
-
-    bool isPlannableBuilding(const df::building_type type) const;
-
-    void reset(DFHack::color_ostream &out);
+    class ItemFiltersWrapper
+    {
+    public:
+        ItemFiltersWrapper(std::vector<ItemFilter> & item_filters)
+            : item_filters(item_filters) { }
+        std::vector<ItemFilter>::reverse_iterator rbegin() const { return item_filters.rbegin(); }
+        std::vector<ItemFilter>::reverse_iterator  rend() const { return item_filters.rend(); }
+        const std::vector<ItemFilter> & get() const { return item_filters; }
+    private:
+        std::vector<ItemFilter> &item_filters;
+    };
 
     void initialize();
+    void reset();
 
+    bool allocatePlannedBuilding(BuildingTypeKey key);
     void addPlannedBuilding(df::building *bld);
+    PlannedBuilding *getPlannedBuilding(df::building *bld);
 
-    void doCycle();
-
-    bool allocatePlannedBuilding(df::building_type type);
-
-    PlannedBuilding *getSelectedPlannedBuilding();
+    bool isPlannableBuilding(BuildingTypeKey key);
 
-    void removeSelectedPlannedBuilding();
+    // returns an empty vector if the type is not supported
+    ItemFiltersWrapper getItemFilters(BuildingTypeKey key);
 
-    ItemFilter *getDefaultItemFilterForType(df::building_type type);
-
-    void adjustMinQuality(df::building_type type, int amount);
-    void adjustMaxQuality(df::building_type type, int amount);
+    void doCycle();
 
 private:
     std::map<df::building_type, df::item_type> item_for_building_type;
-    std::map<df::building_type, ItemFilter> default_item_filters;
+    std::map<df::building_type, ItemFilter> item_filters;
     std::map<df::item_type, std::vector<df::item *>> available_item_vectors;
     std::map<df::item_type, bool> is_relevant_item_type; //Needed for fast check when looping over all items
-
     std::vector<PlannedBuilding> planned_buildings;
 
-    void boundsCheckItemQuality(df::enums::item_quality::item_quality *quality);
-
     void gather_available_items();
 };
 
diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index 93d5ff4e4..6cb45c879 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -1,5 +1,5 @@
-#include "buildingplan-lib.h"
-    
+#include <unordered_map>
+
 #include "df/entity_position.h"
 #include "df/interface_key.h"
 #include "df/ui_build_selector.h"
@@ -14,6 +14,7 @@
 
 #include "uicommon.h"
 #include "listcolumn.h"
+#include "buildingplan-lib.h"
 
 DFHACK_PLUGIN("buildingplan");
 #define PLUGIN_VERSION 0.15
@@ -27,15 +28,14 @@ REQUIRE_GLOBAL(world);
 using namespace DFHack;
 using namespace df::enums;
 
-bool show_help = false;
 bool quickfort_mode = false;
 bool in_dummy_screen = false;
-std::map<df::building_type, bool> planmode_enabled;
+std::unordered_map<BuildingTypeKey, bool, BuildingTypeKeyHash> planmode_enabled;
 
 class ViewscreenChooseMaterial : public dfhack_viewscreen
 {
 public:
-    ViewscreenChooseMaterial(ItemFilter *filter);
+    ViewscreenChooseMaterial(ItemFilter &filter);
 
     void feed(set<df::interface_key> *input);
 
@@ -47,14 +47,12 @@ private:
     ListColumn<df::dfhack_material_category> masks_column;
     ListColumn<MaterialInfo> materials_column;
     int selected_column;
-    ItemFilter *filter;
-
-    df::building_type btype;
+    ItemFilter &filter;
 
     void addMaskEntry(df::dfhack_material_category &mask, const std::string &text)
     {
         auto entry = ListEntry<df::dfhack_material_category>(pad_string(text, MAX_MASK, false), mask);
-        if (filter->matches(mask))
+        if (filter.matches(mask))
             entry.selected = true;
 
         masks_column.add(entry);
@@ -131,7 +129,7 @@ private:
                     material.decode(DFHack::MaterialInfo::PLANT_BASE+j, i);
                     auto name = material.toString();
                     ListEntry<MaterialInfo> entry(pad_string(name, MAX_MATERIAL, false), material);
-                    if (filter->matches(material))
+                    if (filter.matches(material))
                         entry.selected = true;
 
                     materials_column.add(entry);
@@ -147,7 +145,7 @@ private:
         if (!selected_category.whole || material.matches(selected_category))
         {
             ListEntry<MaterialInfo> entry(pad_string(name, MAX_MATERIAL, false), material);
-            if (filter->matches(material))
+            if (filter.matches(material))
                 entry.selected = true;
 
             materials_column.add(entry);
@@ -167,9 +165,10 @@ private:
     }
 };
 
-DFHack::MaterialInfo &material_info_identity_fn(DFHack::MaterialInfo &m) { return m; }
+const DFHack::MaterialInfo &material_info_identity_fn(const DFHack::MaterialInfo &m) { return m; }
 
-ViewscreenChooseMaterial::ViewscreenChooseMaterial(ItemFilter *filter)
+ViewscreenChooseMaterial::ViewscreenChooseMaterial(ItemFilter &filter)
+    : filter(filter)
 {
     selected_column = 0;
     masks_column.setTitle("Type");
@@ -179,7 +178,6 @@ ViewscreenChooseMaterial::ViewscreenChooseMaterial(ItemFilter *filter)
     materials_column.left_margin = MAX_MASK + 3;
     materials_column.setTitle("Material");
     materials_column.multiselect = true;
-    this->filter = filter;
 
     masks_column.changeHighlight(0);
 
@@ -217,7 +215,7 @@ void ViewscreenChooseMaterial::feed(set<df::interface_key> *input)
     }
     if (input->count(interface_key::CUSTOM_SHIFT_C))
     {
-        filter->clear();
+        filter.clear();
         masks_column.clearSelection();
         materials_column.clearSelection();
         populateMaterials();
@@ -225,17 +223,18 @@ void ViewscreenChooseMaterial::feed(set<df::interface_key> *input)
     else if (input->count(interface_key::SEC_SELECT))
     {
         // Convert list selections to material filters
-        filter->mat_mask.whole = 0;
-        filter->materials.clear();
+        filter.clearMaterialMask();
 
         // Category masks
         auto masks = masks_column.getSelectedElems();
         for (auto it = masks.begin(); it != masks.end(); ++it)
-            filter->mat_mask.whole |= it->whole;
+            filter.addMaterialMask(it->whole);
 
         // Specific materials
         auto materials = materials_column.getSelectedElems();
-        transform_(materials, filter->materials, material_info_identity_fn);
+        std::vector<DFHack::MaterialInfo> materialInfos;
+        transform_(materials, materialInfos, material_info_identity_fn);
+        filter.setMaterials(materialInfos);
 
         Screen::dismiss(this);
     }
@@ -285,179 +284,157 @@ void ViewscreenChooseMaterial::render()
 }
 
 //START Viewscreen Hook
-static bool is_planmode_enabled(df::building_type type)
+static bool is_planmode_enabled(BuildingTypeKey key)
 {
-    return planmode_enabled[type] || quickfort_mode;
+    return planmode_enabled[key] || quickfort_mode;
 }
 
-struct buildingplan_hook : public df::viewscreen_dwarfmodest
+struct buildingplan_query_hook : public df::viewscreen_dwarfmodest
 {
-    //START UI Methods
     typedef df::viewscreen_dwarfmodest interpose_base;
 
-    void send_key(const df::interface_key &key)
-    {
-        set< df::interface_key > keys;
-        keys.insert(key);
-        this->feed(&keys);
-    }
-
     bool isInPlannedBuildingQueryMode()
     {
         return (ui->main.mode == df::ui_sidebar_mode::QueryBuilding ||
             ui->main.mode == df::ui_sidebar_mode::BuildingItems) &&
-            planner.getSelectedPlannedBuilding();
+            planner.getPlannedBuilding(world->selected_building);
     }
 
-    bool isInPlannedBuildingPlacementMode()
+    bool handleInput(set<df::interface_key> *input)
     {
-        return ui->main.mode == ui_sidebar_mode::Build &&
-            df::global::ui_build_selector &&
-            df::global::ui_build_selector->stage < 2 &&
-            planner.isPlannableBuilding(ui_build_selector->building_type);
-    }
+        if (!isInPlannedBuildingQueryMode())
+            return false;
 
-    std::vector<Units::NoblePosition> getNoblePositionOfSelectedBuildingOwner()
-    {
-        std::vector<Units::NoblePosition> np;
-        if (ui->main.mode != df::ui_sidebar_mode::QueryBuilding ||
-            !world->selected_building ||
-            !world->selected_building->owner)
+        if (input->count(interface_key::SUSPENDBUILDING))
+            return true; // Don't unsuspend planned buildings
+        if (input->count(interface_key::DESTROYBUILDING))
         {
-            return np;
+            // remove persistent data
+            planner.getPlannedBuilding(world->selected_building)->remove();
+            // still allow the building to be removed
+            return false;
         }
 
-        switch (world->selected_building->getType())
-        {
-        case building_type::Bed:
-        case building_type::Chair:
-        case building_type::Table:
-            break;
-        default:
-            return np;
-        }
+        return true;
+    }
 
-        return getUniqueNoblePositions(world->selected_building->owner);
+    DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
+    {
+        if (!handleInput(input))
+            INTERPOSE_NEXT(feed)(input);
     }
 
-    bool isInNobleRoomQueryMode()
+    DEFINE_VMETHOD_INTERPOSE(void, render, ())
     {
-        if (getNoblePositionOfSelectedBuildingOwner().size() > 0)
-            return canReserveRoom(world->selected_building);
-        else
-            return false;
+        INTERPOSE_NEXT(render)();
+
+        if (!isInPlannedBuildingQueryMode())
+            return;
+
+        // Hide suspend toggle option
+        auto dims = Gui::getDwarfmodeViewDims();
+        int left_margin = dims.menu_x1 + 1;
+        int x = left_margin;
+        int y = 20;
+        Screen::Pen pen(' ', COLOR_BLACK);
+        Screen::fillRect(pen, x, y, dims.menu_x2, y);
+
+        // all current buildings only have one filter
+        auto & filter = planner.getPlannedBuilding(world->selected_building)->getFilters()[0];
+        y = 24;
+        OutputString(COLOR_WHITE, x, y, "Planned Building Filter", true, left_margin);
+        ++y;
+        OutputString(COLOR_BROWN, x, y, "Min Quality: ", false, left_margin);
+        OutputString(COLOR_BLUE, x, y, filter.getMinQuality(), true, left_margin);
+        OutputString(COLOR_BROWN, x, y, "Max Quality: ", false, left_margin);
+        OutputString(COLOR_BLUE, x, y, filter.getMaxQuality(), true, left_margin);
+
+        if (filter.getDecoratedOnly())
+            OutputString(COLOR_BLUE, x, y, "Decorated Only", true, left_margin);
+
+        OutputString(COLOR_BROWN, x, y, "Materials:", true, left_margin);
+        auto filters = filter.getMaterials();
+        for (auto it = filters.begin(); it != filters.end(); ++it)
+            OutputString(COLOR_BLUE, x, y, "*" + *it, true, left_margin);
+    }
+};
+
+struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
+{
+    typedef df::viewscreen_dwarfmodest interpose_base;
+
+    bool isInPlannedBuildingPlacementMode()
+    {
+        return ui->main.mode == ui_sidebar_mode::Build &&
+            df::global::ui_build_selector &&
+            df::global::ui_build_selector->stage < 2 &&
+            planner.isPlannableBuilding(toBuildingTypeKey(ui_build_selector));
     }
 
     bool handleInput(set<df::interface_key> *input)
     {
-        if (isInPlannedBuildingPlacementMode())
+        if (!isInPlannedBuildingPlacementMode())
+            return false;
+
+        if (in_dummy_screen)
         {
-            auto type = ui_build_selector->building_type;
-            if (input->count(interface_key::CUSTOM_SHIFT_P))
-            {
-                planmode_enabled[type] = !planmode_enabled[type];
-                if (!is_planmode_enabled(type))
-                {
-                    Gui::refreshSidebar();
-                    in_dummy_screen = false;
-                }
-                return true;
-            }
-            else if (input->count(interface_key::CUSTOM_P) ||
-                     input->count(interface_key::CUSTOM_F) ||
-                     input->count(interface_key::CUSTOM_D) ||
-                     input->count(interface_key::CUSTOM_N))
+            if (input->count(interface_key::SELECT) || input->count(interface_key::SEC_SELECT)
+                 || input->count(interface_key::LEAVESCREEN))
             {
-                show_help = true;
+                in_dummy_screen = false;
+                // pass LEAVESCREEN up to parent view
+                input->clear();
+                input->insert(interface_key::LEAVESCREEN);
+                return false;
             }
+            return true;
+        }
 
-            if (is_planmode_enabled(type))
-            {
-                if (quickfort_mode && in_dummy_screen)
-                {
-                    if (input->count(interface_key::SELECT) || input->count(interface_key::SEC_SELECT)
-                         || input->count(interface_key::LEAVESCREEN))
-                    {
-                        in_dummy_screen = false;
-                        send_key(interface_key::LEAVESCREEN);
-                    }
-
-                    return true;
-                }
-
-                if (input->count(interface_key::SELECT))
-                {
-                    if (ui_build_selector->errors.size() == 0 && planner.allocatePlannedBuilding(type))
-                    {
-                        Gui::refreshSidebar();
-                        if (quickfort_mode)
-                        {
-                            in_dummy_screen = true;
-                        }
-                    }
-
-                    return true;
-                }
-                else if (input->count(interface_key::CUSTOM_SHIFT_F))
-                {
-                    quickfort_mode = !quickfort_mode;
-                }
-                else if (input->count(interface_key::CUSTOM_SHIFT_M))
-                {
-                    Screen::show(dts::make_unique<ViewscreenChooseMaterial>(planner.getDefaultItemFilterForType(type)), plugin_self);
-                }
-                else if (input->count(interface_key::CUSTOM_Q))
-                {
-                    planner.adjustMinQuality(type, -1);
-                }
-                else if (input->count(interface_key::CUSTOM_W))
-                {
-                    planner.adjustMinQuality(type, 1);
-                }
-                else if (input->count(interface_key::CUSTOM_SHIFT_Q))
-                {
-                    planner.adjustMaxQuality(type, -1);
-                }
-                else if (input->count(interface_key::CUSTOM_SHIFT_W))
-                {
-                    planner.adjustMaxQuality(type, 1);
-                }
-                else if (input->count(interface_key::CUSTOM_SHIFT_D))
-                {
-                    planner.getDefaultItemFilterForType(type)->decorated_only =
-                        !planner.getDefaultItemFilterForType(type)->decorated_only;
-                }
-            }
+        BuildingTypeKey key = toBuildingTypeKey(ui_build_selector);
+        if (input->count(interface_key::CUSTOM_SHIFT_P))
+        {
+            planmode_enabled[key] = !planmode_enabled[key];
+            if (!is_planmode_enabled(key))
+                Gui::refreshSidebar();
+            return true;
         }
-        else if (isInPlannedBuildingQueryMode())
+        if (input->count(interface_key::CUSTOM_SHIFT_F))
         {
-            if (input->count(interface_key::SUSPENDBUILDING))
-            {
-                return true; // Don't unsuspend planned buildings
-            }
-            else if (input->count(interface_key::DESTROYBUILDING))
-            {
-                planner.removeSelectedPlannedBuilding(); // Remove persistent data
-            }
-
+            quickfort_mode = !quickfort_mode;
+            return true;
         }
-        else if (isInNobleRoomQueryMode())
+
+        if (!is_planmode_enabled(key))
+            return false;
+
+        if (input->count(interface_key::SELECT))
         {
-            if (Gui::inRenameBuilding())
-                return false;
-            auto np = getNoblePositionOfSelectedBuildingOwner();
-            df::interface_key last_token = get_string_key(input);
-            if (last_token >= interface_key::STRING_A048 && last_token <= interface_key::STRING_A058)
+            if (ui_build_selector->errors.size() == 0 && planner.allocatePlannedBuilding(key))
             {
-                size_t selection = last_token - interface_key::STRING_A048;
-                if (np.size() < selection)
-                    return false;
-                roomMonitor.toggleRoomForPosition(world->selected_building->id, np.at(selection-1).position->code);
-                return true;
+                Gui::refreshSidebar();
+                if (quickfort_mode)
+                    in_dummy_screen = true;
             }
+            return true;
         }
 
-        return false;
+        // all current buildings only have one filter
+        auto filter = planner.getItemFilters(key).rbegin();
+        if (input->count(interface_key::CUSTOM_SHIFT_M))
+            Screen::show(dts::make_unique<ViewscreenChooseMaterial>(*filter), plugin_self);
+        else if (input->count(interface_key::CUSTOM_Q))
+            filter->decMinQuality();
+        else if (input->count(interface_key::CUSTOM_W))
+            filter->incMinQuality();
+        else if (input->count(interface_key::CUSTOM_SHIFT_Q))
+            filter->decMaxQuality();
+        else if (input->count(interface_key::CUSTOM_SHIFT_W))
+            filter->incMaxQuality();
+        else if (input->count(interface_key::CUSTOM_SHIFT_D))
+            filter->toggleDecoratedOnly();
+        else
+            return false;
+        return true;
     }
 
     DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
@@ -469,133 +446,170 @@ struct buildingplan_hook : public df::viewscreen_dwarfmodest
     DEFINE_VMETHOD_INTERPOSE(void, render, ())
     {
         bool plannable = isInPlannedBuildingPlacementMode();
-        if (plannable && is_planmode_enabled(ui_build_selector->building_type))
+        BuildingTypeKey key = toBuildingTypeKey(ui_build_selector);
+        if (plannable && is_planmode_enabled(key))
         {
             if (ui_build_selector->stage < 1)
-            {
                 // No materials but turn on cursor
                 ui_build_selector->stage = 1;
-            }
 
-            for (auto iter = ui_build_selector->errors.begin(); iter != ui_build_selector->errors.end();)
+            for (auto iter = ui_build_selector->errors.begin();
+                 iter != ui_build_selector->errors.end();)
             {
-                //FIXME Hide bags
-                if (((*iter)->find("Needs") != string::npos && **iter != "Needs adjacent wall")  ||
-                    (*iter)->find("No access") != string::npos)
-                {
+                // FIXME Hide bags
+                if (((*iter)->find("Needs") != string::npos
+                     && **iter != "Needs adjacent wall")
+                    || (*iter)->find("No access") != string::npos)
                     iter = ui_build_selector->errors.erase(iter);
-                }
                 else
-                {
                     ++iter;
-                }
             }
         }
 
         INTERPOSE_NEXT(render)();
 
+        if (!plannable)
+            return;
+
         auto dims = Gui::getDwarfmodeViewDims();
         int left_margin = dims.menu_x1 + 1;
         int x = left_margin;
-        auto type = ui_build_selector->building_type;
-        if (plannable)
+
+        if (in_dummy_screen)
         {
-            if (quickfort_mode && in_dummy_screen)
-            {
-                Screen::Pen pen(' ',COLOR_BLACK);
-                int y = dims.y1 + 1;
-                Screen::fillRect(pen, x, y, dims.menu_x2, y + 20);
+            Screen::Pen pen(' ',COLOR_BLACK);
+            int y = dims.y1 + 1;
+            Screen::fillRect(pen, x, y, dims.menu_x2, y + 20);
 
-                ++y;
+            ++y;
 
-                OutputString(COLOR_BROWN, x, y, "Quickfort Placeholder", true, left_margin);
-                OutputString(COLOR_WHITE, x, y, "Enter, Shift-Enter or Esc", true, left_margin);
-            }
-            else
-            {
-                int y = 23;
+            OutputString(COLOR_BROWN, x, y,
+                "Placeholder for legacy Quickfort. This screen is not required for DFHack native quickfort.",
+                true, left_margin);
+            OutputString(COLOR_WHITE, x, y, "Enter, Shift-Enter or Esc", true, left_margin);
+            return;
+        }
 
-                if (show_help)
-                {
-                    OutputString(COLOR_BROWN, x, y, "Note: ");
-                    OutputString(COLOR_WHITE, x, y, "Use Shift-Keys here", true, left_margin);
-                }
-                OutputToggleString(x, y, "Planning Mode", "P", is_planmode_enabled(type), true, left_margin);
+        int y = 23;
 
-                if (is_planmode_enabled(type))
-                {
-                    OutputToggleString(x, y, "Quickfort Mode", "F", quickfort_mode, true, left_margin);
+        OutputToggleString(x, y, "Planning Mode", "P", planmode_enabled[key], true, left_margin);
+        OutputToggleString(x, y, "Quickfort Mode", "F", quickfort_mode, true, left_margin);
 
-                    auto filter = planner.getDefaultItemFilterForType(type);
+        if (!is_planmode_enabled(key))
+            return;
 
-                    OutputHotkeyString(x, y, "Min Quality: ", "qw");
-                    OutputString(COLOR_BROWN, x, y, filter->getMinQuality(), true, left_margin);
+        auto filter = planner.getItemFilters(key).rbegin();
+        y += 2;
+        OutputHotkeyString(x, y, "Min Quality: ", "qw");
+        OutputString(COLOR_BROWN, x, y, filter->getMinQuality(), true, left_margin);
 
-                    OutputHotkeyString(x, y, "Max Quality: ", "QW");
-                    OutputString(COLOR_BROWN, x, y, filter->getMaxQuality(), true, left_margin);
+        OutputHotkeyString(x, y, "Max Quality: ", "QW");
+        OutputString(COLOR_BROWN, x, y, filter->getMaxQuality(), true, left_margin);
 
-                    OutputToggleString(x, y, "Decorated Only: ", "D", filter->decorated_only, true, left_margin);
+        OutputToggleString(x, y, "Decorated Only", "D", filter->getDecoratedOnly(), true, left_margin);
 
-                    OutputHotkeyString(x, y, "Material Filter:", "M", true, left_margin);
-                    auto filter_descriptions = filter->getMaterialFilterAsVector();
-                    for (auto it = filter_descriptions.begin(); it != filter_descriptions.end(); ++it)
-                        OutputString(COLOR_BROWN, x, y, "   *" + *it, true, left_margin);
-                }
-                else
-                {
-                    in_dummy_screen = false;
-                }
-            }
-        }
-        else if (isInPlannedBuildingQueryMode())
+        OutputHotkeyString(x, y, "Material Filter:", "M", true, left_margin);
+        auto filter_descriptions = filter->getMaterials();
+        for (auto it = filter_descriptions.begin();
+             it != filter_descriptions.end(); ++it)
+             OutputString(COLOR_BROWN, x, y, "   *" + *it, true, left_margin);
+    }
+};
+
+struct buildingplan_room_hook : public df::viewscreen_dwarfmodest
+{
+    typedef df::viewscreen_dwarfmodest interpose_base;
+
+    std::vector<Units::NoblePosition> getNoblePositionOfSelectedBuildingOwner()
+    {
+        std::vector<Units::NoblePosition> np;
+        if (ui->main.mode != df::ui_sidebar_mode::QueryBuilding ||
+            !world->selected_building ||
+            !world->selected_building->owner)
         {
-            in_dummy_screen = false;
-
-            // Hide suspend toggle option
-            int y = 20;
-            Screen::Pen pen(' ', COLOR_BLACK);
-            Screen::fillRect(pen, x, y, dims.menu_x2, y);
-
-            auto filter = planner.getSelectedPlannedBuilding()->getFilter();
-            y = 24;
-            OutputString(COLOR_BROWN, x, y, "Planned Building Filter:", true, left_margin);
-            OutputString(COLOR_BROWN, x, y, "Min Quality: ", false, left_margin);
-            OutputString(COLOR_BLUE, x, y, filter->getMinQuality(), true, left_margin);
-            OutputString(COLOR_BROWN, x, y, "Max Quality: ", false, left_margin);
-            OutputString(COLOR_BLUE, x, y, filter->getMaxQuality(), true, left_margin);
-
-            if (filter->decorated_only)
-                OutputString(COLOR_BLUE, x, y, "Decorated Only", true, left_margin);
-
-            OutputString(COLOR_BROWN, x, y, "Materials:", true, left_margin);
-            auto filters = filter->getMaterialFilterAsVector();
-            for (auto it = filters.begin(); it != filters.end(); ++it)
-                OutputString(COLOR_BLUE, x, y, "*" + *it, true, left_margin);
+            return np;
         }
-        else if (isInNobleRoomQueryMode())
+
+        switch (world->selected_building->getType())
         {
-            auto np = getNoblePositionOfSelectedBuildingOwner();
-            int y = 24;
-            OutputString(COLOR_BROWN, x, y, "DFHack", true, left_margin);
-            OutputString(COLOR_WHITE, x, y, "Auto-allocate to:", true, left_margin);
-            for (size_t i = 0; i < np.size() && i < 9; i++)
-            {
-                bool enabled = (roomMonitor.getReservedNobleCode(world->selected_building->id)
-                    == np[i].position->code);
-                OutputToggleString(x, y, np[i].position->name[0].c_str(),
-                    int_to_string(i+1).c_str(), enabled, true, left_margin);
-            }
+        case building_type::Bed:
+        case building_type::Chair:
+        case building_type::Table:
+            break;
+        default:
+            return np;
         }
+
+        return getUniqueNoblePositions(world->selected_building->owner);
+    }
+
+    bool isInNobleRoomQueryMode()
+    {
+        if (getNoblePositionOfSelectedBuildingOwner().size() > 0)
+            return canReserveRoom(world->selected_building);
         else
+            return false;
+    }
+
+    bool handleInput(set<df::interface_key> *input)
+    {
+        if (!isInNobleRoomQueryMode())
+            return false;
+
+        if (Gui::inRenameBuilding())
+            return false;
+        auto np = getNoblePositionOfSelectedBuildingOwner();
+        df::interface_key last_token = get_string_key(input);
+        if (last_token >= interface_key::STRING_A048
+            && last_token <= interface_key::STRING_A058)
+        {
+            size_t selection = last_token - interface_key::STRING_A048;
+            if (np.size() < selection)
+                return false;
+            roomMonitor.toggleRoomForPosition(world->selected_building->id, np.at(selection-1).position->code);
+            return true;
+        }
+
+        return false;
+    }
+
+    DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
+    {
+        if (!handleInput(input))
+            INTERPOSE_NEXT(feed)(input);
+    }
+
+    DEFINE_VMETHOD_INTERPOSE(void, render, ())
+    {
+        INTERPOSE_NEXT(render)();
+
+        if (!isInNobleRoomQueryMode())
+            return;
+
+        auto np = getNoblePositionOfSelectedBuildingOwner();
+        auto dims = Gui::getDwarfmodeViewDims();
+        int left_margin = dims.menu_x1 + 1;
+        int x = left_margin;
+        int y = 24;
+        OutputString(COLOR_BROWN, x, y, "DFHack", true, left_margin);
+        OutputString(COLOR_WHITE, x, y, "Auto-allocate to:", true, left_margin);
+        for (size_t i = 0; i < np.size() && i < 9; i++)
         {
-            in_dummy_screen = false;
-            show_help = false;
+            bool enabled =
+                roomMonitor.getReservedNobleCode(world->selected_building->id)
+                == np[i].position->code;
+            OutputToggleString(x, y, np[i].position->name[0].c_str(),
+                int_to_string(i+1).c_str(), enabled, true, left_margin);
         }
     }
 };
 
-IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_hook, feed);
-IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_hook, render);
+IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_query_hook, feed);
+IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_place_hook, feed);
+IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_room_hook, feed);
+IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_query_hook, render);
+IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_place_hook, render);
+IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_room_hook, render);
 
 static command_result buildingplan_cmd(color_ostream &out, vector <string> & parameters)
 {
@@ -624,10 +638,14 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
 
     if (enable != is_enabled)
     {
-        planner.reset(out);
-
-        if (!INTERPOSE_HOOK(buildingplan_hook, feed).apply(enable) ||
-            !INTERPOSE_HOOK(buildingplan_hook, render).apply(enable))
+        planner.reset();
+
+        if (!INTERPOSE_HOOK(buildingplan_query_hook, feed).apply(enable) ||
+            !INTERPOSE_HOOK(buildingplan_place_hook, feed).apply(enable) ||
+            !INTERPOSE_HOOK(buildingplan_room_hook, feed).apply(enable) ||
+            !INTERPOSE_HOOK(buildingplan_query_hook, render).apply(enable) ||
+            !INTERPOSE_HOOK(buildingplan_place_hook, render).apply(enable) ||
+            !INTERPOSE_HOOK(buildingplan_room_hook, render).apply(enable))
             return CR_FAILURE;
 
         is_enabled = enable;
@@ -640,7 +658,7 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 {
     commands.push_back(
         PluginCommand(
-        "buildingplan", "Place furniture before it's built",
+        "buildingplan", "Plan building construction before you have materials",
         buildingplan_cmd, false, "Run 'buildingplan debug [on|off]' to toggle debugging, or 'buildingplan version' to query the plugin version."));
     planner.initialize();
 
@@ -651,7 +669,7 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 {
     switch (event) {
     case SC_MAP_LOADED:
-        planner.reset(out);
+        planner.reset();
         roomMonitor.reset(out);
         break;
     default:
@@ -661,13 +679,17 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
     return CR_OK;
 }
 
+static bool cycle_requested = false;
+
 #define DAY_TICKS 1200
 DFhackCExport command_result plugin_onupdate(color_ostream &)
 {
-    if (Maps::IsValid() && !World::ReadPauseState() && world->frame_counter % (DAY_TICKS/2) == 0)
+    if (Maps::IsValid() && !World::ReadPauseState()
+        && (cycle_requested || world->frame_counter % (DAY_TICKS/2) == 0))
     {
         planner.doCycle();
         roomMonitor.doCycle();
+        cycle_requested = false;
     }
 
     return CR_OK;
@@ -680,8 +702,11 @@ DFhackCExport command_result plugin_shutdown(color_ostream &)
 
 // Lua API section
 
-static bool isPlannableBuilding(df::building_type type) {
-    return planner.isPlannableBuilding(type);
+static bool isPlannableBuilding(df::building_type type,
+                                int16_t subtype,
+                                int32_t custom) {
+    return planner.isPlannableBuilding(
+        toBuildingTypeKey(type, subtype, custom));
 }
 
 static void addPlannedBuilding(df::building *bld) {
@@ -692,9 +717,14 @@ static void doCycle() {
     planner.doCycle();
 }
 
+static void scheduleCycle() {
+    cycle_requested = true;
+}
+
 DFHACK_PLUGIN_LUA_FUNCTIONS {
     DFHACK_LUA_FUNCTION(isPlannableBuilding),
     DFHACK_LUA_FUNCTION(addPlannedBuilding),
     DFHACK_LUA_FUNCTION(doCycle),
+    DFHACK_LUA_FUNCTION(scheduleCycle),
     DFHACK_LUA_END
 };
diff --git a/plugins/fortplan.cpp b/plugins/fortplan.cpp
index 72d11b78a..ff8aa547f 100644
--- a/plugins/fortplan.cpp
+++ b/plugins/fortplan.cpp
@@ -48,7 +48,7 @@ struct BuildingInfo {
     }
 
     bool allocate() {
-        return planner.allocatePlannedBuilding(type);
+        return planner.allocatePlannedBuilding(toBuildingTypeKey(type, -1, -1));
     }
 };
 
@@ -122,7 +122,7 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
 
     if (enable != is_enabled)
     {
-        planner.reset(out);
+        planner.reset();
 
         is_enabled = enable;
     }
diff --git a/plugins/lua/buildingplan.lua b/plugins/lua/buildingplan.lua
index 071c07395..157b6211b 100644
--- a/plugins/lua/buildingplan.lua
+++ b/plugins/lua/buildingplan.lua
@@ -4,9 +4,10 @@ local _ENV = mkmodule('plugins.buildingplan')
 
  Native functions:
 
- * bool isPlannableBuilding(df::building_type type)
+ * bool isPlannableBuilding(df::building_type type, int16_t subtype, int32_t custom)
  * void addPlannedBuilding(df::building *bld)
  * void doCycle()
+ * void scheduleCycle()
 
 --]]
 
diff --git a/plugins/uicommon.h b/plugins/uicommon.h
index d8624786c..78256ac69 100644
--- a/plugins/uicommon.h
+++ b/plugins/uicommon.h
@@ -79,7 +79,7 @@ static void for_each_(map<T, V> &v, Fn func)
 }
 
 template <class T, class V, typename Fn>
-static void transform_(vector<T> &src, vector<V> &dst, Fn func)
+static void transform_(const vector<T> &src, vector<V> &dst, Fn func)
 {
     transform(src.begin(), src.end(), back_inserter(dst), func);
 }

From 5087b6d2ae88efcac5efef7943daddd5d8cba754 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 4 Oct 2020 23:53:42 -0700
Subject: [PATCH 407/547] use new default_item_filters structure

so vector references aren't to items on the stack
also don't let query mode swallow all input
---
 plugins/buildingplan-planner.cpp | 8 ++++----
 plugins/buildingplan-planner.h   | 4 +++-
 plugins/buildingplan.cpp         | 7 +++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/plugins/buildingplan-planner.cpp b/plugins/buildingplan-planner.cpp
index c367ecc33..25df38ad5 100644
--- a/plugins/buildingplan-planner.cpp
+++ b/plugins/buildingplan-planner.cpp
@@ -439,7 +439,7 @@ void Planner::initialize()
 void Planner::reset()
 {
     debug("resetting Planner state");
-    item_filters.clear();
+    default_item_filters.clear();
     planned_buildings.clear();
 
     std::vector<PersistentDataItem> items;
@@ -549,9 +549,9 @@ Planner::ItemFiltersWrapper Planner::getItemFilters(BuildingTypeKey key)
     int nfilters = getNumFilters(key);
     if (nfilters < 1)
         return empty_ret;
-    std::vector<ItemFilter> ret;
-    ret.push_back(item_filters[std::get<0>(key)]);
-    return ItemFiltersWrapper(ret);
+    while (default_item_filters[key].size() < nfilters)
+        default_item_filters[key].push_back(ItemFilter());
+    return ItemFiltersWrapper(default_item_filters[key]);
 }
 
 void Planner::doCycle()
diff --git a/plugins/buildingplan-planner.h b/plugins/buildingplan-planner.h
index a1f53dcd2..9341ad03f 100644
--- a/plugins/buildingplan-planner.h
+++ b/plugins/buildingplan-planner.h
@@ -119,7 +119,9 @@ public:
 
 private:
     std::map<df::building_type, df::item_type> item_for_building_type;
-    std::map<df::building_type, ItemFilter> item_filters;
+    std::unordered_map<BuildingTypeKey,
+                       std::vector<ItemFilter>,
+                       BuildingTypeKeyHash> default_item_filters;
     std::map<df::item_type, std::vector<df::item *>> available_item_vectors;
     std::map<df::item_type, bool> is_relevant_item_type; //Needed for fast check when looping over all items
     std::vector<PlannedBuilding> planned_buildings;
diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index 6cb45c879..2caa9c542 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -309,13 +309,12 @@ struct buildingplan_query_hook : public df::viewscreen_dwarfmodest
             return true; // Don't unsuspend planned buildings
         if (input->count(interface_key::DESTROYBUILDING))
         {
-            // remove persistent data
+            // remove persistent data and allow the parent to handle the key
+            // so the building is removed
             planner.getPlannedBuilding(world->selected_building)->remove();
-            // still allow the building to be removed
-            return false;
         }
 
-        return true;
+        return false;
     }
 
     DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))

From 9116b331b7805b2902bf623daa4d7464e96c2b48 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 5 Oct 2020 15:14:39 -0700
Subject: [PATCH 408/547] fix compiler warnings

---
 plugins/buildingplan-planner.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/buildingplan-planner.cpp b/plugins/buildingplan-planner.cpp
index 25df38ad5..d22f7f0b8 100644
--- a/plugins/buildingplan-planner.cpp
+++ b/plugins/buildingplan-planner.cpp
@@ -1,5 +1,6 @@
 #include "df/building_design.h"
 #include "df/building_doorst.h"
+#include "df/building_type.h"
 #include "df/general_ref_building_holderst.h"
 #include "df/job_item.h"
 #include "df/ui_build_selector.h"
@@ -236,15 +237,15 @@ static std::vector<ItemFilter> deserializeFilters(PersistentDataItem &config)
     return ret;
 }
 
-static int getNumFilters(BuildingTypeKey key)
+static size_t getNumFilters(BuildingTypeKey key)
 {
     // TODO: get num filters in Lua when we handle all building types
     return 1;
 }
 
 PlannedBuilding::PlannedBuilding(df::building *building, const std::vector<ItemFilter> &filters)
-    : building(building),
-      building_id(building->id),
+    : building_id(building->id),
+      building(building),
       filters(filters)
 {
     config = DFHack::World::AddPersistentData(planned_building_persistence_key_v1);
@@ -546,7 +547,7 @@ Planner::ItemFiltersWrapper Planner::getItemFilters(BuildingTypeKey key)
     static std::vector<ItemFilter> empty_vector;
     static const ItemFiltersWrapper empty_ret(empty_vector);
 
-    int nfilters = getNumFilters(key);
+    size_t nfilters = getNumFilters(key);
     if (nfilters < 1)
         return empty_ret;
     while (default_item_filters[key].size() < nfilters)

From efd68a3bc9327769b6cad54cee927d8a3f5d8690 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 6 Oct 2020 08:23:16 -0700
Subject: [PATCH 409/547] reinstate buildingplan capital hotkey reminder

---
 plugins/buildingplan.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index 2caa9c542..f94a4bbcf 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -28,6 +28,7 @@ REQUIRE_GLOBAL(world);
 using namespace DFHack;
 using namespace df::enums;
 
+bool show_help = false;
 bool quickfort_mode = false;
 bool in_dummy_screen = false;
 std::unordered_map<BuildingTypeKey, bool, BuildingTypeKeyHash> planmode_enabled;
@@ -373,7 +374,10 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
     bool handleInput(set<df::interface_key> *input)
     {
         if (!isInPlannedBuildingPlacementMode())
+        {
+            show_help = false;
             return false;
+        }
 
         if (in_dummy_screen)
         {
@@ -389,6 +393,14 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
             return true;
         }
 
+        if (input->count(interface_key::CUSTOM_P) ||
+            input->count(interface_key::CUSTOM_F) ||
+            input->count(interface_key::CUSTOM_D) ||
+            input->count(interface_key::CUSTOM_M))
+        {
+            show_help = true;
+        }
+
         BuildingTypeKey key = toBuildingTypeKey(ui_build_selector);
         if (input->count(interface_key::CUSTOM_SHIFT_P))
         {
@@ -491,6 +503,12 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
 
         int y = 23;
 
+        if (show_help)
+        {
+            OutputString(COLOR_BROWN, x, y, "Note: ");
+            OutputString(COLOR_WHITE, x, y, "Use Shift-Keys here", true, left_margin);
+        }
+
         OutputToggleString(x, y, "Planning Mode", "P", planmode_enabled[key], true, left_margin);
         OutputToggleString(x, y, "Quickfort Mode", "F", quickfort_mode, true, left_margin);
 

From 0edebd7e1f351b5345a8b32e2434c7f981762263 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 6 Oct 2020 08:24:59 -0700
Subject: [PATCH 410/547] attempt to fix build errors on gcc-4.8

---
 plugins/buildingplan-planner.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/buildingplan-planner.cpp b/plugins/buildingplan-planner.cpp
index d22f7f0b8..34a377555 100644
--- a/plugins/buildingplan-planner.cpp
+++ b/plugins/buildingplan-planner.cpp
@@ -1,3 +1,5 @@
+#include <functional>
+
 #include "df/building_design.h"
 #include "df/building_doorst.h"
 #include "df/building_type.h"
@@ -244,8 +246,8 @@ static size_t getNumFilters(BuildingTypeKey key)
 }
 
 PlannedBuilding::PlannedBuilding(df::building *building, const std::vector<ItemFilter> &filters)
-    : building_id(building->id),
-      building(building),
+    : building(building),
+      building_id(building->id),
       filters(filters)
 {
     config = DFHack::World::AddPersistentData(planned_building_persistence_key_v1);
@@ -256,8 +258,8 @@ PlannedBuilding::PlannedBuilding(df::building *building, const std::vector<ItemF
 
 PlannedBuilding::PlannedBuilding(PersistentDataItem &config)
     : config(config),
-      building_id(config.ival(1)),
       building(df::building::find(config.ival(1))),
+      building_id(config.ival(1)),
       filters(deserializeFilters(config))
 { }
 

From f270217be5647cb29de6e2336fe8477027454095 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 6 Oct 2020 09:39:21 -0700
Subject: [PATCH 411/547] work around gcc-4-8's missing full std::hash impl

and improve our hash function while I'm there
---
 plugins/buildingplan-planner.cpp | 20 +++++++++++++++++---
 plugins/buildingplan.cpp         |  3 ---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/plugins/buildingplan-planner.cpp b/plugins/buildingplan-planner.cpp
index 34a377555..3cb27145e 100644
--- a/plugins/buildingplan-planner.cpp
+++ b/plugins/buildingplan-planner.cpp
@@ -1,4 +1,5 @@
 #include <functional>
+#include <climits> // for CHAR_BIT
 
 #include "df/building_design.h"
 #include "df/building_doorst.h"
@@ -386,11 +387,24 @@ BuildingTypeKey toBuildingTypeKey(df::ui_build_selector *uibs)
         uibs->building_type, uibs->building_subtype, uibs->custom_type);
 }
 
+// rotates a size_t value left by count bits
+// assumes count is not 0 or >= size_t_bits
+// replace this with std::rotl when we move to C++20
+static std::size_t rotl_size_t(size_t val, uint32_t count)
+{
+    static const int size_t_bits = CHAR_BIT * sizeof(std::size_t);
+    return val << count | val >> (size_t_bits - count);
+}
+
 std::size_t BuildingTypeKeyHash::operator() (const BuildingTypeKey & key) const
 {
-    return std::hash<df::building_type>()(std::get<0>(key))
-        ^ std::hash<int16_t>()(std::get<1>(key))
-        ^ std::hash<int32_t>()(std::get<2>(key));
+    // cast first param to appease gcc-4.8, which is missing the enum
+    // specializations for std::hash
+    std::size_t h1 = std::hash<int32_t>()(static_cast<int32_t>(std::get<0>(key)));
+    std::size_t h2 = std::hash<int16_t>()(std::get<1>(key));
+    std::size_t h3 = std::hash<int32_t>()(std::get<2>(key));
+
+    return h1 ^ rotl_size_t(h2, 8) ^ rotl_size_t(h3, 16);
 }
 
 
diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index f94a4bbcf..1d25da6f0 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -25,9 +25,6 @@ REQUIRE_GLOBAL(world);
 #define MAX_MASK 10
 #define MAX_MATERIAL 21
 
-using namespace DFHack;
-using namespace df::enums;
-
 bool show_help = false;
 bool quickfort_mode = false;
 bool in_dummy_screen = false;

From d254ff240140da8f8fbd7cdbc1e4f94afdab8e57 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 6 Oct 2020 22:02:14 -0400
Subject: [PATCH 412/547] Tweak links to quickfort command docs

---
 data/blueprints/README.md            | 2 +-
 docs/guides/quickfort-user-guide.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/blueprints/README.md b/data/blueprints/README.md
index b7f5421c0..fb4e2d9ef 100644
--- a/data/blueprints/README.md
+++ b/data/blueprints/README.md
@@ -1,4 +1,4 @@
 This folder contains blueprints used by the `quickfort` script. For more information, see:
 
-* [Quickfort overview](https://docs.dfhack.org/en/stable/docs/_auto/base.html#quickfort)
+* [Quickfort command reference](https://docs.dfhack.org/en/stable/docs/_auto/base.html#quickfort)
 * [Quickfort user guide](https://docs.dfhack.org/en/stable/docs/guides/quickfort-user-guide.html)
diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 7147c5515..88b8f5126 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -1090,7 +1090,7 @@ Links
 
 **Quickfort links:**
 
--  `Quickfort command syntax <quickfort>`
+-  `Quickfort command reference <quickfort>`
 -  :forums:`Quickfort forum thread <176889>`
 -  :source:`Quickfort blueprints library <data/blueprints/library>`
 -  :issue:`DFHack issue tracker <>`

From 9ba677a38b9a3267dc240d7cf5e11281e6b4b2a6 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 6 Oct 2020 22:03:13 -0400
Subject: [PATCH 413/547] Update xml

dfhack/df-structures#410
---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index 5756bf859..d8dab1b75 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 5756bf8599630891fc460b1509bd0660b71c0809
+Subproject commit d8dab1b758f7e08fd6cf32e32c04d2389d95e158

From 73d2a4c9e3f3268c603318a5803dc843d3b0e1a1 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 7 Oct 2020 00:28:51 -0400
Subject: [PATCH 414/547] Move docs build to separate job

---
 .github/workflows/build.yml | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8c3819f11..91137d74f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,14 +43,6 @@ jobs:
     - name: Download DF
       run: |
         sh travis/download-df.sh
-    - name: Build docs
-      run: |
-        sphinx-build -qW -j3 . docs/html
-    - name: Upload docs
-      uses: actions/upload-artifact@v1
-      with:
-        name: docs
-        path: docs/html
     - name: Build DFHack
       run: |
         cmake \
@@ -77,12 +69,35 @@ jobs:
         name: test-artifacts
         path: artifacts
     - name: Clean up DF folder
-      # to prevent DFHack-generated files from ending up in the cache
+      # prevent DFHack-generated files from ending up in the cache
       # (download-df.sh also removes them, this is just to save cache space)
       if: success() || failure()
       run: |
         rm -rf "$DF_FOLDER"
 
+  docs:
+    runs-on: ubuntu-18.04
+    steps:
+    - name: Set up Python 3
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3
+    - name: Install dependencies
+      run: |
+        pip install sphinx
+    - name: Clone DFHack
+      uses: actions/checkout@v1
+      with:
+        submodules: true
+    - name: Build docs
+      run: |
+        sphinx-build -qW -j3 . docs/html
+    - name: Upload docs
+      uses: actions/upload-artifact@v1
+      with:
+        name: docs
+        path: docs/html
+
   lint:
     runs-on: ubuntu-18.04
     steps:

From d850389cdebbeca8598a0551dcb1a8f6dfbff15e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 7 Oct 2020 00:31:32 -0400
Subject: [PATCH 415/547] Adjust sphinx flags

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 91137d74f..615082104 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -91,7 +91,7 @@ jobs:
         submodules: true
     - name: Build docs
       run: |
-        sphinx-build -qW -j3 . docs/html
+        sphinx-build -W --keep-going -j3 . docs/html
     - name: Upload docs
       uses: actions/upload-artifact@v1
       with:

From 615bb81da60c3e897566786bb26efb3ced470362 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 7 Oct 2020 00:37:35 -0400
Subject: [PATCH 416/547] Add two GCC versions to build matrix

---
 .github/workflows/build.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 615082104..286885031 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,6 +5,12 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: ubuntu-18.04
+    strategy:
+      fail-fast: false
+      matrix:
+        gcc:
+        - 7
+        - 9
     steps:
     - name: Set up Python 3
       uses: actions/setup-python@v2
@@ -44,6 +50,9 @@ jobs:
       run: |
         sh travis/download-df.sh
     - name: Build DFHack
+      env:
+        CC: gcc-${{ matrix.gcc }}
+        CXX: g++-${{ matrix.gcc }}
       run: |
         cmake \
           -S . \

From 293bc66f4a2e1adb6496d886ce4cacd0b8b9790c Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 6 Oct 2020 22:41:54 -0700
Subject: [PATCH 417/547] update quickfort docs

default dig
notes blueprints
buildingplan
---
 docs/guides/quickfort-user-guide.rst | 46 ++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 88b8f5126..a5673ba5d 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -139,8 +139,11 @@ in DF. The following "mode" keywords are understood:
    zone    Activity zones menu (i)
    query   Set building tasks/prefs menu (q)
 
-There are also "meta" blueprints, but we'll talk about those
-`later <#meta-blueprints>`__.
+If no modeline appears in the first cell, the file or sheet is interpreted as a
+``#dig`` blueprint.
+
+There are also "meta" and "notes" blueprints, but we'll talk about
+`those <#meta-blueprints>`__ `later <#notes-blueprints>`__.
 
 Optionally following this keyword and a space, you may enter a comment. This
 comment will appear in the output of ``quickfort list`` when run from the
@@ -690,9 +693,11 @@ The full modeline syntax, when everything is specified, is:
 
    #mode label(mylabel) start(X;Y;STARTCOMMENT) hidden() message(mymessage) comment
 
-Note that all elements are optional except for the initial ``#mode``. Here are a
-few examples of modelines with optional elements before we discuss them in more
-detail:
+Note that all elements are optional except for the initial ``#mode`` (though, as
+mentioned in the first section, if a modeline doesn't appear at all in the first
+cell of a spreadsheet, the blueprint is interpreted as a ``#dig`` blueprint with
+no optional markers). Here are a few examples of modelines with optional
+elements before we discuss them in more detail:
 
 ::
 
@@ -971,6 +976,34 @@ blueprints that you don't need to run directly. If you ever *do* need to access
 the managed blueprints individually, you can still see them with
 ``quickfort list --hidden``.
 
+Notes blueprints
+~~~~~~~~~~~~~~~~
+
+Sometimes you just want to record some information about your blueprints, such
+as when to apply them, what preparations you need to make, or what the
+blueprints contain. The `messages() <#messages>`__ modeline marker is useful for
+small, single-line messages, but a ``#notes`` blueprint is more convenient for
+long messages or messages that span many lines. The lines in a ``#notes``
+blueprint are output as if they were contained within a messages() marker. For
+example, the following two blueprints result in the same output:
+
+::
+
+   "#meta label(help) message(This is the help text for the blueprint set
+   contained in this file.
+
+   More info here...) blueprint set walkthough"
+
+   #notes label(help) blueprint set walkthrough
+   This is the help text for the blueprint set
+   contained in this file
+
+   More info here...
+
+The quotes around the ``#meta`` modeline allow newlines in a single cell's text.
+Each line of the ``#notes`` "blueprint", however, is in a separate cell,
+allowing for much easier viewing and editing.
+
 Buildingplan integration
 ------------------------
 
@@ -992,7 +1025,8 @@ not yet supported by buildingplan, a good pattern to follow is to first run
 ``quickfort orders`` on the ``#build`` blueprint to manufacture all the required
 items, then apply the blueprint itself.
 
-See the `buildingplan documentation <buildingplan>` for a list of supported types.
+See the `buildingplan documentation <buildingplan>` for more information. As of
+this writing, buildingplan only supports basic furniture.
 
 Generating manager orders
 -------------------------

From 673d1c623f743e02a2ad9e0b21af52cdac0eb2ca Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 7 Oct 2020 11:35:49 -0400
Subject: [PATCH 418/547] Give build jobs better names

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 286885031..c85ef1e1f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,6 +5,7 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: ubuntu-18.04
+    name: build (Linux, GCC ${{ matrix.gcc }})
     strategy:
       fail-fast: false
       matrix:

From c4da68b3a37a487cb8e68f7dd14e71bbe0f44e55 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 7 Oct 2020 11:37:46 -0400
Subject: [PATCH 419/547] Add GCC 4.8 to build matrix

---
 .github/workflows/build.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c85ef1e1f..4a575935a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,6 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         gcc:
+        - 4.8
         - 7
         - 9
     steps:
@@ -30,6 +31,10 @@ jobs:
             ninja-build \
             zlib1g-dev
         pip install sphinx
+    - name: Install GCC
+      if: ${{ matrix.gcc < 7 }}
+      run: |
+        sudo apt-get install gcc-${{ matrix.gcc }} g++-${{ matrix.gcc }}
     - name: Clone DFHack
       uses: actions/checkout@v1
       with:

From ea931897b9cea82d8fe48c9afb13efc48039ff9c Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 7 Oct 2020 12:04:34 -0400
Subject: [PATCH 420/547] Replace GCC 9 with GCC 10 on Ubuntu 20.04

---
 .github/workflows/build.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4a575935a..0a92e57c9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,15 +4,19 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ${{ matrix.os }}
     name: build (Linux, GCC ${{ matrix.gcc }})
     strategy:
       fail-fast: false
       matrix:
+        os:
+        - ubuntu-18.04
         gcc:
         - 4.8
         - 7
-        - 9
+        include:
+        - os: ubuntu-20.04
+          gcc: 10
     steps:
     - name: Set up Python 3
       uses: actions/setup-python@v2
@@ -32,7 +36,7 @@ jobs:
             zlib1g-dev
         pip install sphinx
     - name: Install GCC
-      if: ${{ matrix.gcc < 7 }}
+      if: ${{ matrix.gcc < 7 || matrix.gcc > 9 }}
       run: |
         sudo apt-get install gcc-${{ matrix.gcc }} g++-${{ matrix.gcc }}
     - name: Clone DFHack

From c199a2349c0e5b20603ab01d3c47a7e294504631 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 7 Oct 2020 12:25:26 -0400
Subject: [PATCH 421/547] Install libgtk2.0-0 (for Ubuntu 20.04)

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0a92e57c9..961942a5b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,6 +26,7 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install \
+            libgtk2.0-0 \
             libsdl-image1.2-dev \
             libsdl-ttf2.0-dev \
             libsdl1.2-dev \

From 3e2dd2a3963bc18abd1eaa0375388332cbfb8235 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Wed, 7 Oct 2020 14:01:22 -0700
Subject: [PATCH 422/547] quickfort docs: dreamfort case study

---
 CMakeLists.txt                       |   1 +
 docs/guides/quickfort-user-guide.rst | 286 ++++++++++++++++++++++++++-
 2 files changed, 283 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce3104bca..ad61d8010 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -442,6 +442,7 @@ if(BUILD_DOCS)
 
     file(GLOB SPHINX_DEPS
         "${CMAKE_CURRENT_SOURCE_DIR}/docs/*.rst"
+        "${CMAKE_CURRENT_SOURCE_DIR}/docs/guides/*.rst"
         "${CMAKE_CURRENT_SOURCE_DIR}/docs/changelog.txt"
         "${CMAKE_CURRENT_SOURCE_DIR}/docs/gen_changelog.py"
         "${CMAKE_CURRENT_SOURCE_DIR}/docs/images/*.png"
diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 88b8f5126..a4c6f0d06 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -856,10 +856,11 @@ blueprint packages follow this pattern:
 
 Those three "apply"s in the middle might as well get done in one command instead
 of three. A meta blueprint can encode that sequence. A meta blueprint refers to
-other blueprints by their label (see the `Modeline markers <modeline-markers>`__
-section above) in the same format used by the ``DFHack#`` quickfort command:
-"/", or just "/" for blueprints in .csv files or blueprints in the same
-spreadsheet sheet as the #meta blueprint that references them.
+other blueprints by their label (see the `Modeline markers
+<#modeline-markers>`__ section above) in the same format used by the ``DFHack#``
+quickfort command: ``<sheet name>/<label>``, or just ``/<label>`` for blueprints
+in .csv files or blueprints in the same spreadsheet sheet as the ``#meta``
+blueprint that references them.
 
 A few examples might make this clearer. Say you have a .csv file with the "bed"
 blueprints in the previous section:
@@ -1085,6 +1086,283 @@ Caveats and limitations
 -  This script is relatively new, and there are bound to be bugs! Please report
    them at the :issue:`DFHack issue tracker <>` so they can be addressed.
 
+Dreamfort case study: a practical guide to advanced blueprint design
+--------------------------------------------------------------------
+
+While syntax definitions and toy examples will certainly get you started with
+your blueprints, it may not be clear how all the quickfort features fit together
+or what the best practices are, especially for large and complex blueprint sets.
+This section walks through the "Dreamfort" blueprints found in the DFHack
+blueprint library, highlighting design choices and showcasing practical
+techniques that can help you create better blueprints. Note that this is not a
+guide for how to design the best forts (there is plenty about that `on the wiki
+<http://dwarffortresswiki.org/index.php?title=Design_strategies>`__). This is
+essentially an extended tips and tricks section focused on how to make usable
+and useful quickfort blueprints that will save you time and energy.
+
+The Dreamfort blueprints we'll be discussing are available in the library as
+:source:`one large .csv file <data/blueprints/library/dreamfort.csv>`
+or `online
+<https://drive.google.com/drive/folders/1iS90EEVqUkxTeZiiukVj1pLloZqabKuP>`__ as
+individual spreadsheets. Either can be read and applied by quickfort, but for us
+humans, the online spreadsheets are much easier to work with. Each spreadsheet
+has a "Notes" sheet with some useful details. Flip through some of the
+spreadsheets and read the `walkthrough
+<https://docs.google.com/spreadsheets/d/
+13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=0>`__ to get oriented.
+Also, if you haven't built Dreamfort before, try an embark in a flat area and
+take it for a spin!
+
+Almost every quickfort feature is used somewhere in Dreamfort, so the blueprints
+as a whole are useful as practical examples. You can copy the blueprints and use
+them as starting points for your own, or just refer to them when you create
+something similar.
+
+In this case study, we'll start by discussing the high level organization of the
+Dreamfort blueprint set, using the "surface" blueprints as an example. Then
+we'll walk through the blueprints for each of the remaining fort levels in turn,
+calling out feature usage examples and explaining the parts that might not be
+obvious just from looking at them.
+
+The surface_ level: how to manage complexity
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. _surface: https://docs.google.com/spreadsheets/d/1vlxOuDOTsjsZ5W45Ri1kJKgp3waFo8r505LfZVg5wkU/edit?usp=sharing
+
+For smaller blueprints, packaging and usability are not really that important -
+just write it, run it, and you're done. However, as your blueprints become
+larger and more detailed, there are some best practices that can help you deal
+with the added complexity. Dreamfort's surface level is many steps long since
+there are trees to be cleared, holes to be dug, flooring to be laid, and
+furniture to be built, and each step requires the previous step to be completely
+finished before it can begin. Therefore, a lot of thought went into minimizing
+the toil associated with applying so many blueprints.
+
+.. topic:: Tip
+
+    Use meta blueprints to script blueprint sequences and reduce the number of
+    quickfort commands you have to run.
+
+The single most effective way to make your blueprint sets easier to use is to
+group them with `meta blueprints <#meta-blueprints>`__. For the Dreamfort set of
+blueprints, each logical "step" generally takes more than one blueprint. For
+example, setting up pastures with a ``#zone`` blueprint, placing starting
+stockpiles with a #place blueprint, building starting workshops with a
+``#build`` blueprint, and configuring the stockpiles with a ``#query`` blueprint
+can all be done at once. Bundling blueprints like this reduced the number of
+steps in Dreamfort from 47 to 24, and it also made it much clearer to see which
+blueprints can be applied at once without unpausing the game. Check out
+dreamfort_surface's "`meta
+<https://docs.google.com/spreadsheets/d/
+1vlxOuDOTsjsZ5W45Ri1kJKgp3waFo8r505LfZVg5wkU/edit#gid=972927200>`__" sheet to
+see how much meta blueprints can simplify your life.
+
+Note that one of the ``#meta`` blueprints just has one line. In this case, the
+``#meta`` blueprint isn't strictly necessary. The referenced blueprint could
+just be applied directly. However, quickfort lists blueprints in the order that
+it reads them, and we chose to make a one-blueprint meta blueprint to ensure all
+the steps appear in order in the quickfort list output.
+
+By the way, you can define `as many blueprints as you want
+<#packaging-a-set-of-blueprints>`__ on one sheet, but multi-blueprint sheets are
+especially useful when writing meta blueprints. It's like having a bird's eye
+view of your entire plan in one sheet.
+
+.. topic:: Tip
+
+    Keep the blueprint list uncluttered with hidden() markers.
+
+If a blueprint is bundled into a meta blueprint, it does not need to appear in
+the quickfort list output, since you won't be running it directly. Add a
+`hidden() marker <#hiding-blueprints>`__ to those blueprints to keep the list
+output tidy. You can still access hidden blueprints with ``quickfort list
+--hidden`` if you need to -- for example to reapply a partially completed #build
+blueprint -- but now they won’t clutter up the normal blueprint list.
+
+.. topic:: Tip
+
+    Name your blueprints with a common prefix so you can find them easily.
+
+This goes for both the file name and the `modeline label()
+<#blueprint-labels>`__. Searching and filtering is implemented for both the
+``quickfort list`` command and the quickfort interactive dialog. If you give
+related blueprints a common prefix, it makes it easy to set the filters to
+display just the blueprints that you're interested in. If you have a lot of
+blueprints, this can save you a lot of time. Dreamfort, of course, uses the
+"dreamfort" prefix for the files and sequence names for the labels, like
+"surface1", "surface2", "farming1", etc. So if I’m in the middle of applying the
+surface blueprints, I’d set the filter to ``dreamfort surface`` to just display
+the relevant blueprints.
+
+.. topic:: Tip
+
+    Add descriptive comments that remind you what the blueprint contains.
+
+If you've been away from Dwarf Fortress for a while, it's easy to forget what
+your blueprints actually do. Make use of `modeline comments
+<#modeline-markers>`__ so your descriptions are visible in the blueprint list.
+If you use meta blueprints, all your comments can be conveniently edited on one
+sheet, like in surface's meta sheet.
+
+.. topic:: Tip
+
+    Use message() markers to remind yourself what to do next.
+
+`Messages <#messages>`__ are displayed after a blueprint is applied. Good things
+to include in messages are:
+
+* The name of the next blueprint to apply and when to run it
+* Whether quickfort orders should be run for an upcoming step
+* Any manual actions that have to happen, like assigning minecarts to hauling
+  routes or pasturing animals after creating zones
+
+These things are just too easy to forget. Adding a message() can save you from
+time-wasting mistakes. Note that message() markers can still appear on the
+hidden() blueprints, and they'll still get shown when the blueprint is run via
+the ``#meta`` blueprint. For an example of this, check out the `zones sheet
+<https://docs.google.com/spreadsheets/d/
+1vlxOuDOTsjsZ5W45Ri1kJKgp3waFo8r505LfZVg5wkU/edit#gid=1226136256>`__ where the
+pastures are defined.
+
+The farming_ level: fun with stockpiles
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. _farming: https://docs.google.com/spreadsheets/d/1iuj807iGVk6vsfYY4j52v9_-wsszA1AnFqoxeoehByg/edit?usp=sharing
+
+It is usually convenient to store closely associated blueprints in the same
+spreadsheet. The farming level is very closely tied to the surface because the
+miasma vents have to perfectly line up. However, surface is a separate z-level
+and, more importantly, already has many many blueprints, so farming is split
+into a separate file.
+
+.. topic:: Tip
+
+    Automate stockpile chains when you can, and write message() reminders when
+    you can't.
+
+The farming level starts doing interesting things with query blueprints and
+stockpiles. Note the `careful customization
+<https://docs.google.com/spreadsheets/d/1iuj807iGVk6vsfYY4j52v9_-
+wsszA1AnFqoxeoehByg/edit#gid=486506218>`__ of the food stockpiles and the
+stockpile chains set up with the ``give*`` aliases. This is so when multiple
+stockpiles can hold the same item, the largest can keep the smaller ones filled.
+If you have multiple stockpiles holding the same type on different z-levels,
+though, this can be tricky to set up with a blueprint. Here, the jugs and pots
+stockpiles must be manually linked to the quantum stockpile on the industry
+level, since we can't know beforehand how many z-levels away that is. Note how
+we call that out in the query blueprint's message().
+
+.. topic:: Tip
+
+    Use aliases to set up hauling routes and quantum stockpiles.
+
+Hauling routes are notoriously fiddly to set up, but they can be automated with
+blueprints. Check out the Southern area of the ``#place`` and ``#query``
+blueprints for how the quantum garbage dump is configured.
+
+Note that aliases that must be applied in a particular order must appear in the
+same cell. Otherwise there are no guarantees for which cell will be processed
+first. For example, look at the track stop cells in the ``#query`` blueprint for
+how the hauling routes are given names.
+
+The industry_ level: when not to use aliases
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. _industry: https://docs.google.com/spreadsheets/d/1gvTJxxRxZ5V4vXkqwhL-qlr_lXCNt8176TK14m4kSOU/edit?usp=sharing
+
+The industry level is densely packed and has more complicated examples of
+stockpile configurations and quantum dumps. However, what I'd like to call out
+are the key sequences that are *not* in aliases.
+
+.. topic:: Tip
+
+     Don't use aliases for ad-hoc cursor movements.
+
+It may be tempting to put all query blueprint key sequences into aliases to make
+them easier to edit, keep them all in one place, and make them reusable, but
+some key sequences just aren't very valuable as aliases.
+
+`Check out <https://docs.google.com/spreadsheets/d/1gvTJxxRxZ5V4vXkqwhL-
+qlr_lXCNt8176TK14m4kSOU/edit#gid=787640554>`__ the Eastern (goods) and Northern
+(stone and gems) quantum stockpiles -- cells I19 and R10. They give to the
+jeweler's workshop to prevent the jeweler from using the gems held in reserve
+for strange moods. The keys are not aliased since they're dependent on the
+relative positions of the tiles where they are interpreted, which is easiest to
+see in the blueprint itself. Also, if you move the workshop, it's easier to fix
+the stockpile link right there in the blueprint instead of editing the separate
+aliases.txt file.
+
+The services_ level: handling multi-level dig blueprints
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. _services: https://docs.google.com/spreadsheets/d/1IBy6_pGEe6WSBCLukDz_5I-4vi_mpHuJJyOp2j6SJlY/edit?usp=sharing
+
+Services is a multi-level blueprint that includes a well cistern beneath the
+main level. Unwanted ramps caused by channeling are an annoyance, but we can
+avoid getting a ramp at the bottom of the cistern with careful use of `dig
+priorities <#dig-priorities>`__.
+
+.. topic:: Tip
+
+    Use dig priorities to control ramp creation.
+
+We can `ensure <https://docs.google.com/spreadsheets/d/1IBy6_pGEe6WSBCLukDz_5I-
+4vi_mpHuJJyOp2j6SJlY/edit#gid=962076234>`__ the bottom level is carved out
+before the layer above is channelled by assigning the channel designations lower
+priorities (row 76). This is easy to do here because it's just one tile and
+there is no chance of cave-in. We could have used this technique on the farming
+level for the miasma vents instead of requiring that the channels be dug before
+the farming level is dug, but that would have been much more fiddly for the
+larger areas.
+
+The alternative is just to have a follow-up blueprint that removes any undesired
+ramps. Using dig priorities to avoid the issue in the first place can be
+cleaner, though.
+
+The guildhall_ level: avoiding smoothing issues
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. _guildhall: https://docs.google.com/spreadsheets/d/1wwKcOpEW-v_kyEnFyXS0FTjvLwJsyWbCUmEGaXWxJyU/edit?usp=sharing
+
+The goal of this level is to provide rooms for locations like guildhalls,
+libraries, and temples. The value of these rooms is very important, so we are
+likely to smooth and engrave everything. To smooth or engrave a wall tile, a
+dwarf has to be adjacent to it, and since some furniture, like statues, block
+dwarves from entering a tile, where you put them affects what you can access.
+
+.. topic:: Tip
+
+    Don't put statues in corners unless you want to smooth everything first.
+
+In the guildhall level, the statues are placed so as not to block any wall
+corners. This gives the player freedom for choosing when to smooth. If statues
+block wall segments, it forces the player to smooth before building the statues,
+or else they have to mess with temporarily removing statues to smooth the walls
+behind them.
+
+The beds_ levels: multi level meta blueprints
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. _beds: https://docs.google.com/spreadsheets/d/1QNHORq6YmYfuVVMP5yGAFCQluary_JbgZ-UXACqKs9g/edit?usp=sharing
+
+The suites and apartments blueprints are straightforward. The only fancy bit
+here is the meta blueprint, which brings us to our final tip:
+
+.. topic:: Tip
+
+    Use meta blueprints to lay out multiple adjacent levels.
+
+We couldn't use this technique for the entire fortress since there is often an
+aquifer between the farming and industry levels, and we can't know beforehand
+how many z-levels we need to skip. Here, though, we can at least provide the
+useful shortcut of designating all apartment levels at once. See the meta
+blueprint for how it applies the apartments on six z-levels using ``#>`` between
+apartment blueprint references.
+
+That's it! I hope this guide was useful to you. Please leave feedback on the
+forums if you have ideas on how this guide (or the dreamfort blueprints) can be
+improved!
+
 Links
 -----
 

From 61796a0a7b0089bcd4966b785c97187afa9fb5d5 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 7 Oct 2020 20:19:37 -0400
Subject: [PATCH 423/547] Replace set-env with new environment file

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 961942a5b..b0164ff2e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,9 +49,9 @@ jobs:
       id: env_setup
       run: |
         DF_VERSION="$(sh travis/get-df-version.sh)"
-        echo "::set-env name=DF_VERSION::${DF_VERSION}"
         echo "::set-output name=df_version::${DF_VERSION}"
-        echo "::set-env name=DF_FOLDER::${HOME}/DF/${DF_VERSION}/df_linux"
+        echo "DF_VERSION=${DF_VERSION}" >> $GITHUB_ENV
+        echo "DF_FOLDER=${HOME}/DF/${DF_VERSION}/df_linux" >> $GITHUB_ENV
     - name: Fetch DF cache
       uses: actions/cache@v2
       with:

From 600ea23f12abf34ce2ebeb39dae97a0965e9e5b8 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 8 Oct 2020 00:23:01 -0400
Subject: [PATCH 424/547] Update scripts and authors

---
 docs/Authors.rst | 2 ++
 scripts          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/Authors.rst b/docs/Authors.rst
index 43a4ed674..0ddc0362e 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -33,6 +33,7 @@ Carter Bray             Qartar
 Chris Dombroski         cdombroski
 Clayton Hughes
 Clément Vuchener        cvuchener
+daedsidog               daedsidog
 Dan Amlund              danamlund
 Daniel Brooks           db48x
 David                   Nilsolm
@@ -134,6 +135,7 @@ Rinin                   Rinin
 rndmvar                 rndmvar
 Robert Heinrich         rh73
 Robert Janetzko         robertjanetzko
+Rocco Moretti           roccomoretti
 RocheLimit
 rofl0r                  rofl0r
 root
diff --git a/scripts b/scripts
index 0d7fbec48..4e6bfa81f 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 0d7fbec48e959ba88c885975aecbb034fa5f5c57
+Subproject commit 4e6bfa81f89f93cd0c5abe2775a37ae5ffeaa3f7

From 2fdd6f7aed5c764ad8ee61612d32affea5000c68 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 8 Oct 2020 23:19:16 -0400
Subject: [PATCH 425/547] Convert to explicit ref targets (occasionally section
 links) and fix messages() -> message()

---
 docs/guides/quickfort-user-guide.rst | 73 +++++++++++++++++-----------
 1 file changed, 44 insertions(+), 29 deletions(-)

diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 68db5ed13..8efa9e0cd 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -33,7 +33,7 @@ Browse them on your computer or :source:`online <data/blueprints/library>`,
 or run ``quickfort list -l`` at the ``[DFHack]#`` prompt to list them, and then
 ``quickfort run`` to apply them to your fort!
 
-See the `Links section <#links>`__ for more information and online resources.
+See the `Links`_ section for more information and online resources.
 
 
 .. contents:: Table of Contents
@@ -143,7 +143,7 @@ If no modeline appears in the first cell, the file or sheet is interpreted as a
 ``#dig`` blueprint.
 
 There are also "meta" and "notes" blueprints, but we'll talk about
-`those <#meta-blueprints>`__ `later <#notes-blueprints>`__.
+`those <quickfort-meta>` `later <quickfort-notes>`.
 
 Optionally following this keyword and a space, you may enter a comment. This
 comment will appear in the output of ``quickfort list`` when run from the
@@ -406,6 +406,8 @@ each floor.
 The marker must appear in the first column of the row to be recognized, just
 like a modeline.
 
+.. _quickfort-dig-priorities:
+
 Dig priorities
 ~~~~~~~~~~~~~~
 
@@ -675,6 +677,8 @@ Which would result in a carved track simliar to a constructed track of the form:
    trackNE  trackEW  trackNW  #
    #        #        #        #
 
+.. _quickfort-modeline:
+
 Modeline markers
 ~~~~~~~~~~~~~~~~
 
@@ -708,18 +712,20 @@ elements before we discuss them in more detail:
    #dig label(digdining) hidden() managed by the digwholefort meta blueprint
    #zone label(pastures) message(remember to assign animals to the new pastures)
 
+.. _quickfort-label:
+
 Blueprint labels
 ````````````````
 
 Labels are displayed in the ``quickfort list`` output and are used for
 addressing specific blueprints when there are multiple blueprints in a single
-file or spreadsheet sheet (see `Packaging a set of
-blueprints <#packaging-a-set-of-blueprints>`__ below). If a blueprint has no
-label, the label becomes the ordinal of the blueprint's position in the file or
-sheet. For example, the label of the first blueprint will be "1" if it is not
-otherwise set, the label of the second blueprint will be "2" if it is not
-otherwise set, etc. Labels that are explicitly defined must start with a letter
-to ensure the auto-generated labels don't conflict with user-defined labels.
+file or spreadsheet sheet (see `Packaging a set of blueprints`_ below). If a
+blueprint has no label, the label becomes the ordinal of the blueprint's
+position in the file or sheet. For example, the label of the first blueprint
+will be "1" if it is not otherwise set, the label of the second blueprint will
+be "2" if it is not otherwise set, etc. Labels that are explicitly defined must
+start with a letter to ensure the auto-generated labels don't conflict with
+user-defined labels.
 
 Start positions
 ```````````````
@@ -755,6 +761,8 @@ to the ``masonw`` blueprint above could look like this:
    #meta start(center of workshop) a mason workshop
    /masonw
 
+.. _quickfort-hidden:
+
 Hiding blueprints
 `````````````````
 
@@ -762,7 +770,9 @@ A blueprint with a ``hidden()`` marker won't appear in ``quickfort list`` output
 unless the ``--hidden`` flag is specified. The primary reason for hiding a
 blueprint (rather than, say, deleting it or moving it out of the ``blueprints/``
 folder) is if a blueprint is intended to be run as part of a larger sequence
-managed by a `meta blueprint <#meta-blueprints>`__.
+managed by a `meta blueprint <quickfort-meta>`.
+
+.. _quickfort-message:
 
 Messages
 ````````
@@ -778,6 +788,8 @@ series of blueprints. For long or multi-part messages, you can embed newlines:
    "#meta label(surface1) message(This would be a good time to start digging the industry level.
    Once the area is clear, continue with /surface2.) clear the embark site and set up pastures"
 
+.. _quickfort-packaging:
+
 Packaging a set of blueprints
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -845,6 +857,8 @@ files and just give related blueprints similar names:
 
 But the naming and organization is completely up to you.
 
+.. _quickfort-meta:
+
 Meta blueprints
 ~~~~~~~~~~~~~~~
 
@@ -861,11 +875,10 @@ blueprint packages follow this pattern:
 
 Those three "apply"s in the middle might as well get done in one command instead
 of three. A meta blueprint can encode that sequence. A meta blueprint refers to
-other blueprints by their label (see the `Modeline markers
-<#modeline-markers>`__ section above) in the same format used by the ``DFHack#``
-quickfort command: ``<sheet name>/<label>``, or just ``/<label>`` for blueprints
-in .csv files or blueprints in the same spreadsheet sheet as the ``#meta``
-blueprint that references them.
+other blueprints by their label (see the `Modeline markers`_ section above) in
+the same format used by the `quickfort` command: ``<sheet name>/<label>``, or
+just ``/<label>`` for blueprints in .csv files or blueprints in the same
+spreadsheet sheet as the ``#meta`` blueprint that references them.
 
 A few examples might make this clearer. Say you have a .csv file with the "bed"
 blueprints in the previous section:
@@ -977,16 +990,18 @@ blueprints that you don't need to run directly. If you ever *do* need to access
 the managed blueprints individually, you can still see them with
 ``quickfort list --hidden``.
 
+.. _quickfort-notes:
+
 Notes blueprints
 ~~~~~~~~~~~~~~~~
 
 Sometimes you just want to record some information about your blueprints, such
 as when to apply them, what preparations you need to make, or what the
-blueprints contain. The `messages() <#messages>`__ modeline marker is useful for
-small, single-line messages, but a ``#notes`` blueprint is more convenient for
-long messages or messages that span many lines. The lines in a ``#notes``
-blueprint are output as if they were contained within a messages() marker. For
-example, the following two blueprints result in the same output:
+blueprints contain. The `message() <quickfort-message>` modeline marker is
+useful for small, single-line messages, but a ``#notes`` blueprint is more
+convenient for long messages or messages that span many lines. The lines in a
+``#notes`` blueprint are output as if they were contained within a ``message()``
+marker. For example, the following two blueprints result in the same output:
 
 ::
 
@@ -1178,7 +1193,7 @@ the toil associated with applying so many blueprints.
     quickfort commands you have to run.
 
 The single most effective way to make your blueprint sets easier to use is to
-group them with `meta blueprints <#meta-blueprints>`__. For the Dreamfort set of
+group them with `meta blueprints <quickfort-meta>`. For the Dreamfort set of
 blueprints, each logical "step" generally takes more than one blueprint. For
 example, setting up pastures with a ``#zone`` blueprint, placing starting
 stockpiles with a #place blueprint, building starting workshops with a
@@ -1198,7 +1213,7 @@ it reads them, and we chose to make a one-blueprint meta blueprint to ensure all
 the steps appear in order in the quickfort list output.
 
 By the way, you can define `as many blueprints as you want
-<#packaging-a-set-of-blueprints>`__ on one sheet, but multi-blueprint sheets are
+<quickfort-packaging>` on one sheet, but multi-blueprint sheets are
 especially useful when writing meta blueprints. It's like having a bird's eye
 view of your entire plan in one sheet.
 
@@ -1208,7 +1223,7 @@ view of your entire plan in one sheet.
 
 If a blueprint is bundled into a meta blueprint, it does not need to appear in
 the quickfort list output, since you won't be running it directly. Add a
-`hidden() marker <#hiding-blueprints>`__ to those blueprints to keep the list
+`hidden() marker <quickfort-hidden>` to those blueprints to keep the list
 output tidy. You can still access hidden blueprints with ``quickfort list
 --hidden`` if you need to -- for example to reapply a partially completed #build
 blueprint -- but now they won’t clutter up the normal blueprint list.
@@ -1217,8 +1232,8 @@ blueprint -- but now they won’t clutter up the normal blueprint list.
 
     Name your blueprints with a common prefix so you can find them easily.
 
-This goes for both the file name and the `modeline label()
-<#blueprint-labels>`__. Searching and filtering is implemented for both the
+This goes for both the file name and the `modeline label() <quickfort-label>`.
+Searching and filtering is implemented for both the
 ``quickfort list`` command and the quickfort interactive dialog. If you give
 related blueprints a common prefix, it makes it easy to set the filters to
 display just the blueprints that you're interested in. If you have a lot of
@@ -1234,7 +1249,7 @@ the relevant blueprints.
 
 If you've been away from Dwarf Fortress for a while, it's easy to forget what
 your blueprints actually do. Make use of `modeline comments
-<#modeline-markers>`__ so your descriptions are visible in the blueprint list.
+<quickfort-modeline>` so your descriptions are visible in the blueprint list.
 If you use meta blueprints, all your comments can be conveniently edited on one
 sheet, like in surface's meta sheet.
 
@@ -1242,8 +1257,8 @@ sheet, like in surface's meta sheet.
 
     Use message() markers to remind yourself what to do next.
 
-`Messages <#messages>`__ are displayed after a blueprint is applied. Good things
-to include in messages are:
+`Messages <quickfort-message>` are displayed after a blueprint is applied. Good
+things to include in messages are:
 
 * The name of the next blueprint to apply and when to run it
 * Whether quickfort orders should be run for an upcoming step
@@ -1334,7 +1349,7 @@ The services_ level: handling multi-level dig blueprints
 Services is a multi-level blueprint that includes a well cistern beneath the
 main level. Unwanted ramps caused by channeling are an annoyance, but we can
 avoid getting a ramp at the bottom of the cistern with careful use of `dig
-priorities <#dig-priorities>`__.
+priorities <quickfort-dig-priorities>`.
 
 .. topic:: Tip
 

From 09f262a0c234ad34da176ffb6bd9cd125384572a Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 8 Oct 2020 23:30:59 -0400
Subject: [PATCH 426/547] Disable syntax highlighting in code blocks by default

The default is Python, which none (that I have found) of our code blocks use
---
 conf.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf.py b/conf.py
index e1bde4257..d8f86c7ae 100644
--- a/conf.py
+++ b/conf.py
@@ -282,6 +282,9 @@ default_role = 'ref'
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
+# The default language to highlight source code in.
+highlight_language = 'none'
+
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
 

From a5f85e256d5f443bbc979969b37bc268122fb6e3 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 9 Oct 2020 00:27:22 -0400
Subject: [PATCH 427/547] Default to a basic DFHack-specific pygments lexer
 (supporting comments and prompts)

---
 conf.py                                |  3 ++-
 docs/sphinx_extensions/dfhack/lexer.py | 34 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 docs/sphinx_extensions/dfhack/lexer.py

diff --git a/conf.py b/conf.py
index d8f86c7ae..280b2f81f 100644
--- a/conf.py
+++ b/conf.py
@@ -195,6 +195,7 @@ needs_sphinx = '1.8'
 extensions = [
     'sphinx.ext.extlinks',
     'dfhack.changelog',
+    'dfhack.lexer',
 ]
 
 # This config value must be a dictionary of external sites, mapping unique
@@ -283,7 +284,7 @@ default_role = 'ref'
 pygments_style = 'sphinx'
 
 # The default language to highlight source code in.
-highlight_language = 'none'
+highlight_language = 'dfhack'
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
diff --git a/docs/sphinx_extensions/dfhack/lexer.py b/docs/sphinx_extensions/dfhack/lexer.py
new file mode 100644
index 000000000..96397e241
--- /dev/null
+++ b/docs/sphinx_extensions/dfhack/lexer.py
@@ -0,0 +1,34 @@
+# adapted from:
+#   https://stackoverflow.com/a/16470058
+#   https://pygments.org/docs/lexerdevelopment/
+
+import re
+
+from pygments.lexer import RegexLexer
+from pygments.token import Comment, Generic, Text
+from sphinx.highlighting import lexers
+
+class DFHackLexer(RegexLexer):
+    name = 'DFHack'
+    aliases = ['dfhack']
+    flags = re.IGNORECASE | re.MULTILINE
+
+    tokens = {
+        'root': [
+            (r'\#.+$', Comment.Single),
+            (r'^\[[a-z]+\]\# ', Generic.Prompt),
+            (r'.+?', Text),
+        ]
+    }
+
+def register_lexer(app):
+    lexers['dfhack'] = DFHackLexer()
+
+def setup(app):
+    app.connect('builder-inited', register_lexer)
+
+    return {
+        'version': '0.1',
+        'parallel_read_safe': True,
+        'parallel_write_safe': True,
+    }

From c2280356cbfcb402e19fad6832f687a1c06432d8 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 9 Oct 2020 01:15:42 -0400
Subject: [PATCH 428/547] Set language of some code blocks to enable syntax
 highlighting

---
 docs/Binpatches.rst      |  4 +++-
 docs/Compile.rst         |  6 +++++-
 docs/Core.rst            | 12 +++++++++---
 docs/Documentation.rst   |  8 +++++++-
 docs/Lua API.rst         |  2 ++
 docs/Memory-research.rst |  4 +++-
 docs/Plugins.rst         |  4 +++-
 library/xml              |  2 +-
 scripts                  |  2 +-
 9 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/docs/Binpatches.rst b/docs/Binpatches.rst
index b92190bc8..8af50fa45 100644
--- a/docs/Binpatches.rst
+++ b/docs/Binpatches.rst
@@ -80,7 +80,9 @@ system console:
 
 If you use a permanent patch under OSX or Linux, you must update
 ``symbols.xml`` with the new checksum of the executable.  Find the relevant
-section, and add a new line::
+section, and add a new line:
+
+.. code-block:: xml
 
     <md5-hash value='????????????????????????????????'/>
 
diff --git a/docs/Compile.rst b/docs/Compile.rst
index c98cb939a..5292f758d 100644
--- a/docs/Compile.rst
+++ b/docs/Compile.rst
@@ -1,3 +1,5 @@
+.. highlight:: shell
+
 .. _compile:
 
 ################
@@ -283,7 +285,9 @@ Dwarf Fortress runs, it uses a libstdc++ shipped in the ``libs`` folder, which
 comes from GCC 4.8 and is incompatible with code compiled with newer GCC
 versions. As of DFHack 0.42.05-alpha1, the ``dfhack`` launcher script attempts
 to fix this by automatically removing the DF-provided libstdc++ on startup.
-In rare cases, this may fail and cause errors such as::
+In rare cases, this may fail and cause errors such as:
+
+.. code-block:: text
 
    ./libs/Dwarf_Fortress: /pathToDF/libs/libstdc++.so.6: version
        `GLIBCXX_3.4.18' not found (required by ./hack/libdfhack.so)
diff --git a/docs/Core.rst b/docs/Core.rst
index 5ef3e6a4d..0f83b8c5a 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -63,7 +63,9 @@ or at any other time using the ``dfhack-run`` executable.
 
 If DF/DFHack is started with arguments beginning with ``+``, the remaining
 text is treated as a command in the DFHack console.  It is possible to use
-multiple such commands, which are split on ``+``.  For example::
+multiple such commands, which are split on ``+``.  For example:
+
+.. code-block:: shell
 
     ./dfhack +load-save region1
     "Dwarf Fortress.exe" +devel/print-args Hello! +enable workflow
@@ -93,7 +95,9 @@ but ``dfhack-run`` can be useful in a variety of circumstances:
 - from external programs or scripts
 - if DF or DFHack are not responding
 
-Examples::
+Examples:
+
+.. code-block:: shell
 
     ./dfhack-run cursecheck
     dfhack-run kill-lua
@@ -456,7 +460,9 @@ Environment variables
 =====================
 
 DFHack's behavior can be adjusted with some environment variables. For example,
-on UNIX-like systems::
+on UNIX-like systems:
+
+.. code-block:: shell
 
   DFHACK_SOME_VAR=1 ./dfhack
 
diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index 067f6bf90..f447d8e2b 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -57,7 +57,9 @@ as the in-console documentation by (e.g.) printing it when a ``-help`` argument
 is given.
 
 The docs **must** have a heading which exactly matches the command, underlined
-with ``=====`` to the same length.  For example, a lua file would have::
+with ``=====`` to the same length.  For example, a lua file would have:
+
+.. code-block:: lua
 
     local helpstr = [====[
 
@@ -69,6 +71,8 @@ with ``=====`` to the same length.  For example, a lua file would have::
     ]====]
 
 
+.. highlight:: rst
+
 Where the heading for a section is also the name of a command, the spelling
 and case should exactly match the command to enter in the DFHack command line.
 
@@ -118,6 +122,8 @@ Scripts have link targets created automatically.
 Building the documentation
 ==========================
 
+.. highlight:: shell
+
 Required dependencies
 ---------------------
 In order to build the documentation, you must have Python with Sphinx
diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 8707a0d99..70016804e 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -1,3 +1,5 @@
+.. highlight:: lua
+
 .. _lua-api:
 
 ##############
diff --git a/docs/Memory-research.rst b/docs/Memory-research.rst
index 3f615750a..9729072f5 100644
--- a/docs/Memory-research.rst
+++ b/docs/Memory-research.rst
@@ -119,7 +119,9 @@ GDB
 `GDB <https://www.gnu.org/software/gdb/>`_ is technically cross-platform, but
 tends to work best on Linux, and DFHack currently only offers support for using
 GDB on 64-bit Linux. To start with GDB, pass ``-g`` to the DFHack launcher
-script::
+script:
+
+.. code-block:: shell
 
     ./dfhack -g
 
diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index 55ec4c040..dc225d801 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -1443,7 +1443,9 @@ can be displayed on the main fortress mode screen:
 The file :file:`dfhack-config/dwarfmonitor.json` can be edited to control the
 positions and settings of all widgets displayed. This file should contain a
 JSON object with the key ``widgets`` containing an array of objects - see the
-included file in the ``dfhack-config`` folder for an example::
+included file in the ``dfhack-config`` folder for an example:
+
+.. code-block:: lua
 
     {
         "widgets": [
diff --git a/library/xml b/library/xml
index d8dab1b75..935b687ee 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit d8dab1b758f7e08fd6cf32e32c04d2389d95e158
+Subproject commit 935b687ee65a7d5f470c0c86e50ef80634e1b884
diff --git a/scripts b/scripts
index 4e6bfa81f..a6d5df4e7 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 4e6bfa81f89f93cd0c5abe2775a37ae5ffeaa3f7
+Subproject commit a6d5df4e73f06b4f8a829baeca97f0d63830b65b

From f10bc7678edde3e47cae614d493c29f986f4aa9c Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 9 Oct 2020 12:16:25 -0400
Subject: [PATCH 429/547] Allow breaking long inline code snippets if necessary

---
 docs/styles/dfhack.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/styles/dfhack.css b/docs/styles/dfhack.css
index a25772871..7b735ed42 100644
--- a/docs/styles/dfhack.css
+++ b/docs/styles/dfhack.css
@@ -61,3 +61,7 @@ div.body li > p {
     margin-top: 0;
     margin-bottom: 0;
 }
+
+span.pre {
+    overflow-wrap: break-word;
+}

From 28efe1d2a709b5de3d4bed1798956e1d5c2ba591 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 9 Oct 2020 12:20:13 -0400
Subject: [PATCH 430/547] Add local TOCs to Lua API plugin sections

---
 docs/Lua API.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 70016804e..9ce2c3379 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3756,6 +3756,9 @@ Eventful
 This plugin exports some events to lua thus allowing to run lua functions
 on DF world events.
 
+.. contents::
+  :local:
+
 List of events
 --------------
 
@@ -3916,6 +3919,9 @@ Building-hacks
 This plugin overwrites some methods in workshop df class so that mechanical workshops are possible. Although
 plugin export a function it's recommended to use lua decorated function.
 
+.. contents::
+  :local:
+
 Functions
 ---------
 
@@ -3995,6 +4001,9 @@ Luasocket
 A way to access csocket from lua. The usage is made similar to luasocket in vanilla lua distributions. Currently
 only subset of functions exist and only tcp mode is implemented.
 
+.. contents::
+  :local:
+
 Socket class
 ------------
 
@@ -4077,6 +4086,9 @@ cxxrandom
 
 Exposes some features of the C++11 random number library to Lua.
 
+.. contents::
+  :local:
+
 Native functions (exported to Lua)
 ----------------------------------
 

From 9eff62a05d1fbb0afb7669250ad8170949dcb79e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 9 Oct 2020 12:37:58 -0400
Subject: [PATCH 431/547] Update docs for #1659

---
 docs/Plugins.rst   | 6 ++++++
 docs/changelog.txt | 1 +
 2 files changed, 7 insertions(+)

diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index dc225d801..b900e91ab 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -2648,6 +2648,8 @@ custom reaction raws, with the following differences:
 * If the item has no subtype, the ``:NONE`` can be omitted
 * If the item is ``REMAINS``, ``FISH``, ``FISH_RAW``, ``VERMIN``, ``PET``, or ``EGG``,
   specify a ``CREATURE:CASTE`` pair instead of a material token.
+* If the item is a ``PLANT_GROWTH``, specify a ``PLANT_ID:GROWTH_ID`` pair
+  instead of a material token.
 
 Corpses, body parts, and prepared meals cannot be created using this tool.
 
@@ -2666,6 +2668,10 @@ Examples:
 
     createitem WOOD PLANT_MAT:TOWER_CAP:WOOD
 
+* Create bilberries::
+
+    createitem PLANT_GROWTH BILBERRY:FRUIT
+
 For more examples, :wiki:`see this wiki page <Utility:DFHack/createitem>`.
 
 To change where new items are placed, first run the command with a
diff --git a/docs/changelog.txt b/docs/changelog.txt
index f3d5cc1ed..6df4a266a 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -43,6 +43,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `stockpiles`: fixed a crash when loading food stockpiles
 
 ## Misc Improvements
+- `createitem`: added support for plant growths (fruit, berries, leaves, etc.)
 - `createitem`: added an ``inspect`` subcommand to print the item and material tokens of existing items, which can be used to create additional matching items
 - `embark-assistant`: added support for searching for taller waterfalls (up to 50 z-levels tall)
 

From c9609ad5902ef8b306809fa733ea32fbe5b523a9 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 9 Oct 2020 12:45:49 -0400
Subject: [PATCH 432/547] Make `createitem inspect` consistent for PLANT_GROWTH
 items

---
 library/modules/Items.cpp | 2 +-
 plugins/createitem.cpp    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/library/modules/Items.cpp b/library/modules/Items.cpp
index 3d35edb29..3bc468d04 100644
--- a/library/modules/Items.cpp
+++ b/library/modules/Items.cpp
@@ -178,7 +178,7 @@ std::string ItemTypeInfo::getToken()
     std::string rv = ENUM_KEY_STR(item_type, type);
     if (custom)
         rv += ":" + custom->id;
-    else if (subtype != -1)
+    else if (subtype != -1 && type != item_type::PLANT_GROWTH)
         rv += stl_sprintf(":%d", subtype);
     return rv;
 }
diff --git a/plugins/createitem.cpp b/plugins/createitem.cpp
index f32c51c03..ad80cff64 100644
--- a/plugins/createitem.cpp
+++ b/plugins/createitem.cpp
@@ -390,6 +390,10 @@ command_result df_createitem (color_ostream &out, vector <string> & parameters)
             // default to empty to display a list of valid growths later
             tokens.push_back("");
         }
+        else if (tokens.size() == 3 && tokens[0] == "PLANT")
+        {
+            tokens.erase(tokens.begin());
+        }
         else if (tokens.size() != 2)
         {
             out.printerr("You must specify a plant and growth ID for this item type!\n");

From 23822473989d7d9feb1ff2274159b9fae81c8417 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 9 Oct 2020 19:04:40 -0400
Subject: [PATCH 433/547] Update some docs links to use HTTPS

---
 conf.py                              |  6 +++---
 docs/Compile.rst                     | 12 ++++++------
 docs/Core.rst                        |  4 ++--
 docs/Documentation.rst               |  4 ++--
 docs/History.rst                     |  2 +-
 docs/Introduction.rst                |  2 +-
 docs/Lua API.rst                     |  4 ++--
 docs/guides/quickfort-user-guide.rst |  2 +-
 plugins/tweak/tweak.cpp              |  1 -
 9 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/conf.py b/conf.py
index 280b2f81f..d5ecc3a45 100644
--- a/conf.py
+++ b/conf.py
@@ -202,11 +202,11 @@ extensions = [
 # short alias names to a base URL and a prefix.
 # See http://sphinx-doc.org/ext/extlinks.html
 extlinks = {
-    'wiki': ('http://dwarffortresswiki.org/%s', ''),
+    'wiki': ('https://dwarffortresswiki.org/%s', ''),
     'forums': ('http://www.bay12forums.com/smf/index.php?topic=%s',
                'Bay12 forums thread '),
-    'dffd': ('http://dffd.bay12games.com/file.php?id=%s', 'DFFD file '),
-    'bug': ('http://www.bay12games.com/dwarves/mantisbt/view.php?id=%s',
+    'dffd': ('https://dffd.bay12games.com/file.php?id=%s', 'DFFD file '),
+    'bug': ('https://www.bay12games.com/dwarves/mantisbt/view.php?id=%s',
             'Bug '),
     'source': ('https://github.com/DFHack/dfhack/tree/develop/%s', ''),
     'source:scripts': ('https://github.com/DFHack/scripts/tree/master/%s', ''),
diff --git a/docs/Compile.rst b/docs/Compile.rst
index 5292f758d..7e2709e74 100644
--- a/docs/Compile.rst
+++ b/docs/Compile.rst
@@ -368,7 +368,7 @@ Dependencies and system set-up
     both 32-bit and 64-bit variants. Homebrew also doesn't require constant use
     of ``sudo``.
 
-    Using `Homebrew <http://brew.sh/>`_ (recommended)::
+    Using `Homebrew <https://brew.sh/>`_ (recommended)::
 
         brew tap homebrew/versions
         brew install git
@@ -403,14 +403,14 @@ Dependencies and system set-up
   * In a separate, local Perl install
 
     Rather than using system Perl, you might also want to consider
-    the Perl manager, `Perlbrew <http://perlbrew.pl>`_.
+    the Perl manager, `Perlbrew <https://perlbrew.pl>`_.
 
     This manages Perl 5 locally under ``~/perl5/``, providing an easy
     way to install Perl and run CPAN against it without ``sudo``.
     It can maintain multiple Perl installs and being local has the
     benefit of easy migration and insulation from OS issues and upgrades.
 
-    See http://perlbrew.pl/ for more details.
+    See https://perlbrew.pl/ for more details.
 
 Building
 --------
@@ -521,7 +521,7 @@ To install Chocolatey and the required dependencies:
 You can now use all of these utilities from any normal ``cmd.exe`` window.
 You only need Admin/elevated ``cmd.exe`` for running ``choco install`` commands;
 for all other purposes, including compiling DFHack, you should use
-a normal ``cmd.exe`` (or, better, an improved terminal like `Cmder <http://cmder.net/>`_;
+a normal ``cmd.exe`` (or, better, an improved terminal like `Cmder <https://cmder.net/>`_;
 details below, under Build.)
 
 **NOTE**: you can run the above ``choco install`` command even if you already have
@@ -548,7 +548,7 @@ Some examples:
 CMake
 ^^^^^
 You can get the win32 installer version from
-`the official site <http://www.cmake.org/cmake/resources/software.html>`_.
+`the official site <https://cmake.org/download/>`_.
 It has the usual installer wizard. Make sure you let it add its binary folder
 to your binary search PATH so the tool can be later run from anywhere.
 
@@ -621,7 +621,7 @@ due to the tiny window size and extremely limited scrollback. For that reason yo
 may prefer to compile in the IDE which will always show all build output.
 
 Alternatively (or additionally), consider installing an improved Windows terminal
-such as `Cmder <http://cmder.net/>`_. Easily installed through Chocolatey with:
+such as `Cmder <https://cmder.net/>`_. Easily installed through Chocolatey with:
 ``choco install cmder -y``.
 
 **Note for Cygwin/msysgit users**: It is also possible to compile DFHack from a
diff --git a/docs/Core.rst b/docs/Core.rst
index 0f83b8c5a..f18adfdc1 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -511,5 +511,5 @@ This section is for odd but important notes that don't fit anywhere else.
   Older versions are available here_.
   *These files will eventually be migrated to GitHub.*  (see :issue:`473`)
 
-  .. _DFFD: http://dffd.bay12games.com/search.php?string=DFHack&id=15&limit=1000
-  .. _here: http://dethware.org/dfhack/download
+  .. _DFFD: https://dffd.bay12games.com/search.php?string=DFHack&id=15&limit=1000
+  .. _here: https://dethware.org/dfhack/download
diff --git a/docs/Documentation.rst b/docs/Documentation.rst
index f447d8e2b..03531998e 100644
--- a/docs/Documentation.rst
+++ b/docs/Documentation.rst
@@ -6,13 +6,13 @@ DFHack Documentation System
 
 
 DFHack documentation, like the file you are reading now, is created as ``.rst`` files,
-which are in `reStructuredText (reST) <http://sphinx-doc.org/rest.html>`_ format.
+which are in `reStructuredText (reST) <https://www.sphinx-doc.org/rest.html>`_ format.
 This is a documentation format common in the Python community. It is very
 similar in concept - and in syntax - to Markdown, as found on GitHub and many other
 places. However it is more advanced than Markdown, with more features available when
 compiled to HTML, such as automatic tables of contents, cross-linking, special
 external links (forum, wiki, etc) and more. The documentation is compiled by a
-Python tool, `Sphinx <http://sphinx-doc.org>`_.
+Python tool, `Sphinx <https://www.sphinx-doc.org>`_.
 
 The DFHack build process will compile the documentation, but this is disabled
 by default due to the additional Python and Sphinx requirements. You typically
diff --git a/docs/History.rst b/docs/History.rst
index d382b351e..dc02d02b0 100644
--- a/docs/History.rst
+++ b/docs/History.rst
@@ -227,7 +227,7 @@ Internals
 
 Lua
 ---
-- Lua has been updated to 5.3 - see http://www.lua.org/manual/5.3/readme.html for details
+- Lua has been updated to 5.3 - see https://www.lua.org/manual/5.3/readme.html for details
 
     - Floats are no longer implicitly converted to integers in DFHack API calls
 
diff --git a/docs/Introduction.rst b/docs/Introduction.rst
index 7d510422f..f7525cb4f 100644
--- a/docs/Introduction.rst
+++ b/docs/Introduction.rst
@@ -8,7 +8,7 @@ DFHack is a Dwarf Fortress memory access library, distributed with
 a wide variety of useful scripts and plugins.
 
 The project is currently hosted `on GitHub <https://www.github.com/DFHack/dfhack>`_,
-and can be downloaded from `the releases page <http://github.com/DFHack/dfhack/releases>`_
+and can be downloaded from `the releases page <https://github.com/DFHack/dfhack/releases>`_
 - see `installing` for installation instructions. This is also where the
 `DFHack bug tracker <https://www.github.com/DFHack/dfhack>`_ is hosted.
 
diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 9ce2c3379..9807e8e1b 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -9,7 +9,7 @@ DFHack Lua API
 DFHack has extensive support for
 the Lua_ scripting language, providing access to:
 
-.. _Lua: http://www.lua.org
+.. _Lua: https://www.lua.org
 
 1. Raw data structures used by the game.
 2. Many C++ functions for high-level access to these
@@ -39,7 +39,7 @@ DF data structure wrapper
    :local:
 
 Data structures of the game are defined in XML files located in :file:`library/xml`
-(and `online <http://github.com/DFHack/df-structures>`_, and automatically exported
+(and `online <https://github.com/DFHack/df-structures>`_, and automatically exported
 to lua code as a tree of objects and functions under the ``df`` global, which
 also broadly maps to the ``df`` namespace in the headers generated for C++.
 
diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 8efa9e0cd..d88f10f0a 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -1145,7 +1145,7 @@ This section walks through the "Dreamfort" blueprints found in the DFHack
 blueprint library, highlighting design choices and showcasing practical
 techniques that can help you create better blueprints. Note that this is not a
 guide for how to design the best forts (there is plenty about that `on the wiki
-<http://dwarffortresswiki.org/index.php?title=Design_strategies>`__). This is
+<https://dwarffortresswiki.org/index.php?title=Design_strategies>`__). This is
 essentially an extended tips and tricks section focused on how to make usable
 and useful quickfort blueprints that will save you time and energy.
 
diff --git a/plugins/tweak/tweak.cpp b/plugins/tweak/tweak.cpp
index 237014209..1ea958f5b 100644
--- a/plugins/tweak/tweak.cpp
+++ b/plugins/tweak/tweak.cpp
@@ -866,7 +866,6 @@ static command_result tweak(color_ostream &out, vector <string> &parameters)
         }
 
         // case #1: migrants who have the resident flag set
-        // see http://dffd.wimbli.com/file.php?id=6139 for a save
         if (unit->flags2.bits.resident)
             unit->flags2.bits.resident = 0;
 

From 5e63e6e103d39fb61d491e2df100723f33995f0f Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 9 Oct 2020 19:24:52 -0400
Subject: [PATCH 434/547] Convert some links to use :wiki:

---
 docs/guides/quickfort-user-guide.rst | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index d88f10f0a..76485a985 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -12,8 +12,7 @@ use of multiple files or spreadsheets, each describing a different phase of DF
 construction: designation, building, placing stockpiles/zones, and setting
 configuration.
 
-The original idea and 1.0 codebase came from
-`Valdemar's <https://dwarffortresswiki.org/index.php/User:Valdemar>`__
+The original idea and 1.0 codebase came from :wiki:`Valdemar's <User:Valdemar>`
 auto-designation macro. Joel Thornton (joelpt) reimplemented the core logic in
 Python and extended its functionality with `Quickfort
 2.0 <https://github.com/joelpt/quickfort>`__. This DFHack-native implementation,
@@ -1144,10 +1143,10 @@ or what the best practices are, especially for large and complex blueprint sets.
 This section walks through the "Dreamfort" blueprints found in the DFHack
 blueprint library, highlighting design choices and showcasing practical
 techniques that can help you create better blueprints. Note that this is not a
-guide for how to design the best forts (there is plenty about that `on the wiki
-<https://dwarffortresswiki.org/index.php?title=Design_strategies>`__). This is
-essentially an extended tips and tricks section focused on how to make usable
-and useful quickfort blueprints that will save you time and energy.
+guide for how to design the best forts (there is plenty about that :wiki:`on the
+wiki <Design strategies>`). This is essentially an extended tips and tricks
+section focused on how to make usable and useful quickfort blueprints that will
+save you time and energy.
 
 The Dreamfort blueprints we'll be discussing are available in the library as
 :source:`one large .csv file <data/blueprints/library/dreamfort.csv>`

From b972246d166f206489b7c6850e0e62493a1988c2 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 9 Oct 2020 21:43:58 -0400
Subject: [PATCH 435/547] Update docs (#1652)

---
 docs/Authors.rst   | 1 +
 docs/Plugins.rst   | 2 ++
 docs/changelog.txt | 1 +
 3 files changed, 4 insertions(+)

diff --git a/docs/Authors.rst b/docs/Authors.rst
index 0ddc0362e..e3478e486 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -113,6 +113,7 @@ nocico                  nocico
 Omniclasm
 OwnageIsMagic           OwnageIsMagic
 palenerd                dlmarquis
+PassionateAngler        PassionateAngler
 Patrik Lundell          PatrikLundell
 Paul Fenwick            pjf
 PeridexisErrant         PeridexisErrant
diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index b900e91ab..a690ddbf3 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -1579,6 +1579,8 @@ Options:
 :nick:        Mass-assign nicknames, must be followed by the name you want
               to set.
 :remnick:     Mass-remove nicknames.
+:enumnick:    Assign enumerated nicknames (e.g. "Hen 1", "Hen 2"...). Must be
+              followed by the prefix to use in nicknames.
 :tocages:     Assign unit(s) to cages inside a pasture.
 :uinfo:       Print info about unit(s). If no filters are set a unit must
               be selected in the in-game ui.
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 6df4a266a..7ebe33a55 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -46,6 +46,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `createitem`: added support for plant growths (fruit, berries, leaves, etc.)
 - `createitem`: added an ``inspect`` subcommand to print the item and material tokens of existing items, which can be used to create additional matching items
 - `embark-assistant`: added support for searching for taller waterfalls (up to 50 z-levels tall)
+- `zone`: added an ``enumnick`` subcommand to assign enumerated nicknames (e.g "Hen 1", "Hen 2"...)
 
 # 0.47.04-r2
 

From d1eec9d33895b9ad6ccf3613fc6f80e8091e8e6e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 9 Oct 2020 21:44:16 -0400
Subject: [PATCH 436/547] Update xml

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index 935b687ee..85b8f413f 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 935b687ee65a7d5f470c0c86e50ef80634e1b884
+Subproject commit 85b8f413f6f0561817c16bc0edca99fec6f1e774

From 8d85261cdcea733423d9c2c6b292de58908a2a64 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 9 Oct 2020 22:20:07 -0400
Subject: [PATCH 437/547] Update changelog (#1658 and more of #1652)

---
 docs/changelog.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 7ebe33a55..5a8ad0f0c 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -46,7 +46,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `createitem`: added support for plant growths (fruit, berries, leaves, etc.)
 - `createitem`: added an ``inspect`` subcommand to print the item and material tokens of existing items, which can be used to create additional matching items
 - `embark-assistant`: added support for searching for taller waterfalls (up to 50 z-levels tall)
+- `search`: added support for searching for names containing non-ASCII characters using their ASCII equivalents
 - `zone`: added an ``enumnick`` subcommand to assign enumerated nicknames (e.g "Hen 1", "Hen 2"...)
+- `zone`: added slaughter indication to ``uinfo`` output
 
 # 0.47.04-r2
 

From 9c8098b4f0798c2e88c6d6b71eaa3e3377238355 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 10 Oct 2020 01:40:00 -0400
Subject: [PATCH 438/547] Expose to_search_normalized to Lua, add test, and use
 in ListColumn (most useful for the `stocks` plugin)

---
 docs/Lua API.rst     | 15 ++++++++++++---
 docs/changelog.txt   |  1 +
 library/LuaApi.cpp   |  2 ++
 plugins/listcolumn.h |  8 ++++----
 test/encoding.lua    |  8 ++++++++
 5 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 test/encoding.lua

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 9807e8e1b..fb67610d1 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -881,14 +881,23 @@ can be omitted.
   Convert a string from DF's CP437 encoding to the correct encoding for the
   DFHack console.
 
+.. warning::
+
+  When printing CP437-encoded text to the console (for example, names returned
+  from ``dfhack.TranslateName()``), use ``print(dfhack.df2console(text))`` to
+  ensure proper display on all platforms.
+
+
 * ``dfhack.utf2df(string)``
 
   Convert a string from UTF-8 to DF's CP437 encoding.
 
-**Note:** When printing CP437-encoded text to the console (for example, names
-returned from TranslateName()), use ``print(dfhack.df2console(text)`` to ensure
-proper display on all platforms.
+* ``dfhack.toSearchNormalized(string)``
 
+  Replace non-ASCII alphabetic characters in a CP437-encoded string with their
+  nearest ASCII equivalents, if possible, and returns a CP437-encoded string.
+  Note that the returned string may be longer than the input string. For
+  example, ``ä`` is replaced with ``a``, and ``æ`` is replaced with ``ae``.
 
 Gui module
 ----------
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 5a8ad0f0c..143e793cf 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -47,6 +47,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `createitem`: added an ``inspect`` subcommand to print the item and material tokens of existing items, which can be used to create additional matching items
 - `embark-assistant`: added support for searching for taller waterfalls (up to 50 z-levels tall)
 - `search`: added support for searching for names containing non-ASCII characters using their ASCII equivalents
+- `stocks`: added support for searching for items containing non-ASCII characters using their ASCII equivalents
 - `zone`: added an ``enumnick`` subcommand to assign enumerated nicknames (e.g "Hen 1", "Hen 2"...)
 - `zone`: added slaughter indication to ``uinfo`` output
 
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 78364083f..c863a8d4d 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -1417,6 +1417,7 @@ static bool isMapLoaded() { return Core::getInstance().isMapLoaded(); }
 static std::string df2utf(std::string s) { return DF2UTF(s); }
 static std::string utf2df(std::string s) { return UTF2DF(s); }
 static std::string df2console(color_ostream &out, std::string s) { return DF2CONSOLE(out, s); }
+static std::string toSearchNormalized(std::string s) { return to_search_normalized(s); }
 
 #define WRAP_VERSION_FUNC(name, function) WRAPN(name, DFHack::Version::function)
 
@@ -1434,6 +1435,7 @@ static const LuaWrapper::FunctionReg dfhack_module[] = {
     WRAP(df2utf),
     WRAP(utf2df),
     WRAP(df2console),
+    WRAP(toSearchNormalized),
     WRAP_VERSION_FUNC(getDFHackVersion, dfhack_version),
     WRAP_VERSION_FUNC(getDFHackRelease, dfhack_release),
     WRAP_VERSION_FUNC(getDFHackBuildID, dfhack_build_id),
diff --git a/plugins/listcolumn.h b/plugins/listcolumn.h
index 0abe07b9d..608a94b47 100644
--- a/plugins/listcolumn.h
+++ b/plugins/listcolumn.h
@@ -139,14 +139,14 @@ public:
     virtual void tokenizeSearch (vector<string> *dest, const string search)
     {
         if (!search.empty())
-            split_string(dest, search, " ");
+            split_string(dest, to_search_normalized(search), " ");
     }
 
     virtual bool showEntry(const ListEntry<T> *entry, const vector<string> &search_tokens)
     {
         if (!search_tokens.empty())
         {
-            string item_string = toLower(entry->text);
+            string item_string = to_search_normalized(entry->text);
             for (auto si = search_tokens.begin(); si != search_tokens.end(); si++)
             {
                 if (!si->empty() && item_string.find(*si) == string::npos &&
@@ -164,9 +164,9 @@ public:
         ListEntry<T> *prev_selected = (getDisplayListSize() > 0) ? display_list[highlighted_index] : NULL;
         display_list.clear();
 
-        search_string = toLower(search_string);
+        search_string = to_search_normalized(search_string);
         vector<string> search_tokens;
-        tokenizeSearch(&search_tokens, search_string);
+        tokenizeSearch(&search_tokens, to_search_normalized(search_string));
 
         for (size_t i = 0; i < list.size(); i++)
         {
diff --git a/test/encoding.lua b/test/encoding.lua
new file mode 100644
index 000000000..cb0a72664
--- /dev/null
+++ b/test/encoding.lua
@@ -0,0 +1,8 @@
+function test.toSearchNormalized()
+    expect.eq(dfhack.toSearchNormalized(''), '')
+    expect.eq(dfhack.toSearchNormalized('abcd'), 'abcd')
+    expect.eq(dfhack.toSearchNormalized('ABCD'), 'abcd')
+    expect.eq(dfhack.toSearchNormalized(dfhack.utf2df('áçèîöü')), 'aceiou')
+    expect.eq(dfhack.toSearchNormalized(dfhack.utf2df('ÄÇÉÖÜÿ')), 'aceouy')
+    expect.eq(dfhack.toSearchNormalized(dfhack.utf2df('æÆ')), 'aeae')
+end

From b343d008004717f3c70de106bbf19106ae8c8f5c Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 10 Oct 2020 17:31:30 -0400
Subject: [PATCH 439/547] Update to 0.47.04-r3 (authors, changelog, and
 submodules)

---
 CMakeLists.txt     | 2 +-
 docs/changelog.txt | 9 +++++++++
 library/xml        | 2 +-
 scripts            | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad61d8010..4f8b42521 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,7 +185,7 @@ endif()
 
 # set up versioning.
 set(DF_VERSION "0.47.04")
-set(DFHACK_RELEASE "r2")
+set(DFHACK_RELEASE "r3")
 set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 143e793cf..faec636dd 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -33,6 +33,8 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 # Future
 
+# 0.47.04-r3
+
 ## New Plugins
 - `xlsxreader`: provides an API for Lua scripts to read Excel spreadsheets
 
@@ -41,6 +43,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `getplants`: fixed a crash that could occur on some maps
 - `search`: fixed an issue causing item counts on the trade screen to display inconsistently when searching
 - `stockpiles`: fixed a crash when loading food stockpiles
+- `stockpiles`: fixed an error when saving furniture stockpiles
 
 ## Misc Improvements
 - `createitem`: added support for plant growths (fruit, berries, leaves, etc.)
@@ -51,6 +54,12 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `zone`: added an ``enumnick`` subcommand to assign enumerated nicknames (e.g "Hen 1", "Hen 2"...)
 - `zone`: added slaughter indication to ``uinfo`` output
 
+## Documentation
+- Fixed syntax highlighting of most code blocks to use the appropriate language (or no language) instead of Python
+
+## API
+- Added ``DFHack::to_search_normalized()`` (Lua: ``dfhack.toSearchNormalized()``) to convert non-ASCII alphabetic characters to their ASCII equivalents
+
 # 0.47.04-r2
 
 ## New Tweaks
diff --git a/library/xml b/library/xml
index 85b8f413f..00549aca0 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 85b8f413f6f0561817c16bc0edca99fec6f1e774
+Subproject commit 00549aca0640ca121c20734df667f79b247c93b4
diff --git a/scripts b/scripts
index a6d5df4e7..0b2748554 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit a6d5df4e73f06b4f8a829baeca97f0d63830b65b
+Subproject commit 0b274855424e5d0850d2cfc8b10e1cdcc47c6877

From 93520b4b004b44b01f59cd7616f0315e4bfa8b43 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 11 Oct 2020 20:45:56 -0400
Subject: [PATCH 440/547] dwarfmonitor prefs: fix segfault if item_subtype is
 null for some item types

---
 docs/changelog.txt       |  3 ++
 plugins/dwarfmonitor.cpp | 85 +++++++++++++++++++++++++++++++++-------
 2 files changed, 73 insertions(+), 15 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index faec636dd..7f289c36d 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -33,6 +33,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 # Future
 
+## Fixes
+- `dwarfmonitor`: fixed a crash when opening the ``prefs`` screen if units have vague preferences
+
 # 0.47.04-r3
 
 ## New Plugins
diff --git a/plugins/dwarfmonitor.cpp b/plugins/dwarfmonitor.cpp
index fc1679a19..84e9b9abe 100644
--- a/plugins/dwarfmonitor.cpp
+++ b/plugins/dwarfmonitor.cpp
@@ -1155,52 +1155,107 @@ struct preference_map
 
     string getItemLabel()
     {
-        df::world_raws::T_itemdefs &defs = world->raws.itemdefs;
         label = ENUM_ATTR_STR(item_type, caption, pref.item_type);
         switch (pref.item_type)
         {
         case (df::item_type::WEAPON):
-            label = defs.weapons[pref.item_subtype]->name_plural;
+        {
+            auto *def = vector_get(world->raws.itemdefs.weapons, pref.item_subtype);
+            if (def)
+                label = def->name_plural;
             break;
+        }
         case (df::item_type::TRAPCOMP):
-            label = defs.trapcomps[pref.item_subtype]->name_plural;
+        {
+            auto *def = vector_get(world->raws.itemdefs.trapcomps, pref.item_subtype);
+            if (def)
+                label = def->name_plural;
             break;
+        }
         case (df::item_type::TOY):
-            label = defs.toys[pref.item_subtype]->name_plural;
+        {
+            auto *def = vector_get(world->raws.itemdefs.toys, pref.item_subtype);
+            if (def)
+                label = def->name_plural;
             break;
+        }
         case (df::item_type::TOOL):
-            label = defs.tools[pref.item_subtype]->name_plural;
+        {
+            auto *def = vector_get(world->raws.itemdefs.tools, pref.item_subtype);
+            if (def)
+                label = def->name_plural;
             break;
+        }
         case (df::item_type::INSTRUMENT):
-            label = defs.instruments[pref.item_subtype]->name_plural;
+        {
+            auto *def = vector_get(world->raws.itemdefs.instruments, pref.item_subtype);
+            if (def)
+                label = def->name_plural;
             break;
+        }
         case (df::item_type::ARMOR):
-            label = defs.armor[pref.item_subtype]->name_plural;
+        {
+            auto *def = vector_get(world->raws.itemdefs.armor, pref.item_subtype);
+            if (def)
+                label = def->name_plural;
             break;
+        }
         case (df::item_type::AMMO):
-            label = defs.ammo[pref.item_subtype]->name_plural;
+        {
+            auto *def = vector_get(world->raws.itemdefs.ammo, pref.item_subtype);
+            if (def)
+                label = def->name_plural;
             break;
+        }
         case (df::item_type::SIEGEAMMO):
-            label = defs.siege_ammo[pref.item_subtype]->name_plural;
+        {
+            auto *def = vector_get(world->raws.itemdefs.siege_ammo, pref.item_subtype);
+            if (def)
+                label = def->name_plural;
             break;
+        }
         case (df::item_type::GLOVES):
-            label = defs.gloves[pref.item_subtype]->name_plural;
+        {
+            auto *def = vector_get(world->raws.itemdefs.gloves, pref.item_subtype);
+            if (def)
+                label = def->name_plural;
             break;
+        }
         case (df::item_type::SHOES):
-            label = defs.shoes[pref.item_subtype]->name_plural;
+        {
+            auto *def = vector_get(world->raws.itemdefs.shoes, pref.item_subtype);
+            if (def)
+                label = def->name_plural;
             break;
+        }
         case (df::item_type::SHIELD):
-            label = defs.shields[pref.item_subtype]->name_plural;
+        {
+            auto *def = vector_get(world->raws.itemdefs.shields, pref.item_subtype);
+            if (def)
+                label = def->name_plural;
             break;
+        }
         case (df::item_type::HELM):
-            label = defs.helms[pref.item_subtype]->name_plural;
+        {
+            auto *def = vector_get(world->raws.itemdefs.helms, pref.item_subtype);
+            if (def)
+                label = def->name_plural;
             break;
+        }
         case (df::item_type::PANTS):
-            label = defs.pants[pref.item_subtype]->name_plural;
+        {
+            auto *def = vector_get(world->raws.itemdefs.pants, pref.item_subtype);
+            if (def)
+                label = def->name_plural;
             break;
+        }
         case (df::item_type::FOOD):
-            label = defs.food[pref.item_subtype]->name;
+        {
+            auto *def = vector_get(world->raws.itemdefs.food, pref.item_subtype);
+            if (def)
+                label = def->name;
             break;
+        }
 
         default:
             label = ENUM_ATTR_STR(item_type, caption, pref.item_type);

From bdf2bbc22e587dddc0ab63487059bd41b6132841 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 11 Oct 2020 22:15:01 -0700
Subject: [PATCH 441/547] remove reference in docs to unimplemented behavior

I never implemented ignoring spaces in alias definitions, and now that
I've thought more about the consequences, I don't plan to : ) Ignoring
spaces would lead to conusing behavior when players attempt to give
names with spaces to buildings
---
 dfhack-config/quickfort/aliases.txt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dfhack-config/quickfort/aliases.txt b/dfhack-config/quickfort/aliases.txt
index c5d34ec39..2b90e67c4 100644
--- a/dfhack-config/quickfort/aliases.txt
+++ b/dfhack-config/quickfort/aliases.txt
@@ -22,12 +22,12 @@
 #
 # For example, say you have the following build and place blueprints:
 #
-# #build start(4;1;upper left corner of stockpile) build masonry workshop
+# #build masonry workshop
 # ~, ~,~,`,`,`
 # ~,wm,~,`,`,`
 # ~, ~,~,`,`,`
 #
-# #place start(4;1;upper left corner of stockpile) place stockpile for mason
+# #place stockpile for mason
 # ~,~,~,s,s,s
 # ~,~,~,s,s,s
 # ~,~,~,s,s,s
@@ -63,9 +63,7 @@
 # keycode from the DF interface definition file (data/init/interface.txt),
 # enclosed in curly brackets like an alias, like: "{Right}" or "{Enter}". In
 # order to avoid naming conflicts between aliases and keycodes, the convention
-# is to start aliases with a lowercase letter. You can add spaces in between
-# keystrokes to make them easier to read. Spaces in keystroke sequences will be
-# ignored. To insert a literal space, use "{Space}"
+# is to start aliases with a lowercase letter.
 #
 # Anything enclosed within curly brackets can also have a number after it,
 # indicating how many times that alias or keycode should be repeated. For

From f754164a1ddaa2e0c8b63a7349e4da1b3347fd9a Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 11 Oct 2020 22:16:42 -0700
Subject: [PATCH 442/547] document new query_unsafe option

---
 dfhack-config/quickfort/quickfort.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dfhack-config/quickfort/quickfort.txt b/dfhack-config/quickfort/quickfort.txt
index 575b7a804..c1d70201f 100644
--- a/dfhack-config/quickfort/quickfort.txt
+++ b/dfhack-config/quickfort/quickfort.txt
@@ -22,6 +22,14 @@ buildings_use_blocks=true
 # be designated in marker mode.
 force_marker_mode=false
 
+# Skip query blueprint sanity checks that detect common blueprint errors and
+# halt or skip keycode playback. Checks include ensuring a configurable building
+# exists at the designated cursor position and verifying the active UI screen is
+# the same before and after sending keys for the cursor position. Temporarily
+# enable this if you are running a query blueprint that sends a key sequence
+# that is *not* related to stockpile or building configuration.
+query_unsafe=false
+
 # Set to the maximum number of resources you want assigned to stockpiles of the
 # relevant types. Set to -1 for DF defaults (number of stockpile tiles for
 # stockpiles that take barrels and bins, 1 wheelbarrow for stone stockpiles).

From 88fd25e63c1631fd363748d68176f76d9a204c6e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 12 Oct 2020 23:51:51 -0400
Subject: [PATCH 443/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 0b2748554..a574158ca 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 0b274855424e5d0850d2cfc8b10e1cdcc47c6877
+Subproject commit a574158ca3f12ed2911e77632e09972be56beb3a

From cc159909e2b069b0a7adf66e037b6a1eee998001 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 13 Oct 2020 00:24:29 -0400
Subject: [PATCH 444/547] Mention some third-party Linux packages

Closes #20
---
 docs/Installing.rst | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/Installing.rst b/docs/Installing.rst
index c0175b820..5b564f45f 100644
--- a/docs/Installing.rst
+++ b/docs/Installing.rst
@@ -150,3 +150,19 @@ DF, DFHack, and other utilities. If you are new to Dwarf Fortress and DFHack,
 these may be easier to set up. Note that these packs are not maintained by the
 DFHack team and vary in their release schedules and contents. Some may make
 significant configuration changes, and some may not include DFHack at all.
+
+Linux packages
+==============
+
+Third-party DFHack packages are available for some Linux distributions,
+including in:
+
+* `AUR <https://aur.archlinux.org/packages/dfhack/>`__, for Arch and related
+  distributions
+* `RPM Fusion <https://admin.rpmfusion.org/pkgdb/package/nonfree/dfhack/>`__,
+  for Fedora and related distributions
+
+Note that these may lag behind DFHack releases. If you want to use a newer
+version of DFHack, we generally recommended installing it in a clean copy of DF
+in your home folder. Attempting to upgrade an installation of DFHack from a
+package manager may break it.

From ce7772a1c267bdba1f2c305a872fe8b088302a51 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 14 Oct 2020 21:22:53 -0400
Subject: [PATCH 445/547] Add Filesystem::restorecwd()

This allows restoring the working directory to its original value, which may not actually be the DF root. See #1671, dfhack/scripts#152
---
 docs/Lua API.rst                     |  4 ++++
 library/Core.cpp                     |  5 ++++-
 library/LuaApi.cpp                   |  1 +
 library/include/modules/Filesystem.h |  2 ++
 library/modules/Filesystem.cpp       | 17 +++++++++++++++++
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index fb67610d1..b310b449e 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -2160,6 +2160,10 @@ unless otherwise noted.
 
   Changes the current directory to ``path``. Use with caution.
 
+* ``dfhack.filesystem.restorecwd()``
+
+  Restores the current working directory to what it was when DF started.
+
 * ``dfhack.filesystem.mkdir(path)``
 
   Creates a new directory. Returns ``false`` if unsuccessful, including if ``path`` already exists.
diff --git a/library/Core.cpp b/library/Core.cpp
index c6ce9ea48..ff4ccc98e 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -1618,7 +1618,10 @@ bool Core::Init()
         freopen("stderr.log", "w", stderr);
     #endif
 
-    fprintf(stderr, "DFHack build: %s\n", Version::git_description());
+    Filesystem::init();
+
+    cerr << "DFHack build: " << Version::git_description() << "\n"
+         << "Starting with working directory: " << Filesystem::getcwd() << endl;
 
     // find out what we are...
     #ifdef LINUX_BUILD
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index c863a8d4d..d38cb31ba 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -2371,6 +2371,7 @@ static const luaL_Reg dfhack_screen_funcs[] = {
 
 static const LuaWrapper::FunctionReg dfhack_filesystem_module[] = {
     WRAPM(Filesystem, getcwd),
+    WRAPM(Filesystem, restorecwd),
     WRAPM(Filesystem, chdir),
     WRAPM(Filesystem, mkdir),
     WRAPM(Filesystem, mkdir_recursive),
diff --git a/library/include/modules/Filesystem.h b/library/include/modules/Filesystem.h
index c9218ba33..eac8a1102 100644
--- a/library/include/modules/Filesystem.h
+++ b/library/include/modules/Filesystem.h
@@ -146,8 +146,10 @@ enum _filetype {
 
 namespace DFHack {
     namespace Filesystem {
+        DFHACK_EXPORT void init ();
         DFHACK_EXPORT bool chdir (std::string path);
         DFHACK_EXPORT std::string getcwd ();
+        DFHACK_EXPORT bool restorecwd ();
         DFHACK_EXPORT bool mkdir (std::string path);
         // returns true on success or if directory already exists
         DFHACK_EXPORT bool mkdir_recursive (std::string path);
diff --git a/library/modules/Filesystem.cpp b/library/modules/Filesystem.cpp
index c0d0860ad..7738bfd5e 100644
--- a/library/modules/Filesystem.cpp
+++ b/library/modules/Filesystem.cpp
@@ -52,6 +52,18 @@ SOFTWARE.
 
 using namespace DFHack;
 
+static bool initialized = false;
+static std::string initial_cwd;
+
+void Filesystem::init ()
+{
+    if (!initialized)
+    {
+        initialized = true;
+        initial_cwd = Filesystem::getcwd();
+    }
+}
+
 bool Filesystem::chdir (std::string path)
 {
     return ::chdir(path.c_str()) == 0;
@@ -71,6 +83,11 @@ std::string Filesystem::getcwd ()
     return result;
 }
 
+bool Filesystem::restorecwd ()
+{
+    return Filesystem::chdir(initial_cwd);
+}
+
 bool Filesystem::mkdir (std::string path)
 {
     int fail;

From 82013c0c5ea145ef709048e0d130f9a184ffbd48 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Fri, 16 Oct 2020 13:52:23 -0700
Subject: [PATCH 446/547] prep buildingplan for core algorithm changes

Lots of refactoring and reorganizing, with only cosmetic player-visible changes.

- show quickfort mode hotlkey label regardless of whether the current building type has buildingplan enabled. before, it was only shown after the user enabled buildingplan for the current building. this eliminates the extra step when enabling quickfort mode, which force-enables all building types.
- changed signature of lua-exported isPlannableBuilding to take subtype
  and custom type in addition to building type. this is only used by
  quickfort, and it already sends all three params in preparation for
  this change
- added lua-exported scheduleCycle(), which is like doCycle(), but only
  takes effect on the next non-paused frame. this lets quickfort
  run only one buildingplan cycle regardless of how many #build
  blueprints were run
- declared a few dfhack library methods and params const so buildingplan
  could call them from const methods
- converted buildingplan internal debug logging fn to have a printf api
- reshaped buildingplan-planner API and refactored implementation in
  preparation for upcoming core algorithm changes for supporing all
  building types (no externally-visible functionality changes)
  - changed df::building_type params to type, subtype, custom tuple keys
  - introduced capability to return multiple filters per building type
    (though the current buildings all only have one filter per)
- split monolith hook functions in buildingplan.cpp into one per scope.
  this significantly cleans up the code and preps the hooks to handle
  iterating through multiple item filters.
- got rid of send_key function and replaced with better reporting of
  whether keys have been handled
---
 docs/Lua API.rst                    |   3 +-
 library/include/modules/Materials.h |   4 +-
 library/modules/Materials.cpp       |   4 +-
 plugins/buildingplan-lib.cpp        |  10 +-
 plugins/buildingplan-lib.h          |   2 +-
 plugins/buildingplan-planner.cpp    | 549 ++++++++++++++++-----------
 plugins/buildingplan-planner.h      | 132 ++++---
 plugins/buildingplan.cpp            | 554 +++++++++++++++-------------
 plugins/fortplan.cpp                |   4 +-
 plugins/lua/buildingplan.lua        |   3 +-
 plugins/uicommon.h                  |   2 +-
 11 files changed, 737 insertions(+), 530 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index fb67610d1..86470887c 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3702,9 +3702,10 @@ buildingplan
 
 Native functions:
 
-* ``bool isPlannableBuilding(df::building_type type)`` returns whether the building type is handled by buildingplan
+* ``bool isPlannableBuilding(df::building_type type, int16_t subtype, int32_t custom)`` returns whether the building type is handled by buildingplan
 * ``void addPlannedBuilding(df::building *bld)`` suspends the building jobs and adds the building to the monitor list
 * ``void doCycle()`` runs a check for whether buildlings in the monitor list can be assigned items and unsuspended. This method runs automatically twice a game day, so you only need to call it directly if you want buildingplan to do a check right now.
+* ``void scheduleCycle()`` schedules a cycle to be run during the next non-paused game frame. Can be called multiple times while the game is paused and only one cycle will be scheduled.
 
 burrows
 =======
diff --git a/library/include/modules/Materials.h b/library/include/modules/Materials.h
index b326719c6..a3b4204e5 100644
--- a/library/include/modules/Materials.h
+++ b/library/include/modules/Materials.h
@@ -136,8 +136,8 @@ namespace DFHack
             return findProduct(info.material, name);
         }
 
-        std::string getToken();
-        std::string toString(uint16_t temp = 10015, bool named = true);
+        std::string getToken() const;
+        std::string toString(uint16_t temp = 10015, bool named = true) const;
 
         bool isAnyCloth();
 
diff --git a/library/modules/Materials.cpp b/library/modules/Materials.cpp
index c341ea99e..909fa56f9 100644
--- a/library/modules/Materials.cpp
+++ b/library/modules/Materials.cpp
@@ -305,7 +305,7 @@ bool MaterialInfo::findProduct(df::material *material, const std::string &name)
     return decode(-1);
 }
 
-std::string MaterialInfo::getToken()
+std::string MaterialInfo::getToken() const
 {
     if (isNone())
         return "NONE";
@@ -333,7 +333,7 @@ std::string MaterialInfo::getToken()
     }
 }
 
-std::string MaterialInfo::toString(uint16_t temp, bool named)
+std::string MaterialInfo::toString(uint16_t temp, bool named) const
 {
     if (isNone())
         return "any";
diff --git a/plugins/buildingplan-lib.cpp b/plugins/buildingplan-lib.cpp
index 215dbb900..e05d9b9dc 100644
--- a/plugins/buildingplan-lib.cpp
+++ b/plugins/buildingplan-lib.cpp
@@ -1,16 +1,22 @@
 #include "buildingplan-lib.h"
 
+#include <cstdarg>
 #include "Core.h"
 
 using namespace DFHack;
 
 bool show_debugging = false;
 
-void debug(const std::string &msg)
+void debug(const char *fmt, ...)
 {
     if (!show_debugging)
         return;
 
     color_ostream_proxy out(Core::getInstance().getConsole());
-    out << "DEBUG: " << msg << endl;
+    out.print("DEBUG(buildingplan): ");
+    va_list args;
+    va_start(args, fmt);
+    out.vprint(fmt, args);
+    va_end(args);
+    out.print("\n");
 }
diff --git a/plugins/buildingplan-lib.h b/plugins/buildingplan-lib.h
index 61a00e796..e906ef1a7 100644
--- a/plugins/buildingplan-lib.h
+++ b/plugins/buildingplan-lib.h
@@ -3,6 +3,6 @@
 #include "buildingplan-planner.h"
 #include "buildingplan-rooms.h"
 
-void debug(const std::string &msg);
+void debug(const char *fmt, ...) Wformat(printf,1,2);
 
 extern bool show_debugging;
diff --git a/plugins/buildingplan-planner.cpp b/plugins/buildingplan-planner.cpp
index 6923570c2..3cb27145e 100644
--- a/plugins/buildingplan-planner.cpp
+++ b/plugins/buildingplan-planner.cpp
@@ -1,185 +1,269 @@
+#include <functional>
+#include <climits> // for CHAR_BIT
+
+#include "df/building_design.h"
+#include "df/building_doorst.h"
+#include "df/building_type.h"
 #include "df/general_ref_building_holderst.h"
 #include "df/job_item.h"
-#include "df/building_doorst.h"
-#include "df/building_design.h"
+#include "df/ui_build_selector.h"
 
-#include "modules/Job.h"
 #include "modules/Buildings.h"
 #include "modules/Gui.h"
+#include "modules/Job.h"
+
+#include "uicommon.h"
 
 #include "buildingplan-planner.h"
 #include "buildingplan-lib.h"
-#include "uicommon.h"
 
-/*
-* ItemFilter
-*/
+static const std::string planned_building_persistence_key_v1 = "buildingplan/constraints";
 
-ItemFilter::ItemFilter() :
-        min_quality(df::item_quality::Ordinary),
-        max_quality(df::item_quality::Artifact),
-        decorated_only(false),
-        valid(true)
-{
-    clear(); // mat_mask is not cleared by default (see issue #1047)
-}
+/*
+ * ItemFilter
+ */
 
-bool ItemFilter::matchesMask(DFHack::MaterialInfo &mat)
+ItemFilter::ItemFilter()
 {
-    return (mat_mask.whole) ? mat.matches(mat_mask) : true;
+    clear();
 }
 
-bool ItemFilter::matches(const df::dfhack_material_category mask) const
+void ItemFilter::clear()
 {
-    return mask.whole & mat_mask.whole;
+    min_quality = df::item_quality::Ordinary;
+    max_quality = df::item_quality::Masterful;
+    decorated_only = false;
+    clearMaterialMask();
+    materials.clear();
 }
 
-bool ItemFilter::matches(DFHack::MaterialInfo &material) const
+bool ItemFilter::deserialize(PersistentDataItem &config)
 {
-    for (auto it = materials.begin(); it != materials.end(); ++it)
-        if (material.matches(*it))
-            return true;
-    return false;
-}
+    clear();
 
-bool ItemFilter::matches(df::item *item)
-{
-    if (item->getQuality() < min_quality || item->getQuality() > max_quality)
+    std::vector<std::string> tokens;
+    split_string(&tokens, config.val(), "/");
+    if (tokens.size() != 2)
+    {
+        debug("invalid ItemFilter serialization: '%s'", config.val().c_str());
         return false;
+    }
 
-    if (decorated_only && !item->hasImprovements())
+    if (!deserializeMaterialMask(tokens[0]) || !deserializeMaterials(tokens[1]))
         return false;
 
-    auto imattype = item->getActualMaterial();
-    auto imatindex = item->getActualMaterialIndex();
-    auto item_mat = DFHack::MaterialInfo(imattype, imatindex);
-
-    return (materials.size() == 0) ? matchesMask(item_mat) : matches(item_mat);
+    setMinQuality(config.ival(2) - 1);
+    setMaxQuality(config.ival(4) - 1);
+    decorated_only = config.ival(3) - 1;
+    return true;
 }
 
-std::string material_to_string_fn(DFHack::MaterialInfo m) { return m.toString(); }
+bool ItemFilter::deserializeMaterialMask(std::string ser)
+{
+    if (ser.empty())
+        return true;
 
-std::vector<std::string> ItemFilter::getMaterialFilterAsVector()
+    if (!parseJobMaterialCategory(&mat_mask, ser))
+    {
+        debug("invalid job material category serialization: '%s'", ser.c_str());
+        return false;
+    }
+    return true;
+}
+
+bool ItemFilter::deserializeMaterials(std::string ser)
 {
-    std::vector<std::string> descriptions;
+    if (ser.empty())
+        return true;
 
-    transform_(materials, descriptions, material_to_string_fn);
+    std::vector<std::string> mat_names;
+    split_string(&mat_names, ser, ",");
+    for (auto m = mat_names.begin(); m != mat_names.end(); m++)
+    {
+        DFHack::MaterialInfo material;
+        if (!material.find(*m) || !material.isValid())
+        {
+            debug("invalid material name serialization: '%s'", ser.c_str());
+            return false;
+        }
+        materials.push_back(material);
+    }
+    return true;
+}
 
-    if (descriptions.size() == 0)
-        bitfield_to_string(&descriptions, mat_mask);
+void ItemFilter::serialize(PersistentDataItem &config) const
+{
+    std::ostringstream ser;
+    ser << bitfield_to_string(mat_mask, ",") << "/";
+    if (!materials.empty())
+    {
+        ser << materials[0].getToken();
+        for (size_t i = 1; i < materials.size(); ++i)
+            ser << "," << materials[i].getToken();
+    }
+    config.val() = ser.str();
+    config.ival(2) = min_quality + 1;
+    config.ival(4) = max_quality + 1;
+    config.ival(3) = static_cast<int>(decorated_only) + 1;
+}
 
-    if (descriptions.size() == 0)
-        descriptions.push_back("any");
+void ItemFilter::clearMaterialMask()
+{
+    mat_mask.whole = 0;
+}
 
-    return descriptions;
+void ItemFilter::addMaterialMask(uint32_t mask)
+{
+    mat_mask.whole |= mask;
 }
 
-std::string ItemFilter::getMaterialFilterAsSerial()
+void ItemFilter::setMaterials(std::vector<DFHack::MaterialInfo> materials)
 {
-    std::string str;
+    this->materials = materials;
+}
 
-    str.append(bitfield_to_string(mat_mask, ","));
-    str.append("/");
-    if (materials.size() > 0)
+static void clampItemQuality(df::item_quality *quality)
+{
+    if (*quality > item_quality::Artifact)
     {
-        for (size_t i = 0; i < materials.size(); i++)
-            str.append(materials[i].getToken() + ",");
-
-        if (str[str.size()-1] == ',')
-            str.resize(str.size () - 1);
+        debug("clamping quality to Artifact");
+        *quality = item_quality::Artifact;
     }
+    if (*quality < item_quality::Ordinary)
+    {
+        debug("clamping quality to Ordinary");
+        *quality = item_quality::Ordinary;
+    }
+}
 
-    return str;
+void ItemFilter::setMinQuality(int quality)
+{
+    min_quality = static_cast<df::item_quality>(quality);
+    clampItemQuality(&min_quality);
+    if (max_quality < min_quality)
+        max_quality = min_quality;
 }
 
-bool ItemFilter::parseSerializedMaterialTokens(std::string str)
+void ItemFilter::setMaxQuality(int quality)
 {
-    valid = false;
-    std::vector<std::string> tokens;
-    split_string(&tokens, str, "/");
+    max_quality = static_cast<df::item_quality>(quality);
+    clampItemQuality(&max_quality);
+    if (max_quality < min_quality)
+        min_quality = max_quality;
+}
 
-    if (tokens.size() > 0 && !tokens[0].empty())
-    {
-        if (!parseJobMaterialCategory(&mat_mask, tokens[0]))
-            return false;
-    }
+void ItemFilter::incMinQuality() { setMinQuality(min_quality + 1); }
+void ItemFilter::decMinQuality() { setMinQuality(min_quality - 1); }
+void ItemFilter::incMaxQuality() { setMaxQuality(max_quality + 1); }
+void ItemFilter::decMaxQuality() { setMaxQuality(max_quality - 1); }
 
-    if (tokens.size() > 1 && !tokens[1].empty())
-    {
-        std::vector<std::string> mat_names;
-        split_string(&mat_names, tokens[1], ",");
-        for (auto m = mat_names.begin(); m != mat_names.end(); m++)
-        {
-            DFHack::MaterialInfo material;
-            if (!material.find(*m) || !material.isValid())
-                return false;
+void ItemFilter::toggleDecoratedOnly() { decorated_only = !decorated_only; }
 
-            materials.push_back(material);
-        }
-    }
+static std::string material_to_string_fn(const MaterialInfo &m) { return m.toString(); }
 
-    valid = true;
-    return true;
+uint32_t ItemFilter::getMaterialMask() const { return mat_mask.whole; }
+
+std::vector<std::string> ItemFilter::getMaterials() const
+{
+    std::vector<std::string> descriptions;
+    transform_(materials, descriptions, material_to_string_fn);
+
+    if (descriptions.size() == 0)
+        bitfield_to_string(&descriptions, mat_mask);
+
+    if (descriptions.size() == 0)
+        descriptions.push_back("any");
+
+    return descriptions;
 }
 
-std::string ItemFilter::getMinQuality()
+std::string ItemFilter::getMinQuality() const
 {
     return ENUM_KEY_STR(item_quality, min_quality);
 }
 
-std::string ItemFilter::getMaxQuality()
+std::string ItemFilter::getMaxQuality() const
 {
     return ENUM_KEY_STR(item_quality, max_quality);
 }
 
-bool ItemFilter::isValid()
+bool ItemFilter::getDecoratedOnly() const
 {
-    return valid;
+    return decorated_only;
 }
 
-void ItemFilter::clear()
+bool ItemFilter::matchesMask(DFHack::MaterialInfo &mat) const
 {
-    mat_mask.whole = 0;
-    materials.clear();
+    return mat_mask.whole ? mat.matches(mat_mask) : true;
 }
 
-/*
-* PlannedBuilding
-*/
+bool ItemFilter::matches(df::dfhack_material_category mask) const
+{
+    return mask.whole & mat_mask.whole;
+}
 
-PlannedBuilding::PlannedBuilding(df::building *building, ItemFilter *filter)
+bool ItemFilter::matches(DFHack::MaterialInfo &material) const
 {
-    this->building = building;
-    this->filter = *filter;
-    pos = df::coord(building->centerx, building->centery, building->z);
-    config = DFHack::World::AddPersistentData("buildingplan/constraints");
-    config.val() = filter->getMaterialFilterAsSerial();
-    config.ival(1) = building->id;
-    config.ival(2) = filter->min_quality + 1;
-    config.ival(3) = static_cast<int>(filter->decorated_only) + 1;
-    config.ival(4) = filter->max_quality + 1;
+    for (auto it = materials.begin(); it != materials.end(); ++it)
+        if (material.matches(*it))
+            return true;
+    return false;
 }
 
-PlannedBuilding::PlannedBuilding(PersistentDataItem &config, color_ostream &out)
+bool ItemFilter::matches(df::item *item) const
 {
-    this->config = config;
+    if (item->getQuality() < min_quality || item->getQuality() > max_quality)
+        return false;
 
-    if (!filter.parseSerializedMaterialTokens(config.val()))
-    {
-        out.printerr("Buildingplan: Cannot parse filter: %s\nDiscarding.", config.val().c_str());
-        return;
-    }
+    if (decorated_only && !item->hasImprovements())
+        return false;
 
-    building = df::building::find(config.ival(1));
-    if (!building)
-        return;
+    auto imattype = item->getActualMaterial();
+    auto imatindex = item->getActualMaterialIndex();
+    auto item_mat = DFHack::MaterialInfo(imattype, imatindex);
+
+    return (materials.size() == 0) ? matchesMask(item_mat) : matches(item_mat);
+}
+
+
+/*
+ * PlannedBuilding
+ */
 
-    pos = df::coord(building->centerx, building->centery, building->z);
-    filter.min_quality = static_cast<df::item_quality>(config.ival(2) - 1);
-    filter.max_quality = static_cast<df::item_quality>(config.ival(4) - 1);
-    filter.decorated_only = config.ival(3) - 1;
+static std::vector<ItemFilter> deserializeFilters(PersistentDataItem &config)
+{
+    // simplified implementation while we can assume there is only one filter
+    std::vector<ItemFilter> ret;
+    ItemFilter itemFilter;
+    itemFilter.deserialize(config);
+    ret.push_back(itemFilter);
+    return ret;
+}
+
+static size_t getNumFilters(BuildingTypeKey key)
+{
+    // TODO: get num filters in Lua when we handle all building types
+    return 1;
+}
+
+PlannedBuilding::PlannedBuilding(df::building *building, const std::vector<ItemFilter> &filters)
+    : building(building),
+      building_id(building->id),
+      filters(filters)
+{
+    config = DFHack::World::AddPersistentData(planned_building_persistence_key_v1);
+    config.ival(1) = building_id;
+    // assume all filter vectors are length 1 for now
+    filters[0].serialize(config);
 }
 
+PlannedBuilding::PlannedBuilding(PersistentDataItem &config)
+    : config(config),
+      building(df::building::find(config.ival(1))),
+      building_id(config.ival(1)),
+      filters(deserializeFilters(config))
+{ }
+
 bool PlannedBuilding::assignClosestItem(std::vector<df::item *> *items_vector)
 {
     decltype(items_vector->begin()) closest_item;
@@ -187,7 +271,7 @@ bool PlannedBuilding::assignClosestItem(std::vector<df::item *> *items_vector)
     for (auto item_iter = items_vector->begin(); item_iter != items_vector->end(); item_iter++)
     {
         auto item = *item_iter;
-        if (!filter.matches(item))
+        if (!filters[0].matches(item))
             continue;
 
         auto pos = item->pos;
@@ -255,68 +339,83 @@ bool PlannedBuilding::assignItem(df::item *item)
     return true;
 }
 
-bool PlannedBuilding::isValid()
+// Ensure the building still exists and is in a valid state. It can disappear
+// for lots of reasons, such as running the game with the buildingplan plugin
+// disabled, manually removing the building, modifying it via the API, etc.
+bool PlannedBuilding::isValid() const
 {
-    bool valid = filter.isValid() &&
-        building && Buildings::findAtTile(pos) == building &&
-        building->getBuildStage() == 0;
-
-    if (!valid)
-        remove();
-
-    return valid;
+    return building && df::building::find(building_id)
+        && building->getBuildStage() == 0;
 }
 
-df::building_type PlannedBuilding::getType()
+void PlannedBuilding::remove()
 {
-    return building->getType();
+    DFHack::World::DeletePersistentData(config);
+    building = NULL;
 }
 
-bool PlannedBuilding::isCurrentlySelectedBuilding()
+df::building * PlannedBuilding::getBuilding()
 {
-    return isValid() && (building == df::global::world->selected_building);
+    return building;
 }
 
-ItemFilter *PlannedBuilding::getFilter()
+const std::vector<ItemFilter> & PlannedBuilding::getFilters() const
 {
-    return &filter;
+    return filters;
 }
 
-void PlannedBuilding::remove()
+
+/*
+ * BuildingTypeKey
+ */
+
+BuildingTypeKey toBuildingTypeKey(
+    df::building_type btype, int16_t subtype, int32_t custom)
 {
-    DFHack::World::DeletePersistentData(config);
+    return std::make_tuple(btype, subtype, custom);
 }
 
-/*
-* Planner
-*/
+BuildingTypeKey toBuildingTypeKey(df::building *bld)
+{
+    return std::make_tuple(
+        bld->getType(), bld->getSubtype(), bld->getCustomType());
+}
 
-Planner::Planner() { }
+BuildingTypeKey toBuildingTypeKey(df::ui_build_selector *uibs)
+{
+    return std::make_tuple(
+        uibs->building_type, uibs->building_subtype, uibs->custom_type);
+}
 
-bool Planner::isPlannableBuilding(const df::building_type type) const
+// rotates a size_t value left by count bits
+// assumes count is not 0 or >= size_t_bits
+// replace this with std::rotl when we move to C++20
+static std::size_t rotl_size_t(size_t val, uint32_t count)
 {
-    return item_for_building_type.find(type) != item_for_building_type.end();
+    static const int size_t_bits = CHAR_BIT * sizeof(std::size_t);
+    return val << count | val >> (size_t_bits - count);
 }
 
-void Planner::reset(color_ostream &out)
+std::size_t BuildingTypeKeyHash::operator() (const BuildingTypeKey & key) const
 {
-    planned_buildings.clear();
-    std::vector<PersistentDataItem> items;
-    DFHack::World::GetPersistentData(&items, "buildingplan/constraints");
+    // cast first param to appease gcc-4.8, which is missing the enum
+    // specializations for std::hash
+    std::size_t h1 = std::hash<int32_t>()(static_cast<int32_t>(std::get<0>(key)));
+    std::size_t h2 = std::hash<int16_t>()(std::get<1>(key));
+    std::size_t h3 = std::hash<int32_t>()(std::get<2>(key));
 
-    for (auto i = items.begin(); i != items.end(); i++)
-    {
-        PlannedBuilding pb(*i, out);
-        if (pb.isValid())
-            planned_buildings.push_back(pb);
-    }
+    return h1 ^ rotl_size_t(h2, 8) ^ rotl_size_t(h3, 16);
 }
 
+
+/*
+ * Planner
+ */
+
 void Planner::initialize()
 {
 #define add_building_type(btype, itype) \
     item_for_building_type[df::building_type::btype] = df::item_type::itype; \
-    default_item_filters[df::building_type::btype] =  ItemFilter(); \
     available_item_vectors[df::item_type::itype] = std::vector<df::item *>(); \
     is_relevant_item_type[df::item_type::itype] = true; \
 
@@ -354,53 +453,82 @@ void Planner::initialize()
 #undef add_building_type
 }
 
-void Planner::addPlannedBuilding(df::building *bld)
+void Planner::reset()
 {
-    for (auto iter = bld->jobs.begin(); iter != bld->jobs.end(); iter++)
+    debug("resetting Planner state");
+    default_item_filters.clear();
+    planned_buildings.clear();
+
+    std::vector<PersistentDataItem> items;
+    DFHack::World::GetPersistentData(&items, planned_building_persistence_key_v1);
+    debug("found data for %zu planned buildings", items.size());
+
+    for (auto i = items.begin(); i != items.end(); i++)
     {
-        (*iter)->flags.bits.suspend = true;
-    }
+        PlannedBuilding pb(*i);
+        if (!pb.isValid())
+        {
+            pb.remove();
+            continue;
+        }
 
-    PlannedBuilding pb(bld, &default_item_filters[bld->getType()]);
-    planned_buildings.push_back(pb);
+        planned_buildings.push_back(pb);
+    }
 }
 
-void Planner::doCycle()
+void Planner::addPlannedBuilding(df::building *bld)
 {
-    debug("Running Cycle");
-    if (planned_buildings.size() == 0)
+    auto item_filters = getItemFilters(toBuildingTypeKey(bld)).get();
+    // not a supported type
+    if (item_filters.empty())
+    {
+        debug("failed to add building: unsupported type");
         return;
+    }
 
-    debug("Planned count: " + int_to_string(planned_buildings.size()));
+    // protect against multiple registrations
+    if (getPlannedBuilding(bld))
+    {
+        debug("building already registered");
+        return;
+    }
 
-    gather_available_items();
-    for (auto building_iter = planned_buildings.begin(); building_iter != planned_buildings.end();)
+    PlannedBuilding pb(bld, item_filters);
+    if (pb.isValid())
     {
-        if (building_iter->isValid())
-        {
-            if (show_debugging)
-                debug(std::string("Trying to allocate ") + enum_item_key_str(building_iter->getType()));
+        for (auto job : bld->jobs)
+            job->flags.bits.suspend = true;
 
-            auto required_item_type = item_for_building_type[building_iter->getType()];
-            auto items_vector = &available_item_vectors[required_item_type];
-            if (items_vector->size() == 0 || !building_iter->assignClosestItem(items_vector))
-            {
-                debug("Unable to allocate an item");
-                ++building_iter;
-                continue;
-            }
-        }
-        debug("Removing building plan");
-        building_iter = planned_buildings.erase(building_iter);
+        planned_buildings.push_back(pb);
     }
+    else
+    {
+        pb.remove();
+    }
+}
+
+PlannedBuilding * Planner::getPlannedBuilding(df::building *bld)
+{
+    for (auto & pb : planned_buildings)
+    {
+        if (pb.getBuilding() == bld)
+            return &pb;
+    }
+    return NULL;
+}
+
+bool Planner::isPlannableBuilding(BuildingTypeKey key)
+{
+    return item_for_building_type.count(std::get<0>(key)) > 0;
 }
 
-bool Planner::allocatePlannedBuilding(df::building_type type)
+bool Planner::allocatePlannedBuilding(BuildingTypeKey key)
 {
     coord32_t cursor;
     if (!DFHack::Gui::getCursorCoords(cursor.x, cursor.y, cursor.z))
         return false;
 
+    auto type = std::get<0>(key);
     auto newinst = Buildings::allocInstance(cursor.get_coord16(), type);
     if (!newinst)
         return false;
@@ -430,53 +558,48 @@ bool Planner::allocatePlannedBuilding(df::building_type type)
     return true;
 }
 
-PlannedBuilding *Planner::getSelectedPlannedBuilding()
+Planner::ItemFiltersWrapper Planner::getItemFilters(BuildingTypeKey key)
 {
-    for (auto building_iter = planned_buildings.begin(); building_iter != planned_buildings.end(); building_iter++)
-    {
-        if (building_iter->isCurrentlySelectedBuilding())
-        {
-            return &(*building_iter);
-        }
-    }
+    static std::vector<ItemFilter> empty_vector;
+    static const ItemFiltersWrapper empty_ret(empty_vector);
 
-    return nullptr;
+    size_t nfilters = getNumFilters(key);
+    if (nfilters < 1)
+        return empty_ret;
+    while (default_item_filters[key].size() < nfilters)
+        default_item_filters[key].push_back(ItemFilter());
+    return ItemFiltersWrapper(default_item_filters[key]);
 }
 
-void Planner::removeSelectedPlannedBuilding() { getSelectedPlannedBuilding()->remove(); }
-
-ItemFilter *Planner::getDefaultItemFilterForType(df::building_type type) { return &default_item_filters[type]; }
-
-void Planner::adjustMinQuality(df::building_type type, int amount)
+void Planner::doCycle()
 {
-    auto min_quality = &getDefaultItemFilterForType(type)->min_quality;
-    *min_quality = static_cast<df::item_quality>(*min_quality + amount);
-
-    boundsCheckItemQuality(min_quality);
-    auto max_quality = &getDefaultItemFilterForType(type)->max_quality;
-    if (*min_quality > *max_quality)
-        (*max_quality) = *min_quality;
+    debug("Running Cycle");
+    if (planned_buildings.size() == 0)
+        return;
 
-}
+    debug("Planned count: %zu", planned_buildings.size());
 
-void Planner::adjustMaxQuality(df::building_type type, int amount)
-{
-    auto max_quality = &getDefaultItemFilterForType(type)->max_quality;
-    *max_quality = static_cast<df::item_quality>(*max_quality + amount);
-
-    boundsCheckItemQuality(max_quality);
-    auto min_quality = &getDefaultItemFilterForType(type)->min_quality;
-    if (*max_quality < *min_quality)
-        (*min_quality) = *max_quality;
-}
+    gather_available_items();
+    for (auto building_iter = planned_buildings.begin(); building_iter != planned_buildings.end();)
+    {
+        if (building_iter->isValid())
+        {
+            auto type = building_iter->getBuilding()->getType();
+            debug("Trying to allocate %s", enum_item_key_str(type));
 
-void Planner::boundsCheckItemQuality(item_quality::item_quality *quality)
-{
-    *quality = static_cast<df::item_quality>(*quality);
-    if (*quality > item_quality::Artifact)
-        (*quality) = item_quality::Artifact;
-    if (*quality < item_quality::Ordinary)
-        (*quality) = item_quality::Ordinary;
+            auto required_item_type = item_for_building_type[type];
+            auto items_vector = &available_item_vectors[required_item_type];
+            if (items_vector->size() == 0 || !building_iter->assignClosestItem(items_vector))
+            {
+                debug("Unable to allocate an item");
+                ++building_iter;
+                continue;
+            }
+        }
+        debug("Removing building plan");
+        building_iter->remove();
+        building_iter = planned_buildings.erase(building_iter);
+    }
 }
 
 void Planner::gather_available_items()
diff --git a/plugins/buildingplan-planner.h b/plugins/buildingplan-planner.h
index 67eeb9bff..9341ad03f 100644
--- a/plugins/buildingplan-planner.h
+++ b/plugins/buildingplan-planner.h
@@ -1,99 +1,131 @@
 #pragma once
 
-#include "df/item_quality.h"
+#include <unordered_map>
+
+#include "df/building.h"
 #include "df/dfhack_material_category.h"
+#include "df/item_quality.h"
+#include "df/job_item.h"
+
 #include "modules/Materials.h"
 #include "modules/Persistence.h"
 
-struct ItemFilter
+class ItemFilter
 {
+public:
+    ItemFilter();
+
+    void clear();
+    bool deserialize(DFHack::PersistentDataItem &config);
+    void serialize(DFHack::PersistentDataItem &config) const;
+
+    void addMaterialMask(uint32_t mask);
+    void clearMaterialMask();
+    void setMaterials(std::vector<DFHack::MaterialInfo> materials);
+
+    void incMinQuality();
+    void decMinQuality();
+    void incMaxQuality();
+    void decMaxQuality();
+    void toggleDecoratedOnly();
+
+    uint32_t getMaterialMask() const;
+    std::vector<std::string> getMaterials() const;
+    std::string getMinQuality() const;
+    std::string getMaxQuality() const;
+    bool getDecoratedOnly() const;
+
+    bool matches(df::dfhack_material_category mask) const;
+    bool matches(DFHack::MaterialInfo &material) const;
+    bool matches(df::item *item) const;
+
+private:
     df::dfhack_material_category mat_mask;
     std::vector<DFHack::MaterialInfo> materials;
     df::item_quality min_quality;
     df::item_quality max_quality;
     bool decorated_only;
 
-    ItemFilter();
-
-    bool matchesMask(DFHack::MaterialInfo &mat);
-    bool matches(const df::dfhack_material_category mask) const;
-    bool matches(DFHack::MaterialInfo &material) const;
-    bool matches(df::item *item);
-
-    std::vector<std::string> getMaterialFilterAsVector();
-    std::string getMaterialFilterAsSerial();
-    bool parseSerializedMaterialTokens(std::string str);
-
-    std::string getMinQuality();
-    std::string getMaxQuality();
-
-    bool isValid();
-    void clear();
-
-private:
-    bool valid;
+    bool deserializeMaterialMask(std::string ser);
+    bool deserializeMaterials(std::string ser);
+    void setMinQuality(int quality);
+    void setMaxQuality(int quality);
+    bool matchesMask(DFHack::MaterialInfo &mat) const;
 };
 
 class PlannedBuilding
 {
 public:
-    PlannedBuilding(df::building *building, ItemFilter *filter);
-    PlannedBuilding(DFHack::PersistentDataItem &config, DFHack::color_ostream &out);
+    PlannedBuilding(df::building *building, const std::vector<ItemFilter> &filters);
+    PlannedBuilding(DFHack::PersistentDataItem &config);
 
     bool assignClosestItem(std::vector<df::item *> *items_vector);
     bool assignItem(df::item *item);
 
-    bool isValid();
+    bool isValid() const;
     void remove();
 
-    df::building_type getType();
-    bool isCurrentlySelectedBuilding();
-
-    ItemFilter *getFilter();
+    df::building * getBuilding();
+    const std::vector<ItemFilter> & getFilters() const;
 
 private:
-    df::building *building;
     DFHack::PersistentDataItem config;
-    df::coord pos;
-    ItemFilter filter;
+    df::building *building;
+    df::building::key_field_type building_id;
+    std::vector<ItemFilter> filters;
+};
+
+// building type, subtype, custom
+typedef std::tuple<df::building_type, int16_t, int32_t> BuildingTypeKey;
+
+BuildingTypeKey toBuildingTypeKey(
+    df::building_type btype, int16_t subtype, int32_t custom);
+BuildingTypeKey toBuildingTypeKey(df::building *bld);
+BuildingTypeKey toBuildingTypeKey(df::ui_build_selector *uibs);
+
+struct BuildingTypeKeyHash
+{
+    std::size_t operator() (const BuildingTypeKey & key) const;
 };
 
 class Planner
 {
 public:
-    Planner();
-
-    bool isPlannableBuilding(const df::building_type type) const;
-
-    void reset(DFHack::color_ostream &out);
+    class ItemFiltersWrapper
+    {
+    public:
+        ItemFiltersWrapper(std::vector<ItemFilter> & item_filters)
+            : item_filters(item_filters) { }
+        std::vector<ItemFilter>::reverse_iterator rbegin() const { return item_filters.rbegin(); }
+        std::vector<ItemFilter>::reverse_iterator  rend() const { return item_filters.rend(); }
+        const std::vector<ItemFilter> & get() const { return item_filters; }
+    private:
+        std::vector<ItemFilter> &item_filters;
+    };
 
     void initialize();
+    void reset();
 
+    bool allocatePlannedBuilding(BuildingTypeKey key);
     void addPlannedBuilding(df::building *bld);
+    PlannedBuilding *getPlannedBuilding(df::building *bld);
 
-    void doCycle();
-
-    bool allocatePlannedBuilding(df::building_type type);
-
-    PlannedBuilding *getSelectedPlannedBuilding();
+    bool isPlannableBuilding(BuildingTypeKey key);
 
-    void removeSelectedPlannedBuilding();
+    // returns an empty vector if the type is not supported
+    ItemFiltersWrapper getItemFilters(BuildingTypeKey key);
 
-    ItemFilter *getDefaultItemFilterForType(df::building_type type);
-
-    void adjustMinQuality(df::building_type type, int amount);
-    void adjustMaxQuality(df::building_type type, int amount);
+    void doCycle();
 
 private:
     std::map<df::building_type, df::item_type> item_for_building_type;
-    std::map<df::building_type, ItemFilter> default_item_filters;
+    std::unordered_map<BuildingTypeKey,
+                       std::vector<ItemFilter>,
+                       BuildingTypeKeyHash> default_item_filters;
     std::map<df::item_type, std::vector<df::item *>> available_item_vectors;
     std::map<df::item_type, bool> is_relevant_item_type; //Needed for fast check when looping over all items
-
     std::vector<PlannedBuilding> planned_buildings;
 
-    void boundsCheckItemQuality(df::enums::item_quality::item_quality *quality);
-
     void gather_available_items();
 };
 
diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index 93d5ff4e4..1d25da6f0 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -1,5 +1,5 @@
-#include "buildingplan-lib.h"
-    
+#include <unordered_map>
+
 #include "df/entity_position.h"
 #include "df/interface_key.h"
 #include "df/ui_build_selector.h"
@@ -14,6 +14,7 @@
 
 #include "uicommon.h"
 #include "listcolumn.h"
+#include "buildingplan-lib.h"
 
 DFHACK_PLUGIN("buildingplan");
 #define PLUGIN_VERSION 0.15
@@ -24,18 +25,15 @@ REQUIRE_GLOBAL(world);
 #define MAX_MASK 10
 #define MAX_MATERIAL 21
 
-using namespace DFHack;
-using namespace df::enums;
-
 bool show_help = false;
 bool quickfort_mode = false;
 bool in_dummy_screen = false;
-std::map<df::building_type, bool> planmode_enabled;
+std::unordered_map<BuildingTypeKey, bool, BuildingTypeKeyHash> planmode_enabled;
 
 class ViewscreenChooseMaterial : public dfhack_viewscreen
 {
 public:
-    ViewscreenChooseMaterial(ItemFilter *filter);
+    ViewscreenChooseMaterial(ItemFilter &filter);
 
     void feed(set<df::interface_key> *input);
 
@@ -47,14 +45,12 @@ private:
     ListColumn<df::dfhack_material_category> masks_column;
     ListColumn<MaterialInfo> materials_column;
     int selected_column;
-    ItemFilter *filter;
-
-    df::building_type btype;
+    ItemFilter &filter;
 
     void addMaskEntry(df::dfhack_material_category &mask, const std::string &text)
     {
         auto entry = ListEntry<df::dfhack_material_category>(pad_string(text, MAX_MASK, false), mask);
-        if (filter->matches(mask))
+        if (filter.matches(mask))
             entry.selected = true;
 
         masks_column.add(entry);
@@ -131,7 +127,7 @@ private:
                     material.decode(DFHack::MaterialInfo::PLANT_BASE+j, i);
                     auto name = material.toString();
                     ListEntry<MaterialInfo> entry(pad_string(name, MAX_MATERIAL, false), material);
-                    if (filter->matches(material))
+                    if (filter.matches(material))
                         entry.selected = true;
 
                     materials_column.add(entry);
@@ -147,7 +143,7 @@ private:
         if (!selected_category.whole || material.matches(selected_category))
         {
             ListEntry<MaterialInfo> entry(pad_string(name, MAX_MATERIAL, false), material);
-            if (filter->matches(material))
+            if (filter.matches(material))
                 entry.selected = true;
 
             materials_column.add(entry);
@@ -167,9 +163,10 @@ private:
     }
 };
 
-DFHack::MaterialInfo &material_info_identity_fn(DFHack::MaterialInfo &m) { return m; }
+const DFHack::MaterialInfo &material_info_identity_fn(const DFHack::MaterialInfo &m) { return m; }
 
-ViewscreenChooseMaterial::ViewscreenChooseMaterial(ItemFilter *filter)
+ViewscreenChooseMaterial::ViewscreenChooseMaterial(ItemFilter &filter)
+    : filter(filter)
 {
     selected_column = 0;
     masks_column.setTitle("Type");
@@ -179,7 +176,6 @@ ViewscreenChooseMaterial::ViewscreenChooseMaterial(ItemFilter *filter)
     materials_column.left_margin = MAX_MASK + 3;
     materials_column.setTitle("Material");
     materials_column.multiselect = true;
-    this->filter = filter;
 
     masks_column.changeHighlight(0);
 
@@ -217,7 +213,7 @@ void ViewscreenChooseMaterial::feed(set<df::interface_key> *input)
     }
     if (input->count(interface_key::CUSTOM_SHIFT_C))
     {
-        filter->clear();
+        filter.clear();
         masks_column.clearSelection();
         materials_column.clearSelection();
         populateMaterials();
@@ -225,17 +221,18 @@ void ViewscreenChooseMaterial::feed(set<df::interface_key> *input)
     else if (input->count(interface_key::SEC_SELECT))
     {
         // Convert list selections to material filters
-        filter->mat_mask.whole = 0;
-        filter->materials.clear();
+        filter.clearMaterialMask();
 
         // Category masks
         auto masks = masks_column.getSelectedElems();
         for (auto it = masks.begin(); it != masks.end(); ++it)
-            filter->mat_mask.whole |= it->whole;
+            filter.addMaterialMask(it->whole);
 
         // Specific materials
         auto materials = materials_column.getSelectedElems();
-        transform_(materials, filter->materials, material_info_identity_fn);
+        std::vector<DFHack::MaterialInfo> materialInfos;
+        transform_(materials, materialInfos, material_info_identity_fn);
+        filter.setMaterials(materialInfos);
 
         Screen::dismiss(this);
     }
@@ -285,179 +282,167 @@ void ViewscreenChooseMaterial::render()
 }
 
 //START Viewscreen Hook
-static bool is_planmode_enabled(df::building_type type)
+static bool is_planmode_enabled(BuildingTypeKey key)
 {
-    return planmode_enabled[type] || quickfort_mode;
+    return planmode_enabled[key] || quickfort_mode;
 }
 
-struct buildingplan_hook : public df::viewscreen_dwarfmodest
+struct buildingplan_query_hook : public df::viewscreen_dwarfmodest
 {
-    //START UI Methods
     typedef df::viewscreen_dwarfmodest interpose_base;
 
-    void send_key(const df::interface_key &key)
-    {
-        set< df::interface_key > keys;
-        keys.insert(key);
-        this->feed(&keys);
-    }
-
     bool isInPlannedBuildingQueryMode()
     {
         return (ui->main.mode == df::ui_sidebar_mode::QueryBuilding ||
             ui->main.mode == df::ui_sidebar_mode::BuildingItems) &&
-            planner.getSelectedPlannedBuilding();
+            planner.getPlannedBuilding(world->selected_building);
     }
 
-    bool isInPlannedBuildingPlacementMode()
+    bool handleInput(set<df::interface_key> *input)
     {
-        return ui->main.mode == ui_sidebar_mode::Build &&
-            df::global::ui_build_selector &&
-            df::global::ui_build_selector->stage < 2 &&
-            planner.isPlannableBuilding(ui_build_selector->building_type);
-    }
+        if (!isInPlannedBuildingQueryMode())
+            return false;
 
-    std::vector<Units::NoblePosition> getNoblePositionOfSelectedBuildingOwner()
-    {
-        std::vector<Units::NoblePosition> np;
-        if (ui->main.mode != df::ui_sidebar_mode::QueryBuilding ||
-            !world->selected_building ||
-            !world->selected_building->owner)
+        if (input->count(interface_key::SUSPENDBUILDING))
+            return true; // Don't unsuspend planned buildings
+        if (input->count(interface_key::DESTROYBUILDING))
         {
-            return np;
+            // remove persistent data and allow the parent to handle the key
+            // so the building is removed
+            planner.getPlannedBuilding(world->selected_building)->remove();
         }
 
-        switch (world->selected_building->getType())
-        {
-        case building_type::Bed:
-        case building_type::Chair:
-        case building_type::Table:
-            break;
-        default:
-            return np;
-        }
+        return false;
+    }
 
-        return getUniqueNoblePositions(world->selected_building->owner);
+    DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
+    {
+        if (!handleInput(input))
+            INTERPOSE_NEXT(feed)(input);
     }
 
-    bool isInNobleRoomQueryMode()
+    DEFINE_VMETHOD_INTERPOSE(void, render, ())
     {
-        if (getNoblePositionOfSelectedBuildingOwner().size() > 0)
-            return canReserveRoom(world->selected_building);
-        else
-            return false;
+        INTERPOSE_NEXT(render)();
+
+        if (!isInPlannedBuildingQueryMode())
+            return;
+
+        // Hide suspend toggle option
+        auto dims = Gui::getDwarfmodeViewDims();
+        int left_margin = dims.menu_x1 + 1;
+        int x = left_margin;
+        int y = 20;
+        Screen::Pen pen(' ', COLOR_BLACK);
+        Screen::fillRect(pen, x, y, dims.menu_x2, y);
+
+        // all current buildings only have one filter
+        auto & filter = planner.getPlannedBuilding(world->selected_building)->getFilters()[0];
+        y = 24;
+        OutputString(COLOR_WHITE, x, y, "Planned Building Filter", true, left_margin);
+        ++y;
+        OutputString(COLOR_BROWN, x, y, "Min Quality: ", false, left_margin);
+        OutputString(COLOR_BLUE, x, y, filter.getMinQuality(), true, left_margin);
+        OutputString(COLOR_BROWN, x, y, "Max Quality: ", false, left_margin);
+        OutputString(COLOR_BLUE, x, y, filter.getMaxQuality(), true, left_margin);
+
+        if (filter.getDecoratedOnly())
+            OutputString(COLOR_BLUE, x, y, "Decorated Only", true, left_margin);
+
+        OutputString(COLOR_BROWN, x, y, "Materials:", true, left_margin);
+        auto filters = filter.getMaterials();
+        for (auto it = filters.begin(); it != filters.end(); ++it)
+            OutputString(COLOR_BLUE, x, y, "*" + *it, true, left_margin);
+    }
+};
+
+struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
+{
+    typedef df::viewscreen_dwarfmodest interpose_base;
+
+    bool isInPlannedBuildingPlacementMode()
+    {
+        return ui->main.mode == ui_sidebar_mode::Build &&
+            df::global::ui_build_selector &&
+            df::global::ui_build_selector->stage < 2 &&
+            planner.isPlannableBuilding(toBuildingTypeKey(ui_build_selector));
     }
 
     bool handleInput(set<df::interface_key> *input)
     {
-        if (isInPlannedBuildingPlacementMode())
+        if (!isInPlannedBuildingPlacementMode())
         {
-            auto type = ui_build_selector->building_type;
-            if (input->count(interface_key::CUSTOM_SHIFT_P))
-            {
-                planmode_enabled[type] = !planmode_enabled[type];
-                if (!is_planmode_enabled(type))
-                {
-                    Gui::refreshSidebar();
-                    in_dummy_screen = false;
-                }
-                return true;
-            }
-            else if (input->count(interface_key::CUSTOM_P) ||
-                     input->count(interface_key::CUSTOM_F) ||
-                     input->count(interface_key::CUSTOM_D) ||
-                     input->count(interface_key::CUSTOM_N))
-            {
-                show_help = true;
-            }
+            show_help = false;
+            return false;
+        }
 
-            if (is_planmode_enabled(type))
+        if (in_dummy_screen)
+        {
+            if (input->count(interface_key::SELECT) || input->count(interface_key::SEC_SELECT)
+                 || input->count(interface_key::LEAVESCREEN))
             {
-                if (quickfort_mode && in_dummy_screen)
-                {
-                    if (input->count(interface_key::SELECT) || input->count(interface_key::SEC_SELECT)
-                         || input->count(interface_key::LEAVESCREEN))
-                    {
-                        in_dummy_screen = false;
-                        send_key(interface_key::LEAVESCREEN);
-                    }
-
-                    return true;
-                }
-
-                if (input->count(interface_key::SELECT))
-                {
-                    if (ui_build_selector->errors.size() == 0 && planner.allocatePlannedBuilding(type))
-                    {
-                        Gui::refreshSidebar();
-                        if (quickfort_mode)
-                        {
-                            in_dummy_screen = true;
-                        }
-                    }
-
-                    return true;
-                }
-                else if (input->count(interface_key::CUSTOM_SHIFT_F))
-                {
-                    quickfort_mode = !quickfort_mode;
-                }
-                else if (input->count(interface_key::CUSTOM_SHIFT_M))
-                {
-                    Screen::show(dts::make_unique<ViewscreenChooseMaterial>(planner.getDefaultItemFilterForType(type)), plugin_self);
-                }
-                else if (input->count(interface_key::CUSTOM_Q))
-                {
-                    planner.adjustMinQuality(type, -1);
-                }
-                else if (input->count(interface_key::CUSTOM_W))
-                {
-                    planner.adjustMinQuality(type, 1);
-                }
-                else if (input->count(interface_key::CUSTOM_SHIFT_Q))
-                {
-                    planner.adjustMaxQuality(type, -1);
-                }
-                else if (input->count(interface_key::CUSTOM_SHIFT_W))
-                {
-                    planner.adjustMaxQuality(type, 1);
-                }
-                else if (input->count(interface_key::CUSTOM_SHIFT_D))
-                {
-                    planner.getDefaultItemFilterForType(type)->decorated_only =
-                        !planner.getDefaultItemFilterForType(type)->decorated_only;
-                }
+                in_dummy_screen = false;
+                // pass LEAVESCREEN up to parent view
+                input->clear();
+                input->insert(interface_key::LEAVESCREEN);
+                return false;
             }
+            return true;
         }
-        else if (isInPlannedBuildingQueryMode())
+
+        if (input->count(interface_key::CUSTOM_P) ||
+            input->count(interface_key::CUSTOM_F) ||
+            input->count(interface_key::CUSTOM_D) ||
+            input->count(interface_key::CUSTOM_M))
         {
-            if (input->count(interface_key::SUSPENDBUILDING))
-            {
-                return true; // Don't unsuspend planned buildings
-            }
-            else if (input->count(interface_key::DESTROYBUILDING))
-            {
-                planner.removeSelectedPlannedBuilding(); // Remove persistent data
-            }
+            show_help = true;
+        }
 
+        BuildingTypeKey key = toBuildingTypeKey(ui_build_selector);
+        if (input->count(interface_key::CUSTOM_SHIFT_P))
+        {
+            planmode_enabled[key] = !planmode_enabled[key];
+            if (!is_planmode_enabled(key))
+                Gui::refreshSidebar();
+            return true;
         }
-        else if (isInNobleRoomQueryMode())
+        if (input->count(interface_key::CUSTOM_SHIFT_F))
         {
-            if (Gui::inRenameBuilding())
-                return false;
-            auto np = getNoblePositionOfSelectedBuildingOwner();
-            df::interface_key last_token = get_string_key(input);
-            if (last_token >= interface_key::STRING_A048 && last_token <= interface_key::STRING_A058)
+            quickfort_mode = !quickfort_mode;
+            return true;
+        }
+
+        if (!is_planmode_enabled(key))
+            return false;
+
+        if (input->count(interface_key::SELECT))
+        {
+            if (ui_build_selector->errors.size() == 0 && planner.allocatePlannedBuilding(key))
             {
-                size_t selection = last_token - interface_key::STRING_A048;
-                if (np.size() < selection)
-                    return false;
-                roomMonitor.toggleRoomForPosition(world->selected_building->id, np.at(selection-1).position->code);
-                return true;
+                Gui::refreshSidebar();
+                if (quickfort_mode)
+                    in_dummy_screen = true;
             }
+            return true;
         }
 
-        return false;
+        // all current buildings only have one filter
+        auto filter = planner.getItemFilters(key).rbegin();
+        if (input->count(interface_key::CUSTOM_SHIFT_M))
+            Screen::show(dts::make_unique<ViewscreenChooseMaterial>(*filter), plugin_self);
+        else if (input->count(interface_key::CUSTOM_Q))
+            filter->decMinQuality();
+        else if (input->count(interface_key::CUSTOM_W))
+            filter->incMinQuality();
+        else if (input->count(interface_key::CUSTOM_SHIFT_Q))
+            filter->decMaxQuality();
+        else if (input->count(interface_key::CUSTOM_SHIFT_W))
+            filter->incMaxQuality();
+        else if (input->count(interface_key::CUSTOM_SHIFT_D))
+            filter->toggleDecoratedOnly();
+        else
+            return false;
+        return true;
     }
 
     DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
@@ -469,133 +454,176 @@ struct buildingplan_hook : public df::viewscreen_dwarfmodest
     DEFINE_VMETHOD_INTERPOSE(void, render, ())
     {
         bool plannable = isInPlannedBuildingPlacementMode();
-        if (plannable && is_planmode_enabled(ui_build_selector->building_type))
+        BuildingTypeKey key = toBuildingTypeKey(ui_build_selector);
+        if (plannable && is_planmode_enabled(key))
         {
             if (ui_build_selector->stage < 1)
-            {
                 // No materials but turn on cursor
                 ui_build_selector->stage = 1;
-            }
 
-            for (auto iter = ui_build_selector->errors.begin(); iter != ui_build_selector->errors.end();)
+            for (auto iter = ui_build_selector->errors.begin();
+                 iter != ui_build_selector->errors.end();)
             {
-                //FIXME Hide bags
-                if (((*iter)->find("Needs") != string::npos && **iter != "Needs adjacent wall")  ||
-                    (*iter)->find("No access") != string::npos)
-                {
+                // FIXME Hide bags
+                if (((*iter)->find("Needs") != string::npos
+                     && **iter != "Needs adjacent wall")
+                    || (*iter)->find("No access") != string::npos)
                     iter = ui_build_selector->errors.erase(iter);
-                }
                 else
-                {
                     ++iter;
-                }
             }
         }
 
         INTERPOSE_NEXT(render)();
 
+        if (!plannable)
+            return;
+
         auto dims = Gui::getDwarfmodeViewDims();
         int left_margin = dims.menu_x1 + 1;
         int x = left_margin;
-        auto type = ui_build_selector->building_type;
-        if (plannable)
+
+        if (in_dummy_screen)
         {
-            if (quickfort_mode && in_dummy_screen)
-            {
-                Screen::Pen pen(' ',COLOR_BLACK);
-                int y = dims.y1 + 1;
-                Screen::fillRect(pen, x, y, dims.menu_x2, y + 20);
+            Screen::Pen pen(' ',COLOR_BLACK);
+            int y = dims.y1 + 1;
+            Screen::fillRect(pen, x, y, dims.menu_x2, y + 20);
 
-                ++y;
+            ++y;
 
-                OutputString(COLOR_BROWN, x, y, "Quickfort Placeholder", true, left_margin);
-                OutputString(COLOR_WHITE, x, y, "Enter, Shift-Enter or Esc", true, left_margin);
-            }
-            else
-            {
-                int y = 23;
+            OutputString(COLOR_BROWN, x, y,
+                "Placeholder for legacy Quickfort. This screen is not required for DFHack native quickfort.",
+                true, left_margin);
+            OutputString(COLOR_WHITE, x, y, "Enter, Shift-Enter or Esc", true, left_margin);
+            return;
+        }
 
-                if (show_help)
-                {
-                    OutputString(COLOR_BROWN, x, y, "Note: ");
-                    OutputString(COLOR_WHITE, x, y, "Use Shift-Keys here", true, left_margin);
-                }
-                OutputToggleString(x, y, "Planning Mode", "P", is_planmode_enabled(type), true, left_margin);
+        int y = 23;
 
-                if (is_planmode_enabled(type))
-                {
-                    OutputToggleString(x, y, "Quickfort Mode", "F", quickfort_mode, true, left_margin);
+        if (show_help)
+        {
+            OutputString(COLOR_BROWN, x, y, "Note: ");
+            OutputString(COLOR_WHITE, x, y, "Use Shift-Keys here", true, left_margin);
+        }
 
-                    auto filter = planner.getDefaultItemFilterForType(type);
+        OutputToggleString(x, y, "Planning Mode", "P", planmode_enabled[key], true, left_margin);
+        OutputToggleString(x, y, "Quickfort Mode", "F", quickfort_mode, true, left_margin);
 
-                    OutputHotkeyString(x, y, "Min Quality: ", "qw");
-                    OutputString(COLOR_BROWN, x, y, filter->getMinQuality(), true, left_margin);
+        if (!is_planmode_enabled(key))
+            return;
 
-                    OutputHotkeyString(x, y, "Max Quality: ", "QW");
-                    OutputString(COLOR_BROWN, x, y, filter->getMaxQuality(), true, left_margin);
+        auto filter = planner.getItemFilters(key).rbegin();
+        y += 2;
+        OutputHotkeyString(x, y, "Min Quality: ", "qw");
+        OutputString(COLOR_BROWN, x, y, filter->getMinQuality(), true, left_margin);
 
-                    OutputToggleString(x, y, "Decorated Only: ", "D", filter->decorated_only, true, left_margin);
+        OutputHotkeyString(x, y, "Max Quality: ", "QW");
+        OutputString(COLOR_BROWN, x, y, filter->getMaxQuality(), true, left_margin);
 
-                    OutputHotkeyString(x, y, "Material Filter:", "M", true, left_margin);
-                    auto filter_descriptions = filter->getMaterialFilterAsVector();
-                    for (auto it = filter_descriptions.begin(); it != filter_descriptions.end(); ++it)
-                        OutputString(COLOR_BROWN, x, y, "   *" + *it, true, left_margin);
-                }
-                else
-                {
-                    in_dummy_screen = false;
-                }
-            }
-        }
-        else if (isInPlannedBuildingQueryMode())
+        OutputToggleString(x, y, "Decorated Only", "D", filter->getDecoratedOnly(), true, left_margin);
+
+        OutputHotkeyString(x, y, "Material Filter:", "M", true, left_margin);
+        auto filter_descriptions = filter->getMaterials();
+        for (auto it = filter_descriptions.begin();
+             it != filter_descriptions.end(); ++it)
+             OutputString(COLOR_BROWN, x, y, "   *" + *it, true, left_margin);
+    }
+};
+
+struct buildingplan_room_hook : public df::viewscreen_dwarfmodest
+{
+    typedef df::viewscreen_dwarfmodest interpose_base;
+
+    std::vector<Units::NoblePosition> getNoblePositionOfSelectedBuildingOwner()
+    {
+        std::vector<Units::NoblePosition> np;
+        if (ui->main.mode != df::ui_sidebar_mode::QueryBuilding ||
+            !world->selected_building ||
+            !world->selected_building->owner)
         {
-            in_dummy_screen = false;
-
-            // Hide suspend toggle option
-            int y = 20;
-            Screen::Pen pen(' ', COLOR_BLACK);
-            Screen::fillRect(pen, x, y, dims.menu_x2, y);
-
-            auto filter = planner.getSelectedPlannedBuilding()->getFilter();
-            y = 24;
-            OutputString(COLOR_BROWN, x, y, "Planned Building Filter:", true, left_margin);
-            OutputString(COLOR_BROWN, x, y, "Min Quality: ", false, left_margin);
-            OutputString(COLOR_BLUE, x, y, filter->getMinQuality(), true, left_margin);
-            OutputString(COLOR_BROWN, x, y, "Max Quality: ", false, left_margin);
-            OutputString(COLOR_BLUE, x, y, filter->getMaxQuality(), true, left_margin);
-
-            if (filter->decorated_only)
-                OutputString(COLOR_BLUE, x, y, "Decorated Only", true, left_margin);
-
-            OutputString(COLOR_BROWN, x, y, "Materials:", true, left_margin);
-            auto filters = filter->getMaterialFilterAsVector();
-            for (auto it = filters.begin(); it != filters.end(); ++it)
-                OutputString(COLOR_BLUE, x, y, "*" + *it, true, left_margin);
+            return np;
         }
-        else if (isInNobleRoomQueryMode())
+
+        switch (world->selected_building->getType())
         {
-            auto np = getNoblePositionOfSelectedBuildingOwner();
-            int y = 24;
-            OutputString(COLOR_BROWN, x, y, "DFHack", true, left_margin);
-            OutputString(COLOR_WHITE, x, y, "Auto-allocate to:", true, left_margin);
-            for (size_t i = 0; i < np.size() && i < 9; i++)
-            {
-                bool enabled = (roomMonitor.getReservedNobleCode(world->selected_building->id)
-                    == np[i].position->code);
-                OutputToggleString(x, y, np[i].position->name[0].c_str(),
-                    int_to_string(i+1).c_str(), enabled, true, left_margin);
-            }
+        case building_type::Bed:
+        case building_type::Chair:
+        case building_type::Table:
+            break;
+        default:
+            return np;
         }
+
+        return getUniqueNoblePositions(world->selected_building->owner);
+    }
+
+    bool isInNobleRoomQueryMode()
+    {
+        if (getNoblePositionOfSelectedBuildingOwner().size() > 0)
+            return canReserveRoom(world->selected_building);
         else
+            return false;
+    }
+
+    bool handleInput(set<df::interface_key> *input)
+    {
+        if (!isInNobleRoomQueryMode())
+            return false;
+
+        if (Gui::inRenameBuilding())
+            return false;
+        auto np = getNoblePositionOfSelectedBuildingOwner();
+        df::interface_key last_token = get_string_key(input);
+        if (last_token >= interface_key::STRING_A048
+            && last_token <= interface_key::STRING_A058)
         {
-            in_dummy_screen = false;
-            show_help = false;
+            size_t selection = last_token - interface_key::STRING_A048;
+            if (np.size() < selection)
+                return false;
+            roomMonitor.toggleRoomForPosition(world->selected_building->id, np.at(selection-1).position->code);
+            return true;
+        }
+
+        return false;
+    }
+
+    DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
+    {
+        if (!handleInput(input))
+            INTERPOSE_NEXT(feed)(input);
+    }
+
+    DEFINE_VMETHOD_INTERPOSE(void, render, ())
+    {
+        INTERPOSE_NEXT(render)();
+
+        if (!isInNobleRoomQueryMode())
+            return;
+
+        auto np = getNoblePositionOfSelectedBuildingOwner();
+        auto dims = Gui::getDwarfmodeViewDims();
+        int left_margin = dims.menu_x1 + 1;
+        int x = left_margin;
+        int y = 24;
+        OutputString(COLOR_BROWN, x, y, "DFHack", true, left_margin);
+        OutputString(COLOR_WHITE, x, y, "Auto-allocate to:", true, left_margin);
+        for (size_t i = 0; i < np.size() && i < 9; i++)
+        {
+            bool enabled =
+                roomMonitor.getReservedNobleCode(world->selected_building->id)
+                == np[i].position->code;
+            OutputToggleString(x, y, np[i].position->name[0].c_str(),
+                int_to_string(i+1).c_str(), enabled, true, left_margin);
         }
     }
 };
 
-IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_hook, feed);
-IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_hook, render);
+IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_query_hook, feed);
+IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_place_hook, feed);
+IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_room_hook, feed);
+IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_query_hook, render);
+IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_place_hook, render);
+IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_room_hook, render);
 
 static command_result buildingplan_cmd(color_ostream &out, vector <string> & parameters)
 {
@@ -624,10 +652,14 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
 
     if (enable != is_enabled)
     {
-        planner.reset(out);
-
-        if (!INTERPOSE_HOOK(buildingplan_hook, feed).apply(enable) ||
-            !INTERPOSE_HOOK(buildingplan_hook, render).apply(enable))
+        planner.reset();
+
+        if (!INTERPOSE_HOOK(buildingplan_query_hook, feed).apply(enable) ||
+            !INTERPOSE_HOOK(buildingplan_place_hook, feed).apply(enable) ||
+            !INTERPOSE_HOOK(buildingplan_room_hook, feed).apply(enable) ||
+            !INTERPOSE_HOOK(buildingplan_query_hook, render).apply(enable) ||
+            !INTERPOSE_HOOK(buildingplan_place_hook, render).apply(enable) ||
+            !INTERPOSE_HOOK(buildingplan_room_hook, render).apply(enable))
             return CR_FAILURE;
 
         is_enabled = enable;
@@ -640,7 +672,7 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
 {
     commands.push_back(
         PluginCommand(
-        "buildingplan", "Place furniture before it's built",
+        "buildingplan", "Plan building construction before you have materials",
         buildingplan_cmd, false, "Run 'buildingplan debug [on|off]' to toggle debugging, or 'buildingplan version' to query the plugin version."));
     planner.initialize();
 
@@ -651,7 +683,7 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 {
     switch (event) {
     case SC_MAP_LOADED:
-        planner.reset(out);
+        planner.reset();
         roomMonitor.reset(out);
         break;
     default:
@@ -661,13 +693,17 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
     return CR_OK;
 }
 
+static bool cycle_requested = false;
+
 #define DAY_TICKS 1200
 DFhackCExport command_result plugin_onupdate(color_ostream &)
 {
-    if (Maps::IsValid() && !World::ReadPauseState() && world->frame_counter % (DAY_TICKS/2) == 0)
+    if (Maps::IsValid() && !World::ReadPauseState()
+        && (cycle_requested || world->frame_counter % (DAY_TICKS/2) == 0))
     {
         planner.doCycle();
         roomMonitor.doCycle();
+        cycle_requested = false;
     }
 
     return CR_OK;
@@ -680,8 +716,11 @@ DFhackCExport command_result plugin_shutdown(color_ostream &)
 
 // Lua API section
 
-static bool isPlannableBuilding(df::building_type type) {
-    return planner.isPlannableBuilding(type);
+static bool isPlannableBuilding(df::building_type type,
+                                int16_t subtype,
+                                int32_t custom) {
+    return planner.isPlannableBuilding(
+        toBuildingTypeKey(type, subtype, custom));
 }
 
 static void addPlannedBuilding(df::building *bld) {
@@ -692,9 +731,14 @@ static void doCycle() {
     planner.doCycle();
 }
 
+static void scheduleCycle() {
+    cycle_requested = true;
+}
+
 DFHACK_PLUGIN_LUA_FUNCTIONS {
     DFHACK_LUA_FUNCTION(isPlannableBuilding),
     DFHACK_LUA_FUNCTION(addPlannedBuilding),
     DFHACK_LUA_FUNCTION(doCycle),
+    DFHACK_LUA_FUNCTION(scheduleCycle),
     DFHACK_LUA_END
 };
diff --git a/plugins/fortplan.cpp b/plugins/fortplan.cpp
index 72d11b78a..ff8aa547f 100644
--- a/plugins/fortplan.cpp
+++ b/plugins/fortplan.cpp
@@ -48,7 +48,7 @@ struct BuildingInfo {
     }
 
     bool allocate() {
-        return planner.allocatePlannedBuilding(type);
+        return planner.allocatePlannedBuilding(toBuildingTypeKey(type, -1, -1));
     }
 };
 
@@ -122,7 +122,7 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
 
     if (enable != is_enabled)
     {
-        planner.reset(out);
+        planner.reset();
 
         is_enabled = enable;
     }
diff --git a/plugins/lua/buildingplan.lua b/plugins/lua/buildingplan.lua
index 071c07395..157b6211b 100644
--- a/plugins/lua/buildingplan.lua
+++ b/plugins/lua/buildingplan.lua
@@ -4,9 +4,10 @@ local _ENV = mkmodule('plugins.buildingplan')
 
  Native functions:
 
- * bool isPlannableBuilding(df::building_type type)
+ * bool isPlannableBuilding(df::building_type type, int16_t subtype, int32_t custom)
  * void addPlannedBuilding(df::building *bld)
  * void doCycle()
+ * void scheduleCycle()
 
 --]]
 
diff --git a/plugins/uicommon.h b/plugins/uicommon.h
index d8624786c..78256ac69 100644
--- a/plugins/uicommon.h
+++ b/plugins/uicommon.h
@@ -79,7 +79,7 @@ static void for_each_(map<T, V> &v, Fn func)
 }
 
 template <class T, class V, typename Fn>
-static void transform_(vector<T> &src, vector<V> &dst, Fn func)
+static void transform_(const vector<T> &src, vector<V> &dst, Fn func)
 {
     transform(src.begin(), src.end(), back_inserter(dst), func);
 }

From 1368fb400338a92b3b5970917fee6cb0ca067aa2 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Fri, 16 Oct 2020 14:03:05 -0700
Subject: [PATCH 447/547] buildingplan: construct buildings from lua

Replace C++ building construction code with lua constructBuilding so we can get the proper job_item filters set. these filters will be used when we replace the core buildingplan algorithm in the next PR.
---
 plugins/CMakeLists.txt           |  2 +-
 plugins/buildingplan-planner.cpp | 36 -------------------------
 plugins/buildingplan-planner.h   |  1 -
 plugins/buildingplan.cpp         | 29 +++++++++++++++++++-
 plugins/fortplan.cpp             | 45 +++++++++++++++++++++++++++-----
 plugins/lua/buildingplan.lua     | 36 +++++++++++++++++++++++++
 plugins/lua/fortplan.lua         | 13 +++++++++
 7 files changed, 117 insertions(+), 45 deletions(-)
 create mode 100644 plugins/lua/fortplan.lua

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 116bdd445..46a7d4097 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -126,7 +126,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(flows flows.cpp)
     dfhack_plugin(follow follow.cpp)
     dfhack_plugin(forceequip forceequip.cpp)
-    dfhack_plugin(fortplan fortplan.cpp LINK_LIBRARIES buildingplan-lib)
+    dfhack_plugin(fortplan fortplan.cpp LINK_LIBRARIES buildingplan-lib lua)
     dfhack_plugin(generated-creature-renamer generated-creature-renamer.cpp)
     dfhack_plugin(getplants getplants.cpp)
     dfhack_plugin(hotkeys hotkeys.cpp)
diff --git a/plugins/buildingplan-planner.cpp b/plugins/buildingplan-planner.cpp
index 3cb27145e..925d0f4c3 100644
--- a/plugins/buildingplan-planner.cpp
+++ b/plugins/buildingplan-planner.cpp
@@ -522,42 +522,6 @@ bool Planner::isPlannableBuilding(BuildingTypeKey key)
     return item_for_building_type.count(std::get<0>(key)) > 0;
 }
 
-bool Planner::allocatePlannedBuilding(BuildingTypeKey key)
-{
-    coord32_t cursor;
-    if (!DFHack::Gui::getCursorCoords(cursor.x, cursor.y, cursor.z))
-        return false;
-
-    auto type = std::get<0>(key);
-    auto newinst = Buildings::allocInstance(cursor.get_coord16(), type);
-    if (!newinst)
-        return false;
-
-    df::job_item *filter = new df::job_item();
-    filter->item_type = item_type::NONE;
-    filter->mat_index = 0;
-    filter->flags2.bits.building_material = true;
-    std::vector<df::job_item*> filters;
-    filters.push_back(filter);
-
-    if (!Buildings::constructWithFilters(newinst, filters))
-    {
-        delete newinst;
-        return false;
-    }
-
-    if (type == building_type::Door)
-    {
-        auto door = virtual_cast<df::building_doorst>(newinst);
-        if (door)
-            door->door_flags.bits.pet_passable = true;
-    }
-
-    addPlannedBuilding(newinst);
-
-    return true;
-}
-
 Planner::ItemFiltersWrapper Planner::getItemFilters(BuildingTypeKey key)
 {
     static std::vector<ItemFilter> empty_vector;
diff --git a/plugins/buildingplan-planner.h b/plugins/buildingplan-planner.h
index 9341ad03f..cda217d81 100644
--- a/plugins/buildingplan-planner.h
+++ b/plugins/buildingplan-planner.h
@@ -106,7 +106,6 @@ public:
     void initialize();
     void reset();
 
-    bool allocatePlannedBuilding(BuildingTypeKey key);
     void addPlannedBuilding(df::building *bld);
     PlannedBuilding *getPlannedBuilding(df::building *bld);
 
diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index 1d25da6f0..703e567b7 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -287,6 +287,33 @@ static bool is_planmode_enabled(BuildingTypeKey key)
     return planmode_enabled[key] || quickfort_mode;
 }
 
+static bool construct_planned_building()
+{
+     auto L = Lua::Core::State;
+     color_ostream_proxy out(Core::getInstance().getConsole());
+
+     CoreSuspendClaimer suspend;
+     Lua::StackUnwinder top(L);
+
+    if (!(lua_checkstack(L, 1) &&
+          Lua::PushModulePublic(out, L, "plugins.buildingplan",
+                                "construct_building_from_ui_state") &&
+          Lua::SafeCall(out, L, 0, 1)))
+    {
+        return false;
+    }
+
+    auto bld = static_cast<df::building *>(LuaWrapper::get_object_ref(L, -1));
+    lua_pop(L, 1);
+
+    if (!bld)
+        return false;
+
+    planner.addPlannedBuilding(bld);
+
+    return true;
+}
+
 struct buildingplan_query_hook : public df::viewscreen_dwarfmodest
 {
     typedef df::viewscreen_dwarfmodest interpose_base;
@@ -417,7 +444,7 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
 
         if (input->count(interface_key::SELECT))
         {
-            if (ui_build_selector->errors.size() == 0 && planner.allocatePlannedBuilding(key))
+            if (ui_build_selector->errors.size() == 0 && construct_planned_building())
             {
                 Gui::refreshSidebar();
                 if (quickfort_mode)
diff --git a/plugins/fortplan.cpp b/plugins/fortplan.cpp
index ff8aa547f..8fbf8fb72 100644
--- a/plugins/fortplan.cpp
+++ b/plugins/fortplan.cpp
@@ -1,14 +1,17 @@
 #include <fstream>
 #include <vector>
 
-#include "df/world.h"
+#include "df/job_item.h"
 #include "df/trap_type.h"
+#include "df/world.h"
 
+#include "modules/Buildings.h"
 #include "modules/Filesystem.h"
 #include "modules/Gui.h"
 #include "modules/Maps.h"
 #include "modules/World.h"
 
+#include "LuaTools.h"
 #include "PluginManager.h"
 
 #include "buildingplan-lib.h"
@@ -47,8 +50,38 @@ struct BuildingInfo {
         hasCustomOptions = false;
     }
 
-    bool allocate() {
-        return planner.allocatePlannedBuilding(toBuildingTypeKey(type, -1, -1));
+    bool allocate(coord32_t cursor) {
+        auto L = Lua::Core::State;
+        color_ostream_proxy out(Core::getInstance().getConsole());
+
+        CoreSuspendClaimer suspend;
+        Lua::StackUnwinder top(L);
+
+        if (!lua_checkstack(L, 5) ||
+            !Lua::PushModulePublic(out, L, "plugins.fortplan",
+                                   "construct_building_from_params"))
+        {
+            return false;
+        }
+
+        Lua::Push(L, type);
+        Lua::Push(L, cursor.x);
+        Lua::Push(L, cursor.y);
+        Lua::Push(L, cursor.z);
+
+        if (!Lua::SafeCall(out, L, 4, 1))
+            return false;
+
+        auto bld =
+            static_cast<df::building *>(LuaWrapper::get_object_ref(L, -1));
+        lua_pop(L, 1);
+
+        if (!bld)
+            return false;
+
+        planner.addPlannedBuilding(bld);
+
+        return true;
     }
 };
 
@@ -347,13 +380,13 @@ command_result fortplan(color_ostream &out, vector<string> & params) {
                                     offsetCursor.x -= xOffset;
                                     offsetCursor.y -= yOffset;
                                     DFHack::Gui::setCursorCoords(offsetCursor.x, offsetCursor.y, offsetCursor.z);
-                                    if (!buildingInfo.allocate()) {
+                                    if (!buildingInfo.allocate(offsetCursor)) {
                                         con.print("*** There was an error placing building with code '%s' centered at (%zu,%zu).\n",curCode.c_str(),x,y);
                                     }
                                     DFHack::Gui::setCursorCoords(cursor.x, cursor.y, cursor.z);
                                 } else if (block) {
                                     //con.print("Placing a building with code '%s' with corner at (%d,%d) and default size %dx%d.\n",curCode.c_str(),x,y,buildingInfo.defaultWidth,buildingInfo.defaultHeight);
-                                    if (!buildingInfo.allocate()) {
+                                    if (!buildingInfo.allocate(cursor)) {
                                         con.print("*** There was an error placing building with code '%s' with corner at (%zu,%zu).\n",curCode.c_str(),x,y);
                                     }
                                 } else {
@@ -366,7 +399,7 @@ command_result fortplan(color_ostream &out, vector<string> & params) {
                             }
                         } else {
                             //con.print("Building a(n) %s.\n",buildingInfo.name.c_str());
-                            if (!buildingInfo.allocate()) {
+                            if (!buildingInfo.allocate(cursor)) {
                                 con.print("*** There was an error placing the %s at (%zu,%zu).\n",buildingInfo.name.c_str(),x,y);
                             }
                         }
diff --git a/plugins/lua/buildingplan.lua b/plugins/lua/buildingplan.lua
index 157b6211b..1ab462201 100644
--- a/plugins/lua/buildingplan.lua
+++ b/plugins/lua/buildingplan.lua
@@ -11,4 +11,40 @@ local _ENV = mkmodule('plugins.buildingplan')
 
 --]]
 
+local guidm = require('gui.dwarfmode')
+require('dfhack.buildings')
+
+-- needs the core suspended
+function construct_building_from_ui_state()
+    local uibs = df.global.ui_build_selector
+    local world = df.global.world
+    local direction = world.selected_direction
+    local _, width, height = dfhack.buildings.getCorrectSize(
+        world.building_width, world.building_height, uibs.building_type,
+        uibs.building_subtype, uibs.custom_type, direction)
+    -- the cursor is at the center of the building; we need the upper-left
+    -- corner of the building
+    local pos = guidm.getCursorPos()
+    pos.x = pos.x - math.floor(width/2)
+    pos.y = pos.y - math.floor(height/2)
+    local bld, err = dfhack.buildings.constructBuilding{
+        type=uibs.building_type, subtype=uibs.building_subtype,
+        custom=uibs.custom_type, pos=pos, width=width, height=height,
+        direction=direction}
+    if err then error(err) end
+    -- TODO: assign fields for the types that need them. we can't pass them all
+    -- in to the call to constructBuilding since the unneeded fields will cause
+    -- errors
+    --local fields = {
+    --    friction=uibs.friction,
+    --    use_dump=uibs.use_dump,
+    --    dump_x_shift=uibs.dump_x_shift,
+    --    dump_y_shift=uibs.dump_y_shift,
+    --    speed=uibs.speed
+    --}
+    -- TODO: use quickfort's post_construction_fns? maybe move those functions
+    -- into the library so they get applied automatically
+    return bld
+end
+
 return _ENV
diff --git a/plugins/lua/fortplan.lua b/plugins/lua/fortplan.lua
new file mode 100644
index 000000000..71e69c69d
--- /dev/null
+++ b/plugins/lua/fortplan.lua
@@ -0,0 +1,13 @@
+local _ENV = mkmodule('plugins.fortplan')
+
+require('dfhack.buildings')
+
+function construct_building_from_params(building_type, x, y, z)
+    local pos = xyz2pos(x, y, z)
+    local bld, err =
+            dfhack.buildings.constructBuilding{type=building_type, pos=pos}
+    if err then error(err) end
+    return bld
+end
+
+return _ENV

From 100b374af73659b2f00a9c26697f3b17fd1a3a72 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Fri, 16 Oct 2020 14:08:52 -0700
Subject: [PATCH 448/547] generalize buildingplan for all building types

but restrict to only the currently supported set so we can still assume only one filter is required for each building.

changes:
- update buildingplan plugin version to 2.0
- new serialization format for planned buildings
- old persistent data is automatically migrated to new format on load
- algorithm now respects job_item filters; items must match job_item filter and buildingplan ItemFilter
- more invalid items are now filtered out, like items encased in ice. are there any others we should be checking (see BadFlags struct)
- items are sorted before job is unsuspended so final item ordering is correct regardless of what order the items were matched and attached
- item counts in filters are kept up to date so if buildingplan is disabled before all filters are matched and the building is completed by DF itself, the item counts will come out correct (though the item ordering and building "roughness" may be incorrect)
- fixes two memory leaks in building finalization code
- allows artifacts to be matched (ItemFilter defaults now top out at Masterful -- Artifact is selectable but must be manually specified)
- add gui to switch between items for buildings that require multiple item types
---
 plugins/buildingplan-planner.cpp | 714 ++++++++++++++++++++++---------
 plugins/buildingplan-planner.h   |  30 +-
 plugins/buildingplan.cpp         | 163 ++++++-
 plugins/fortplan.cpp             |   2 -
 plugins/lua/buildingplan.lua     |  47 ++
 5 files changed, 719 insertions(+), 237 deletions(-)

diff --git a/plugins/buildingplan-planner.cpp b/plugins/buildingplan-planner.cpp
index 925d0f4c3..dcdcfb777 100644
--- a/plugins/buildingplan-planner.cpp
+++ b/plugins/buildingplan-planner.cpp
@@ -12,12 +12,14 @@
 #include "modules/Gui.h"
 #include "modules/Job.h"
 
+#include "LuaTools.h"
 #include "uicommon.h"
 
 #include "buildingplan-planner.h"
 #include "buildingplan-lib.h"
 
 static const std::string planned_building_persistence_key_v1 = "buildingplan/constraints";
+static const std::string planned_building_persistence_key_v2 = "buildingplan/constraints2";
 
 /*
  * ItemFilter
@@ -37,24 +39,24 @@ void ItemFilter::clear()
     materials.clear();
 }
 
-bool ItemFilter::deserialize(PersistentDataItem &config)
+bool ItemFilter::deserialize(std::string ser)
 {
     clear();
 
     std::vector<std::string> tokens;
-    split_string(&tokens, config.val(), "/");
-    if (tokens.size() != 2)
+    split_string(&tokens, ser, "/");
+    if (tokens.size() != 5)
     {
-        debug("invalid ItemFilter serialization: '%s'", config.val().c_str());
+        debug("invalid ItemFilter serialization: '%s'", ser.c_str());
         return false;
     }
 
     if (!deserializeMaterialMask(tokens[0]) || !deserializeMaterials(tokens[1]))
         return false;
 
-    setMinQuality(config.ival(2) - 1);
-    setMaxQuality(config.ival(4) - 1);
-    decorated_only = config.ival(3) - 1;
+    setMinQuality(atoi(tokens[2].c_str()));
+    setMaxQuality(atoi(tokens[3].c_str()));
+    decorated_only = static_cast<bool>(atoi(tokens[4].c_str()));
     return true;
 }
 
@@ -91,7 +93,8 @@ bool ItemFilter::deserializeMaterials(std::string ser)
     return true;
 }
 
-void ItemFilter::serialize(PersistentDataItem &config) const
+// format: mat,mask,elements/materials,list/minq/maxq/decorated
+std::string ItemFilter::serialize() const
 {
     std::ostringstream ser;
     ser << bitfield_to_string(mat_mask, ",") << "/";
@@ -101,10 +104,10 @@ void ItemFilter::serialize(PersistentDataItem &config) const
         for (size_t i = 1; i < materials.size(); ++i)
             ser << "," << materials[i].getToken();
     }
-    config.val() = ser.str();
-    config.ival(2) = min_quality + 1;
-    config.ival(4) = max_quality + 1;
-    config.ival(3) = static_cast<int>(decorated_only) + 1;
+    ser << "/" << static_cast<int>(min_quality);
+    ser << "/" << static_cast<int>(max_quality);
+    ser << "/" << static_cast<int>(decorated_only);
+    return ser.str();
 }
 
 void ItemFilter::clearMaterialMask()
@@ -230,20 +233,59 @@ bool ItemFilter::matches(df::item *item) const
  * PlannedBuilding
  */
 
-static std::vector<ItemFilter> deserializeFilters(PersistentDataItem &config)
+// format: itemfilterser|itemfilterser|...
+static std::string serializeFilters(const std::vector<ItemFilter> &filters)
 {
-    // simplified implementation while we can assume there is only one filter
+    std::ostringstream ser;
+    if (!filters.empty())
+    {
+        ser << filters[0].serialize();
+        for (size_t i = 1; i < filters.size(); ++i)
+            ser << "|" << filters[i].serialize();
+    }
+    return ser.str();
+}
+
+static std::vector<ItemFilter> deserializeFilters(std::string ser)
+{
+    std::vector<std::string> isers;
+    split_string(&isers, ser, "|");
     std::vector<ItemFilter> ret;
-    ItemFilter itemFilter;
-    itemFilter.deserialize(config);
-    ret.push_back(itemFilter);
+    for (auto & iser : isers)
+    {
+        ItemFilter filter;
+        if (filter.deserialize(iser))
+            ret.push_back(filter);
+    }
     return ret;
 }
 
 static size_t getNumFilters(BuildingTypeKey key)
 {
-    // TODO: get num filters in Lua when we handle all building types
-    return 1;
+    auto L = Lua::Core::State;
+    color_ostream_proxy out(Core::getInstance().getConsole());
+    Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, 4) || !Lua::PushModulePublic(
+            out, L, "plugins.buildingplan", "get_num_filters"))
+    {
+        debug("failed to push the lua method on the stack");
+        return 0;
+    }
+
+    Lua::Push(L, std::get<0>(key));
+    Lua::Push(L, std::get<1>(key));
+    Lua::Push(L, std::get<2>(key));
+
+    if (!Lua::SafeCall(out, L, 3, 1))
+    {
+        debug("lua call failed");
+        return 0;
+    }
+
+    int num_filters = lua_tonumber(L, -1);
+    lua_pop(L, 1);
+    return num_filters;
 }
 
 PlannedBuilding::PlannedBuilding(df::building *building, const std::vector<ItemFilter> &filters)
@@ -251,92 +293,27 @@ PlannedBuilding::PlannedBuilding(df::building *building, const std::vector<ItemF
       building_id(building->id),
       filters(filters)
 {
-    config = DFHack::World::AddPersistentData(planned_building_persistence_key_v1);
-    config.ival(1) = building_id;
-    // assume all filter vectors are length 1 for now
-    filters[0].serialize(config);
+    config = DFHack::World::AddPersistentData(planned_building_persistence_key_v2);
+    config.ival(0) = building_id;
+    config.val() = serializeFilters(filters);
 }
 
 PlannedBuilding::PlannedBuilding(PersistentDataItem &config)
     : config(config),
-      building(df::building::find(config.ival(1))),
-      building_id(config.ival(1)),
-      filters(deserializeFilters(config))
-{ }
-
-bool PlannedBuilding::assignClosestItem(std::vector<df::item *> *items_vector)
+      building(df::building::find(config.ival(0))),
+      building_id(config.ival(0)),
+      filters(deserializeFilters(config.val()))
 {
-    decltype(items_vector->begin()) closest_item;
-    int32_t closest_distance = -1;
-    for (auto item_iter = items_vector->begin(); item_iter != items_vector->end(); item_iter++)
-    {
-        auto item = *item_iter;
-        if (!filters[0].matches(item))
-            continue;
-
-        auto pos = item->pos;
-        auto distance = abs(pos.x - building->centerx) +
-            abs(pos.y - building->centery) +
-            abs(pos.z - building->z) * 50;
-
-        if (closest_distance > -1 && distance >= closest_distance)
-            continue;
-
-        closest_distance = distance;
-        closest_item = item_iter;
-    }
-
-    if (closest_distance > -1 && assignItem(*closest_item))
-    {
-        debug("Item assigned");
-        items_vector->erase(closest_item);
-        remove();
-        return true;
-    }
-
-    return false;
-}
-
-void delete_item_fn(df::job_item *x) { delete x; }
-
-bool PlannedBuilding::assignItem(df::item *item)
-{
-    auto ref = df::allocate<df::general_ref_building_holderst>();
-    if (!ref)
-    {
-        Core::printerr("Could not allocate general_ref_building_holderst\n");
-        return false;
-    }
-
-    ref->building_id = building->id;
-
-    if (building->jobs.size() != 1)
-        return false;
-
-    auto job = building->jobs[0];
-
-    for_each_(job->job_items, delete_item_fn);
-    job->job_items.clear();
-    job->flags.bits.suspend = false;
-
-    bool rough = false;
-    Job::attachJobItem(job, item, df::job_item_ref::Hauled);
-    if (item->getType() == item_type::BOULDER)
-        rough = true;
-    building->mat_type = item->getMaterial();
-    building->mat_index = item->getMaterialIndex();
-
-    job->mat_type = building->mat_type;
-    job->mat_index = building->mat_index;
-
-    if (building->needsDesign())
+    if (building)
     {
-        auto act = (df::building_actual *) building;
-        act->design = new df::building_design();
-        act->design->flags.bits.rough = rough;
+        if (filters.size() !=
+            getNumFilters(toBuildingTypeKey(building)))
+        {
+            debug("invalid ItemFilter vector serialization: '%s'",
+                config.val().c_str());
+            building = NULL;
+        }
     }
-
-    return true;
 }
 
 // Ensure the building still exists and is in a valid state. It can disappear
@@ -361,6 +338,8 @@ df::building * PlannedBuilding::getBuilding()
 
 const std::vector<ItemFilter> & PlannedBuilding::getFilters() const
 {
+    // if we want to be able to dynamically change the filters, we'll need to
+    // re-bucket the tasks in Planner.
     return filters;
 }
 
@@ -412,45 +391,112 @@ std::size_t BuildingTypeKeyHash::operator() (const BuildingTypeKey & key) const
  * Planner
  */
 
-void Planner::initialize()
-{
-#define add_building_type(btype, itype) \
-    item_for_building_type[df::building_type::btype] = df::item_type::itype; \
-    available_item_vectors[df::item_type::itype] = std::vector<df::item *>(); \
-    is_relevant_item_type[df::item_type::itype] = true; \
-
-    FOR_ENUM_ITEMS(item_type, it)
-        is_relevant_item_type[it] = false;
-
-    add_building_type(Armorstand, ARMORSTAND);
-    add_building_type(Bed, BED);
-    add_building_type(Chair, CHAIR);
-    add_building_type(Coffin, COFFIN);
-    add_building_type(Door, DOOR);
-    add_building_type(Floodgate, FLOODGATE);
-    add_building_type(Hatch, HATCH_COVER);
-    add_building_type(GrateWall, GRATE);
-    add_building_type(GrateFloor, GRATE);
-    add_building_type(BarsVertical, BAR);
-    add_building_type(BarsFloor, BAR);
-    add_building_type(Cabinet, CABINET);
-    add_building_type(Box, BOX);
-    // skip kennels, farm plot
-    add_building_type(Weaponrack, WEAPONRACK);
-    add_building_type(Statue, STATUE);
-    add_building_type(Slab, SLAB);
-    add_building_type(Table, TABLE);
-    // skip roads ... furnaces
-    add_building_type(WindowGlass, WINDOW);
-    // skip gem window ... support
-    add_building_type(AnimalTrap, ANIMALTRAP);
-    add_building_type(Chain, CHAIN);
-    add_building_type(Cage, CAGE);
-    // skip archery target
-    add_building_type(TractionBench, TRACTION_BENCH);
-    // skip nest box, hive (tools)
-
-#undef add_building_type
+// convert v1 persistent data into v2 format
+// we can remove this conversion code once v2 has been live for a while
+void migrateV1ToV2()
+{
+    std::vector<PersistentDataItem> configs;
+    DFHack::World::GetPersistentData(&configs, planned_building_persistence_key_v1);
+    if (configs.empty())
+        return;
+
+    debug("migrating %zu persisted configs to new format", configs.size());
+    for (auto config : configs)
+    {
+        df::building *bld = df::building::find(config.ival(1));
+        if (!bld)
+        {
+            debug("buliding no longer exists; removing config");
+            DFHack::World::DeletePersistentData(config);
+            continue;
+        }
+
+        if (bld->getBuildStage() != 0 || bld->jobs.size() != 1
+            || bld->jobs[0]->job_items.size() != 1)
+        {
+            debug("building in invalid state; removing config");
+            DFHack::World::DeletePersistentData(config);
+            continue;
+        }
+
+        // fix up the building so we can set the material properties later
+        bld->mat_type = -1;
+        bld->mat_index = -1;
+
+        // the v1 filters are not initialized correctly and will match any item.
+        // we need to fix them up a bit.
+        auto filter = bld->jobs[0]->job_items[0];
+        df::item_type type;
+        switch (bld->getType())
+        {
+        case df::building_type::Armorstand: type = df::item_type::ARMORSTAND; break;
+        case df::building_type::Bed: type = df::item_type::BED; break;
+        case df::building_type::Chair: type = df::item_type::CHAIR; break;
+        case df::building_type::Coffin: type = df::item_type::COFFIN; break;
+        case df::building_type::Door: type = df::item_type::DOOR; break;
+        case df::building_type::Floodgate: type = df::item_type::FLOODGATE; break;
+        case df::building_type::Hatch: type = df::item_type::HATCH_COVER; break;
+        case df::building_type::GrateWall: type = df::item_type::GRATE; break;
+        case df::building_type::GrateFloor: type = df::item_type::GRATE; break;
+        case df::building_type::BarsVertical: type = df::item_type::BAR; break;
+        case df::building_type::BarsFloor: type = df::item_type::BAR; break;
+        case df::building_type::Cabinet: type = df::item_type::CABINET; break;
+        case df::building_type::Box: type = df::item_type::BOX; break;
+        case df::building_type::Weaponrack: type = df::item_type::WEAPONRACK; break;
+        case df::building_type::Statue: type = df::item_type::STATUE; break;
+        case df::building_type::Slab: type = df::item_type::SLAB; break;
+        case df::building_type::Table: type = df::item_type::TABLE; break;
+        case df::building_type::WindowGlass: type = df::item_type::WINDOW; break;
+        case df::building_type::AnimalTrap: type = df::item_type::ANIMALTRAP; break;
+        case df::building_type::Chain: type = df::item_type::CHAIN; break;
+        case df::building_type::Cage: type = df::item_type::CAGE; break;
+        case df::building_type::TractionBench: type = df::item_type::TRACTION_BENCH; break;
+        default:
+            debug("building has unhandled type; removing config");
+            DFHack::World::DeletePersistentData(config);
+            continue;
+        }
+        filter->item_type = type;
+        filter->item_subtype = -1;
+        filter->mat_type = -1;
+        filter->mat_index = -1;
+        filter->flags1.whole = 0;
+        filter->flags2.whole = 0;
+        filter->flags2.bits.allow_artifact = true;
+        filter->flags3.whole = 0;
+        filter->flags4 = 0;
+        filter->flags5 = 0;
+        filter->metal_ore = -1;
+        filter->min_dimension = -1;
+        filter->has_tool_use = df::tool_uses::NONE;
+        filter->quantity = 1;
+
+        std::vector<std::string> tokens;
+        split_string(&tokens, config.val(), "/");
+        if (tokens.size() != 2)
+        {
+            debug("invalid v1 format; removing config");
+            DFHack::World::DeletePersistentData(config);
+            continue;
+        }
+
+        ItemFilter item_filter;
+        item_filter.deserializeMaterialMask(tokens[0]);
+        item_filter.deserializeMaterials(tokens[1]);
+        item_filter.setMinQuality(config.ival(2) - 1);
+        item_filter.setMaxQuality(config.ival(4) - 1);
+        if (config.ival(3) - 1)
+            item_filter.toggleDecoratedOnly();
+
+        // create the v2 record
+        std::vector<ItemFilter> item_filters;
+        item_filters.push_back(item_filter);
+        PlannedBuilding pb(bld, item_filters);
+
+        // remove the v1 record
+        DFHack::World::DeletePersistentData(config);
+        debug("v1 record successfully migrated");
+    }
 }
 
 void Planner::reset()
@@ -458,9 +504,12 @@ void Planner::reset()
     debug("resetting Planner state");
     default_item_filters.clear();
     planned_buildings.clear();
+    tasks.clear();
+
+    migrateV1ToV2();
 
     std::vector<PersistentDataItem> items;
-    DFHack::World::GetPersistentData(&items, planned_building_persistence_key_v1);
+    DFHack::World::GetPersistentData(&items, planned_building_persistence_key_v2);
     debug("found data for %zu planned buildings", items.size());
 
     for (auto i = items.begin(); i != items.end(); i++)
@@ -472,7 +521,8 @@ void Planner::reset()
             continue;
         }
 
-        planned_buildings.push_back(pb);
+        if (registerTasks(pb))
+            planned_buildings.insert(std::make_pair(pb.getBuilding()->id, pb));
     }
 }
 
@@ -487,19 +537,19 @@ void Planner::addPlannedBuilding(df::building *bld)
     }
 
     // protect against multiple registrations
-    if (getPlannedBuilding(bld))
+    if (planned_buildings.count(bld->id) != 0)
     {
-        debug("building already registered");
+        debug("failed to add building: already registered");
         return;
     }
 
     PlannedBuilding pb(bld, item_filters);
-    if (pb.isValid())
+    if (pb.isValid() && registerTasks(pb))
     {
         for (auto job : bld->jobs)
             job->flags.bits.suspend = true;
 
-        planned_buildings.push_back(pb);
+        planned_buildings.insert(std::make_pair(bld->id, pb));
     }
     else
     {
@@ -507,19 +557,107 @@ void Planner::addPlannedBuilding(df::building *bld)
     }
 }
 
-PlannedBuilding * Planner::getPlannedBuilding(df::building *bld)
+static std::string getBucket(const df::job_item & ji,
+                             const std::vector<ItemFilter> & item_filters)
+{
+    std::ostringstream ser;
+
+    // pull out and serialize only known relevant fields. if we miss a few, then
+    // the filter bucket will be slighly less specific than it could be, but
+    // that's probably ok. we'll just end up bucketing slightly different items
+    // together. this is only a problem if the different filter at the front of
+    // the queue doesn't match any available items and blocks filters behind it
+    // that could be matched.
+    ser << ji.item_type << ':' << ji.item_subtype << ':' << ji.mat_type << ':'
+        << ji.mat_index << ':' << ji.flags1.whole << ':' << ji.flags2.whole
+        << ':' << ji.flags3.whole << ':' << ji.flags4 << ':' << ji.flags5 << ':'
+        << ji.metal_ore << ':' << ji.has_tool_use;
+
+    for (auto & item_filter : item_filters)
+    {
+        ser << ':' << item_filter.serialize();
+    }
+
+    return ser.str();
+}
+
+bool Planner::registerTasks(PlannedBuilding & pb)
 {
-    for (auto & pb : planned_buildings)
+    df::building * bld = pb.getBuilding();
+    if (bld->jobs.size() != 1)
+    {
+        debug("unexpected number of jobs: want 1, got %zu", bld->jobs.size());
+        return false;
+    }
+    auto job_items = bld->jobs[0]->job_items;
+    int num_job_items = job_items.size();
+    if (num_job_items < 1)
     {
-        if (pb.getBuilding() == bld)
-            return &pb;
+        debug("unexpected number of job items: want >0, got %d", num_job_items);
+        return false;
     }
-    return NULL;
+    for (int job_item_idx = 0; job_item_idx < num_job_items; ++job_item_idx)
+    {
+        auto vector_id = df::job_item_vector_id::IN_PLAY;
+        auto job_item = job_items[job_item_idx];
+        if (job_item->vector_id)
+          vector_id = job_item->vector_id;
+        auto bucket = getBucket(*job_item, pb.getFilters());
+        for (int item_num = 0; item_num < job_item->quantity; ++item_num)
+        {
+            int32_t id = bld->id;
+            tasks[vector_id][bucket].push(std::make_pair(id, job_item_idx));
+            debug("added task: %s/%s/%d,%d; "
+                  "%zu vectors, %zu buckets, %zu tasks in bucket",
+                  ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
+                  bucket.c_str(), id, job_item_idx, tasks.size(),
+                  tasks[vector_id].size(), tasks[vector_id][bucket].size());
+        }
+    }
+    return true;
+}
+
+PlannedBuilding * Planner::getPlannedBuilding(df::building *bld)
+{
+    if (!bld || planned_buildings.count(bld->id) == 0)
+        return NULL;
+    return &planned_buildings.at(bld->id);
 }
 
 bool Planner::isPlannableBuilding(BuildingTypeKey key)
 {
-    return item_for_building_type.count(std::get<0>(key)) > 0;
+    if (getNumFilters(key) == 0)
+        return false;
+
+    // restrict supported types to be the same as the previous implementation
+    switch(std::get<0>(key))
+    {
+        case df::enums::building_type::Armorstand:
+        case df::enums::building_type::Bed:
+        case df::enums::building_type::Chair:
+        case df::enums::building_type::Coffin:
+        case df::enums::building_type::Door:
+        case df::enums::building_type::Floodgate:
+        case df::enums::building_type::Hatch:
+        case df::enums::building_type::GrateWall:
+        case df::enums::building_type::GrateFloor:
+        case df::enums::building_type::BarsVertical:
+        case df::enums::building_type::BarsFloor:
+        case df::enums::building_type::Cabinet:
+        case df::enums::building_type::Box:
+        case df::enums::building_type::Weaponrack:
+        case df::enums::building_type::Statue:
+        case df::enums::building_type::Slab:
+        case df::enums::building_type::Table:
+        case df::enums::building_type::WindowGlass:
+        case df::enums::building_type::AnimalTrap:
+        case df::enums::building_type::Chain:
+        case df::enums::building_type::Cage:
+        case df::enums::building_type::TractionBench:
+            return true;
+        default:
+            return false;
+    }
 }
 
 Planner::ItemFiltersWrapper Planner::getItemFilters(BuildingTypeKey key)
@@ -535,84 +673,250 @@ Planner::ItemFiltersWrapper Planner::getItemFilters(BuildingTypeKey key)
     return ItemFiltersWrapper(default_item_filters[key]);
 }
 
-void Planner::doCycle()
+// precompute a bitmask with bad item flags
+struct BadFlags
 {
-    debug("Running Cycle");
-    if (planned_buildings.size() == 0)
-        return;
-
-    debug("Planned count: %zu", planned_buildings.size());
+    uint32_t whole;
 
-    gather_available_items();
-    for (auto building_iter = planned_buildings.begin(); building_iter != planned_buildings.end();)
+    BadFlags()
     {
-        if (building_iter->isValid())
-        {
-            auto type = building_iter->getBuilding()->getType();
-            debug("Trying to allocate %s", enum_item_key_str(type));
+        df::item_flags flags;
+        #define F(x) flags.bits.x = true;
+        F(dump); F(forbid); F(garbage_collect);
+        F(hostile); F(on_fire); F(rotten); F(trader);
+        F(in_building); F(construction); F(in_job);
+        F(owned); F(in_chest); F(removed); F(encased);
+        #undef F
+        whole = flags.whole;
+    }
+};
 
-            auto required_item_type = item_for_building_type[type];
-            auto items_vector = &available_item_vectors[required_item_type];
-            if (items_vector->size() == 0 || !building_iter->assignClosestItem(items_vector))
-            {
-                debug("Unable to allocate an item");
-                ++building_iter;
-                continue;
-            }
-        }
-        debug("Removing building plan");
-        building_iter->remove();
-        building_iter = planned_buildings.erase(building_iter);
+static bool itemPassesScreen(df::item * item)
+{
+    static BadFlags bad_flags;
+    return !(item->flags.whole & bad_flags.whole)
+        && !item->isAssignedToStockpile()
+        // TODO: make this configurable
+        && !(item->getType() == df::item_type::BOX && item->isBag());
+}
+
+static bool matchesFilters(df::item * item,
+                           df::job_item * job_item,
+                           const ItemFilter & item_filter)
+{
+    if (job_item->item_type > -1 && job_item->item_type != item->getType())
+        return false;
+
+    if (job_item->item_subtype > -1 &&
+        job_item->item_subtype != item->getSubtype())
+        return false;
+
+    if (job_item->has_tool_use > df::tool_uses::NONE
+        && !item->hasToolUse(job_item->has_tool_use))
+        return false;
+
+    return DFHack::Job::isSuitableItem(
+            job_item, item->getType(), item->getSubtype())
+        && DFHack::Job::isSuitableMaterial(
+            job_item, item->getMaterial(), item->getMaterialIndex())
+        && item_filter.matches(item);
+}
+
+// note that this just removes the PlannedBuilding. the tasks will get dropped
+// as we discover them in the tasks queues and they fail their isValid() check.
+// this "lazy" task cleaning algorithm works because there is no way to
+// re-register a building once it has been removed -- if it fails isValid()
+// then it has either been built or desroyed. therefore there is no chance of
+// duplicate tasks getting added to the tasks queues.
+void Planner::unregisterBuilding(int32_t id)
+{
+    if (planned_buildings.count(id) > 0)
+    {
+        planned_buildings.at(id).remove();
+        planned_buildings.erase(id);
     }
 }
 
-void Planner::gather_available_items()
+static bool isJobReady(df::job * job)
 {
-    debug("Gather available items");
-    for (auto iter = available_item_vectors.begin(); iter != available_item_vectors.end(); iter++)
+    int needed_items = 0;
+    for (auto job_item : job->job_items) { needed_items += job_item->quantity; }
+    if (needed_items)
     {
-        iter->second.clear();
+        debug("building needs %d more item(s)", needed_items);
+        return false;
     }
+    return true;
+}
 
-    // Precompute a bitmask with the bad flags
-    df::item_flags bad_flags;
-    bad_flags.whole = 0;
+static bool job_item_idx_lt(df::job_item_ref *a, df::job_item_ref *b)
+{
+    // we want the items in the opposite order of the filters
+    return a->job_item_idx > b->job_item_idx;
+}
 
-    #define F(x) bad_flags.bits.x = true;
-    F(dump); F(forbid); F(garbage_collect);
-    F(hostile); F(on_fire); F(rotten); F(trader);
-    F(in_building); F(construction); F(artifact);
-    #undef F
+// this function does not remove the job_items since their quantity fields are
+// now all at 0, so there is no risk of having extra items attached. we don't
+// remove them to keep the "finalize with buildingplan active" path as similar
+// as possible to the "finalize with buildingplan disabled" path.
+static void finalizeBuilding(df::building * bld)
+{
+    debug("finalizing building %d", bld->id);
+    auto job = bld->jobs[0];
 
-    std::vector<df::item*> &items = df::global::world->items.other[df::items_other_id::IN_PLAY];
+    // sort the items so they get added to the structure in the correct order
+    std::sort(job->items.begin(), job->items.end(), job_item_idx_lt);
 
-    for (size_t i = 0; i < items.size(); i++)
+    // derive the material properties of the building and job from the first
+    // applicable item, though if any boulders are involved, it makes the whole
+    // structure "rough".
+    bool rough = false;
+    for (auto attached_item : job->items)
     {
-        df::item *item = items[i];
-
-        if (item->flags.whole & bad_flags.whole)
-            continue;
-
-        df::item_type itype = item->getType();
-        if (!is_relevant_item_type[itype])
-            continue;
+        df::item *item = attached_item->item;
+        rough = rough || item->getType() == item_type::BOULDER;
+        if (bld->mat_type == -1)
+        {
+            bld->mat_type = item->getMaterial();
+            job->mat_type = bld->mat_type;
+        }
+        if (bld->mat_index == -1)
+        {
+            bld->mat_index = item->getMaterialIndex();
+            job->mat_index = bld->mat_index;
+        }
+    }
 
-        if (itype == df::item_type::BOX && item->isBag())
-            continue; //Skip bags
+    if (bld->needsDesign())
+    {
+        auto act = (df::building_actual *)bld;
+        if (!act->design)
+            act->design = new df::building_design();
+        act->design->flags.bits.rough = rough;
+    }
 
-        if (item->flags.bits.artifact)
-            continue;
+    // we're good to go!
+    job->flags.bits.suspend = false;
+    Job::checkBuildingsNow();
+}
 
-        if (item->flags.bits.in_job ||
-            item->isAssignedToStockpile() ||
-            item->flags.bits.owned ||
-            item->flags.bits.in_chest)
+void Planner::popInvalidTasks(std::queue<std::pair<int32_t, int>> & task_queue)
+{
+    while (!task_queue.empty())
+    {
+        auto & task = task_queue.front();
+        auto id = task.first;
+        if (planned_buildings.count(id) > 0)
         {
-            continue;
+            PlannedBuilding & pb = planned_buildings.at(id);
+            if (pb.isValid() &&
+                pb.getBuilding()->jobs[0]->job_items[task.second]->quantity)
+            {
+                break;
+            }
         }
+        debug("discarding invalid task: bld=%d, job_item_idx=%d",
+              id, task.second);
+        task_queue.pop();
+        unregisterBuilding(id);
+    }
+}
 
-        available_item_vectors[itype].push_back(item);
+void Planner::doCycle()
+{
+    debug("running cycle for %zu registered buildings",
+          planned_buildings.size());
+    for (auto it = tasks.begin(); it != tasks.end();)
+    {
+        auto & buckets = it->second;
+        auto other_id = ENUM_ATTR(job_item_vector_id, other, it->first);
+        auto item_vector = df::global::world->items.other[other_id];
+        debug("matching %zu items in vector %s against %zu buckets",
+              item_vector.size(),
+              ENUM_KEY_STR(job_item_vector_id, it->first).c_str(),
+              buckets.size());
+        for (auto item_it = item_vector.rbegin();
+             item_it != item_vector.rend();
+             ++item_it)
+        {
+            auto item = *item_it;
+            if (!itemPassesScreen(item))
+                continue;
+            for (auto bucket_it = buckets.begin(); bucket_it != buckets.end();)
+            {
+                auto & task_queue = bucket_it->second;
+                popInvalidTasks(task_queue);
+                if (task_queue.empty())
+                {
+                    debug("removing empty bucket: %s/%s; %zu buckets left",
+                          ENUM_KEY_STR(job_item_vector_id, it->first).c_str(),
+                          bucket_it->first.c_str(),
+                          buckets.size() - 1);
+                    bucket_it = buckets.erase(bucket_it);
+                    continue;
+                }
+                auto & task = task_queue.front();
+                auto id = task.first;
+                auto & pb = planned_buildings.at(id);
+                auto building = pb.getBuilding();
+                auto job = building->jobs[0];
+                auto filter_idx = task.second;
+                if (matchesFilters(item, job->job_items[filter_idx],
+                        pb.getFilters()[filter_idx])
+                   && DFHack::Job::attachJobItem(job, item,
+                            df::job_item_ref::Hauled, filter_idx))
+                {
+                    MaterialInfo material;
+                    material.decode(item);
+                    ItemTypeInfo item_type;
+                    item_type.decode(item);
+                    debug("attached %s %s to filter %d for %s(%d): %s/%s",
+                          material.toString().c_str(),
+                          item_type.toString().c_str(),
+                          filter_idx,
+                          ENUM_KEY_STR(building_type, building->getType()).c_str(),
+                          id,
+                          ENUM_KEY_STR(job_item_vector_id, it->first).c_str(),
+                          bucket_it->first.c_str());
+                    // keep quantity aligned with the actual number of remaining
+                    // items so if buildingplan is turned off, the building will
+                    // be completed with the correct number of items.
+                    --job->job_items[filter_idx]->quantity;
+                    task_queue.pop();
+                    if (isJobReady(job))
+                    {
+                        finalizeBuilding(building);
+                        unregisterBuilding(id);
+                    }
+                    if (task_queue.empty())
+                    {
+                        debug(
+                            "removing empty item bucket: %s/%s; %zu remaining",
+                            ENUM_KEY_STR(job_item_vector_id, it->first).c_str(),
+                            bucket_it->first.c_str(),
+                            buckets.size() - 1);
+                        buckets.erase(bucket_it);
+                    }
+                    // we found a home for this item; no need to look further
+                    break;
+                }
+                ++bucket_it;
+            }
+            if (buckets.empty())
+                break;
+        }
+        if (buckets.empty())
+        {
+            debug("removing empty vector: %s; %zu vectors left",
+                  ENUM_KEY_STR(job_item_vector_id, it->first).c_str(),
+                  tasks.size() - 1);
+            it = tasks.erase(it);
+        }
+        else
+            ++it;
     }
+    debug("cycle done; %zu registered buildings left",
+          planned_buildings.size());
 }
 
 Planner planner;
diff --git a/plugins/buildingplan-planner.h b/plugins/buildingplan-planner.h
index cda217d81..22d0487c3 100644
--- a/plugins/buildingplan-planner.h
+++ b/plugins/buildingplan-planner.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <queue>
 #include <unordered_map>
 
 #include "df/building.h"
@@ -16,8 +17,8 @@ public:
     ItemFilter();
 
     void clear();
-    bool deserialize(DFHack::PersistentDataItem &config);
-    void serialize(DFHack::PersistentDataItem &config) const;
+    bool deserialize(std::string ser);
+    std::string serialize() const;
 
     void addMaterialMask(uint32_t mask);
     void clearMaterialMask();
@@ -40,6 +41,9 @@ public:
     bool matches(df::item *item) const;
 
 private:
+    // remove friend declaration when we no longer need v1 deserialization
+    friend void migrateV1ToV2();
+
     df::dfhack_material_category mat_mask;
     std::vector<DFHack::MaterialInfo> materials;
     df::item_quality min_quality;
@@ -59,9 +63,6 @@ public:
     PlannedBuilding(df::building *building, const std::vector<ItemFilter> &filters);
     PlannedBuilding(DFHack::PersistentDataItem &config);
 
-    bool assignClosestItem(std::vector<df::item *> *items_vector);
-    bool assignItem(df::item *item);
-
     bool isValid() const;
     void remove();
 
@@ -71,8 +72,8 @@ public:
 private:
     DFHack::PersistentDataItem config;
     df::building *building;
-    df::building::key_field_type building_id;
-    std::vector<ItemFilter> filters;
+    const df::building::key_field_type building_id;
+    const std::vector<ItemFilter> filters;
 };
 
 // building type, subtype, custom
@@ -103,7 +104,6 @@ public:
         std::vector<ItemFilter> &item_filters;
     };
 
-    void initialize();
     void reset();
 
     void addPlannedBuilding(df::building *bld);
@@ -117,15 +117,17 @@ public:
     void doCycle();
 
 private:
-    std::map<df::building_type, df::item_type> item_for_building_type;
     std::unordered_map<BuildingTypeKey,
                        std::vector<ItemFilter>,
                        BuildingTypeKeyHash> default_item_filters;
-    std::map<df::item_type, std::vector<df::item *>> available_item_vectors;
-    std::map<df::item_type, bool> is_relevant_item_type; //Needed for fast check when looping over all items
-    std::vector<PlannedBuilding> planned_buildings;
-
-    void gather_available_items();
+    // building id -> PlannedBuilding
+    std::unordered_map<int32_t, PlannedBuilding> planned_buildings;
+    // vector id -> filter bucket -> queue of (building id, job_item index)
+    std::map<df::job_item_vector_id, std::map<std::string, std::queue<std::pair<int32_t, int>>>> tasks;
+
+    bool registerTasks(PlannedBuilding &plannedBuilding);
+    void unregisterBuilding(int32_t id);
+    void popInvalidTasks(std::queue<std::pair<int32_t, int>> &task_queue);
 };
 
 extern Planner planner;
diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index 703e567b7..58c911dcf 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -1,5 +1,3 @@
-#include <unordered_map>
-
 #include "df/entity_position.h"
 #include "df/interface_key.h"
 #include "df/ui_build_selector.h"
@@ -17,7 +15,7 @@
 #include "buildingplan-lib.h"
 
 DFHACK_PLUGIN("buildingplan");
-#define PLUGIN_VERSION 0.15
+#define PLUGIN_VERSION 2.0
 REQUIRE_GLOBAL(ui);
 REQUIRE_GLOBAL(ui_build_selector);
 REQUIRE_GLOBAL(world);
@@ -287,6 +285,33 @@ static bool is_planmode_enabled(BuildingTypeKey key)
     return planmode_enabled[key] || quickfort_mode;
 }
 
+static std::string get_item_label(const BuildingTypeKey &key, int item_idx)
+{
+     auto L = Lua::Core::State;
+     color_ostream_proxy out(Core::getInstance().getConsole());
+     Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, 5) ||
+        !Lua::PushModulePublic(
+            out, L, "plugins.buildingplan", "get_item_label"))
+        return "Failed push";
+
+    Lua::Push(L, std::get<0>(key));
+    Lua::Push(L, std::get<1>(key));
+    Lua::Push(L, std::get<2>(key));
+    Lua::Push(L, item_idx);
+
+    if (!Lua::SafeCall(out, L, 4, 1))
+        return "Failed call";
+
+    const char *s = lua_tostring(L, -1);
+    if (!s)
+        return "No string";
+
+    lua_pop(L, 1);
+    return s;
+}
+
 static bool construct_planned_building()
 {
      auto L = Lua::Core::State;
@@ -318,6 +343,16 @@ struct buildingplan_query_hook : public df::viewscreen_dwarfmodest
 {
     typedef df::viewscreen_dwarfmodest interpose_base;
 
+    // no non-static fields allowed (according to VTableInterpose.h)
+    static df::building *bld;
+    static PlannedBuilding *pb;
+    static int filter_count;
+    static int filter_idx;
+
+    // logic is reversed since we're starting at the last filter
+    bool hasNextFilter() const { return filter_idx > 0; }
+    bool hasPrevFilter() const { return filter_idx + 1 < filter_count; }
+
     bool isInPlannedBuildingQueryMode()
     {
         return (ui->main.mode == df::ui_sidebar_mode::QueryBuilding ||
@@ -325,21 +360,45 @@ struct buildingplan_query_hook : public df::viewscreen_dwarfmodest
             planner.getPlannedBuilding(world->selected_building);
     }
 
+    // reinit static fields when selected building changes
+    void initStatics()
+    {
+        df::building *cur_bld = world->selected_building;
+        if (bld != cur_bld)
+        {
+            bld = cur_bld;
+            pb = planner.getPlannedBuilding(bld);
+            filter_count = pb->getFilters().size();
+            filter_idx = filter_count - 1;
+        }
+    }
+
     bool handleInput(set<df::interface_key> *input)
     {
         if (!isInPlannedBuildingQueryMode())
             return false;
 
+        initStatics();
+
         if (input->count(interface_key::SUSPENDBUILDING))
             return true; // Don't unsuspend planned buildings
         if (input->count(interface_key::DESTROYBUILDING))
         {
-            // remove persistent data and allow the parent to handle the key
-            // so the building is removed
-            planner.getPlannedBuilding(world->selected_building)->remove();
+            // remove persistent data
+            pb->remove();
+            // still allow the building to be removed
+            return false;
         }
 
-        return false;
+        // ctrl+Right
+        if (input->count(interface_key::A_MOVE_E_DOWN) && hasNextFilter())
+            --filter_idx;
+        // ctrl+Left
+        else if (input->count(interface_key::A_MOVE_W_DOWN) && hasPrevFilter())
+            ++filter_idx;
+        else
+            return false;
+        return true;
     }
 
     DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
@@ -355,6 +414,8 @@ struct buildingplan_query_hook : public df::viewscreen_dwarfmodest
         if (!isInPlannedBuildingQueryMode())
             return;
 
+        initStatics();
+
         // Hide suspend toggle option
         auto dims = Gui::getDwarfmodeViewDims();
         int left_margin = dims.menu_x1 + 1;
@@ -363,10 +424,13 @@ struct buildingplan_query_hook : public df::viewscreen_dwarfmodest
         Screen::Pen pen(' ', COLOR_BLACK);
         Screen::fillRect(pen, x, y, dims.menu_x2, y);
 
-        // all current buildings only have one filter
-        auto & filter = planner.getPlannedBuilding(world->selected_building)->getFilters()[0];
+        auto & filter = pb->getFilters()[filter_idx];
         y = 24;
-        OutputString(COLOR_WHITE, x, y, "Planned Building Filter", true, left_margin);
+        std::string item_label =
+            stl_sprintf("Item %d of %d", filter_count - filter_idx, filter_count);
+        OutputString(COLOR_WHITE, x, y, "Planned Building Filter", true, left_margin + 1);
+        OutputString(COLOR_WHITE, x, y, item_label.c_str(), true, left_margin + 1);
+        OutputString(COLOR_WHITE, x, y, get_item_label(toBuildingTypeKey(bld), filter_idx).c_str(), true, left_margin);
         ++y;
         OutputString(COLOR_BROWN, x, y, "Min Quality: ", false, left_margin);
         OutputString(COLOR_BLUE, x, y, filter.getMinQuality(), true, left_margin);
@@ -380,13 +444,35 @@ struct buildingplan_query_hook : public df::viewscreen_dwarfmodest
         auto filters = filter.getMaterials();
         for (auto it = filters.begin(); it != filters.end(); ++it)
             OutputString(COLOR_BLUE, x, y, "*" + *it, true, left_margin);
+
+        ++y;
+        if (hasPrevFilter())
+            OutputHotkeyString(x, y, "Prev Item", "Ctrl+Left", true, left_margin);
+        if (hasNextFilter())
+            OutputHotkeyString(x, y, "Next Item", "Ctrl+Right", true, left_margin);
     }
 };
 
+df::building * buildingplan_query_hook::bld;
+PlannedBuilding * buildingplan_query_hook::pb;
+int buildingplan_query_hook::filter_count;
+int buildingplan_query_hook::filter_idx;
+
 struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
 {
     typedef df::viewscreen_dwarfmodest interpose_base;
 
+    // no non-static fields allowed (according to VTableInterpose.h)
+    static BuildingTypeKey key;
+    static std::vector<ItemFilter>::reverse_iterator filter_rbegin;
+    static std::vector<ItemFilter>::reverse_iterator filter_rend;
+    static std::vector<ItemFilter>::reverse_iterator filter;
+    static int filter_count;
+    static int filter_idx;
+
+    bool hasNextFilter() const { return filter + 1 != filter_rend; }
+    bool hasPrevFilter() const { return filter != filter_rbegin; }
+
     bool isInPlannedBuildingPlacementMode()
     {
         return ui->main.mode == ui_sidebar_mode::Build &&
@@ -395,6 +481,22 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
             planner.isPlannableBuilding(toBuildingTypeKey(ui_build_selector));
     }
 
+    // reinit static fields when selected building type changes
+    void initStatics()
+    {
+        BuildingTypeKey cur_key = toBuildingTypeKey(ui_build_selector);
+        if (key != cur_key)
+        {
+            key = cur_key;
+            auto wrapper = planner.getItemFilters(key);
+            filter_rbegin = wrapper.rbegin();
+            filter_rend = wrapper.rend();
+            filter = filter_rbegin;
+            filter_count = wrapper.get().size();
+            filter_idx = filter_count - 1;
+        }
+    }
+
     bool handleInput(set<df::interface_key> *input)
     {
         if (!isInPlannedBuildingPlacementMode())
@@ -402,6 +504,8 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
             show_help = false;
             return false;
         }
+        
+        initStatics();
 
         if (in_dummy_screen)
         {
@@ -425,7 +529,6 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
             show_help = true;
         }
 
-        BuildingTypeKey key = toBuildingTypeKey(ui_build_selector);
         if (input->count(interface_key::CUSTOM_SHIFT_P))
         {
             planmode_enabled[key] = !planmode_enabled[key];
@@ -453,8 +556,6 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
             return true;
         }
 
-        // all current buildings only have one filter
-        auto filter = planner.getItemFilters(key).rbegin();
         if (input->count(interface_key::CUSTOM_SHIFT_M))
             Screen::show(dts::make_unique<ViewscreenChooseMaterial>(*filter), plugin_self);
         else if (input->count(interface_key::CUSTOM_Q))
@@ -467,6 +568,18 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
             filter->incMaxQuality();
         else if (input->count(interface_key::CUSTOM_SHIFT_D))
             filter->toggleDecoratedOnly();
+        // ctrl+Right
+        else if (input->count(interface_key::A_MOVE_E_DOWN) && hasNextFilter())
+        {
+            ++filter;
+            --filter_idx;
+        }
+        // ctrl+Left
+        else if (input->count(interface_key::A_MOVE_W_DOWN) && hasPrevFilter())
+        {
+            --filter;
+            ++filter_idx;
+        }
         else
             return false;
         return true;
@@ -481,7 +594,6 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
     DEFINE_VMETHOD_INTERPOSE(void, render, ())
     {
         bool plannable = isInPlannedBuildingPlacementMode();
-        BuildingTypeKey key = toBuildingTypeKey(ui_build_selector);
         if (plannable && is_planmode_enabled(key))
         {
             if (ui_build_selector->stage < 1)
@@ -506,6 +618,8 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
         if (!plannable)
             return;
 
+        initStatics();
+
         auto dims = Gui::getDwarfmodeViewDims();
         int left_margin = dims.menu_x1 + 1;
         int x = left_margin;
@@ -539,8 +653,13 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
         if (!is_planmode_enabled(key))
             return;
 
-        auto filter = planner.getItemFilters(key).rbegin();
         y += 2;
+        std::string title =
+            stl_sprintf("Filter for Item %d of %d:",
+                        filter_count - filter_idx, filter_count);
+        OutputString(COLOR_WHITE, x, y, title.c_str(), true, left_margin + 1);
+        OutputString(COLOR_WHITE, x, y, get_item_label(key, filter_idx).c_str(), true, left_margin);
+
         OutputHotkeyString(x, y, "Min Quality: ", "qw");
         OutputString(COLOR_BROWN, x, y, filter->getMinQuality(), true, left_margin);
 
@@ -554,9 +673,22 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
         for (auto it = filter_descriptions.begin();
              it != filter_descriptions.end(); ++it)
              OutputString(COLOR_BROWN, x, y, "   *" + *it, true, left_margin);
+
+        y += 2;
+        if (hasPrevFilter())
+            OutputHotkeyString(x, y, "Prev Item", "Ctrl+Left", true, left_margin);
+        if (hasNextFilter())
+            OutputHotkeyString(x, y, "Next Item", "Ctrl+Right", true, left_margin);
     }
 };
 
+BuildingTypeKey buildingplan_place_hook::key;
+std::vector<ItemFilter>::reverse_iterator buildingplan_place_hook::filter_rbegin;
+std::vector<ItemFilter>::reverse_iterator buildingplan_place_hook::filter_rend;
+std::vector<ItemFilter>::reverse_iterator buildingplan_place_hook::filter;
+int buildingplan_place_hook::filter_count;
+int buildingplan_place_hook::filter_idx;
+
 struct buildingplan_room_hook : public df::viewscreen_dwarfmodest
 {
     typedef df::viewscreen_dwarfmodest interpose_base;
@@ -701,7 +833,6 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
         PluginCommand(
         "buildingplan", "Plan building construction before you have materials",
         buildingplan_cmd, false, "Run 'buildingplan debug [on|off]' to toggle debugging, or 'buildingplan version' to query the plugin version."));
-    planner.initialize();
 
     return CR_OK;
 }
diff --git a/plugins/fortplan.cpp b/plugins/fortplan.cpp
index 8fbf8fb72..859ae4701 100644
--- a/plugins/fortplan.cpp
+++ b/plugins/fortplan.cpp
@@ -130,8 +130,6 @@ DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCom
     buildings.push_back(BuildingInfo("N",df::building_type::NestBox,"Nest Box",1,1));
     buildings.push_back(BuildingInfo("~h",df::building_type::Hive,"Hive",1,1));
 
-    planner.initialize();
-
     return CR_OK;
 }
 
diff --git a/plugins/lua/buildingplan.lua b/plugins/lua/buildingplan.lua
index 1ab462201..49b80990f 100644
--- a/plugins/lua/buildingplan.lua
+++ b/plugins/lua/buildingplan.lua
@@ -14,6 +14,53 @@ local _ENV = mkmodule('plugins.buildingplan')
 local guidm = require('gui.dwarfmode')
 require('dfhack.buildings')
 
+-- does not need the core suspended
+function get_num_filters(btype, subtype, custom)
+    local filters = dfhack.buildings.getFiltersByType(
+        {}, btype, subtype, custom)
+    if filters then return #filters end
+    return 0
+end
+
+local function to_title_case(str)
+    str = str:gsub('(%a)([%w_]*)',
+        function (first, rest) return first:upper()..rest:lower() end)
+    str = str:gsub('_', ' ')
+    return str
+end
+
+-- returns a reasonable label for the item based on the qualities of the filter
+-- does not need the core suspended
+-- reverse_idx is 0-based and is expected to be counted from the *last* filter
+function get_item_label(btype, subtype, custom, reverse_idx)
+    local filters = dfhack.buildings.getFiltersByType(
+        {}, btype, subtype, custom)
+    if not filters then return 'No item' end
+    if reverse_idx < 0 or reverse_idx >= #filters then
+        return 'Invalid index'
+    end
+    local filter = filters[#filters-reverse_idx]
+    if filter.has_tool_use then
+        return to_title_case(df.tool_uses[filter.has_tool_use])
+    end
+    if filter.item_type then
+        return to_title_case(df.item_type[filter.item_type])
+    end
+    if filter.flags2 and filter.flags2.building_material then
+        if filter.flags2.fire_safe then
+            return "Fire-safe building material";
+        end
+        if filter.flags2.magma_safe then
+            return "Magma-safe building material";
+        end
+        return "Generic building material";
+    end
+    if filter.vector_id then
+        return to_title_case(df.job_item_vector_id[filter.vector_id])
+    end
+    return "Unknown";
+end
+
 -- needs the core suspended
 function construct_building_from_ui_state()
     local uibs = df.global.ui_build_selector

From 09fbaba72609d4f98e117f925d517e42841f7de2 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Fri, 16 Oct 2020 14:23:35 -0700
Subject: [PATCH 449/547] buildingplan: support all building types

Allow buildingplan to handle all building types, update the docs, and add in little extra fixes to ensure all the new types work correctly.
---
 data/blueprints/library/dreamfort.csv | 54 ++++++++---------
 docs/Plugins.rst                      | 39 +++++++++++--
 docs/changelog.txt                    |  9 +++
 docs/guides/quickfort-user-guide.rst  | 83 ++++++++++++++++-----------
 library/modules/Buildings.cpp         | 15 +++++
 plugins/buildingplan-planner.cpp      | 52 ++++-------------
 plugins/lua/buildingplan.lua          | 22 ++++---
 7 files changed, 156 insertions(+), 118 deletions(-)

diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
index 2eb98607f..8924df3c6 100644
--- a/data/blueprints/library/dreamfort.csv
+++ b/data/blueprints/library/dreamfort.csv
@@ -2,26 +2,28 @@
 Welcome to the Dreamfort Walkthrough!
 It can be difficult applying a set of blueprints that you did not write yourself. This walkthrough will guide you through the high-level steps of building Dreamfort.
 ""
-"The final fort will have a walled-in area on the surface for livestock, trading, and military. Be sure to bring some blocks with you for the initial set of workshops! One z-level down is the farming level, with related workshops and vents up to the surface for miasma control. The farming level also has a miniature dining hall and dormitory for use until you get the services and apartment levels set up."
+"The final fort will have a walled-in area on the surface for livestock, trading, and military. Be sure to bring some blocks with you for the initial set of workshops! One z-level down is the farming level, with related workshops and vents up to the surface for miasma control. The farming level also has a miniature dining hall and dormitory for use until you get the services and beds levels set up."
 ""
 "Beyond those two, the other layers can be built in any order, at any z-level, according to your preference and the layout peculiarities of your embark site:"
 "- The industry level has a compact, but complete set of workshops and stockpiles (minus what is already provided on the farming level)"
 "- The services level has dining, hospital, and justice services, including a well system. This level is 4 z-levels deep."
-"- The guildhall level has many rooms for building libraries, temples, and guildhalls"
+"- The guildhall level has many empty rooms for building libraries, temples, and guildhalls"
 - The suites level has fancy rooms for your nobles
 - The apartments level(s) has small but well-furnished bedrooms for your other dwarves
 ""
+"Run the ""help"" blueprints for each level for more details."
+""
 "Dreamfort has a central staircase-based design. Choose a tile for your staircase on the surface in a nice, flat area. For all blueprints, the cursor will start on this tile on the z-level where you want to apply the blueprint."
 ""
-"Blueprints that require manual steps (like 'assign animals to pasture') will leave a message telling you so after you apply them. Blueprints will also leave messages with hints when you might want to run ""quickfort orders"" on specific blueprints to start manufacturing needed items."
+"Blueprints that require manual steps (like 'assign minecart to hauling route') will leave a message telling you so after you apply them. Blueprints will also leave messages with hints when you might want to run ""quickfort orders"" on specific blueprints to start manufacturing needed items."
 ""
 "Directly after embark, apply /surface1 on a flat area on the surface and /industry1 somewhere underground (but not immediately below the surface -- that will be for the farming level). Work your way through the steps for those levels: apply /surface2 when /surface1 is done, /industry2 when /industry1 is done, etc. Once you channel out parts of the surface with /surface3, you can start the farming sequence with /farming1. You can start the services, guildhall, suites, and apartments sequences as your fort needs those levels."
 ""
-"This .csv file is generated from source .xlsx files. If you want to look at how these blueprints are put together, including full lists of their features, it will be easier to look at the .xlsx files than this giant .csv. You can view them online at: https://drive.google.com/drive/folders/1iS90EEVqUkxTeZiiukVj1pLloZqabKuP"
+"This .csv file is generated from source .xlsx files. If you want to look at how these blueprints are put together, it will be easier to look at the online spreadsheets than this giant .csv. You can view them at: https://drive.google.com/drive/folders/1iS90EEVqUkxTeZiiukVj1pLloZqabKuP"
 You are welcome to copy those files and make your own modifications!
 "#dreamfort.csv is generated with the following command:
   for fname in dreamfort*.xlsx; do xlsx2csv -a -p '' $fname; done | sed 's/,*$//'"
-#notes label(surface_readme)
+#notes label(surface_help)
 "Sets up a large, protected entrance to your fort in a flat area on the surface."
 ""
 Features:
@@ -46,7 +48,7 @@ Once the area is clear, continue with /surface2.) clear an area and set up pastu
 clear_small/surface_clear_small
 zones/surface_zones
 ""
-"#meta label(surface2) start(staircase center) message(This would be a good time to queue manager orders for /surface4, /surface5, and /surface6. If you want a consistent color for your walls, remember to set the rock material for the manager orders for blocks.
+"#meta label(surface2) start(staircase center) message(This would be a good time to queue manager orders for /surface4, /surface5, and /surface6. If you want a consistent color for your walls, remember to set the rock material in the buildingplan UI and in the manager orders for blocks.
 Once the whole area is clear, continue with /surface3.) set up starting workshops/stockpiles and clear a larger area. if you didn't bring blocks, temporarily turn off the buildings_use_blocks setting so you can use wood or boulders"
 build_start/surface_build_start
 place_start/surface_place_start
@@ -54,14 +56,14 @@ query_start/surface_query_start
 clear/surface_clear
 pick/surface_pick
 ""
-"#meta label(surface3) start(staircase center) message(Once the channels are dug out and you have around 650 blocks, continue with /surface4. You can also start digging out the sub-surface farming level once the channels are done.) channel to prevent miasma in the sub-surface farming level"
+"#meta label(surface3) start(staircase center) message(Once the channels are dug out, continue with /surface4. You can also start digging out the sub-surface farming level once the channels are done.) channel to prevent miasma in the sub-surface farming level"
 dig/surface_channel
 ""
-"#meta label(surface4) start(staircase center) message(Once floors and walls are built and you have completed the manager orders for /surface5, continue with /surface5.) cover up the holes with flooring and build walls"
+"#meta label(surface4) start(staircase center) message(Once floors and walls are built, continue with /surface5.) cover up the holes with flooring and build walls"
 build_floors/surface_floors
 build_walls/surface_walls
 ""
-"#meta label(surface5) start(staircase center) message(Once you have around 1,050 blocks, continue with /surface6) build gates, furniture, the trade depot, and traps"
+"#meta label(surface5) start(staircase center) message(Once buildings have been constructed, continue with /surface6) build gates, furniture, the trade depot, and traps"
 build_bridges/surface_gates
 build_buildings/surface_buildings
 ""
@@ -820,7 +822,7 @@ p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,
 
 
 
-#notes label(farming_readme)
+#notes label(farming_help)
 "Sets up farming, food storage, and related industries. Also provides post-embark necessities that can later be disassembed."
 ""
 Features:
@@ -844,7 +846,7 @@ Screw Press
 Manual steps you have to take:
 Assign the office to your manager
 Assign a minecart to your quantum garbage stockpile hauling route
-"if the industry level is already built, configure the jugs, pots, and bags stockpiles to take from the ""Goods"" quantum stockpile on the industry level"
+"If the industry level is already built, configure the jugs, pots, and bags stockpiles to take from the ""Goods"" quantum stockpile on the industry level"
 "#dig label(farming1) start(23; 25; staircase center) message(This would be a good time to queue up manager orders for /farming2. Once the area is dug out, continue with /farming2.)"
 
 
@@ -985,13 +987,13 @@ query_stockpiles/farming_query_stockpiles
 #place label(farming_place) start(23; 25) hidden() use the meta blueprints for normal application
 
 
-,,,,,,,,,`,`,`,`,`,`,`,`,f(3x6),`,`,,`,,`,,f(14x16),`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,`,`,`,`,`,f(3x6),,,,`,,`,,f(14x16),,,,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,f(8x1),`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,b(8x1),`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,f(8x1),,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,b(8x1),,,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,,,`,,,`,,,`,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,f(14x10),`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,f(14x10),,,,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
@@ -1002,7 +1004,7 @@ query_stockpiles/farming_query_stockpiles
 ,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,`,,,,`,,,,`,,,,`,`,`,,,`,,,,`
-,,,,,,,,u,u,u,u,`,`,`,u(5x3),`,`,`,`,,`,`,`,,`,`,`,,`,`,`
+,,,,,,,,u,u,u,u,`,`,`,u(5x3),,,`,`,,`,`,`,,`,`,`,,`,`,`
 ,,,,,,,,g,`,`,u,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,g,g,g,g,`,`,`,`,`,`,`,`,,`,,`,,`,`,`,,`,`,`
 ,,,,,,,,,`,,,,`,,,,`,,,,`,`,`,,,`,,,,`
@@ -1010,20 +1012,20 @@ query_stockpiles/farming_query_stockpiles
 ,,,,,,,,,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`
 ,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,,,,,,,,,,,,,`,`,`,,,,,`,,,,,`
-,,,,,,,,,`,`,`,,f(7x2),`,`,`,`,`,`,,`,,`,,r(2x3),`,`,`,`,,f(1x3),`,`,`
+,,,,,,,,,`,`,`,,f(7x2),,,`,`,`,`,,`,,`,,r(2x3),,,`,`,,f(1x3),,,`
 ,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`
 ,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,,,,,`,,,,,`
-,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,,ry(14x10),`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,`,`,,ry(14x10),,,,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,`,`,`,,f(7x2),`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,`,`,`,,f(7x2),,,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,,`,,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,,,,,ry(3x3),`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,ry(3x3),,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,,,,,,,,,,,,,,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,,,,,,ry(1x1),,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,ry,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 
 
 "#query label(farming_query_stockpiles) start(23; 25) hidden() message(remember to:
@@ -1116,7 +1118,7 @@ query_stockpiles/farming_query_stockpiles
 ,,,,,,,,,,,,,,,,,,,,,,`,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 
 
-#notes label(industry_readme)
+#notes label(industry_help)
 Sets up workshops for all non-farming industries
 ""
 Features:
@@ -1303,7 +1305,7 @@ query/industry_query
 ,,,,,,,,,,,`,`,`,`,`,`,`,`,`,`,`,`,`
 
 
-#notes label(services_readme)
+#notes label(services_help)
 "Sets up public services (dining, hospital, etc.)"
 ""
 Features:
@@ -1319,7 +1321,7 @@ Manual steps you have to take:
 "If you want to declare the dining room as a tavern, the bedrooms at the top can be assigned to the tavern as rented rooms."
 "Configure the soap stockpiles to take from the industry level ""Metalworker"" quantum stockpile (which holds all the bars)"
 "Convert the bath pit zones to pond zones when you are ready to fill them with 3-depth water. This is the only really fiddly bit, since you have to carefully disable the pond zone again when the final bucket to bring the water to an even 3-depth is on the way."
-"Fill the cisterns with water, either with a bucket brigade or by plumbing flowing water. Fill so that there are two z-levels of 7-depth water. If you want to fill with buckets, designate a pond zone on the level below the main floor. If you feel adventurous and are experience with water pressure, you can instead route (depressurized!) water to the second-to-bottom level (the one above the up staircases)."
+"Fill the cisterns with water, either with a bucket brigade or by plumbing flowing water. Fill so that there are two z-levels of 7-depth water. If you want to fill with buckets, designate a pond zone on the level below the main floor. If you feel adventurous and are experienced with water pressure, you can instead route (depressurized!) water to the second-to-bottom level (the one above the up staircases)."
 "#dig label(services1) start(23; 22; staircase center) message(This would be a good time to queue manager orders for /services2. Once the area is dug out, continue with /services2.)"
 
 
@@ -1633,7 +1635,7 @@ query_stockpiles/services_query_stockpiles
 ,,`,`,`,`,`,`,,`,`,`,`,`,`
 
 
-#notes label(guildhall_readme)
+#notes label(guildhall_help)
 "Multiple 7x7 rooms for guildhalls, temples, libraries, etc."
 ""
 Features:
@@ -1738,7 +1740,7 @@ Features:
 ,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,,,,,,,,`,`,`,`,`,`,`,,,,,,`,`,`,`,`,`,`
 
 
-#notes label(beds_readme)
+#notes label(beds_help)
 Suites for nobles and apartments for the teeming masses
 ""
 Features:
diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index a690ddbf3..3cff80c9c 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -706,15 +706,44 @@ enabled materials, you should be able to place complex constructions more conven
 buildingplan
 ============
 When active (via ``enable buildingplan``), this plugin adds a planning mode for
-furniture placement.  You can then place furniture and other buildings before
-the required materials are available, and the job will be unsuspended when
-the item is created.
+building placement. You can then place furniture, constructions, and other buildings
+before the required materials are available, and they will be created in a suspended
+state. Buildingplan will periodically scan for appropriate items, and the jobs will
+be unsuspended when the items are available.
 
-Very useful when combined with `workflow` - you can set a constraint
+This is very useful when combined with `workflow` - you can set a constraint
 to always have one or two doors/beds/tables/chairs/etc available, and place
-as many as you like.  The plugins then take over and fulfill the orders,
+as many as you like. The plugins then take over and fulfill the orders,
 with minimal space dedicated to stockpiles.
 
+Item filtering
+--------------
+
+While placing a building, you can set filters for what materials you want the building made
+out of, what quality you want the component items to be, and whether you want the items to
+be decorated.
+
+If a building type takes more than one item to construct, use Ctrl+Left and Ctrl+Right to
+select the item that you want to set filters for. Any filters that you set will be used for
+all buildings of the selected type from that point onward (until you set a new filter or
+clear the current one).
+
+For example, you can be sure that all your constructed walls are the same color by setting
+a filter to accept only certain types of stone.
+
+Quickfort mode
+--------------
+
+If you use the external Python Quickfort to apply building blueprints instead of the native
+DFHack `quickfort` script, you must enable Quickfort mode. This temporarily enables
+buildingplan for all building types and adds an extra blank screen after every building
+placement. This "dummy" screen is needed for Python Quickfort to interact successfully with
+Dwarf Fortress.
+
+Note that Quickfort mode is only for compatibility with the legacy Python Quickfort. The
+DFHack `quickfort` script does not need Quickfort mode to be enabled. The `quickfort` script
+will successfully integrate with buildingplan as long as the buildingplan plugin is enabled.
+
 .. _confirm:
 
 confirm
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 7f289c36d..dbe296c85 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -34,8 +34,17 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 # Future
 
 ## Fixes
+- `buildingplan`: artifacts are now successfully matched when max quality is set to ``artifacts``
 - `dwarfmonitor`: fixed a crash when opening the ``prefs`` screen if units have vague preferences
 
+## Misc Improvements
+- `buildingplan`: all buildings, furniture, and constructions are now supported (except for the few building types not supported by dfhack itself)
+- `buildingplan`: now respects building job_item filters when matching items
+- `buildingplan`: default filter setting for max quality changed from ``artifact`` to ``masterwork``
+
+## API
+- `buildingplan`: added Lua interface API
+
 # 0.47.04-r3
 
 ## New Plugins
diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 76485a985..bef85b161 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -69,7 +69,8 @@ Features
 
 -  Build mode
 
-   -  DFHack buildingplan integration
+   -  DFHack buildingplan integration, so you can place buildings before
+      manufacturing all required source materials
    -  Designate complete constructions at once, without having to wait for each
       tile to become supported before you can build it
    -  Automatic expansion of building footprints to their minimum dimensions, so
@@ -1022,32 +1023,49 @@ allowing for much easier viewing and editing.
 Buildingplan integration
 ------------------------
 
-Buildingplan is a DFHack plugin that keeps jobs in a suspended state until the
-materials required for the job are available. This prevents a building
-designation from being canceled when a dwarf picks up the job but can't find the
-materials.
-
-For all types that buildingplan supports, quickfort using buildingplan to manage
-construction. Buildings are still constructed immediately if you have the
-materials, but you now have the freedom to apply build blueprints before you
-manufacture all required materials, and the jobs will be fulfilled as the
-materials become available.
-
-If a ``#build`` blueprint only refers to supported types, the buildingplan
-integration pairs well with the `workflow` plugin, which can build items a few
-at a time continuously as long as they are needed. For building types that are
-not yet supported by buildingplan, a good pattern to follow is to first run
-``quickfort orders`` on the ``#build`` blueprint to manufacture all the required
-items, then apply the blueprint itself.
-
-See the `buildingplan documentation <buildingplan>` for more information. As of
-this writing, buildingplan only supports basic furniture.
+Buildingplan is a DFHack plugin that keeps building construction jobs in a
+suspended state until the materials required for the job are available. This
+prevents a building designation from being canceled when a dwarf picks up the
+job but can't find the materials.
+
+As long as the `buildingplan` plugin is enabled, quickfort will use it to manage
+construction. The buildingplan plugin also has an "enabled" setting for each
+building type, but that setting only applies to the buildingplan user interface;
+quickfort will always use buildingplan to manage everything designated in a
+``#build`` blueprint.
+
+However, quickfort *does* use buildingplan's filters for each building type. For
+example, you can use the buildingplan UI to set the stone you want your walls
+made out of. Or you can specify that all buildingplan-managed tables must be of
+Masterful quality. The current filter settings are saved with planned buildings
+when the ``#build`` blueprint is run. This means you can set the filters the way
+you want for one blueprint, run the blueprint, and then freely change them again
+for the next blueprint, even if the first set of buildings haven't been built
+yet.
+
+Note that buildings are still constructed immediately if you already have the
+materials. However, with the buildingplan integration you now have the freedom
+to apply ``#build`` blueprints before you manufacture the resources. The
+construction jobs will be fulfilled as the materials become available.
+
+Since it can be difficult to figure out exactly what source materials you need
+for a ``#build`` blueprint, quickfort supplies the ``orders`` command. It
+enqueues manager orders for everything that the buildings in a ``#build``
+blueprint require. See the next section for more details on this.
+
+Alternately, if you know you only need a few types of items, the `workflow`
+plugin can be configured to build those items continuously for as long as they
+are needed.
+
+If the buildingplan plugin is not enabled, run ``quickfort orders`` first and
+make sure all manager orders are fulfilled before applying a ``#build``
+blueprint.
 
 Generating manager orders
 -------------------------
 
 Quickfort can generate manager orders to make sure you have the proper items in
-stock to apply a ``#build`` blueprint.
+stock for a ``#build`` blueprint.
 
 Many items can be manufactured from different source materials. Orders will
 always choose rock when it can, then wood, then cloth, then iron. You can always
@@ -1066,7 +1084,9 @@ If you want your constructions to be in a consistent color, be sure to choose a
 rock type for all of your 'Make rock blocks' orders by selecting the order and
 hitting ``d``. You might want to set the rock type for other non-block orders to
 something different if you fear running out of the type of rock that you want to
-use for blocks.
+use for blocks. You should also set the `buildingplan` material filter for
+construction building types to that type of rock as well so other random blocks
+you might have lying around aren't used.
 
 There are a few building types that will generate extra manager orders for
 related materials:
@@ -1105,23 +1125,16 @@ Tips and tricks
 Caveats and limitations
 -----------------------
 
--  Buildings will be designated regardless of whether you have the required
-   materials, but if materials are not available when the construction job is
-   picked up by a dwarf, the buildings will be canceled and the designations
-   will disappear. Until the buildingplan plugin can be extended to support all
-   building types, you should use ``quickfort orders`` to pre-manufacture all
-   the materials you need for a ``#build`` blueprint before you apply it.
-
 -  If you use the ``jugs`` alias in your ``#query``-mode blueprints, be aware
    that there is no way to differentiate jugs from other types of tools in the
    game. Therefore, ``jugs`` stockpiles will also take nest boxes and other
    tools. The only workaround is not to have other tools lying around in your
    fort.
 
--  Likewise for bags. The game does not differentiate between empty and full
-   bags, so you'll get bags of gypsum power and sand in your bags stockpile
-   unless you avoid collecting sand and are careful to assign all your gypsum to
-   your hospital.
+-  Likewise for the ``bags`` alias. The game does not differentiate between
+   empty and full bags, so you'll get bags of gypsum power and sand in your bags
+   stockpile unless you avoid collecting sand and are careful to assign all your
+   gypsum to your hospital.
 
 -  Weapon traps and upright spear/spike traps can currently only be built with a
    single weapon.
@@ -1260,7 +1273,7 @@ sheet, like in surface's meta sheet.
 things to include in messages are:
 
 * The name of the next blueprint to apply and when to run it
-* Whether quickfort orders should be run for an upcoming step
+* Whether quickfort orders could be run for an upcoming step
 * Any manual actions that have to happen, like assigning minecarts to hauling
   routes or pasturing animals after creating zones
 
diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp
index 976ade441..6d6d777f7 100644
--- a/library/modules/Buildings.cpp
+++ b/library/modules/Buildings.cpp
@@ -368,10 +368,19 @@ df::building *Buildings::allocInstance(df::coord pos, df::building_type type, in
             obj->bucket_z = bld->z;
         break;
     }
+    case building_type::Workshop:
+    {
+        if (VIRTUAL_CAST_VAR(obj, df::building_workshopst, bld))
+            obj->profile.max_general_orders = 5;
+        break;
+    }
     case building_type::Furnace:
     {
         if (VIRTUAL_CAST_VAR(obj, df::building_furnacest, bld))
+        {
             obj->melt_remainder.resize(df::inorganic_raw::get_vector().size(), 0);
+            obj->profile.max_general_orders = 5;
+        }
         break;
     }
     case building_type::Coffin:
@@ -419,6 +428,12 @@ df::building *Buildings::allocInstance(df::coord pos, df::building_type type, in
             obj->gate_flags.bits.closed = true;
         break;
     }
+    case building_type::Bridge:
+    {
+        if (VIRTUAL_CAST_VAR(obj, df::building_bridgest, bld))
+            obj->gate_flags.bits.closed = false;
+        break;
+    }
     default:
         break;
     }
diff --git a/plugins/buildingplan-planner.cpp b/plugins/buildingplan-planner.cpp
index dcdcfb777..0a714854c 100644
--- a/plugins/buildingplan-planner.cpp
+++ b/plugins/buildingplan-planner.cpp
@@ -495,7 +495,9 @@ void migrateV1ToV2()
 
         // remove the v1 record
         DFHack::World::DeletePersistentData(config);
-        debug("v1 record successfully migrated");
+        debug("v1 %s(%d) record successfully migrated",
+              ENUM_KEY_STR(building_type, bld->getType()).c_str(),
+              bld->id);
     }
 }
 
@@ -510,13 +512,14 @@ void Planner::reset()
 
     std::vector<PersistentDataItem> items;
     DFHack::World::GetPersistentData(&items, planned_building_persistence_key_v2);
-    debug("found data for %zu planned buildings", items.size());
+    debug("found data for %zu planned building(s)", items.size());
 
     for (auto i = items.begin(); i != items.end(); i++)
     {
         PlannedBuilding pb(*i);
         if (!pb.isValid())
         {
+            debug("discarding invalid planned building");
             pb.remove();
             continue;
         }
@@ -608,7 +611,7 @@ bool Planner::registerTasks(PlannedBuilding & pb)
             int32_t id = bld->id;
             tasks[vector_id][bucket].push(std::make_pair(id, job_item_idx));
             debug("added task: %s/%s/%d,%d; "
-                  "%zu vectors, %zu buckets, %zu tasks in bucket",
+                  "%zu vector(s), %zu filter bucket(s), %zu task(s) in bucket",
                   ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
                   bucket.c_str(), id, job_item_idx, tasks.size(),
                   tasks[vector_id].size(), tasks[vector_id][bucket].size());
@@ -626,38 +629,7 @@ PlannedBuilding * Planner::getPlannedBuilding(df::building *bld)
 
 bool Planner::isPlannableBuilding(BuildingTypeKey key)
 {
-    if (getNumFilters(key) == 0)
-        return false;
-
-    // restrict supported types to be the same as the previous implementation
-    switch(std::get<0>(key))
-    {
-        case df::enums::building_type::Armorstand:
-        case df::enums::building_type::Bed:
-        case df::enums::building_type::Chair:
-        case df::enums::building_type::Coffin:
-        case df::enums::building_type::Door:
-        case df::enums::building_type::Floodgate:
-        case df::enums::building_type::Hatch:
-        case df::enums::building_type::GrateWall:
-        case df::enums::building_type::GrateFloor:
-        case df::enums::building_type::BarsVertical:
-        case df::enums::building_type::BarsFloor:
-        case df::enums::building_type::Cabinet:
-        case df::enums::building_type::Box:
-        case df::enums::building_type::Weaponrack:
-        case df::enums::building_type::Statue:
-        case df::enums::building_type::Slab:
-        case df::enums::building_type::Table:
-        case df::enums::building_type::WindowGlass:
-        case df::enums::building_type::AnimalTrap:
-        case df::enums::building_type::Chain:
-        case df::enums::building_type::Cage:
-        case df::enums::building_type::TractionBench:
-            return true;
-        default:
-            return false;
-    }
+    return getNumFilters(key) >= 1;
 }
 
 Planner::ItemFiltersWrapper Planner::getItemFilters(BuildingTypeKey key)
@@ -831,7 +803,7 @@ void Planner::doCycle()
         auto & buckets = it->second;
         auto other_id = ENUM_ATTR(job_item_vector_id, other, it->first);
         auto item_vector = df::global::world->items.other[other_id];
-        debug("matching %zu items in vector %s against %zu buckets",
+        debug("matching %zu item(s) in vector %s against %zu filter bucket(s)",
               item_vector.size(),
               ENUM_KEY_STR(job_item_vector_id, it->first).c_str(),
               buckets.size());
@@ -848,7 +820,7 @@ void Planner::doCycle()
                 popInvalidTasks(task_queue);
                 if (task_queue.empty())
                 {
-                    debug("removing empty bucket: %s/%s; %zu buckets left",
+                    debug("removing empty bucket: %s/%s; %zu bucket(s) left",
                           ENUM_KEY_STR(job_item_vector_id, it->first).c_str(),
                           bucket_it->first.c_str(),
                           buckets.size() - 1);
@@ -891,7 +863,7 @@ void Planner::doCycle()
                     if (task_queue.empty())
                     {
                         debug(
-                            "removing empty item bucket: %s/%s; %zu remaining",
+                            "removing empty item bucket: %s/%s; %zu left",
                             ENUM_KEY_STR(job_item_vector_id, it->first).c_str(),
                             bucket_it->first.c_str(),
                             buckets.size() - 1);
@@ -907,7 +879,7 @@ void Planner::doCycle()
         }
         if (buckets.empty())
         {
-            debug("removing empty vector: %s; %zu vectors left",
+            debug("removing empty vector: %s; %zu vector(s) left",
                   ENUM_KEY_STR(job_item_vector_id, it->first).c_str(),
                   tasks.size() - 1);
             it = tasks.erase(it);
@@ -915,7 +887,7 @@ void Planner::doCycle()
         else
             ++it;
     }
-    debug("cycle done; %zu registered buildings left",
+    debug("cycle done; %zu registered building(s) left",
           planned_buildings.size());
 }
 
diff --git a/plugins/lua/buildingplan.lua b/plugins/lua/buildingplan.lua
index 49b80990f..2de7db7d2 100644
--- a/plugins/lua/buildingplan.lua
+++ b/plugins/lua/buildingplan.lua
@@ -79,18 +79,16 @@ function construct_building_from_ui_state()
         custom=uibs.custom_type, pos=pos, width=width, height=height,
         direction=direction}
     if err then error(err) end
-    -- TODO: assign fields for the types that need them. we can't pass them all
-    -- in to the call to constructBuilding since the unneeded fields will cause
-    -- errors
-    --local fields = {
-    --    friction=uibs.friction,
-    --    use_dump=uibs.use_dump,
-    --    dump_x_shift=uibs.dump_x_shift,
-    --    dump_y_shift=uibs.dump_y_shift,
-    --    speed=uibs.speed
-    --}
-    -- TODO: use quickfort's post_construction_fns? maybe move those functions
-    -- into the library so they get applied automatically
+    -- assign fields for the types that need them. we can't pass them all in to
+    -- the call to constructBuilding since attempting to assign unrelated
+    -- fields to building types that don't support them causes errors.
+    for k,v in pairs(bld) do
+        if k == 'friction' then bld.friction = uibs.friction end
+        if k == 'use_dump' then bld.use_dump = uibs.use_dump end
+        if k == 'dump_x_shift' then bld.dump_x_shift = uibs.dump_x_shift end
+        if k == 'dump_y_shift' then bld.dump_y_shift = uibs.dump_y_shift end
+        if k == 'speed' then bld.speed = uibs.speed end
+    end
     return bld
 end
 

From 6c3bac2d6caf7382a88a929afa485a4c3f89487a Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 17 Oct 2020 22:20:39 -0700
Subject: [PATCH 450/547] document extended zone configuration syntax

---
 docs/guides/quickfort-user-guide.rst | 53 +++++++++++++++++++---------
 1 file changed, 37 insertions(+), 16 deletions(-)

diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index bef85b161..f4b15969a 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -96,6 +96,7 @@ Features
       created stockpiles
    -  Automatic splitting of stockpiles and zones that exceed maximum dimension
       limits
+   -  Full access to all zone settings, such as hospital supply counts
 
 -  Query mode
 
@@ -478,37 +479,57 @@ It is very common to have stockpiles that accept multiple categories of items or
 zones that permit more than one activity. Although it is perfectly valid to
 declare a single-purpose stockpile or zone and then modify it with a ``#query``
 blueprint, quickfort also supports directly declaring all the types on the
-``#place`` and ``#zone`` blueprints. For example, to declare a 10x10 area that
-is a pasture, a fruit picking area, and a meeting area all at once, you could
-write:
+``#place`` and ``#zone`` blueprints. For example, to declare a 20x10 stockpile
+that accepts both corpses and refuse, you could write:
+
+::
+
+   #place refuse heap
+   yr(20x10)
+
+
+And similarly, to declare a zone that is a pasture, a fruit picking area, and a
+meeting area all at once:
 
 ::
 
    #zone main pasture and picnic area
    nmg(10x10)
 
-And similarly, to declare a stockpile that accepts both corpses and refuse, you
-could write:
+The order of the individual letters doesn't matter.
+
+Detailed configuration for zones, such as the pit/pond toggle, can also be set
+by mimicking the hotkeys used to set them. Note that gather flags default to
+true, so specifying them in a blueprint will turn the toggles off. If you need
+to set configuration from multiple zone subscreens, separate the key sections
+with ``^``. Note the special syntax for setting hospital supply levels, which
+have no in-game hotkeys:
 
 ::
 
-   #place refuse heap
-   yr(20x10)
+   #zone a combination hospital and shrub (but not fruit) gathering zone
+   gGtf^hH{hospital buckets=5 splints=20}(10x10)
 
-The order of the individual letters doesn't matter.
+The valid hospital settings (and their maximum values) are:
 
+::
+
+    thread   (1500000)
+    cloth    (1000000)
+    splints  (100)
+    crutches (100)
+    powder   (15000)
+    buckets  (100)
+    soap     (15000)
+    
 To toggle the ``active`` flag for zones, add an ``a`` character to the string.
-For example, to create a *disabled* pit zone (that you later intend to turn into
-a pond and carefully fill to 3-depth water):
+For example, to create a *disabled* pond zone (that you later intend to
+carefully fill with 3-depth water for a dwarven bathtub):
 
 ::
 
-   #zone disabled future pond zone
-   pa(1x3)
-
-Note that while this notation covers most use cases, tweaking low-level zone
-parameters, like hospital supply levels or converting between pits and ponds,
-must still be done manually or with a ``#query`` blueprint.
+   #zone disabled pond zone
+   apPf(1x3)
 
 Minecart tracks
 ~~~~~~~~~~~~~~~

From ea5a5414c93af8f280b0d5c84ec286f741e1d018 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 17 Oct 2020 22:21:50 -0700
Subject: [PATCH 451/547] document (and use) parameterized aliases

---
 data/quickfort/aliases-common.txt   | 62 ++++++++++++++++-------------
 dfhack-config/quickfort/aliases.txt | 18 ++++++++-
 2 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt
index ed9a34393..d5f52efcf 100644
--- a/data/quickfort/aliases-common.txt
+++ b/data/quickfort/aliases-common.txt
@@ -1,8 +1,8 @@
 # Common baseline for aliases for quickfort query mode blueprints.
 #
-# Please DO NOT EDIT this file directly. Instead, custom aliases should be added
-# to dfhack-config/quickfort/aliases.txt. See that file for syntax
-# documentation.
+# Please DO NOT EDIT this file directly. It will get overwritten when DFHack
+# is updated. Instead, custom aliases should be added to
+# dfhack-config/quickfort/aliases.txt. See that file for syntax documentation.
 #
 # The aliases in this file were tested in DF 0.47.04 on 2020 Jul 18.
 #
@@ -31,14 +31,15 @@ linksonly: a
 nocontainers: CE
 
 # for configuring stockpiles to give to other nearby stockpiles/workshops
-give2up: g{Up 2}&
-give2down: g{Down 2}&
-give2left: g{Left 2}&
-give2right: g{Right 2}&
-give10up: g{Up 10}&
-give10down: g{Down 10}&
-give10left: g{Left 10}&
-give10right: g{Right 10}&
+give: g{move}&
+give2up: {give move={Up 2}}
+give2down: {give move={Down 2}}
+give2left: {give move={Left 2}}
+give2right: {give move={Right 2}}
+give10up: {give move={Up 10}}
+give10down: {give move={Down 10}}
+give10left: {give move={Left 10}}
+give10right: {give move={Right 10}}
 
 # use to toggle a sequence of stockpile options. for example: {togglesequence 5}
 togglesequence: &{Down}
@@ -58,25 +59,30 @@ quantum: {linksonly}{nocontainers}{enableanimals}{enablefood}{furnitureprefix}{e
 
 # Run one of the quantumstopfrom* aliases over a track stop that is set to dump
 # into a quantum stockpile. The alias will set up the stop to accept all types
-# (the actual types stored in the quantum stockpile is controlled by the feeder
-# stockpile) and link the indicated adjacent feeder stockpile (for example, the
-# quantumstopfromsouth alias will link to a feeder stockpile to the South). All
-# you need to do afterwards is assign a vehicle to the stop (and optionally
-# give the route a name --see the namelastroute* aliases below). The track stop
-# does not need to be constructed yet, but the feeder stockpile needs to exist
-# so we can link it.
-quantumstopprefix: ^hrs&xxx&{enablesequence 17}^
-quantumstopfromeast: {quantumstopprefix}s{Right}p^{Left}^q
-quantumstopfromsouth: {quantumstopprefix}s{Down}p^{Up}^q
-quantumstopfromwest: {quantumstopprefix}s{Left}p^{Right}^q
-quantumstopfromnorth: {quantumstopprefix}s{Up}p^{Down}^q
-
-# Give a name to the most recently defined route. Keep in mind that names have
-# a maximum length of 22 characters. It assumes that the route has exactly one
-# stop defined. Use it with the quantumstopfrom* aliases above like this:
-#   {quantumstopfromeast}{namelastrouteprefix}Trash Dumper{namelastroutesuffix}
+# (the actual types stored in the quantum stockpile should be controlled by the
+# feeder stockpile) and link the indicated adjacent feeder stockpile. For
+# example, the quantumstopfromsouth alias should be used over a track stop set
+# to dump to the North and take items from a feeder stockpile one tile to the
+# South. All you need to do afterwards is assign a vehicle to the stop. The
+# track stop does not need to be constructed yet, but the feeder stockpile needs
+# to exist so we can link to it.
+#
+# Be sure to define the optional 'name' parameter if you want to give your
+# quantum hauling routes custom names. Keep in mind that names have a maximum
+# length of 22 characters. For example:
+#   {quantumstopfromsouth name="Trash Dump"}
+#
+# For several examples of these aliases, see
+# https://docs.google.com/spreadsheets/d/1gvTJxxRxZ5V4vXkqwhL-qlr_lXCNt8176TK14m4kSOU
 namelastrouteprefix: ^h--n
 namelastroutesuffix: &^q
+namelastroute: {namelastrouteprefix}{name}{namelastroutesuffix}
+quantumstopprefix: ^hrs&xxx&{enablesequence 17}^
+quantumstopsuffix: ^q{namelastroute}
+quantumstopfromeast: {quantumstopprefix}s{Right}p^{Left}{quantumstopsuffix}
+quantumstopfromsouth: {quantumstopprefix}s{Down}p^{Up}{quantumstopsuffix}
+quantumstopfromwest: {quantumstopprefix}s{Left}p^{Right}{quantumstopsuffix}
+quantumstopfromnorth: {quantumstopprefix}s{Up}p^{Down}{quantumstopsuffix}
 
 
 ##################################
diff --git a/dfhack-config/quickfort/aliases.txt b/dfhack-config/quickfort/aliases.txt
index 2b90e67c4..2743a39f3 100644
--- a/dfhack-config/quickfort/aliases.txt
+++ b/dfhack-config/quickfort/aliases.txt
@@ -1,6 +1,6 @@
-# aliases for quickfort query mode blueprints
+# Aliases for quickfort #query mode blueprints
 #
-# This file defines custom keycode shortcuts for query mode blueprints.
+# This file defines custom keycode shortcuts for #query mode blueprints.
 # Definitions in this file take precedence over any definitions in the baseline
 # aliases configuration file at hack/data/quickfort/aliases-common.txt. See that
 # file for the many useful aliases that are already defined.
@@ -69,6 +69,20 @@
 # indicating how many times that alias or keycode should be repeated. For
 # example: "{togglesequence 9}" or "{Down 5}".
 #
+# Finally, you can specify sub-aliases that will only be defined while the
+# current alias is being resolved by adding them after the alias name (but
+# before the repetition number, if it is specified), for example:
+#   {quantumstopfromeast name="Trash Dump"}
+# The value of the sub-alias 'name' is used by quantumstopfromeast (or one of
+# the aliases it calls) to give a useful name to your quantum dump hauling
+# route. You can also use this format to temporarily override the value of an
+# existing regularly-defined alias.
+#
+# Sub-aliases must be in one of the following formats:
+#   subaliasname=valwithnospaces
+#   subaliasname="val with spaces"
+#   subaliasname={someotheralias repetitions}
+#
 # Ctrl, Alt, and Shift modifiers can be specified for the next keycode by adding
 # them into the key sequence. For example, Alt-h is written as "{Alt}h".
 #

From 914c24d873a1ac9d975d6da56e0a27f18b434b84 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 17 Oct 2020 22:22:32 -0700
Subject: [PATCH 452/547] use new quickfort features in dreamfort

parameterized aliases and configurable zones
---
 data/blueprints/library/dreamfort.csv | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
index 8924df3c6..64d32ce8d 100644
--- a/data/blueprints/library/dreamfort.csv
+++ b/data/blueprints/library/dreamfort.csv
@@ -1070,7 +1070,7 @@ query_stockpiles/farming_query_stockpiles
 ,,,,,,,,,,,,,,,,,,,,,bodyparts,linksonly,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,,,,,,,,,,,,,`,`,`,`,give2left,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,,,,,,,,,,,,,,,,,,,{quantumstopfromnorth}{namelastrouteprefix}Trash Dumper{namelastroutesuffix},,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,,,,,,,,,,,,,,,,,,,"{quantumstopfromnorth name=""Trash Dumper""}",,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,,,,,,,,,,,,,,,,,,,quantum,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 
 
@@ -1279,7 +1279,7 @@ query/industry_query
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,{quantum}g{Up}{Left 5}&,`,`,`,`,`,`,`,`,`,`,`,`,`
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,{quantumstopfromsouth}{namelastrouteprefix}Stoneworker quantum{namelastroutesuffix},`,`,`,`,`,`,`,`,`,`,`,`,`
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,"{quantumstopfromsouth name=""Stoneworker quantum""}",`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,otherstone,,,`,`,`,`,`,`,`,`,`,`,`,`
 ,,miscliquid,`,`,`,`,`,`,`,`,`,`,`,`,`,~,nocontainers,~,`,`,`,`,`,`,`,`,`,`,`,`,`,steelbars
 ,,nocontainers,`,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`,`
@@ -1287,7 +1287,7 @@ query/industry_query
 ,,`,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,`,{cages}{permittraps},,,`,`,`,,,,`,`,`,forbidotherstone,,,`,`,`,`,`,`,`,t{Left 6}{Down}&
-,,`,`,`,`,`,`,{quantum}g{Up 10}{Right 4}&,{quantumstopfromeast}{namelastrouteprefix}Goods/Wood quantum{namelastroutesuffix},~,nocontainers,~,`,,`,,`,,`,,`,~,nocontainers,~,{quantumstopfromwest}{namelastrouteprefix}Metalworker quantum{namelastroutesuffix},quantum,`,`,`,`,`,`
+,,`,`,`,`,`,`,{quantum}g{Up 10}{Right 4}&,"{quantumstopfromeast name=""Goods/Wood quantum""}",~,nocontainers,~,`,,`,,`,,`,,`,~,nocontainers,~,"{quantumstopfromwest name=""Metalworker quantum""}",quantum,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,`,{tallow}{permitdye},,,`,`,`,,,,`,`,`,forbidpotash,,,`,`,`,`,`,`,`,t{Left 6}{Up}&
 ,,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,`,`,,`,`,`,`,`,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,`,`,`,`,`,,,`,,`,,,`,`,`,`,`,`,`,`,`,`,`,`
@@ -1295,7 +1295,7 @@ query/industry_query
 ,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,craftrefuse,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,~,nocontainers,~,`,`,`,`,`,`,`,`,`,`,`,`,`,coal
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,nocontainers,`,t{Up 7}&,~,~,~,~
-,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,{quantumstopfromnorth}{namelastrouteprefix}Clothier/Bones quantum{namelastroutesuffix},`,`,`,`,`,`,{ironweapons}{permitsteelweapons}{forbidmasterworkweapons}{forbidartifactweapons}
+,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,"{quantumstopfromnorth name=""Clothier/Bones quantum""}",`,`,`,`,`,`,{ironweapons}{permitsteelweapons}{forbidmasterworkweapons}{forbidartifactweapons}
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,quantum,`,`,`,`,`,`,{ironarmor}{permitsteelarmor},forbidmasterworkarmor,forbidartifactarmor,~,~,~,~
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`
 ,,,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,nocontainers,give2up,t{Up 11}&,~,~,~,~
@@ -1320,7 +1320,7 @@ Garbage dump
 Manual steps you have to take:
 "If you want to declare the dining room as a tavern, the bedrooms at the top can be assigned to the tavern as rented rooms."
 "Configure the soap stockpiles to take from the industry level ""Metalworker"" quantum stockpile (which holds all the bars)"
-"Convert the bath pit zones to pond zones when you are ready to fill them with 3-depth water. This is the only really fiddly bit, since you have to carefully disable the pond zone again when the final bucket to bring the water to an even 3-depth is on the way."
+"Activate the bath pond zones when you are ready to fill them with 3-depth water. This is the only really fiddly bit, since you have to carefully disable the pond zone again when the final bucket to bring the water to an even 3-depth is on the way."
 "Fill the cisterns with water, either with a bucket brigade or by plumbing flowing water. Fill so that there are two z-levels of 7-depth water. If you want to fill with buckets, designate a pond zone on the level below the main floor. If you feel adventurous and are experienced with water pressure, you can instead route (depressurized!) water to the second-to-bottom level (the one above the up staircases)."
 "#dig label(services1) start(23; 22; staircase center) message(This would be a good time to queue manager orders for /services2. Once the area is dug out, continue with /services2.)"
 
@@ -1533,7 +1533,7 @@ query_stockpiles/services_query_stockpiles
 ,,`,`,`,`,`,`,,`,`,`,`,`,`
 
 
-#zone label(services_zone) start(23; 22) hidden() use the meta blueprints for normal application
+#zone label(services_zone) start(23; 22) hidden() message(activate the bath pond zones when you are ready to fill them with 3-depth water) use the meta blueprints for normal application
 
 
 ,,`,`,`,,,`,`,`,,,`,`,`
@@ -1554,9 +1554,9 @@ query_stockpiles/services_query_stockpiles
 ,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`,,,,`,`,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,`,,,,,,,,`,`,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,pa,`,`,`,`,`,`,`,`,`,pa,`,`,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,pa,`,,`,`,`,`,`,,`,pa,`,,`,`,`,`,`,`,`,`,`
-,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,pa,`,`,`,`,`,`,`,`,`,pa,`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,apPf(1x3),`,`,`,`,`,`,`,`,`,apPf(1x3),`,`,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,~,`,,`,`,`,`,`,,`,~,`,,`,`,`,`,`,`,`,`,`
+,,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,~,`,`,`,`,`,`,`,`,`,~,`,`,`,`,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,`,`,`,`,`,`,,`,`,`,,`,`,`,`,`,,`,`,`,,`,`,`,`,`,`,`,`,`
 ,,`,`,`,`,`,`,`,`,`,`,`,`,`,,,,,,,,d,,,,,,,,`,`,`,`,`,`,`,`,`
 ,,,,,,`,`,,`,`,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,`

From 05d2e5b65c370e3ab467f0e3efe93c82615d3f31 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 18 Oct 2020 13:49:11 -0700
Subject: [PATCH 453/547] update case study:  order-dependent aliases

since the example I had used no longer exists now that we have
parameterized aliases. I had to find another example in the industry
blueprints. I made it a proper "tip" and added more explanation as well.
---
 docs/guides/quickfort-user-guide.rst | 46 ++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index f4b15969a..2dfaa74b1 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -1342,11 +1342,6 @@ Hauling routes are notoriously fiddly to set up, but they can be automated with
 blueprints. Check out the Southern area of the ``#place`` and ``#query``
 blueprints for how the quantum garbage dump is configured.
 
-Note that aliases that must be applied in a particular order must appear in the
-same cell. Otherwise there are no guarantees for which cell will be processed
-first. For example, look at the track stop cells in the ``#query`` blueprint for
-how the hauling routes are given names.
-
 The industry_ level: when not to use aliases
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -1354,7 +1349,7 @@ The industry_ level: when not to use aliases
 
 The industry level is densely packed and has more complicated examples of
 stockpile configurations and quantum dumps. However, what I'd like to call out
-are the key sequences that are *not* in aliases.
+first are the key sequences that are *not* in aliases.
 
 .. topic:: Tip
 
@@ -1374,6 +1369,45 @@ see in the blueprint itself. Also, if you move the workshop, it's easier to fix
 the stockpile link right there in the blueprint instead of editing the separate
 aliases.txt file.
 
+There are also good examples in the query blueprint for how to use the
+``permit`` and ``forbid`` stockpile aliases.
+
+.. topic:: Tip
+
+     Put all configuration that must be applied in a particular order in the
+     same spreadsheet cell.
+
+Most of the baseline aliases distributed with DFHack fall into one of three
+categories:
+
+# Make a stockpile accept only a particular item type in a category
+# Permit an item type, but do not otherwise change the stockpile configuration
+# Forbid an item type, but do not otherwise change the stockpile configuration
+
+If you have a stockpile that covers multiple tiles, it might seem natural to put
+one alias per spreadsheet cell. The aliases still all get applied to the
+stockpile, and with only one alias per cell, you can just type the alias name
+and avoid having to use the messier-looking ``{alias1}{alias2}`` syntax:
+
+::
+
+    #query Incorrectly configure a 3x3 food stockpile to accept tallow and dye
+    tallow
+    permitdye
+
+However, in quickfort there are no guarantees about which cell will be
+processed first. In the example above, we obviously intend for the food
+stockpile to have everything forbidden, then tallow permitted, then dye
+permitted. The algorithm could happen to apply them in the opposite order,
+though, and we'd end up with dye being permitted, then everything being
+forbidden and tallow being enabled. To make sure you always get what you want,
+write order-sensitive aliases on the same line:
+
+::
+
+    #query Properly configure a 3x3 food stockpile to accept tallow and dye
+    {tallow}{permitdye}
+
 The services_ level: handling multi-level dig blueprints
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

From 3a200fcd92b394ee67700c1e6750a5f7b39043e3 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 20 Oct 2020 01:01:02 -0400
Subject: [PATCH 454/547] Expand `probe` documentation

---
 docs/Plugins.rst | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index a690ddbf3..f9ce3184c 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -134,7 +134,17 @@ single Lua function, in ``hack/lua/plugins/pathable.lua``:
 
 probe
 =====
-Can be used to determine tile properties like temperature.
+
+This plugin provides multiple commands that print low-level properties of the
+selected objects.
+
+* ``probe``: prints some properties of the tile selected with :kbd:`k`. Some of
+  these properties can be passed into `tiletypes`.
+* ``cprobe``: prints some properties of the unit selected with :kbd:`v`, as well
+  as the IDs of any worn items. `gui/gm-unit` and `gui/gm-editor` are more
+  complete in-game alternatives.
+* ``bprobe``: prints some properties of the building selected with :kbd:`q` or
+  :kbd:`t`. `gui/gm-editor` is a more complete in-game alternative.
 
 .. _prospect:
 .. _prospector:
@@ -2488,7 +2498,8 @@ See also `alltraffic`, `filltraffic`, and `restrictice`.
 tiletypes
 =========
 Can be used for painting map tiles and is an interactive command, much like
-`liquids`.  If something goes wrong, `fixveins` may help.
+`liquids`. Some properties of existing tiles can be looked up with `probe`. If
+something goes wrong, `fixveins` may help.
 
 The tool works with two set of options and a brush. The brush determines which
 tiles will be processed. First set of options is the filter, which can exclude

From 84973d1fb80906da92477816e4439aa45f6972a0 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 20 Oct 2020 01:06:47 -0400
Subject: [PATCH 455/547] Sort plugins in Lua API.rst

---
 docs/Lua API.rst | 422 +++++++++++++++++++++++------------------------
 1 file changed, 211 insertions(+), 211 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index fb67610d1..2cf9e5db1 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3697,6 +3697,88 @@ Native functions:
   ``start`` and ``end`` are tables containing positions (see
   ``xyz2pos``). ``name`` is used as the basis for the filename.
 
+.. _building-hacks:
+
+building-hacks
+==============
+
+This plugin overwrites some methods in workshop df class so that mechanical workshops are possible. Although
+plugin export a function it's recommended to use lua decorated function.
+
+.. contents::
+  :local:
+
+Functions
+---------
+
+``registerBuilding(table)`` where table must contain name, as a workshop raw name, the rest are optional:
+
+    :name:
+        custom workshop id e.g. ``SOAPMAKER``
+
+        .. note:: this is the only mandatory field.
+
+    :fix_impassible:
+        if true make impassible tiles impassible to liquids too
+    :consume:
+        how much machine power is needed to work.
+        Disables reactions if not supplied enough and ``needs_power==1``
+    :produce:
+        how much machine power is produced.
+    :needs_power:
+        if produced in network < consumed stop working, default true
+    :gears:
+        a table or ``{x=?,y=?}`` of connection points for machines.
+    :action:
+        a table of number (how much ticks to skip) and a function which
+        gets called on shop update
+    :animate:
+        a table of frames which can be a table of:
+
+        a. tables of 4 numbers ``{tile,fore,back,bright}`` OR
+        b. empty table (tile not modified) OR
+        c. ``{x=<number> y=<number> + 4 numbers like in first case}``,
+           this generates full frame useful for animations that change little (1-2 tiles)
+
+    :canBeRoomSubset:
+        a flag if this building can be counted in room. 1 means it can, 0 means it can't and -1 default building behaviour
+    :auto_gears:
+        a flag that automatically fills up gears and animate. It looks over building definition for gear icons and maps them.
+
+    Animate table also might contain:
+
+    :frameLength:
+        how many ticks does one frame take OR
+    :isMechanical:
+        a bool that says to try to match to mechanical system (i.e. how gears are turning)
+
+``getPower(building)`` returns two number - produced and consumed power if building can be modified and returns nothing otherwise
+
+``setPower(building,produced,consumed)`` sets current productiona and consumption for a building.
+
+Examples
+--------
+
+Simple mechanical workshop::
+
+  require('plugins.building-hacks').registerBuilding{name="BONE_GRINDER",
+    consume=15,
+    gears={x=0,y=0}, --connection point
+    animate={
+      isMechanical=true, --animate the same conn. point as vanilla gear
+      frames={
+      {{x=0,y=0,42,7,0,0}}, --first frame, 1 changed tile
+      {{x=0,y=0,15,7,0,0}} -- second frame, same
+      }
+    }
+
+Or with auto_gears::
+
+  require('plugins.building-hacks').registerBuilding{name="BONE_GRINDER",
+    consume=15,
+    auto_gears=true
+    }
+
 buildingplan
 ============
 
@@ -3751,15 +3833,134 @@ Native functions:
 
 The lua module file also re-exports functions from ``dfhack.burrows``.
 
-sort
-====
+.. _cxxrandom:
 
-Does not export any native functions as of now. Instead, it
-calls lua code to perform the actual ordering of list items.
+cxxrandom
+=========
+
+Exposes some features of the C++11 random number library to Lua.
+
+.. contents::
+  :local:
+
+Native functions (exported to Lua)
+----------------------------------
+
+- ``GenerateEngine(seed)``
+
+  returns engine id
+
+- ``DestroyEngine(rngID)``
+
+  destroys corresponding engine
+
+- ``NewSeed(rngID, seed)``
+
+  re-seeds engine
+
+- ``rollInt(rngID, min, max)``
+
+  generates random integer
+
+- ``rollDouble(rngID, min, max)``
+
+  generates random double
+
+- ``rollNormal(rngID, avg, stddev)``
+
+  generates random normal[gaus.]
+
+- ``rollBool(rngID, chance)``
+
+  generates random boolean
+
+- ``MakeNumSequence(start, end)``
+
+  returns sequence id
+
+- ``AddToSequence(seqID, num)``
+
+  adds a number to the sequence
+
+- ``ShuffleSequence(rngID, seqID)``
+
+  shuffles the number sequence
+
+- ``NextInSequence(seqID)``
+
+  returns the next number in sequence
+
+
+Lua plugin functions
+--------------------
+
+- ``MakeNewEngine(seed)``
+
+  returns engine id
+
+Lua plugin classes
+------------------
+
+``crng``
+~~~~~~~~
+
+- ``init(id, df, dist)``: constructor
+
+  - ``id``: Reference ID of engine to use in RNGenerations
+  - ``df`` (optional): bool indicating whether to destroy the Engine when the crng object is garbage collected
+  - ``dist`` (optional): lua number distribution to use
+
+- ``changeSeed(seed)``: alters engine's seed value
+- ``setNumDistrib(distrib)``: sets the number distribution crng object should use
+
+  - ``distrib``: number distribution object to use in RNGenerations
+
+- ``next()``: returns the next number in the distribution
+- ``shuffle()``: effectively shuffles the number distribution
+
+``normal_distribution``
+~~~~~~~~~~~~~~~~~~~~~~~
+
+- ``init(avg, stddev)``: constructor
+- ``next(id)``: returns next number in the distribution
+
+  - ``id``: engine ID to pass to native function
+
+``real_distribution``
+~~~~~~~~~~~~~~~~~~~~~
+
+- ``init(min, max)``: constructor
+- ``next(id)``: returns next number in the distribution
+
+  - ``id``: engine ID to pass to native function
+
+``int_distribution``
+~~~~~~~~~~~~~~~~~~~~
+
+- ``init(min, max)``: constructor
+- ``next(id)``: returns next number in the distribution
+
+  - ``id``: engine ID to pass to native function
+
+``bool_distribution``
+~~~~~~~~~~~~~~~~~~~~~
+
+- ``init(min, max)``: constructor
+- ``next(id)``: returns next boolean in the distribution
+
+  - ``id``: engine ID to pass to native function
+
+``num_sequence``
+~~~~~~~~~~~~~~~~
+
+- ``init(a, b)``: constructor
+- ``add(num)``: adds num to the end of the number sequence
+- ``shuffle()``: shuffles the sequence of numbers
+- ``next()``: returns next number in the sequence
 
 .. _eventful:
 
-Eventful
+eventful
 ========
 
 This plugin exports some events to lua thus allowing to run lua functions
@@ -3920,91 +4121,9 @@ Integrated tannery::
   b=require "plugins.eventful"
   b.addReactionToShop("TAN_A_HIDE","LEATHERWORKS")
 
-.. _building-hacks:
-
-Building-hacks
-==============
-
-This plugin overwrites some methods in workshop df class so that mechanical workshops are possible. Although
-plugin export a function it's recommended to use lua decorated function.
-
-.. contents::
-  :local:
-
-Functions
----------
-
-``registerBuilding(table)`` where table must contain name, as a workshop raw name, the rest are optional:
-
-    :name:
-        custom workshop id e.g. ``SOAPMAKER``
-
-        .. note:: this is the only mandatory field.
-
-    :fix_impassible:
-        if true make impassible tiles impassible to liquids too
-    :consume:
-        how much machine power is needed to work.
-        Disables reactions if not supplied enough and ``needs_power==1``
-    :produce:
-        how much machine power is produced.
-    :needs_power:
-        if produced in network < consumed stop working, default true
-    :gears:
-        a table or ``{x=?,y=?}`` of connection points for machines.
-    :action:
-        a table of number (how much ticks to skip) and a function which
-        gets called on shop update
-    :animate:
-        a table of frames which can be a table of:
-
-        a. tables of 4 numbers ``{tile,fore,back,bright}`` OR
-        b. empty table (tile not modified) OR
-        c. ``{x=<number> y=<number> + 4 numbers like in first case}``,
-           this generates full frame useful for animations that change little (1-2 tiles)
-
-    :canBeRoomSubset:
-        a flag if this building can be counted in room. 1 means it can, 0 means it can't and -1 default building behaviour
-    :auto_gears:
-        a flag that automatically fills up gears and animate. It looks over building definition for gear icons and maps them.
-
-    Animate table also might contain:
-
-    :frameLength:
-        how many ticks does one frame take OR
-    :isMechanical:
-        a bool that says to try to match to mechanical system (i.e. how gears are turning)
-
-``getPower(building)`` returns two number - produced and consumed power if building can be modified and returns nothing otherwise
-
-``setPower(building,produced,consumed)`` sets current productiona and consumption for a building.
-
-Examples
---------
-
-Simple mechanical workshop::
-
-  require('plugins.building-hacks').registerBuilding{name="BONE_GRINDER",
-    consume=15,
-    gears={x=0,y=0}, --connection point
-    animate={
-      isMechanical=true, --animate the same conn. point as vanilla gear
-      frames={
-      {{x=0,y=0,42,7,0,0}}, --first frame, 1 changed tile
-      {{x=0,y=0,15,7,0,0}} -- second frame, same
-      }
-    }
-
-Or with auto_gears::
-
-  require('plugins.building-hacks').registerBuilding{name="BONE_GRINDER",
-    consume=15,
-    auto_gears=true
-    }
-
 .. _luasocket:
 
-Luasocket
+luasocket
 =========
 
 A way to access csocket from lua. The usage is made similar to luasocket in vanilla lua distributions. Currently
@@ -4088,130 +4207,11 @@ Functions
 
   returns a table with w*h*4 entries of rendered tiles. The format is same as ``df.global.gps.screen`` (tile,foreground,bright,background).
 
-.. _cxxrandom:
-
-cxxrandom
-=========
-
-Exposes some features of the C++11 random number library to Lua.
-
-.. contents::
-  :local:
-
-Native functions (exported to Lua)
-----------------------------------
-
-- ``GenerateEngine(seed)``
-
-  returns engine id
-
-- ``DestroyEngine(rngID)``
-
-  destroys corresponding engine
-
-- ``NewSeed(rngID, seed)``
-
-  re-seeds engine
-
-- ``rollInt(rngID, min, max)``
-
-  generates random integer
-
-- ``rollDouble(rngID, min, max)``
-
-  generates random double
-
-- ``rollNormal(rngID, avg, stddev)``
-
-  generates random normal[gaus.]
-
-- ``rollBool(rngID, chance)``
-
-  generates random boolean
-
-- ``MakeNumSequence(start, end)``
-
-  returns sequence id
-
-- ``AddToSequence(seqID, num)``
-
-  adds a number to the sequence
-
-- ``ShuffleSequence(rngID, seqID)``
-
-  shuffles the number sequence
-
-- ``NextInSequence(seqID)``
-
-  returns the next number in sequence
-
-
-Lua plugin functions
---------------------
-
-- ``MakeNewEngine(seed)``
-
-  returns engine id
-
-Lua plugin classes
-------------------
-
-``crng``
-~~~~~~~~
-
-- ``init(id, df, dist)``: constructor
-
-  - ``id``: Reference ID of engine to use in RNGenerations
-  - ``df`` (optional): bool indicating whether to destroy the Engine when the crng object is garbage collected
-  - ``dist`` (optional): lua number distribution to use
-
-- ``changeSeed(seed)``: alters engine's seed value
-- ``setNumDistrib(distrib)``: sets the number distribution crng object should use
-
-  - ``distrib``: number distribution object to use in RNGenerations
-
-- ``next()``: returns the next number in the distribution
-- ``shuffle()``: effectively shuffles the number distribution
-
-``normal_distribution``
-~~~~~~~~~~~~~~~~~~~~~~~
-
-- ``init(avg, stddev)``: constructor
-- ``next(id)``: returns next number in the distribution
-
-  - ``id``: engine ID to pass to native function
-
-``real_distribution``
-~~~~~~~~~~~~~~~~~~~~~
-
-- ``init(min, max)``: constructor
-- ``next(id)``: returns next number in the distribution
-
-  - ``id``: engine ID to pass to native function
-
-``int_distribution``
-~~~~~~~~~~~~~~~~~~~~
-
-- ``init(min, max)``: constructor
-- ``next(id)``: returns next number in the distribution
-
-  - ``id``: engine ID to pass to native function
-
-``bool_distribution``
-~~~~~~~~~~~~~~~~~~~~~
-
-- ``init(min, max)``: constructor
-- ``next(id)``: returns next boolean in the distribution
-
-  - ``id``: engine ID to pass to native function
-
-``num_sequence``
-~~~~~~~~~~~~~~~~
+sort
+====
 
-- ``init(a, b)``: constructor
-- ``add(num)``: adds num to the end of the number sequence
-- ``shuffle()``: shuffles the sequence of numbers
-- ``next()``: returns next number in the sequence
+Does not export any native functions as of now. Instead, it
+calls lua code to perform the actual ordering of list items.
 
 .. _xlsxreader:
 

From 2bd0e938addbd1b59f7fbc90e98f448128da8f90 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 20 Oct 2020 01:11:01 -0400
Subject: [PATCH 456/547] Move pathable to Lua API docs

---
 docs/Lua API.rst | 13 +++++++++++++
 docs/Plugins.rst | 18 +++---------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 2cf9e5db1..ecc9ef88e 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4207,6 +4207,19 @@ Functions
 
   returns a table with w*h*4 entries of rendered tiles. The format is same as ``df.global.gps.screen`` (tile,foreground,bright,background).
 
+.. _pathable:
+
+pathable
+========
+
+This plugin implements the back end of the `gui/pathable` script. It exports a
+single Lua function, in ``hack/lua/plugins/pathable.lua``:
+
+* ``paintScreen(cursor[,skip_unrevealed])``: Paint each visible of the screen
+  green or red, depending on whether it can be pathed to from the tile at
+  ``cursor``. If ``skip_unrevealed`` is specified and true, do not draw
+  unrevealed tiles.
+
 sort
 ====
 
diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index f9ce3184c..f96bd78de 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -117,19 +117,6 @@ A tool for checking how many tiles contain flowing liquids. If you suspect that
 your magma sea leaks into HFS, you can use this tool to be sure without
 revealing the map.
 
-.. _pathable:
-
-pathable
-========
-
-This plugin implements the back end of the `gui/pathable` script. It exports a
-single Lua function, in ``hack/lua/plugins/pathable.lua``:
-
-* ``paintScreen(cursor[,skip_unrevealed])``: Paint each visible of the screen
-  green or red, depending on whether it can be pathed to from the tile at
-  ``cursor``. If ``skip_unrevealed`` is specified and true, do not draw
-  unrevealed tiles.
-
 .. _probe:
 
 probe
@@ -2971,9 +2958,10 @@ Lua API
 Some plugins consist solely of native libraries exposed to Lua. They are listed
 in the `lua-api` file under `lua-plugins`:
 
-* `eventful`
 * `building-hacks`
+* `cxxrandom`
+* `eventful`
 * `luasocket`
 * `map-render`
-* `cxxrandom`
+* `pathable`
 * `xlsxreader`

From 26505acb70d0545487b8f536c1efd09dbf51d981 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 20 Oct 2020 01:18:25 -0400
Subject: [PATCH 457/547] Add some cross-references and clean up

---
 docs/Lua API.rst | 15 ++++++++-------
 docs/Plugins.rst | 11 +++++++----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index ecc9ef88e..cbc97bb1d 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3687,7 +3687,7 @@ the plugin. See existing files in ``plugins/lua`` for examples.
 blueprint
 =========
 
-Native functions:
+Native functions provided by the `blueprint` plugin:
 
 * ``dig(start, end, name)``
 * ``build(start, end, name)``
@@ -3782,7 +3782,7 @@ Or with auto_gears::
 buildingplan
 ============
 
-Native functions:
+Native functions provided by the `buildingplan` plugin:
 
 * ``bool isPlannableBuilding(df::building_type type)`` returns whether the building type is handled by buildingplan
 * ``void addPlannedBuilding(df::building *bld)`` suspends the building jobs and adds the building to the monitor list
@@ -3791,7 +3791,7 @@ Native functions:
 burrows
 =======
 
-Implements extended burrow manipulations.
+The `burrows` plugin implements extended burrow manipulations.
 
 Events:
 
@@ -4197,8 +4197,9 @@ A class with all the tcp functionality.
 map-render
 ==========
 
-A way to ask df to render a slice of map. This uses native df rendering function so it's highly dependant on
-df settings (e.g. used tileset, colors, if using graphics or not and so on...)
+A way to ask DF to render a section of the fortress mode map. This uses a native
+DF rendering function so it's highly dependent on DF settings (e.g. tileset,
+colors, etc.)
 
 Functions
 ---------
@@ -4223,8 +4224,8 @@ single Lua function, in ``hack/lua/plugins/pathable.lua``:
 sort
 ====
 
-Does not export any native functions as of now. Instead, it
-calls lua code to perform the actual ordering of list items.
+The `sort <sort>` plugin does not export any native functions as of now.
+Instead, it calls Lua code to perform the actual ordering of list items.
 
 .. _xlsxreader:
 
diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index f96bd78de..eaecb1cba 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -37,7 +37,9 @@ For more information, see `the full Stonesense README <stonesense>`.
 
 blueprint
 =========
-Exports a portion of your fortress into QuickFort style blueprint files.::
+Exports a portion of your fortress into QuickFort style blueprint files.
+
+Usage::
 
     blueprint <x> <y> <z> <name> [dig] [build] [place] [query]
 
@@ -781,6 +783,7 @@ Adds a :kbd:`q` menu for track stops, which is completely blank by default.
 This allows you to view and/or change the track stop's friction and dump
 direction settings, using the keybindings from the track stop building interface.
 
+.. _sort:
 .. _sort-items:
 
 sort-items
@@ -1940,10 +1943,10 @@ Options:
 :L:     Low Traffic
 :R:     Restricted Traffic
 
-.. _burrow:
+.. _burrows:
 
-burrow
-======
+burrows
+=======
 Miscellaneous burrow control. Allows manipulating burrows and automated burrow
 expansion while digging.
 

From 00f012d334858e65e5e5da90a0da10d033cc64f6 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 21 Oct 2020 17:52:23 -0400
Subject: [PATCH 458/547] GitHub Actions: add alternative plugin builds

---
 .github/workflows/build.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b0164ff2e..7aacd6950 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: ${{ matrix.os }}
-    name: build (Linux, GCC ${{ matrix.gcc }})
+    name: build (Linux, GCC ${{ matrix.gcc }}, ${{ matrix.plugins }} plugins)
     strategy:
       fail-fast: false
       matrix:
@@ -14,9 +14,18 @@ jobs:
         gcc:
         - 4.8
         - 7
+        plugins:
+        - supported
         include:
         - os: ubuntu-20.04
           gcc: 10
+          plugins: supported
+        - os: ubuntu-20.04
+          gcc: 10
+          plugins: dev
+        - os: ubuntu-20.04
+          gcc: 10
+          plugins: stonesense
     steps:
     - name: Set up Python 3
       uses: actions/setup-python@v2
@@ -37,7 +46,6 @@ jobs:
             zlib1g-dev
         pip install sphinx
     - name: Install GCC
-      if: ${{ matrix.gcc < 7 || matrix.gcc > 9 }}
       run: |
         sudo apt-get install gcc-${{ matrix.gcc }} g++-${{ matrix.gcc }}
     - name: Clone DFHack
@@ -70,11 +78,15 @@ jobs:
           -B build-ci \
           -G Ninja \
           -DDFHACK_BUILD_ARCH=64 \
-          -DBUILD_DOCS:BOOL=ON \
           -DBUILD_TESTS:BOOL=ON \
+          -DBUILD_DEV_PLUGINS:BOOL=${{ matrix.plugins == 'dev' }} \
+          -DBUILD_SIZECHECK:BOOL=${{ matrix.plugins == 'dev' }} \
+          -DBUILD_STONESENSE:BOOL=${{ matrix.plugins == 'stonesense' }} \
+          -DBUILD_SUPPORTED:BOOL=${{ matrix.plugins == 'supported' }} \
           -DCMAKE_INSTALL_PREFIX="$DF_FOLDER"
         ninja -C build-ci install
     - name: Run tests
+      if: ${{ matrix.plugins == 'supported' }}
       run: |
         export TERM=dumb
         mv "$DF_FOLDER"/dfhack.init-example "$DF_FOLDER"/dfhack.init

From 9357c9f8886b5585673cfbbb3d64c06d1870757e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 21 Oct 2020 20:13:50 -0400
Subject: [PATCH 459/547] Only upload test artifacts if tests ran

---
 .github/workflows/build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7aacd6950..16e3b6415 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -86,6 +86,7 @@ jobs:
           -DCMAKE_INSTALL_PREFIX="$DF_FOLDER"
         ninja -C build-ci install
     - name: Run tests
+      id: run_tests
       if: ${{ matrix.plugins == 'supported' }}
       run: |
         export TERM=dumb
@@ -96,7 +97,8 @@ jobs:
         cp "$DF_FOLDER/test_status.json" "$DF_FOLDER"/*.log artifacts
     - name: Upload test artifacts
       uses: actions/upload-artifact@v1
-      if: success() || failure()
+      if: (success() || failure()) && steps.run_tests.outcome != 'skipped'
+      continue-on-error: true
       with:
         name: test-artifacts
         path: artifacts

From a0ff7c393b6a34a020f203a75b8b9de955a6faa4 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 21 Oct 2020 20:14:16 -0400
Subject: [PATCH 460/547] Give artifacts a unique name

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 16e3b6415..f0bb79cda 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -100,7 +100,7 @@ jobs:
       if: (success() || failure()) && steps.run_tests.outcome != 'skipped'
       continue-on-error: true
       with:
-        name: test-artifacts
+        name: test-artifacts-${{ matrix.gcc }}
         path: artifacts
     - name: Clean up DF folder
       # prevent DFHack-generated files from ending up in the cache

From 7e78d8802eebfe3ec1d0d505106a1c96dacfc1dd Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 22 Oct 2020 21:37:49 -0700
Subject: [PATCH 461/547] migrate qf's buildings_use_blocks to buildingplan

- remove buildings_use_blocks setting from quickfort config file
- add a new Buildingplan Global Settings dialog to house global settings
- move Quickfort Mode (for legacy Python Quickfort) into that dialog
- add four settings to control how generic building materials are matched:
  - blocks
  - boulders
  - logs
  - bars
- ajust the buildingplan algorithm to register duplicate tasks for
  building material item filters, one for each type. since we track how
  many items we've matched for a filter, the first matched item will
  "win" and the extras will get detected as invalid and popped off the
  queue.
- ensure boulders, logs, and bars are scanned last, and in that order
- more global settings planned for the future! see
  http://www.bay12forums.com/smf/index.php?topic=176889.msg8202679#msg8202679
---
 dfhack-config/quickfort/quickfort.txt |  13 +-
 docs/changelog.txt                    |   6 +-
 plugins/buildingplan-planner.cpp      | 282 ++++++++++++++++++--------
 plugins/buildingplan-planner.h        |   6 +
 plugins/buildingplan.cpp              |  65 ++++--
 plugins/lua/buildingplan.lua          | 111 ++++++++++
 6 files changed, 377 insertions(+), 106 deletions(-)

diff --git a/dfhack-config/quickfort/quickfort.txt b/dfhack-config/quickfort/quickfort.txt
index c1d70201f..3a57bfbaf 100644
--- a/dfhack-config/quickfort/quickfort.txt
+++ b/dfhack-config/quickfort/quickfort.txt
@@ -5,19 +5,16 @@
 #
 # If you have edited this file but want to revert to "factory defaults", delete
 # this file and a fresh one will be copied from
-# dfhack-config/default/quickfort/qickfort.txt the next time you start DFHack.
+# dfhack-config/default/quickfort/quickfort.txt the next time you start DFHack.
 
 # Directory tree to search for blueprints. Can be set to an absolute or relative
 # path. If set to a relative path, resolves to a directory under the DF folder.
+# Note that if you change this directory, you will not automatically pick up
+# blueprints written by the DFHack "blueprint" plugin (which always writes to
+# the "blueprints" dir).
 blueprints_dir=blueprints
 
-# Force all blueprint buildings that could be built with any building material
-# to only use blocks. The prevents logs, boulders, and bars (e.g. potash and
-# coal) from being wasted on constructions. If set to false, buildings will be
-# built with any available building material.
-buildings_use_blocks=true
-
-# Set to "true" or "false". If true, will designate dig blueprints in marker
+# Set to "true" or "false". If true, will designate all dig blueprints in marker
 # mode. If false, only cells with dig codes explicitly prefixed with an "m" will
 # be designated in marker mode.
 force_marker_mode=false
diff --git a/docs/changelog.txt b/docs/changelog.txt
index dbe296c85..b26984d53 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -38,9 +38,11 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `dwarfmonitor`: fixed a crash when opening the ``prefs`` screen if units have vague preferences
 
 ## Misc Improvements
-- `buildingplan`: all buildings, furniture, and constructions are now supported (except for the few building types not supported by dfhack itself)
-- `buildingplan`: now respects building job_item filters when matching items
+- `buildingplan`: all buildings, furniture, and constructions are now supported (except for instruments)
+- `buildingplan`: now respects building job_item filters when matching items, so you can set your own programmatic filters for buildings before submitting them to buildingplan
 - `buildingplan`: default filter setting for max quality changed from ``artifact`` to ``masterwork``
+- `buildingplan`: new global settings page accessible via ``G`` hotkey when on any building build screen; ``Quickfort Mode`` toggle for legacy Python Quickfort has been moved to this page
+- `buildingplan`: new global settings for whether generic building materials should match blocks, boulders, logs, and/or bars. defaults are everything but bars.
 
 ## API
 - `buildingplan`: added Lua interface API
diff --git a/plugins/buildingplan-planner.cpp b/plugins/buildingplan-planner.cpp
index 0a714854c..42c84f4dc 100644
--- a/plugins/buildingplan-planner.cpp
+++ b/plugins/buildingplan-planner.cpp
@@ -501,6 +501,33 @@ void migrateV1ToV2()
     }
 }
 
+static void init_global_settings(std::map<std::string, bool> & settings)
+{
+    settings.clear();
+    settings["blocks"] = true;
+    settings["boulders"] = true;
+    settings["logs"] = true;
+    settings["bars"] = false;
+}
+
+const std::map<std::string, bool> & Planner::getGlobalSettings() const
+{
+    return global_settings;
+}
+
+bool Planner::setGlobalSetting(std::string name, bool value)
+{
+    if (global_settings.count(name) == 0)
+    {
+        debug("attempted to set invalid setting: '%s'", name.c_str());
+        return false;
+    }
+    debug("global setting '%s' %d -> %d",
+          name.c_str(), global_settings[name], value);
+    global_settings[name] = value;
+    return true;
+}
+
 void Planner::reset()
 {
     debug("resetting Planner state");
@@ -508,6 +535,8 @@ void Planner::reset()
     planned_buildings.clear();
     tasks.clear();
 
+    init_global_settings(global_settings);
+
     migrateV1ToV2();
 
     std::vector<PersistentDataItem> items;
@@ -584,6 +613,41 @@ static std::string getBucket(const df::job_item & ji,
     return ser.str();
 }
 
+// get a list of item vectors that we should search for matches
+static std::vector<df::job_item_vector_id> getVectorIds(df::job_item *job_item,
+        const std::map<std::string, bool> & global_settings)
+{
+    std::vector<df::job_item_vector_id> ret;
+
+    // if the filter already has the vector_id set to something specific, use it
+    if (job_item->vector_id > df::job_item_vector_id::IN_PLAY)
+    {
+        debug("using vector_id from job_item: %s",
+              ENUM_KEY_STR(job_item_vector_id, job_item->vector_id).c_str());
+        ret.push_back(job_item->vector_id);
+        return ret;
+    }
+
+    // if the filer is for building material, refer to our global settings for
+    // which vectors to search
+    if (job_item->flags2.bits.building_material)
+    {
+        if (global_settings.at("blocks"))
+            ret.push_back(df::job_item_vector_id::BLOCKS);
+        if (global_settings.at("boulders"))
+            ret.push_back(df::job_item_vector_id::BOULDER);
+        if (global_settings.at("logs"))
+            ret.push_back(df::job_item_vector_id::WOOD);
+        if (global_settings.at("bars"))
+            ret.push_back(df::job_item_vector_id::BAR);
+    }
+
+    // fall back to IN_PLAY if no other vector was appropriate
+    if (ret.empty())
+        ret.push_back(df::job_item_vector_id::IN_PLAY);
+    return ret;
+}
+
 bool Planner::registerTasks(PlannedBuilding & pb)
 {
     df::building * bld = pb.getBuilding();
@@ -599,22 +663,27 @@ bool Planner::registerTasks(PlannedBuilding & pb)
         debug("unexpected number of job items: want >0, got %d", num_job_items);
         return false;
     }
+    int32_t id = bld->id;
     for (int job_item_idx = 0; job_item_idx < num_job_items; ++job_item_idx)
     {
-        auto vector_id = df::job_item_vector_id::IN_PLAY;
         auto job_item = job_items[job_item_idx];
-        if (job_item->vector_id)
-          vector_id = job_item->vector_id;
         auto bucket = getBucket(*job_item, pb.getFilters());
-        for (int item_num = 0; item_num < job_item->quantity; ++item_num)
+        auto vector_ids = getVectorIds(job_item, global_settings);
+
+        // if there are multiple vector_ids, schedule duplicate tasks. after
+        // the correct number of items are matched, the extras will get popped
+        // as invalid
+        for (auto vector_id : vector_ids)
         {
-            int32_t id = bld->id;
-            tasks[vector_id][bucket].push(std::make_pair(id, job_item_idx));
-            debug("added task: %s/%s/%d,%d; "
-                  "%zu vector(s), %zu filter bucket(s), %zu task(s) in bucket",
-                  ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
-                  bucket.c_str(), id, job_item_idx, tasks.size(),
-                  tasks[vector_id].size(), tasks[vector_id][bucket].size());
+            for (int item_num = 0; item_num < job_item->quantity; ++item_num)
+            {
+                tasks[vector_id][bucket].push(std::make_pair(id, job_item_idx));
+                debug("added task: %s/%s/%d,%d; "
+                      "%zu vector(s), %zu filter bucket(s), %zu task(s) in bucket",
+                      ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
+                      bucket.c_str(), id, job_item_idx, tasks.size(),
+                      tasks[vector_id].size(), tasks[vector_id][bucket].size());
+            }
         }
     }
     return true;
@@ -794,99 +863,144 @@ void Planner::popInvalidTasks(std::queue<std::pair<int32_t, int>> & task_queue)
     }
 }
 
-void Planner::doCycle()
+void Planner::doVector(df::job_item_vector_id vector_id,
+       std::map<std::string, std::queue<std::pair<int32_t, int>>> & buckets)
 {
-    debug("running cycle for %zu registered buildings",
-          planned_buildings.size());
-    for (auto it = tasks.begin(); it != tasks.end();)
+    auto other_id = ENUM_ATTR(job_item_vector_id, other, vector_id);
+    auto item_vector = df::global::world->items.other[other_id];
+    debug("matching %zu item(s) in vector %s against %zu filter bucket(s)",
+          item_vector.size(),
+          ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
+          buckets.size());
+    for (auto item_it = item_vector.rbegin();
+         item_it != item_vector.rend();
+         ++item_it)
     {
-        auto & buckets = it->second;
-        auto other_id = ENUM_ATTR(job_item_vector_id, other, it->first);
-        auto item_vector = df::global::world->items.other[other_id];
-        debug("matching %zu item(s) in vector %s against %zu filter bucket(s)",
-              item_vector.size(),
-              ENUM_KEY_STR(job_item_vector_id, it->first).c_str(),
-              buckets.size());
-        for (auto item_it = item_vector.rbegin();
-             item_it != item_vector.rend();
-             ++item_it)
+        auto item = *item_it;
+        if (!itemPassesScreen(item))
+            continue;
+        for (auto bucket_it = buckets.begin(); bucket_it != buckets.end();)
         {
-            auto item = *item_it;
-            if (!itemPassesScreen(item))
+            auto & task_queue = bucket_it->second;
+            popInvalidTasks(task_queue);
+            if (task_queue.empty())
+            {
+                debug("removing empty bucket: %s/%s; %zu bucket(s) left",
+                      ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
+                      bucket_it->first.c_str(),
+                      buckets.size() - 1);
+                bucket_it = buckets.erase(bucket_it);
                 continue;
-            for (auto bucket_it = buckets.begin(); bucket_it != buckets.end();)
+            }
+            auto & task = task_queue.front();
+            auto id = task.first;
+            auto & pb = planned_buildings.at(id);
+            auto building = pb.getBuilding();
+            auto job = building->jobs[0];
+            auto filter_idx = task.second;
+            if (matchesFilters(item, job->job_items[filter_idx],
+                    pb.getFilters()[filter_idx])
+               && DFHack::Job::attachJobItem(job, item,
+                        df::job_item_ref::Hauled, filter_idx))
             {
-                auto & task_queue = bucket_it->second;
-                popInvalidTasks(task_queue);
-                if (task_queue.empty())
+                MaterialInfo material;
+                material.decode(item);
+                ItemTypeInfo item_type;
+                item_type.decode(item);
+                debug("attached %s %s to filter %d for %s(%d): %s/%s",
+                      material.toString().c_str(),
+                      item_type.toString().c_str(),
+                      filter_idx,
+                      ENUM_KEY_STR(building_type, building->getType()).c_str(),
+                      id,
+                      ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
+                      bucket_it->first.c_str());
+                // keep quantity aligned with the actual number of remaining
+                // items so if buildingplan is turned off, the building will
+                // be completed with the correct number of items.
+                --job->job_items[filter_idx]->quantity;
+                task_queue.pop();
+                if (isJobReady(job))
                 {
-                    debug("removing empty bucket: %s/%s; %zu bucket(s) left",
-                          ENUM_KEY_STR(job_item_vector_id, it->first).c_str(),
-                          bucket_it->first.c_str(),
-                          buckets.size() - 1);
-                    bucket_it = buckets.erase(bucket_it);
-                    continue;
+                    finalizeBuilding(building);
+                    unregisterBuilding(id);
                 }
-                auto & task = task_queue.front();
-                auto id = task.first;
-                auto & pb = planned_buildings.at(id);
-                auto building = pb.getBuilding();
-                auto job = building->jobs[0];
-                auto filter_idx = task.second;
-                if (matchesFilters(item, job->job_items[filter_idx],
-                        pb.getFilters()[filter_idx])
-                   && DFHack::Job::attachJobItem(job, item,
-                            df::job_item_ref::Hauled, filter_idx))
+                if (task_queue.empty())
                 {
-                    MaterialInfo material;
-                    material.decode(item);
-                    ItemTypeInfo item_type;
-                    item_type.decode(item);
-                    debug("attached %s %s to filter %d for %s(%d): %s/%s",
-                          material.toString().c_str(),
-                          item_type.toString().c_str(),
-                          filter_idx,
-                          ENUM_KEY_STR(building_type, building->getType()).c_str(),
-                          id,
-                          ENUM_KEY_STR(job_item_vector_id, it->first).c_str(),
-                          bucket_it->first.c_str());
-                    // keep quantity aligned with the actual number of remaining
-                    // items so if buildingplan is turned off, the building will
-                    // be completed with the correct number of items.
-                    --job->job_items[filter_idx]->quantity;
-                    task_queue.pop();
-                    if (isJobReady(job))
-                    {
-                        finalizeBuilding(building);
-                        unregisterBuilding(id);
-                    }
-                    if (task_queue.empty())
-                    {
-                        debug(
-                            "removing empty item bucket: %s/%s; %zu left",
-                            ENUM_KEY_STR(job_item_vector_id, it->first).c_str(),
-                            bucket_it->first.c_str(),
-                            buckets.size() - 1);
-                        buckets.erase(bucket_it);
-                    }
-                    // we found a home for this item; no need to look further
-                    break;
+                    debug(
+                        "removing empty item bucket: %s/%s; %zu left",
+                        ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
+                        bucket_it->first.c_str(),
+                        buckets.size() - 1);
+                    buckets.erase(bucket_it);
                 }
-                ++bucket_it;
-            }
-            if (buckets.empty())
+                // we found a home for this item; no need to look further
                 break;
+            }
+            ++bucket_it;
         }
+        if (buckets.empty())
+            break;
+    }
+}
+
+struct VectorsToScanLast
+{
+    std::vector<df::job_item_vector_id> vectors;
+    VectorsToScanLast()
+    {
+        // order is important here. we want to match boulders before wood and
+        // everything before bars. blocks are not listed here since we'll have
+        // already scanned them when we did the first pass through the buckets.
+        vectors.push_back(df::job_item_vector_id::BOULDER);
+        vectors.push_back(df::job_item_vector_id::WOOD);
+        vectors.push_back(df::job_item_vector_id::BAR);
+    }
+};
+
+void Planner::doCycle()
+{
+    debug("running cycle for %zu registered building(s)",
+          planned_buildings.size());
+    static const VectorsToScanLast vectors_to_scan_last;
+    for (auto it = tasks.begin(); it != tasks.end();)
+    {
+        auto vector_id = it->first;
+        // we could make this a set, but it's only three elements
+        if (std::find(vectors_to_scan_last.vectors.begin(),
+                      vectors_to_scan_last.vectors.end(),
+                      vector_id) != vectors_to_scan_last.vectors.end())
+        {
+            ++it;
+            continue;
+        }
+
+        auto & buckets = it->second;
+        doVector(vector_id, buckets);
         if (buckets.empty())
         {
             debug("removing empty vector: %s; %zu vector(s) left",
-                  ENUM_KEY_STR(job_item_vector_id, it->first).c_str(),
+                  ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
                   tasks.size() - 1);
             it = tasks.erase(it);
         }
         else
             ++it;
     }
+    for (auto vector_id : vectors_to_scan_last.vectors)
+    {
+        if (tasks.count(vector_id) == 0)
+            continue;
+        auto & buckets = tasks[vector_id];
+        doVector(vector_id, buckets);
+        if (buckets.empty())
+        {
+            debug("removing empty vector: %s; %zu vector(s) left",
+                  ENUM_KEY_STR(job_item_vector_id, vector_id).c_str(),
+                  tasks.size() - 1);
+            tasks.erase(vector_id);
+        }
+    }
     debug("cycle done; %zu registered building(s) left",
           planned_buildings.size());
 }
diff --git a/plugins/buildingplan-planner.h b/plugins/buildingplan-planner.h
index 22d0487c3..18cfaf0b1 100644
--- a/plugins/buildingplan-planner.h
+++ b/plugins/buildingplan-planner.h
@@ -104,6 +104,9 @@ public:
         std::vector<ItemFilter> &item_filters;
     };
 
+    const std::map<std::string, bool> & getGlobalSettings() const;
+    bool setGlobalSetting(std::string name, bool value);
+
     void reset();
 
     void addPlannedBuilding(df::building *bld);
@@ -117,6 +120,7 @@ public:
     void doCycle();
 
 private:
+    std::map<std::string, bool> global_settings;
     std::unordered_map<BuildingTypeKey,
                        std::vector<ItemFilter>,
                        BuildingTypeKeyHash> default_item_filters;
@@ -128,6 +132,8 @@ private:
     bool registerTasks(PlannedBuilding &plannedBuilding);
     void unregisterBuilding(int32_t id);
     void popInvalidTasks(std::queue<std::pair<int32_t, int>> &task_queue);
+    void doVector(df::job_item_vector_id vector_id,
+        std::map<std::string, std::queue<std::pair<int32_t, int>>> & buckets);
 };
 
 extern Planner planner;
diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index 58c911dcf..52bd5118f 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -18,7 +18,7 @@ DFHACK_PLUGIN("buildingplan");
 #define PLUGIN_VERSION 2.0
 REQUIRE_GLOBAL(ui);
 REQUIRE_GLOBAL(ui_build_selector);
-REQUIRE_GLOBAL(world);
+REQUIRE_GLOBAL(world); // used in buildingplan library
 
 #define MAX_MASK 10
 #define MAX_MATERIAL 21
@@ -287,9 +287,9 @@ static bool is_planmode_enabled(BuildingTypeKey key)
 
 static std::string get_item_label(const BuildingTypeKey &key, int item_idx)
 {
-     auto L = Lua::Core::State;
-     color_ostream_proxy out(Core::getInstance().getConsole());
-     Lua::StackUnwinder top(L);
+    auto L = Lua::Core::State;
+    color_ostream_proxy out(Core::getInstance().getConsole());
+    Lua::StackUnwinder top(L);
 
     if (!lua_checkstack(L, 5) ||
         !Lua::PushModulePublic(
@@ -314,11 +314,11 @@ static std::string get_item_label(const BuildingTypeKey &key, int item_idx)
 
 static bool construct_planned_building()
 {
-     auto L = Lua::Core::State;
-     color_ostream_proxy out(Core::getInstance().getConsole());
+    auto L = Lua::Core::State;
+    color_ostream_proxy out(Core::getInstance().getConsole());
 
-     CoreSuspendClaimer suspend;
-     Lua::StackUnwinder top(L);
+    CoreSuspendClaimer suspend;
+    Lua::StackUnwinder top(L);
 
     if (!(lua_checkstack(L, 1) &&
           Lua::PushModulePublic(out, L, "plugins.buildingplan",
@@ -339,6 +339,36 @@ static bool construct_planned_building()
     return true;
 }
 
+static void show_global_settings_dialog()
+{
+    auto L = Lua::Core::State;
+    color_ostream_proxy out(Core::getInstance().getConsole());
+    Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, 2) ||
+        !Lua::PushModulePublic(
+            out, L, "plugins.buildingplan", "show_global_settings_dialog"))
+    {
+        debug("Failed to push the module");
+        return;
+    }
+
+    lua_newtable(L);
+    int ctable = lua_gettop(L);
+    Lua::SetField(L, quickfort_mode, ctable, "quickfort_mode");
+
+    for (auto & setting : planner.getGlobalSettings())
+    {
+        Lua::SetField(L, setting.second, ctable, setting.first.c_str());
+    }
+
+    if (!Lua::SafeCall(out, L, 1, 0))
+    {
+        debug("Failed call to show_global_settings_dialog");
+        return;
+    }
+}
+
 struct buildingplan_query_hook : public df::viewscreen_dwarfmodest
 {
     typedef df::viewscreen_dwarfmodest interpose_base;
@@ -522,7 +552,7 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
         }
 
         if (input->count(interface_key::CUSTOM_P) ||
-            input->count(interface_key::CUSTOM_F) ||
+            input->count(interface_key::CUSTOM_G) ||
             input->count(interface_key::CUSTOM_D) ||
             input->count(interface_key::CUSTOM_M))
         {
@@ -536,9 +566,9 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
                 Gui::refreshSidebar();
             return true;
         }
-        if (input->count(interface_key::CUSTOM_SHIFT_F))
+        if (input->count(interface_key::CUSTOM_SHIFT_G))
         {
-            quickfort_mode = !quickfort_mode;
+            show_global_settings_dialog();
             return true;
         }
 
@@ -648,7 +678,7 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
         }
 
         OutputToggleString(x, y, "Planning Mode", "P", planmode_enabled[key], true, left_margin);
-        OutputToggleString(x, y, "Quickfort Mode", "F", quickfort_mode, true, left_margin);
+        OutputHotkeyString(x, y, "Global Settings", "G", true, left_margin);
 
         if (!is_planmode_enabled(key))
             return;
@@ -893,10 +923,21 @@ static void scheduleCycle() {
     cycle_requested = true;
 }
 
+static void setSetting(std::string name, bool value) {
+    if (name == "quickfort_mode")
+    {
+        debug("setting quickfort_mode %d -> %d", quickfort_mode, value);
+        quickfort_mode = value;
+        return;
+    }
+    planner.setGlobalSetting(name, value);
+}
+
 DFHACK_PLUGIN_LUA_FUNCTIONS {
     DFHACK_LUA_FUNCTION(isPlannableBuilding),
     DFHACK_LUA_FUNCTION(addPlannedBuilding),
     DFHACK_LUA_FUNCTION(doCycle),
     DFHACK_LUA_FUNCTION(scheduleCycle),
+    DFHACK_LUA_FUNCTION(setSetting),
     DFHACK_LUA_END
 };
diff --git a/plugins/lua/buildingplan.lua b/plugins/lua/buildingplan.lua
index 2de7db7d2..ac92082f3 100644
--- a/plugins/lua/buildingplan.lua
+++ b/plugins/lua/buildingplan.lua
@@ -4,6 +4,7 @@ local _ENV = mkmodule('plugins.buildingplan')
 
  Native functions:
 
+ * void setSetting(string name, boolean value)
  * bool isPlannableBuilding(df::building_type type, int16_t subtype, int32_t custom)
  * void addPlannedBuilding(df::building *bld)
  * void doCycle()
@@ -11,6 +12,7 @@ local _ENV = mkmodule('plugins.buildingplan')
 
 --]]
 
+local dialogs = require('gui.dialogs')
 local guidm = require('gui.dwarfmode')
 require('dfhack.buildings')
 
@@ -92,4 +94,113 @@ function construct_building_from_ui_state()
     return bld
 end
 
+--
+-- GlobalSettings dialog
+--
+
+local GlobalSettings = defclass(GlobalSettings, dialogs.MessageBox)
+GlobalSettings.focus_path = 'buildingplan_globalsettings'
+
+GlobalSettings.ATTRS{
+    settings = {}
+}
+
+function GlobalSettings:onDismiss()
+    for k,v in pairs(self.settings) do
+        -- call back into C++ to save changes
+        setSetting(k, v)
+    end
+end
+
+-- does not need the core suspended.
+function show_global_settings_dialog(settings)
+    GlobalSettings{
+        frame_title="Buildingplan Global Settings",
+        settings=settings,
+    }:show()
+end
+
+function GlobalSettings:toggle_setting(name)
+    self.settings[name] = not self.settings[name]
+end
+
+function GlobalSettings:get_setting_string(name)
+    if self.settings[name] then return 'On' end
+    return 'Off'
+end
+
+function GlobalSettings:is_setting_enabled(name)
+    return self.settings[name]
+end
+
+function GlobalSettings:make_setting_label_token(text, key, name, width)
+    return {text=text, key=key, key_sep=': ', key_pen=COLOR_GREEN,
+            on_activate=self:callback('toggle_setting', name), width=width}
+end
+
+function GlobalSettings:make_setting_value_token(name)
+    return {text=self:callback('get_setting_string', name),
+            enabled=self:callback('is_setting_enabled', name),
+            pen=COLOR_YELLOW, dpen=COLOR_GRAY}
+end
+
+-- mockup:
+--[[
+                          Buildingplan Global Settings
+
+  e: Enable all: Off
+    Enables buildingplan for all building types. Use this to avoid having to
+    manually enable buildingplan for each building type that you want to plan.
+    Note that DFHack quickfort will use buildingplan to manage buildings
+    regardless of whether buildingplan is "enabled" for the building type.
+
+  Allowed types for generic, fire-safe, and magma-safe building material:
+  b: Blocks:   On
+  s: Boulders: On
+  w: Wood:     On
+  r: Bars:     Off
+    Changes to these settings will be applied to newly-planned buildings.
+
+  A: Apply building material filter settings to existing planned buildings
+    Use this if your planned buildings can't be completed because the settings
+    above were too restrictive when the buildings were originally planned.
+
+  M: Edit list of materials to avoid
+  potash
+  pearlash
+  ash
+  coal
+    Buildingplan will avoid using these material types when a planned building's
+    material filter is set to 'any'. They can stil be matched when they are
+    explicitly allowed by a planned building's material filter. Changes to this
+    list take effect for existing buildings immediately.
+
+  g: Allow bags: Off
+    This allows bags to be placed where a 'coffer' is planned.
+
+  f: Legacy Quickfort Mode: Off
+    Compatibility mode for the legacy Python-based Quickfort application. This
+    setting is not needed for DFHack quickfort.
+--]]
+function GlobalSettings:init()
+    self.subviews.label:setText{
+        'Allowed types for generic, fire-safe, and magma-safe building material:\n',
+        self:make_setting_label_token('Blocks', 'CUSTOM_B', 'blocks', 10),
+            self:make_setting_value_token('blocks'), '\n',
+        self:make_setting_label_token('Boulders', 'CUSTOM_S', 'boulders', 10),
+            self:make_setting_value_token('boulders'), '\n',
+        self:make_setting_label_token('Wood', 'CUSTOM_W', 'logs', 10),
+            self:make_setting_value_token('logs'), '\n',
+        self:make_setting_label_token('Bars', 'CUSTOM_R', 'bars', 10),
+            self:make_setting_value_token('bars'), '\n',
+        '  Changes to these settings will be applied to newly-planned buildings.\n',
+        '\n',
+        self:make_setting_label_token('Legacy Quickfort Mode', 'CUSTOM_F',
+                                      'quickfort_mode', 23),
+            self:make_setting_value_token('quickfort_mode'), '\n',
+        '  Compatibility mode for the legacy Python-based Quickfort application.\n',
+        '  This setting is not needed for DFHack quickfort.'
+    }
+end
+
 return _ENV

From 0f517f38f84ddd7a99ed50ffe776e2da20394885 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 22 Oct 2020 22:01:45 -0700
Subject: [PATCH 462/547] don't conflict with automaterial plugin

shift buildingplan text down so we don't overwrite each other
---
 plugins/buildingplan.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index 58c911dcf..910e5ebe4 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -641,6 +641,12 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
 
         int y = 23;
 
+        if (ui_build_selector->building_type == df::building_type::Construction)
+        {
+            // try not to conflict with the automaterial plugin UI
+            y = 34;
+        }
+
         if (show_help)
         {
             OutputString(COLOR_BROWN, x, y, "Note: ");

From 186f28a94b381da1b094e62134d46901e3d52f3a Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 13 Oct 2020 22:44:16 -0700
Subject: [PATCH 463/547] filters for altars, display cases, and bookcases

---
 library/lua/dfhack/buildings.lua | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/lua/dfhack/buildings.lua b/library/lua/dfhack/buildings.lua
index 54f6fa19c..5bb84b1d1 100644
--- a/library/lua/dfhack/buildings.lua
+++ b/library/lua/dfhack/buildings.lua
@@ -179,6 +179,9 @@ local building_inputs = {
     [df.building_type.Slab] = { { item_type=df.item_type.SLAB } },
     [df.building_type.NestBox] = { { has_tool_use=df.tool_uses.NEST_BOX, item_type=df.item_type.TOOL } },
     [df.building_type.Hive] = { { has_tool_use=df.tool_uses.HIVE, item_type=df.item_type.TOOL } },
+    [df.building_type.OfferingPlace] = { { has_tool_use=df.tool_uses.PLACE_OFFERING, item_type=df.item_type.TOOL } },
+    [df.building_type.Bookcase] = { { has_tool_use=df.tool_uses.BOOKCASE, item_type=df.item_type.TOOL } },
+    [df.building_type.DisplayFurniture] = { { has_tool_use=df.tool_uses.DISPLAY_OBJECT, item_type=df.item_type.TOOL } },
     [df.building_type.Rollers] = {
         {
             name='mechanism',

From bc4dd7b1a354df4e587e30655989eed6c37ab887 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Fri, 23 Oct 2020 09:41:56 -0700
Subject: [PATCH 464/547] add walkthroughs for each dreamfort level

---
 data/blueprints/library/dreamfort.csv | 112 +++++++++++++++++++++-----
 1 file changed, 92 insertions(+), 20 deletions(-)

diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
index 64d32ce8d..5a5c87dfc 100644
--- a/data/blueprints/library/dreamfort.csv
+++ b/data/blueprints/library/dreamfort.csv
@@ -1,26 +1,28 @@
 #notes label(help) run me for the dreamfort walkthrough
 Welcome to the Dreamfort Walkthrough!
-It can be difficult applying a set of blueprints that you did not write yourself. This walkthrough will guide you through the high-level steps of building Dreamfort.
+It can be difficult applying a set of blueprints that you did not write yourself. This walkthrough will guide you through the high-level steps of building Dreamfort. Each level also has its own mini-walkthrough with specific steps for that level.
 ""
-"The final fort will have a walled-in area on the surface for livestock, trading, and military. Be sure to bring some blocks with you for the initial set of workshops! One z-level down is the farming level, with related workshops and vents up to the surface for miasma control. The farming level also has a miniature dining hall and dormitory for use until you get the services and beds levels set up."
+"The final fort will have a walled-in area on the surface for livestock, trading, and military. One z-level down is the farming level, with related workshops and vents up to the surface for miasma control. The farming level also has a miniature dining hall and dormitory for use until you get the services and housing levels set up."
 ""
 "Beyond those two, the other layers can be built in any order, at any z-level, according to your preference and the layout peculiarities of your embark site:"
-"- The industry level has a compact, but complete set of workshops and stockpiles (minus what is already provided on the farming level)"
+"- The industry level has a compact, but complete set of workshops and stockpiles (minus what is already provided on the farming level)."
 "- The services level has dining, hospital, and justice services, including a well system. This level is 4 z-levels deep."
-"- The guildhall level has many empty rooms for building libraries, temples, and guildhalls"
-- The suites level has fancy rooms for your nobles
-- The apartments level(s) has small but well-furnished bedrooms for your other dwarves
+"- The guildhall level has many empty rooms for building libraries, temples, and guildhalls."
+- The suites level has fancy rooms for your nobles.
+- The apartments level(s) has small but well-furnished bedrooms for your other dwarves.
 ""
-"Run the ""help"" blueprints for each level for more details."
+"Run each level's ""help"" blueprint (e.g. /surface_help) for more details."
 ""
-"Dreamfort has a central staircase-based design. Choose a tile for your staircase on the surface in a nice, flat area. For all blueprints, the cursor will start on this tile on the z-level where you want to apply the blueprint."
+"Dreamfort has a central staircase-based design. For all Dreamfort levels, place the cursor on the center staircase tile when you apply the blueprints. The first surface blueprint will designate a column of staircases that you can use as a guide."
 ""
-"Blueprints that require manual steps (like 'assign minecart to hauling route') will leave a message telling you so after you apply them. Blueprints will also leave messages with hints when you might want to run ""quickfort orders"" on specific blueprints to start manufacturing needed items."
+"Dreamfort blueprints take care of everything to get the fort up and running. You don't need to clear any trees or create any extra buildings or stockpiles (though of course you are free to do so). Blueprints that do require manual steps (like 'assign minecart to hauling route') will leave a message telling you so when you apply them. Blueprints will also leave messages with hints when you might want to run ""quickfort orders"" to start manufacturing needed items."
 ""
-"Directly after embark, apply /surface1 on a flat area on the surface and /industry1 somewhere underground (but not immediately below the surface -- that will be for the farming level). Work your way through the steps for those levels: apply /surface2 when /surface1 is done, /industry2 when /industry1 is done, etc. Once you channel out parts of the surface with /surface3, you can start the farming sequence with /farming1. You can start the services, guildhall, suites, and apartments sequences as your fort needs those levels."
+"Dreamfort works best at an embark site that is flat and has at least one soil layer. New players should also avoid aquifers if they are not prepared to deal with them. Bring picks for mining, an axe for woodcutting, and about 10 blocks (of any material) to speed up construction of starting workshops."
+""
+"Directly after embark, apply /surface1 on the surface (see /surface_help for how to select a good spot) and /industry1 at least two z-levels underground (the z-level immediately below the surface is reserved for the farming level). The walkthroughs for those levels will guide you. Once you channel out parts of the surface with /surface3, you can start the farming sequence on the z-level below the surface with /farming1. You can start the services, guildhall, suites, and apartments sequences as your fort needs those levels."
 ""
 "This .csv file is generated from source .xlsx files. If you want to look at how these blueprints are put together, it will be easier to look at the online spreadsheets than this giant .csv. You can view them at: https://drive.google.com/drive/folders/1iS90EEVqUkxTeZiiukVj1pLloZqabKuP"
-You are welcome to copy those files and make your own modifications!
+You are welcome to copy those spreadsheets and make your own modifications!
 "#dreamfort.csv is generated with the following command:
   for fname in dreamfort*.xlsx; do xlsx2csv -a -p '' $fname; done | sed 's/,*$//'"
 #notes label(surface_help)
@@ -28,7 +30,8 @@ You are welcome to copy those files and make your own modifications!
 ""
 Features:
 A starting set of workshops and stockpiles (which you can later remove once you establish your permanent workshops and storage)
-Walls and lever-controlled gates for security
+Trade depot area
+"Walls, roof, and lever-controlled gates for security"
 Trap-filled hallways for invaders
 Livestock grazing area with nestbox zones and beehives
 A grid of 1x1 farm plots (meant to be managed with DFHack autofarm)
@@ -36,20 +39,29 @@ An extra room near the entrance for a barracks (once you get your military going
 Miasma vents for the farming level that is intended to be built in the layer directly beneath the surface
 ""
 Manual steps you have to take:
-Assign grazing livestock to the large pasture and dogs to the pasture over the stairwell (DFHack's autonestbox will manage the nestbox zones)
+Assign grazing livestock to the large pasture and dogs to the pasture over the stairwell (DFHack's autonestbox can manage the nestbox zones)
 Connect levers to the gates
 ""
 "All blueprints are managed by the meta blueprints in the ""meta"" sheet. Each stage is meant to be applied after the previous stage is completely finished. For example, you can't build furniture until all the flooring has been constructed."
 ""
 Be sure to choose an embark site that has an area flat enough to use these blueprints!
+""
+Surface Walkthrough:
+"1) Choose a tile for your central staircase. The terrain around that tile should be perfectly flat. Trees are ok, but no slopes, rivers, or lakes. To be sure that the tile you've chosen is in a good spot, set the cursor over that tile and run ""quickfort run library/dreamfort.csv -n /surface4"". This will show you the eventual boundaries of the fort. Some wall segments might be missing due to existing trees, but that's ok. Make sure the area within the exterior walls is flat. Run ""quickfort undo library/dreamfort.csv -n /surface4"" to clean up."
+"2) With the cursor on the chosen tile, run /surface1 to clear surrounding trees and set up your pastures. Remember to assign your dogs to the pasture around the staircase and your grazing animals to the large pasture. You can let your cats roam free."
+"3) Once the trees have been cleared, run /surface2 to set up starting workshops/stockpiles and clear trees from a larger area. Run ""quickfort orders"" for /surface4, /surface5, and /surface6 to get a head start manufacturing items for those blueprints. If you want a consistent color for your walls and floors, remember to set the rock material in the buildingplan UI and in the manager orders for the blocks."
+"4) Once the trees have been cleared from the larger area, run /surface3 to channel out the miasma vents for the farming level."
+"5) When the channels have been dug, run /surface4 to build the protective walls and flooring. You can also start digging out the sub-surface farming level (/farming1) at this point. Although the vents will be covered with flooring, they will still work to prevent miasma."
+"6) Once all the constructions are built, run /surface5 build gates, furniture, the trade depot, and traps."
+"7) When at least the beehives are in place, run /surface6 to configure the hives and construct a roof."
 "#meta label(surface1) start(staircase center)
 message(This would be a good time to start digging the industry level.
-Once the area is clear, continue with /surface2.) clear an area and set up pastures"
+Once the area is clear of trees, continue with /surface2.) clear trees and set up pastures"
 clear_small/surface_clear_small
 zones/surface_zones
 ""
 "#meta label(surface2) start(staircase center) message(This would be a good time to queue manager orders for /surface4, /surface5, and /surface6. If you want a consistent color for your walls, remember to set the rock material in the buildingplan UI and in the manager orders for blocks.
-Once the whole area is clear, continue with /surface3.) set up starting workshops/stockpiles and clear a larger area. if you didn't bring blocks, temporarily turn off the buildings_use_blocks setting so you can use wood or boulders"
+Once the whole area is clear of trees, continue with /surface3.) set up starting workshops/stockpiles and clear a larger area"
 build_start/surface_build_start
 place_start/surface_place_start
 query_start/surface_query_start
@@ -121,7 +133,34 @@ build_roof/surface_roof
 ,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`
 
 
-
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
 #zone label(surface_zones) start(23; 25) hidden() message(remember to assign your dogs to the staircase pasture and your grazing animals to the large pasture) use the meta blueprints for normal application
 
 
@@ -847,6 +886,12 @@ Manual steps you have to take:
 Assign the office to your manager
 Assign a minecart to your quantum garbage stockpile hauling route
 "If the industry level is already built, configure the jugs, pots, and bags stockpiles to take from the ""Goods"" quantum stockpile on the industry level"
+""
+Farming Walkthough:
+"1) Wait until you have completed /surface3 before digging out the farming level on the z-level below the surface, otherwise you will likely get caveins as your miners channel out the miasma vents over empty space."
+"2) Start digging with /farming1 and get started on manufacturing furniture by running ""quickfort orders"" on /farming2."
+"3) Once the level is dug out, run /farming2 to build workshops and build and configure stockpiles. Remember to assign a minecart to the newly-designated quantum garbage dump. There are also jugs, pots, and bags stockpiles on this level that should be configured to ""take"" from the industry level stockpiles once we get the industry level built."
+"4) When the furniture is in place, run /farming3 to designate your temporary dining room and dormitory. The blueprint also attempts to assign the office to your manager, but double-check this assignment in case your dwarves are in an unexpected order."
 "#dig label(farming1) start(23; 25; staircase center) message(This would be a good time to queue up manager orders for /farming2. Once the area is dug out, continue with /farming2.)"
 
 
@@ -1154,6 +1199,12 @@ Manual steps you have to take:
 Assign minecarts to your quantum stockpile hauling routes
 "Give from the ""Goods"" quantum stockpile to the jugs, pots, and bags stockpiles on the farming level"
 "If desired, set the stockpiles in the bottom right to auto-melt. This results in melting all weapons and armor that are not masterwork steel. This is great for your military, but it takes a *lot* of fuel. If you enable this, be sure you're in a heavily forested area, enable auto-chop, and set up manager orders to keep your coal stocks high."
+""
+Industry Walkthrough:
+1) You can start digging out /industry1 immediately after embark. It is best to choose a stone layer at least two layers underground so the boulders can be used by your starting workshops to manufacture needed items.
+"2) Queue up manufacturing by running ""quickfort orders"" on /industry2."
+"3) Once the area is dug out, run /industry2. Remember to assign minecarts to to your quantum stockpile hauling routes, and if the farming level is already built, give from the ""Goods"" quantum stockpile to the jugs, pots, and bags stockpiles on the farming level."
+"4) If you want to automatically melt goblinite and other low-quality weapons and armor, mark the south-east stockpiles for auto-melt."
 "#dig label(industry1) start(18; 18; staircase center) message(This would be a good time to queue manager orders for /industry2. Once the area is dug out, continue with /industry2.)"
 
 
@@ -1309,8 +1360,8 @@ query/industry_query
 "Sets up public services (dining, hospital, etc.)"
 ""
 Features:
-Spacious dining room (can be declared a tavern)
-Food and drink stockpiles
+Spacious dining room (also usable as a tavern)
+Prepared food and drink stockpiles
 Well system (bring your own water)
 Public baths with soap stockpiles
 Three well-appointed jail cells
@@ -1321,7 +1372,14 @@ Manual steps you have to take:
 "If you want to declare the dining room as a tavern, the bedrooms at the top can be assigned to the tavern as rented rooms."
 "Configure the soap stockpiles to take from the industry level ""Metalworker"" quantum stockpile (which holds all the bars)"
 "Activate the bath pond zones when you are ready to fill them with 3-depth water. This is the only really fiddly bit, since you have to carefully disable the pond zone again when the final bucket to bring the water to an even 3-depth is on the way."
-"Fill the cisterns with water, either with a bucket brigade or by plumbing flowing water. Fill so that there are two z-levels of 7-depth water. If you want to fill with buckets, designate a pond zone on the level below the main floor. If you feel adventurous and are experienced with water pressure, you can instead route (depressurized!) water to the second-to-bottom level (the one above the up staircases)."
+"Fill the cisterns with water, either with a bucket brigade or by plumbing flowing water. Fill so that there are two z-levels of 7-depth water to prevent muddiness. If you want to fill with buckets, designate a pond zone on the level below the main floor. If you feel adventurous and are experienced with water pressure, you can instead route (depressurized!) water to the second-to-bottom level (the one above the up staircases)."
+""
+Services Walkthough:
+1) Start this level before your fort grows beyond around 50 dwarves so everyone has a place to eat.
+"2) Start digging with /services1. Note that this digs out the main level and three levels below for the well plumbing. Start manufacturing with ""quickfort orders"" on /services2."
+"3) Once the area is dug out, set up the furniture, stockpiles, and hospital and garbage dump zones with /services2. Fill your soap stockpiles around the bath channels by configuring them to take from the bar quantum stockpile (the one on the right near the forge) on the industry level."
+"4) When all furniture is placed, run /services3 to configure your dining room and jail."
+5) Fill the bath and wells with either a bucket brigade or by carefully routing flowing water to them.
 "#dig label(services1) start(23; 22; staircase center) message(This would be a good time to queue manager orders for /services2. Once the area is dug out, continue with /services2.)"
 
 
@@ -1639,7 +1697,12 @@ query_stockpiles/services_query_stockpiles
 "Multiple 7x7 rooms for guildhalls, temples, libraries, etc."
 ""
 Features:
-"Big empty rooms. Double-thick walls to ensure engravings are on the ""correct"" side. Fill with furniture and assign as needed."
+"Big empty rooms. Double-thick walls to ensure engravings add value to the ""correct"" side. Fill with furniture and assign as needed."
+""
+Guildhall Walkthrough:
+"1) Dig out the rooms with /guildhall1 and queue up manufacturing by running ""quickfort orders"" on /guildhall2."
+"2) Once the area is dug out, add in generic furniture with /guildhall2."
+"3) Furnish individual rooms as you need specific guildhalls, libraries, and temples."
 "#dig label(guildhall1) start(25; 25; staircase center) message(This would be a good time to queue manager orders for /guildhall2. Once the area is dug out, continue with /guildhall2.)"
 
 
@@ -1747,6 +1810,15 @@ Features:
 Well-appointed suites to satisfy most nobles
 Apartments with beds and storage to keep dwarves happy
 Meta blueprint included for designating 6 levels of apartments for a full 200+ dwarves
+""
+Suites Walkthrough:
+"1) Dig out the suites layer with /suites1 and queue up manufacturing by running ""quickfort orders"" on /suites2."
+"2) Once the area is dug out, furnish the suites with /suites2. The rooms are left unconfigured so you can set them up as needed room types and assign them to specific nobles. Each room can serve as a bedroom, a dining hall, an office, or a tomb."
+""
+Apartments Walkthrough:
+"1) Dig out one layer of apartments with /apartments1, or 6 layers at once (enough for 200 dwarves) with /apartments1_stack. Run ""quickfort orders"" for /apartments2 once for every apartments layer that you are digging."
+"2) Once a layer is dug out, furnish it with /apartments2."
+"3) Once the beds are in place (the other furniture can still be unbuilt), configure the rooms with /apartments3. Once the urns are all in place, run ""burial -pets"" to set them all to accept burials."
 "#dig label(suites1) start(18; 18; staircase center) message(This would be a good time to queue manager orders for /suites2. Once the area is dug out, continue with /suites2) noble suites"
 
 ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d

From 233ce26ab576ebc4b2a1d96514b7ee2c6a5047d5 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Fri, 23 Oct 2020 09:45:41 -0700
Subject: [PATCH 465/547] update changelog

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index dbe296c85..764d4cd46 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -41,6 +41,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `buildingplan`: all buildings, furniture, and constructions are now supported (except for the few building types not supported by dfhack itself)
 - `buildingplan`: now respects building job_item filters when matching items
 - `buildingplan`: default filter setting for max quality changed from ``artifact`` to ``masterwork``
+- The Dreamfort sample blueprints now have complete walkthroughs for each fort level
 
 ## API
 - `buildingplan`: added Lua interface API

From 55a52554ee901e410eca840aaa5658cf57bd63bd Mon Sep 17 00:00:00 2001
From: Myk <myk002@yahoo.com>
Date: Fri, 23 Oct 2020 13:55:14 -0700
Subject: [PATCH 466/547] use CheckDFObject instead of static cast

Co-authored-by: Alan <lethosor@users.noreply.github.com>
---
 plugins/buildingplan.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index 703e567b7..82551be23 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -303,7 +303,7 @@ static bool construct_planned_building()
         return false;
     }
 
-    auto bld = static_cast<df::building *>(LuaWrapper::get_object_ref(L, -1));
+    auto bld = Lua::CheckDFObject<df::building>(L, -1);
     lua_pop(L, 1);
 
     if (!bld)

From e614d16e0e99b9ce2294ce49d1fd7db1e7f8fd57 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Fri, 23 Oct 2020 15:30:40 -0700
Subject: [PATCH 467/547] use Lua::CheckDFObject instead of static cast

---
 plugins/fortplan.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/fortplan.cpp b/plugins/fortplan.cpp
index 8fbf8fb72..07685ca2b 100644
--- a/plugins/fortplan.cpp
+++ b/plugins/fortplan.cpp
@@ -72,8 +72,7 @@ struct BuildingInfo {
         if (!Lua::SafeCall(out, L, 4, 1))
             return false;
 
-        auto bld =
-            static_cast<df::building *>(LuaWrapper::get_object_ref(L, -1));
+        auto bld = Lua::CheckDFObject<df::building>(L, -1);
         lua_pop(L, 1);
 
         if (!bld)

From a3bec346a7dc78a32a5c3977595f9d8a13175b56 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Fri, 23 Oct 2020 20:25:56 -0700
Subject: [PATCH 468/547] clarify text a bit and move stair guide

---
 data/blueprints/library/dreamfort.csv | 67 ++++++++++++++-------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
index 5a5c87dfc..914562093 100644
--- a/data/blueprints/library/dreamfort.csv
+++ b/data/blueprints/library/dreamfort.csv
@@ -15,11 +15,11 @@ It can be difficult applying a set of blueprints that you did not write yourself
 ""
 "Dreamfort has a central staircase-based design. For all Dreamfort levels, place the cursor on the center staircase tile when you apply the blueprints. The first surface blueprint will designate a column of staircases that you can use as a guide."
 ""
-"Dreamfort blueprints take care of everything to get the fort up and running. You don't need to clear any trees or create any extra buildings or stockpiles (though of course you are free to do so). Blueprints that do require manual steps (like 'assign minecart to hauling route') will leave a message telling you so when you apply them. Blueprints will also leave messages with hints when you might want to run ""quickfort orders"" to start manufacturing needed items."
+"Dreamfort blueprints take care of everything to get the fort up and running. You don't need to clear any trees or create any extra buildings or stockpiles (though of course you are free to do so). Blueprints that do require manual steps (like 'assign minecart to hauling route') will leave a message telling you so when you run them. Blueprints will also leave messages with hints when you might want to run ""quickfort orders"" to start manufacturing needed items."
 ""
 "Dreamfort works best at an embark site that is flat and has at least one soil layer. New players should also avoid aquifers if they are not prepared to deal with them. Bring picks for mining, an axe for woodcutting, and about 10 blocks (of any material) to speed up construction of starting workshops."
 ""
-"Directly after embark, apply /surface1 on the surface (see /surface_help for how to select a good spot) and /industry1 at least two z-levels underground (the z-level immediately below the surface is reserved for the farming level). The walkthroughs for those levels will guide you. Once you channel out parts of the surface with /surface3, you can start the farming sequence on the z-level below the surface with /farming1. You can start the services, guildhall, suites, and apartments sequences as your fort needs those levels."
+"Directly after embark, apply /surface1 on the surface (see /surface_help for how to select a good spot) and /industry1 on a level least two z-levels underground (the z-level immediately below the surface is reserved for the farming level). The walkthroughs for those levels will guide you. Once you channel out parts of the surface with /surface3, you can start the farming sequence on the z-level below the surface with /farming1. You can start the services, guildhall, suites, and apartments sequences as your fort needs those levels."
 ""
 "This .csv file is generated from source .xlsx files. If you want to look at how these blueprints are put together, it will be easier to look at the online spreadsheets than this giant .csv. You can view them at: https://drive.google.com/drive/folders/1iS90EEVqUkxTeZiiukVj1pLloZqabKuP"
 You are welcome to copy those spreadsheets and make your own modifications!
@@ -42,12 +42,10 @@ Manual steps you have to take:
 Assign grazing livestock to the large pasture and dogs to the pasture over the stairwell (DFHack's autonestbox can manage the nestbox zones)
 Connect levers to the gates
 ""
-"All blueprints are managed by the meta blueprints in the ""meta"" sheet. Each stage is meant to be applied after the previous stage is completely finished. For example, you can't build furniture until all the flooring has been constructed."
-""
 Be sure to choose an embark site that has an area flat enough to use these blueprints!
 ""
 Surface Walkthrough:
-"1) Choose a tile for your central staircase. The terrain around that tile should be perfectly flat. Trees are ok, but no slopes, rivers, or lakes. To be sure that the tile you've chosen is in a good spot, set the cursor over that tile and run ""quickfort run library/dreamfort.csv -n /surface4"". This will show you the eventual boundaries of the fort. Some wall segments might be missing due to existing trees, but that's ok. Make sure the area within the exterior walls is flat. Run ""quickfort undo library/dreamfort.csv -n /surface4"" to clean up."
+"1) Choose a tile for your central staircase. The terrain around that tile should be perfectly flat. Trees are ok, but no slopes, rivers, or lakes. To be sure that the tile you've chosen is in a good spot, set the cursor over that tile and run ""quickfort run library/dreamfort.csv -n /surface4"". This will show you the eventual boundaries of the fort. Some wall segments might be missing due to existing trees, but that's ok. Make sure the area within the exterior wall is flat. Run ""quickfort undo library/dreamfort.csv -n /surface4"" to clean up."
 "2) With the cursor on the chosen tile, run /surface1 to clear surrounding trees and set up your pastures. Remember to assign your dogs to the pasture around the staircase and your grazing animals to the large pasture. You can let your cats roam free."
 "3) Once the trees have been cleared, run /surface2 to set up starting workshops/stockpiles and clear trees from a larger area. Run ""quickfort orders"" for /surface4, /surface5, and /surface6 to get a head start manufacturing items for those blueprints. If you want a consistent color for your walls and floors, remember to set the rock material in the buildingplan UI and in the manager orders for the blocks."
 "4) Once the trees have been cleared from the larger area, run /surface3 to channel out the miasma vents for the farming level."
@@ -57,6 +55,7 @@ Surface Walkthrough:
 "#meta label(surface1) start(staircase center)
 message(This would be a good time to start digging the industry level.
 Once the area is clear of trees, continue with /surface2.) clear trees and set up pastures"
+stair_guide/surface_stair_guide
 clear_small/surface_clear_small
 zones/surface_zones
 ""
@@ -84,6 +83,36 @@ query_buildings/surface_query_buildings
 build_scaffolding/surface_scaffolding
 #<
 build_roof/surface_roof
+#dig label(surface_stair_guide) hidden() use the meta blueprints for normal application
+j
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
+#>
+i
 #dig label(surface_clear_small) start(23; 25) hidden() use the meta blueprints for normal application
 
 
@@ -133,34 +162,6 @@ build_roof/surface_roof
 ,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`
 
 
-#>
-i
-#>
-i
-#>
-i
-#>
-i
-#>
-i
-#>
-i
-#>
-i
-#>
-i
-#>
-i
-#>
-i
-#>
-i
-#>
-i
-#>
-i
-#>
-i
 #zone label(surface_zones) start(23; 25) hidden() message(remember to assign your dogs to the staircase pasture and your grazing animals to the large pasture) use the meta blueprints for normal application
 
 

From 83e8755e6d9877be076ab380bf2b7cacb504a796 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Fri, 23 Oct 2020 20:26:37 -0700
Subject: [PATCH 469/547] fix typos in quantum alias

---
 data/quickfort/aliases-common.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt
index d5f52efcf..857160711 100644
--- a/data/quickfort/aliases-common.txt
+++ b/data/quickfort/aliases-common.txt
@@ -50,7 +50,7 @@ enablesequence: e{Down}
 # clothes and armor in this quantum stockpile will rot away. If you want bones
 # in your quantum stockpile, apply this alias to a refuse stockpile (but don't
 # put useful clothes or armor in there!)
-quantum: {linksonly}{nocontainers}{enableanimals}{enablefood}{furnitureprefix}{enablestone}{enableammo}{enablecoins}{enablebars}{enablegems}{enablefinishedgoods}{enableleather}{enablecloth}{enablewood}}{enableweapons}{enablearmor}{enablesheet}
+quantum: {linksonly}{nocontainers}{enableanimals}{enablefood}{enablefurniture}{enablestone}{enableammo}{enablecoins}{enablebars}{enablegems}{enablefinishedgoods}{enableleather}{enablecloth}{enablewood}{enableweapons}{enablearmor}{enablesheet}
 
 
 ##################################

From b4498a262c06f96e62e5e049d3fab5edfbc656c6 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Fri, 23 Oct 2020 21:12:04 -0700
Subject: [PATCH 470/547] update more dreamfort help, add automation.json

---
 data/blueprints/library/dreamfort.csv | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
index 914562093..096a6657e 100644
--- a/data/blueprints/library/dreamfort.csv
+++ b/data/blueprints/library/dreamfort.csv
@@ -17,7 +17,7 @@ It can be difficult applying a set of blueprints that you did not write yourself
 ""
 "Dreamfort blueprints take care of everything to get the fort up and running. You don't need to clear any trees or create any extra buildings or stockpiles (though of course you are free to do so). Blueprints that do require manual steps (like 'assign minecart to hauling route') will leave a message telling you so when you run them. Blueprints will also leave messages with hints when you might want to run ""quickfort orders"" to start manufacturing needed items."
 ""
-"Dreamfort works best at an embark site that is flat and has at least one soil layer. New players should also avoid aquifers if they are not prepared to deal with them. Bring picks for mining, an axe for woodcutting, and about 10 blocks (of any material) to speed up construction of starting workshops."
+"Dreamfort works best at an embark site that is flat and has at least one soil layer. New players should also avoid aquifers if they are not prepared to deal with them. Bring picks for mining, an axe for woodcutting, and an anvil for a forge."
 ""
 "Directly after embark, apply /surface1 on the surface (see /surface_help for how to select a good spot) and /industry1 on a level least two z-levels underground (the z-level immediately below the surface is reserved for the farming level). The walkthroughs for those levels will guide you. Once you channel out parts of the surface with /surface3, you can start the farming sequence on the z-level below the surface with /farming1. You can start the services, guildhall, suites, and apartments sequences as your fort needs those levels."
 ""
@@ -53,7 +53,7 @@ Surface Walkthrough:
 "6) Once all the constructions are built, run /surface5 build gates, furniture, the trade depot, and traps."
 "7) When at least the beehives are in place, run /surface6 to configure the hives and construct a roof."
 "#meta label(surface1) start(staircase center)
-message(This would be a good time to start digging the industry level.
+message(Once the stairwell is mined out, you should start digging the industry level in a non-aquifer rock layer.
 Once the area is clear of trees, continue with /surface2.) clear trees and set up pastures"
 stair_guide/surface_stair_guide
 clear_small/surface_clear_small
@@ -1200,12 +1200,14 @@ Manual steps you have to take:
 Assign minecarts to your quantum stockpile hauling routes
 "Give from the ""Goods"" quantum stockpile to the jugs, pots, and bags stockpiles on the farming level"
 "If desired, set the stockpiles in the bottom right to auto-melt. This results in melting all weapons and armor that are not masterwork steel. This is great for your military, but it takes a *lot* of fuel. If you enable this, be sure you're in a heavily forested area, enable auto-chop, and set up manager orders to keep your coal stocks high."
+Download automation.json from https://drive.google.com/file/d/17WcN5mK-rnADOm2B_JFpPnByYgkYjxhb/view and put it in your dfhack-config/orders/ directory.
 ""
 Industry Walkthrough:
 1) You can start digging out /industry1 immediately after embark. It is best to choose a stone layer at least two layers underground so the boulders can be used by your starting workshops to manufacture needed items.
 "2) Queue up manufacturing by running ""quickfort orders"" on /industry2."
 "3) Once the area is dug out, run /industry2. Remember to assign minecarts to to your quantum stockpile hauling routes, and if the farming level is already built, give from the ""Goods"" quantum stockpile to the jugs, pots, and bags stockpiles on the farming level."
 "4) If you want to automatically melt goblinite and other low-quality weapons and armor, mark the south-east stockpiles for auto-melt."
+"5) Run ""orders import automation"" to use the provided automation.json to take care of your fort's basic needs."
 "#dig label(industry1) start(18; 18; staircase center) message(This would be a good time to queue manager orders for /industry2. Once the area is dug out, continue with /industry2.)"
 
 
@@ -1321,7 +1323,8 @@ query/industry_query
 "#query label(industry_query) start(18; 18) hidden() message(remember to:
 - assign minecarts to to your quantum stockpile hauling routes
 - if the farming level is already built, give from the ""Goods"" quantum stockpile to the jugs, pots, and bags stockpiles on the farming level
-- if you want to automatically melt goblinite and other low-quality weapons and armor, mark the south-east stockpiles for auto-melt) use the meta blueprints for normal application"
+- if you want to automatically melt goblinite and other low-quality weapons and armor, mark the south-east stockpiles for auto-melt) use the meta blueprints for normal application
+- now that your industry is set up, run ""orders import automation"" to automate your fort's basic needs (download automation.json from https://drive.google.com/file/d/17WcN5mK-rnADOm2B_JFpPnByYgkYjxhb/view?usp=sharing and put it in your dfhack-config/orders/ directory)"
 
 
 ,,,,,,,,,,,roughgems,nocontainers,`,`,`,`,t{Down 6}&,`,`,`,`,`,`

From a2f943e7e5eba65f574ef2e0661f1f2c45979eda Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 24 Oct 2020 09:19:15 -0700
Subject: [PATCH 471/547] don't shift UI down for track constructions

automat doesn't have UI there to avoid
---
 plugins/buildingplan.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index 910e5ebe4..501594c4a 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -1,3 +1,4 @@
+#include "df/construction_type.h"
 #include "df/entity_position.h"
 #include "df/interface_key.h"
 #include "df/ui_build_selector.h"
@@ -641,7 +642,9 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
 
         int y = 23;
 
-        if (ui_build_selector->building_type == df::building_type::Construction)
+        if (ui_build_selector->building_type == df::building_type::Construction
+            && ui_build_selector->building_subtype <
+               df::construction_type::TrackN)
         {
             // try not to conflict with the automaterial plugin UI
             y = 34;

From 3e0b0f8078656c6492581f0d1f2c24ba4101ba65 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 24 Oct 2020 09:21:18 -0700
Subject: [PATCH 472/547] update changelog

---
 docs/changelog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 764d4cd46..37cbe6b94 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -41,7 +41,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `buildingplan`: all buildings, furniture, and constructions are now supported (except for the few building types not supported by dfhack itself)
 - `buildingplan`: now respects building job_item filters when matching items
 - `buildingplan`: default filter setting for max quality changed from ``artifact`` to ``masterwork``
-- The Dreamfort sample blueprints now have complete walkthroughs for each fort level
+- The Dreamfort sample blueprints now have complete walkthroughs for each fort level and importable orders that automate basic fort stock management
 
 ## API
 - `buildingplan`: added Lua interface API

From 58917b03d167ba96afd5e5d66e7ee6ab7a4b0a20 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 24 Oct 2020 14:27:33 -0400
Subject: [PATCH 473/547] Switch away from CheckDFObject in unprotected calls

See https://github.com/DFHack/dfhack/pull/1674#issuecomment-716028460
---
 plugins/buildingplan.cpp | 5 ++++-
 plugins/fortplan.cpp     | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index 82551be23..3390b04b0 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -303,11 +303,14 @@ static bool construct_planned_building()
         return false;
     }
 
-    auto bld = Lua::CheckDFObject<df::building>(L, -1);
+    auto bld = Lua::GetDFObject<df::building>(L, -1);
     lua_pop(L, 1);
 
     if (!bld)
+    {
+        out.printerr("buildingplan: construct_building_from_ui_state() failed\n");
         return false;
+    }
 
     planner.addPlannedBuilding(bld);
 
diff --git a/plugins/fortplan.cpp b/plugins/fortplan.cpp
index 07685ca2b..8b8dc5584 100644
--- a/plugins/fortplan.cpp
+++ b/plugins/fortplan.cpp
@@ -72,11 +72,14 @@ struct BuildingInfo {
         if (!Lua::SafeCall(out, L, 4, 1))
             return false;
 
-        auto bld = Lua::CheckDFObject<df::building>(L, -1);
+        auto bld = Lua::GetDFObject<df::building>(L, -1);
         lua_pop(L, 1);
 
         if (!bld)
+        {
+            out.printerr("fortplan: construct_building_from_params() failed\n");
             return false;
+        }
 
         planner.addPlannedBuilding(bld);
 

From a0c86b8a9bea6fcf9e0e04fb3dd4665329a5407f Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 24 Oct 2020 21:14:09 -0700
Subject: [PATCH 474/547] rewrite quickfort user guide into

spend more space highlighting how users can use the blueprint plugin to
avoid learning how to write blueprints themselves
---
 docs/guides/quickfort-user-guide.rst | 54 +++++++++++++++-------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 2dfaa74b1..9e5db34c3 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -5,32 +5,38 @@ Quickfort User Guide
 
 `Quickfort <quickfort>` is a DFHack script that helps you build fortresses from
 "blueprint" .csv and .xlsx files. Many applications exist to edit these files,
-such as MS Excel and `Google Sheets <https://sheets.new>`__. You can also build
-your plan "for real" in Dwarf Fortress, and then export your map using the `blueprint`
-plugin. Most layout and building-oriented DF commands are supported through the
-use of multiple files or spreadsheets, each describing a different phase of DF
-construction: designation, building, placing stockpiles/zones, and setting
-configuration.
-
-The original idea and 1.0 codebase came from :wiki:`Valdemar's <User:Valdemar>`
-auto-designation macro. Joel Thornton (joelpt) reimplemented the core logic in
-Python and extended its functionality with `Quickfort
-2.0 <https://github.com/joelpt/quickfort>`__. This DFHack-native implementation,
-called "DFHack Quickfort" or just "quickfort", builds upon Quickfort 2.0's
-formats and features. DFHack Quickfort is written in Lua and interacts with
-Dwarf Fortress memory structures directly, allowing for instantaneous blueprint
-application, error checking and recovery, and many other advanced features.
+such as MS Excel and `Google Sheets <https://sheets.new>`__. Most layout and
+building-oriented DF commands are supported through the use of multiple files or
+spreadsheets, each describing a different phase of DF construction: designation,
+building, placing stockpiles/zones, and setting configuration.
+
+The original idea came from :wiki:`Valdemar's <User:Valdemar>` auto-designation
+macro. Joel Thornton reimplemented the core logic in Python and extended its
+functionality with `Quickfort 2.0 <https://github.com/joelpt/quickfort>`__. This
+DFHack-native implementation, called "DFHack Quickfort" or just "quickfort",
+builds upon Quickfort 2.0's formats and features. Any blueprint that worked in
+Python Quickfort 2.0 should work with DFHack Quickfort. DFHack Quickfort is
+written in Lua and interacts with Dwarf Fortress memory structures directly,
+allowing for instantaneous blueprint application, error checking and recovery,
+and many other advanced features.
 
 This document focuses on DFHack Quickfort's capabilities and teaches players how
-to understand and build blueprint files. Some of the text was originally written
-by Joel Thornton, reused here with his permission.
-
-For those just looking to apply blueprints, check out the `quickfort command's
-documentation <quickfort>` for syntax. There are also many ready-to-use blueprints
-available in the ``blueprints/library`` subfolder in your DFHack installation.
-Browse them on your computer or :source:`online <data/blueprints/library>`,
-or run ``quickfort list -l`` at the ``[DFHack]#`` prompt to list them, and then
-``quickfort run`` to apply them to your fort!
+to understand and create blueprint files. Some of the text was originally
+written by Joel Thornton, reused here with his permission.
+
+For those just looking to apply existing blueprints, check out the `quickfort
+command's documentation <quickfort>` for syntax. There are many ready-to-use
+blueprints available in the ``blueprints/library`` subfolder in your DFHack
+installation. Browse them on your computer or
+:source:`online <data/blueprints/library>`, or run ``quickfort list -l`` at the
+``[DFHack]#`` prompt to list them, and then ``quickfort run`` to apply them to
+your fort!
+
+Before you become an expert at writing blueprints, though, you should know that
+the easiest way to make a quickfort blueprint is to build your plan "for real"
+in Dwarf Fortress and then export your map using the DFHack `blueprint` plugin.
+You can apply those blueprints as-is in your next fort, or you can fine-tune
+them with additional features from this guide.
 
 See the `Links`_ section for more information and online resources.
 

From 51f49b1c2cf7b728b2acf1181ea4d10e3ace22c4 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 24 Oct 2020 21:17:53 -0700
Subject: [PATCH 475/547] add bedroom and tomb blueprints to the library

---
 .../28-3-Modified_Windmill_Villas.csv         |  69 ++++++
 .../28-3-Modified_Windmill_Villas.png         | Bin 0 -> 5757 bytes
 .../48-4-Raynard_Whirlpool_Housing.csv        |  99 ++++++++
 .../48-4-Raynard_Whirlpool_Housing.png        | Bin 0 -> 546 bytes
 .../bedrooms/95-9-Hactar1_3_Branch_Tree.csv   | 231 ++++++++++++++++++
 .../bedrooms/95-9-Hactar1_3_Branch_Tree.png   | Bin 0 -> 4312 bytes
 data/blueprints/library/embark.csv            |  11 +-
 .../blueprints/library/tombs/Mini_Saracen.csv |  26 ++
 .../library/tombs/The_Saracen_Crypts.csv      |  98 ++++++++
 .../library/tombs/The_Saracen_Crypts.png      | Bin 0 -> 11666 bytes
 10 files changed, 528 insertions(+), 6 deletions(-)
 create mode 100644 data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv
 create mode 100644 data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.png
 create mode 100644 data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
 create mode 100644 data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.png
 create mode 100644 data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
 create mode 100644 data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.png
 create mode 100644 data/blueprints/library/tombs/Mini_Saracen.csv
 create mode 100644 data/blueprints/library/tombs/The_Saracen_Crypts.csv
 create mode 100644 data/blueprints/library/tombs/The_Saracen_Crypts.png

diff --git a/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv b/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv
new file mode 100644
index 000000000..006c01f55
--- /dev/null
+++ b/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv
@@ -0,0 +1,69 @@
+"#dig start(11; 11) 28 bedrooms, 3 tiles each (efficient layout)"
+ , , , , , ,d, , , , , ,d, , , , , , , , ,#
+ , , , , , ,d, , , , , ,d, , , , , , , , ,#
+ , , , ,d, ,d, ,d, ,d, ,d, ,d, , , , , , ,#
+ , , , ,d, ,d, ,d, ,d, ,d, ,d, , , , , , ,#
+ , , , ,d,d,d,d,d, ,d,d,d, ,d, ,d,d,d, , ,#
+ , , , , , ,d, , , , , ,d,d, , ,d, , , , ,#
+ , ,d,d,d, ,d, ,d,d,d, ,d,d,d,d,d,d,d,d,d,#
+ , , , , ,d,d, , , ,d, ,d, , , ,d, , , , ,#
+d,d,d,d,d,d,d,d,d,d,d,d,d, ,d, ,d,d,d, , ,#
+ , , , ,d, , , ,d,i,i,i,d, ,d, , , , , , ,#
+ , ,d,d,d, ,d,d,d,i,i,i,d,d,d, ,d,d,d, , ,#
+ , , , , , ,d, ,d,i,i,i,d, , , ,d, , , , ,#
+ , ,d,d,d, ,d, ,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+ , , , ,d, , , ,d, ,d, , , ,d,d, , , , , ,#
+d,d,d,d,d,d,d,d,d, ,d,d,d, ,d, ,d,d,d, , ,#
+ , , , ,d, , ,d,d, , , , , ,d, , , , , , ,#
+ , ,d,d,d, ,d, ,d,d,d, ,d,d,d,d,d, , , , ,#
+ , , , , , ,d, ,d, ,d, ,d, ,d, ,d, , , , ,#
+ , , , , , ,d, ,d, ,d, ,d, ,d, ,d, , , , ,#
+ , , , , , , , ,d, , , , , ,d, , , , , , ,#
+ , , , , , , , ,d, , , , , ,d, , , , , , ,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+"#build label(furniture) start(11; 11) 28x doors, beds, coffers, and cabinets"
+ , , , , , ,f, , , , , ,f, , , , , , , , ,#
+ , , , , , ,h, , , , , ,h, , , , , , , , ,#
+ , , , ,f, ,b, ,f, ,f, ,b, ,f, , , , , , ,#
+ , , , ,h, ,d, ,h, ,h, ,d, ,h, , , , , , ,#
+ , , , ,b,d,`,d,b, ,b,d,`, ,b, ,b,h,f, , ,#
+ , , , , , ,`, , , , , ,`,d, , ,d, , , , ,#
+ , ,f,h,b, ,`, ,f,h,b, ,`,`,`,`,`,d,b,h,f,#
+ , , , , ,d,`, , , ,d, ,`, , , ,d, , , , ,#
+f,h,b,d,`,`,`,`,`,`,`,`,`, ,f, ,b,h,f, , ,#
+ , , , ,d, , , ,`,`,`,`,`, ,h, , , , , , ,#
+ , ,f,h,b, ,b,d,`,`,`,`,`,d,b, ,b,h,f, , ,#
+ , , , , , ,h, ,`,`,`,`,`, , , ,d, , , , ,#
+ , ,f,h,b, ,f, ,`,`,`,`,`,`,`,`,`,d,b,h,f,#
+ , , , ,d, , , ,`, ,d, , , ,`,d, , , , , ,#
+f,h,b,d,`,`,`,`,`, ,b,h,f, ,`, ,b,h,f, , ,#
+ , , , ,d, , ,d,`, , , , , ,`, , , , , , ,#
+ , ,f,h,b, ,b, ,`,d,b, ,b,d,`,d,b, , , , ,#
+ , , , , , ,h, ,d, ,h, ,h, ,d, ,h, , , , ,#
+ , , , , , ,f, ,b, ,f, ,f, ,b, ,f, , , , ,#
+ , , , , , , , ,h, , , , , ,h, , , , , , ,#
+ , , , , , , , ,f, , , , , ,f, , , , , , ,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#query label(rooms) start(11; 11) room designations
+ , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , ,r+,, , , , ,r+,, , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , ,#
+ , , , ,r+,, , ,r+,,r+,, , ,r+,,r+,, , , ,#
+ , , , , , , , , , , , , , , , , , , , , ,#
+ , , , ,r+,, , , , ,r+,, , , , , , ,r+,, ,#
+ , , , , , , , , , , , , , , , , , , , , ,#
+ , ,r+,, , , , , , , , , , , , ,r+,, , , ,#
+ , , , , , , , , , , , , , , , , , , , , ,#
+ , , , ,r+,,r+,, , , , , , ,r+,,r+,, , , ,#
+ , , , , , , , , , , , , , , , , , , , , ,#
+ , , , ,r+,, , , , , , , , , , , , ,r+,, ,#
+ , , , , , , , , , , , , , , , , , , , , ,#
+ , ,r+,, , , , , , ,r+,, , , , ,r+,, , , ,#
+ , , , , , , , , , , , , , , , , , , , , ,#
+ , , , ,r+,,r+,, , ,r+,,r+,, , ,r+,, , , ,#
+ , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , ,r+,, , , , ,r+,, , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , ,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
diff --git a/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.png b/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.png
new file mode 100644
index 0000000000000000000000000000000000000000..dda3673e26f2926131ebd84013f2eac6e293a3e1
GIT binary patch
literal 5757
zcmZWr1z1#Fw?0Tpi!|Z~(l~T?w}5oVfG{*D4N}q}-3VB8*C5>?$c%*45RxN|gc3t@
z=kvSY{qKG5bIv~d+0R~k@3r3dJ!`M{r#fmRg!F^}0FY>?E9+zWY)l&^z{7kAqiG#5
z-CZwrGj9MOy8m~>0`lL`Vy1MRm6V=7b@KG_^mg*}V$x7jV)A<7>FDf+SrM>UXaF%Z
z*rAp|uN*6C#f4{TdFoRUFzG8MhEt}ob2Hy1*NkI+w?L)WcTYtHhhg+>9CmVYcoLN!
zh&X|89)FYheRAZ7xP-CGwcrn~vz_SeiJO)=S!DH5VG|s`mw-51T}V$PoVY^q;l1yX
zBZI?ho4oQ7gsffwIYHAiX76hjEZ{6uTKe&$Ui@wVD`1+40O-{&=;eP9drP*fm}iL<
z9);EGlP0c35Kalm2PG?(0`jU@;f1;E2Ebb!z;@i;ZUcDA1K4teZBGN?g=cxeSb#+)
zGZog`G=S;8L!2_;Bn4E%jT2M=Q+|NbQEN~FnCAibHB21Uf%;aU7e-Fh2oMkh{CaWG
zTmVimU^~jf5&%Ty0hFr0O{9N4t|douW01;glx|~{P>HZ0;CYU3V#5276Q)7)m{Jsc
z2b?d@+aH)mCm112_WkG!0K843!bE#?9RMS(g~3FVp`<oEyFGZfkL>I=Znof6Uh)92
z<`X)31LA9<50}CVcfWbhwvXdvP4w0mo#@y|Cf@?Q-B~m_^7<Pam3OIa3kzGDoAa83
ziWcB8laL!ozfG^nwcB~9^cDK#d-pnPgrHS~8qV4G{x8Q*N*=(|??%}zZKtSRwG!Q4
zF-|`k)Uaza<)+-wqj;XIoS$?gSn?=dF`a9OZR+;f`YPxWTXt0hsCSXY3QprGx3b4R
z)#4yG_32$l1HkVN&%PN>0_<?7$ThhC?Sb62+FLdt+)*R_IRIEIv+^2_HOY+-0D$t_
z2=00XhT}e3P%qwtKHQ}~qAOd`C`H!6enoOc!e`+RUf6O~zf$CknW$&vw&k0VXB6($
zbBf9EBIWHj`a~+@MRoxuDC*<vjJS)VFiLPA%)A(fWtU*el1xC87k$Rur;bCB$jbCN
zj#BTDR+@;qfPR7@laV^(Z<!Z&Bw{U9+tZ{*0l`;SF`a4xnGub8GBd<2N^Rw0^iits
ziM~Gb5y(%Wep~SMMKirjlIT0+*D5En#S~ek5&qsEwD>}UZv4E%1Bwmept~9N;|-6h
ziK~X`>y4|iJK|65;SK&c6cH-DcSUjh6`8;f71T|inCi@{moq(J6~4E4SL`l!lwLo_
zql|K`X7=`b=YzC%f&#Io>L8X`ij@0&<iT-DgJP@{@k)XmZK-!O8a^6MQB0{$dFZq3
zfGP@v)#+I>J}*9VZN!(z1Tj4xjovKW9M}}vWY}c>Z9!OQC;$B8nZY`z{+Np<-4^+l
z@D`p!uAqX^hkX6z@^^;!L{iKZYu-Wi>-1vF?+g3pOH4#kYiO0!yw94ZccO7ZJJ<d2
zX}`Ce^-w40tI5>(j@pl$AK1tK#3V6Pkt1;sPPzhGd|C*dKW$y^lTy0rM7j|}elY=5
zE;5fS&(p}18_NBXDs7A~OEZf-i-DWZu%fcGa;1{U=*Vc?Fr~uUAf#5+NXTHL;_gg#
zl~HBkQ<MRN0i;5zJhl>2?rA9ZG1Tlj9?xvx$$+lXN4>WVHXEJ8Ohoo{O#vWgSCXn2
z-w2UG_J)atmwwzGxz~&xi87TH?<ACjG=)r>^p7$f<?uIhpP#+)(YcG{EXz3xO<18k
z;9BQmC>4IvCg5P{TA7`bZCa&XrB|hf>JqKpD=RGRQt2?ej38AQ(d4k?P=lnva0`(J
z3kJ(&gk{v)GLk2?yp^sc4DULW{d+vh_H&E6t;36+c$TdMb|Ehwgz#M(Ub|nEov0C;
z;x!So;vtA(w9-Q&&po9X`9=`G^pvay<dsUmS>T+tsI<08=?~vjU#pTOIS*TIux_{y
zyAOY0$75$^*V5kA-p|+9ZY$*~m3kueWMtyY#QTZaJdpw!fjL2B0kUAOV71lOJir_T
zEr)(`&}iH=FE!hTc6vmcOPH0I8kt))sn!(Mu+4VVbd=pIYtzZlsVbU<4AlREeuh@G
z($#Ox;~{FH?$8i0#Eu5iI#fHbpV5^O(jM~qS_Ypac7e2t(VQ{VyZHsBq_N~mKJ3lD
zT*%OI_6{G!6iyDG7utZ{ALkl$E;J~ZR)f$$+Pou=;u7PvUXAnS$nq923@?v%ZEE_Q
zJhxg4nmQ>gXe#L6D@WAri|#w`$1W9r5iaH`G86LtIxwpAU2khrj;J_`-*vS*R98ti
z0@8wH;j`yUGpU)YZ!Ph!M1v1#WKU&Z6mQ6GNQ<oqu9(?;5$kOoZ5`Jg@GP>4UR4TX
zxqWsUbUO)@g|lHnu;U{XA}sD)o&~*R?n#!DL^zx_F6=2Jy=_yVQb>7K^J=TFhS_QK
zXKD>I8kq}AgE^B%KMnmc`xPI&4Ne>gCFY2ZjW&sqOZJL0rJoeY5%Hf~Qu1C^zEI9q
zUMYYG=t|V_Xo_&lR`R+?FN(Dbx62LlI+}g?W?E>f;imOKf|t8i)WfZN^=j`ZcD-<&
zXd{>=mv7X{EASnx|2Vpgx`LMiB$+M$Bu+;>^H71DyPP_S?e~3uwq(M<e#U;tBfd$|
z$+&qXOYVm{zty?5gVKMdb&3SC4hfZjw%VdNDpEV2kUUu~kSwCk_hWJwl#%Qbh)hpQ
zeXdx^tepXc>_WC3{l=>uq8o39JQ7>^9%kWxc5O<n#x>(1gesQ)Ff`|!<Hm1<IG8y0
zOvH~#WLFhEp4j`+G=@kOdvj2HyGPMav6c=kiP19QVKm+Ds&<iRlztwFAl#tBeH>$q
zS1tW10m|+EO}A>#B&RmCi#<r&HNv`Y>{VY2mMe<Lh;S=91hq7`XQgY(XSUh`zKAJg
zkfn-GsHH^E<WPmpb1nsJF~oX~_2eyOHdj;)wmpM8PC4#uukaLEkY-orZ0C@AkSr`V
zldKvy@12~gAoy}7I1wF@P^GpHJ<^{#9m+n#CZyyHKN=nzUKon*Pc65A=gvGP_Zfma
zPlbPeLs)d8uVp`XBaE<&w7)ribGX#FY(mS`##io~Wna2m)#$iC-y6Z6!oJ35A%)Jh
z&3t2=k}=dznSG2>BOUpx`=;=~pNB-0#OU>#;dK@-<-pAy^xakTLlVhFzog*mHT>zn
z{1_pOd@hRlzw=cK4Dv56>@3=KzsOF`?ydw~sUiL%dm}7u7N~h-_}O`J=hbuu<TpI2
zFsm>ml=pne7V#b$jI@WXx{!Guw3GX+O{v@_BBeT|V3xl>`TTA~Y~45cWRhPeY2&`@
zvnzd*F|9k&@unlcw$0MDZ9k~1CD;+Y!%!p!TR!dz{6&2``>jYqX1VJq$P+z;K3Sz+
z4t>FK4IA%R@aNdC>D2ACIhNm3SWsGy{U&E|vowFO6z0<F|MqBdNezt`9SOflJ4qo^
z!cECb8IK`}K^2M1N=U5By|~`FDpP_#gR>XW+`PXTuce{p3qAXWnuAT|PQJ_eos-ey
z{<7qHw--fMhZyc3e%SpvKuEy)*!Xg<&wt6E@!-QMneOIGrZCQ1r}KsrgRf<m8FU#L
zw>a3jM_2YjJP1s^i33s4Rsev8<d>Iv8JIDXy}G_O00glCKzJkooZn*l9RTp<2Y_8$
z0FcZD02<G9n;}(9eVVJGtY8?h__MGtt4fk0Cehzfg5kj{%+qT%%KV+&3up>=-~$U_
z$rG^SnEC+ZccOrT);Z92W^(UW_mfD`{hJ<dakS{XDMgPacP075d(L-k9c~ow0|Z3!
zra=E4%v;yjV_ovr)6-L&3`E`glmLjrWdZ?UtV7qXezu#dbD@sg>ubiXh@m^=)Brhk
zcs<6T*Q2W+GBkQhUEs|FuNtHVH~hN_voIjq#vWx_fI3GTKQsk}za#(mu<wxI=-SSn
zYcsFbmC$E_&}6Dw-_So6|N3%BXyV^W{ieoW?cnFN#MXj1^oQluYx}hNzkU64c6fbn
z;`d2S&(eU|BM-i&#V_UpgSei@W(|`iDAGh+e#$$4B9k}$t}-ue{Hb+*wrQ-1Qpu;T
zw<BY&ZT6sjmWG<hmJ{dS&8mW<U59Rr6Bl@fM^{>T;F=9>dx$l6#A@`=9a=)HDBM4R
z9gcVQvl%D0v<*WaboI21wJmzbC2v_;-uK;@|I4@l>pzx2-J$DBREN~@_9jp5$<k6f
z&1rF1-G<5y`oO(w)FjXz7xWK=7>t=fhr8Bm=AI`0$qPI(V#o{GzM45EUq9rEF&Eh^
z6E0@gKWJl2yGI^dPS6DzyP-5(U$keBw1k|V$|_eY5dI1HAAqgbIAC8B2cb~d)zXE8
z+CP&RKK=mmGJXh6C5yU_wCG8JpI^tox#7bCeJ%3U<bS~ULu_y2k)&&?Y&>LWF}t&;
z#=g!plJY;ZKxcne7lT?Iq=j}tF$w-{9D&F${>S29a!j*^i1kg3Eh1+o8D5007TXVR
zr_;2ZpPO*Qn*<~Nw@4yr){wOd?S@4VnL6}Gv{1ht7I8H2M+O*`t!_|xFlLyeu4)^g
zH47Gjw*M`!Ke`Nvt{a+N$vC>i@&AAN3W#>?vI;@1hGZS}{+}J|wy0`xXDKnH{zt^&
zLoTkVcYwry<o+*E|N1~q9Z*^Sp7T+S$Vo_;KS+aO%G|&#8zu)sZr!%JYbh)1Ywlha
zHP6mKd7NuB2-aSP)`+O+2`?fqZ<a$>Oy*9k&Uf3{OJ*t^&WJD3KmEAI(;Gn@moE{}
zOxDjo+b+7xI1^M?znL4*#@v=$SDAxW(Hfe8a|EubrCf|DBa;#`@DCfm)QgaMbG}tq
zFn;10VUqLiFcW;PEvKH$^vcTjm6gUk1CUQQ)<sCln6>2_CW29P$k@>v7*fcpZZ3p0
z+Q>+c9B12;8ApSw!a09(s2r8wJo~Yw6tO2t;b@k<og2ctpQlHum(Dtz5Cs<BHPYm=
zA1a+?B382BDV>FwlXWPmb5(E>(#L?CZMamlr;~#GvK?m7*X7A6nF<78kW^S5NXx#Z
zWp?=eC-Zb^_-FLBUT|amZ|O2HEp^TE5`kS#id23`wL3zWB%!JP=Y2c{dF|=1{KSrb
z5$$-1f8FtURFWw$t&yHe{wjHdrBJ7AAx3LDb6vc&7PTK#L;lL6m0>GTrwBQD{<4%+
zgOlKn_vExN8~jMsu6Rm#VpOsr{O848W=z<Xl`gX{XjBw1aOqK&vPkRW)!v>2v6WCp
zgVkdPB6xEW>597Tq7&cK-c5`)rW_g=@Jwg*X|o(X>eM^`nEAmT6CCld9JR3?r9aIe
zuei;3)QL;X1JUX30}Mf#NC{snNOD^*Nlt0SJxMVq+8ANtND1nZU$KmX4=(~nUGs;p
z@D7@!CYrIm3J#HfabeFDkM~kX-`?!L<bZqYYv#G$k9oHP;vL|d8|fCE7PR7}k$gak
zx|@jGr>Lj-nh=ItAM7&cyLs7Nad@0d<fh{0J#j>^idI8Di~;|;8sNu(##+K!lDUIp
zWJLF_p+0-DPd3M$P4@ACVfht0J={t)15Ep5B-igkEmdDX+rjZuD+!@R1=O8uym8Xf
zCksL1))H`b<}|wSs?-@1^`xI{agPsk>78}36_@Xvvvq_te4?DW#E1S~fXA2NwHIwk
z$;CPxlErXCBPtAt?ubw)tJ{k)+_eV(#ls~jceox#0E0^cb8Uk&-USbvYDUzMNDT=x
zIs-B-g0&@Q%klc?`b>RFm9*!o52FzgT_bG=#zrc0s4UXhf$FBilqd)EZbb!8!mIXL
zq0)3DqjX9=AN^n6?&1iARDF8gbQzY@ui5*k`PYL=<;x2BrOeEOIn`ONbh9xWzreJT
zWRU~>spS1n#N5czWxV}BXR9faD>?g}-k!Nq0%Tf0(`i(|><vHnTHLjKt)$=$?X@3{
z&fP50?X?xo^qSL|m@$UprS+X_XbGucO{@&4ece2!raF84<FcRX+2V1CXQ_nr$5Lk(
zkE|sRv4oAYfz{pt%J1i5>i?6K|KuYASBog}4>Re`3B!ASm&e20t4Q<5Cd5|&_!py1
zGWK?$j)PhL*HIQRMu{y)c!O+rfz0w)qwt6|W7ift>fC+j$lR3?r_ae|6)l<Y$SS+U
z@jd61CYRM*%Yw;V%V~%W5p(mb`Qs8F+L-o(;AM2zthp=K)(<JO>>A@aG#b6&zTX6<
zb-4~Z5oZj}a`&gM;v~#y?^9Y>^Li_+z4KDGpk5=tG}9sPGmB)QPU0`MRrF3!S2{9~
zeIlmke#}~I-;9h`$FgIS<euAN_ks4ZL}HeZS@Avd#lm{t9HJ6uP5m)FH<#p%Ury_(
z+S4y-gPS88A3WP)o))paTsFYwVq;8E%P>lH$jeK7A?p5MWV>k^cD!7n-El%VEnG6a
zBdnQL7(5ki5YYq*7FUx_w$E_ri}(#Wb`m1X`_fSAwGuSv%Pu8CaEI`fZD!3_9|UnB
z+cfY~)AWiwqR=x7DM6+3oP!?oFT^{KZ2Vfg`XHV>@l;(ImIA5yEbRQ;gSHjbavXMZ
z+4Kcw!&O~bS&nK?qbbi6By*pCJz-IVWH;JMQ=Mo`+HHSWaxZMo-pU5don3MZk3Uqy
z)FTDtcAM7?_@g5ktOA#fAfaNeas3>J3eQ$Vp@~zlsbZX&?(YuNdAUihL!Jl17(>Rv
zWqYkFhNlXaR+2DCElhV&-TuQeVPf3zo*#oR(>{SF*D|zb)*RJ+;7c3R(PkB)EO!{(
zsff8@{`-<a^@*wPy`J;GaAwsI4BAi4A^qM`pW9w5m*n7R<~Yl~0Rb^r;|6Ghk|WqO
z)~~!!D{CALdpbj8uNQxHr_83FeWOP0!LLp^1B(nEjHqIqoLn^YtMiXPMIg`Imdj&N
z7pI~f6Me2~hs)l<LkySk_M!En36BhJ)W+N(%3dF_ysPt8CTQM)v@p3n^OQm*&7e7q
ztU~At=hRRcByQoRNT8WMm{}~fsDJn-a>h?}(4Q=gPb3i8g8S2u&Kf)<ve*+lLl@lD
zkOG=*PP#gP7{^JyDYV7`n|WcsunnSLLvEy~UZT?_2Ogup)J&FS(ofW7>SIJ`_F-43
zZ}|BWO|D8*kT6epJt&~i0H&C$dS>>Nck)K&BkXWY^fdh`sGe2hi=B%m*Ty*}^^RTL
z>oh%F^WsNFViu5QVX`od7)9A5OvYEyOWLN8#?Lz{Kh2aJFm`QUe{JPwZ4c5m$Vk67
zD>w<!)z@U1fy{V{-3u$pESiGuak@L^pQf{Z{&AV2{I`qtIog`er??9Iiz7RNeud{)
z8K7|=v+VphRd)x7a<jXXq#SbxRwp;X&YwE#d(Kf079ew2qc(yFT)@=xfQE{Wa;>86
GtN#L58|9b)

literal 0
HcmV?d00001

diff --git a/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv b/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
new file mode 100644
index 000000000..9329353f4
--- /dev/null
+++ b/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
@@ -0,0 +1,99 @@
+"#dig start(16; 16; central 3x3 stairwell) 48 rooms, 4 tiles each (more aesthetic)"
+ , , , , , , , , , , , , ,d, , , ,d, , , , , , , , , , , , , ,#
+ , , , ,d, , , ,d, , , ,d,d,d,d,d,d,d, , , ,d, , , ,d, , , , ,#
+ , , ,d,d,d,d,d,d,d, , , ,d, ,d, ,d, , , ,d,d,d,d,d,d,d, , , ,#
+ ,d, , ,d, ,d, ,d, , ,d, , , ,d, , , ,d, , ,d, ,d, ,d, , ,d, ,#
+d,d,d, , , ,d, , , ,d,d,d, ,d,d,d, ,d,d,d, , , ,d, , , ,d,d,d,#
+ ,d, , ,d,d,d,d,d, , ,d, , ,d,d,d, , ,d, , ,d,d,d,d,d, , ,d, ,#
+ ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, ,#
+ ,d, , ,d,d,d,d,d, , ,d, , ,d,d,d, , ,d, , ,d,d,d,d,d, , ,d, ,#
+d,d,d, , , ,d, , , ,d,d,d, ,d,d,d, ,d,d,d, , , ,d, , , ,d,d,d,#
+ ,d, , ,d, ,d, ,d, , ,d, , , ,d, , , ,d, , ,d, ,d, ,d, , ,d, ,#
+ , , ,d,d,d,d,d,d,d, , , ,d, ,d, ,d, , , ,d,d,d,d,d,d,d, , , ,#
+ , , , ,d, ,d, ,d, , , ,d,d,d,d,d,d,d, , , ,d, ,d, ,d, , , , ,#
+ , ,d, , , ,d, , , ,d, , ,d, ,d, ,d, , ,d, , , ,d, , , ,d, , ,#
+ ,d,d,d, ,d,d,d, ,d,d,d, , , ,d, , , ,d,d,d, ,d,d,d, ,d,d,d, ,#
+ , ,d, , ,d,d,d, , ,d, , ,d,d,d,d,d, , ,d, , ,d,d,d, , ,d, , ,#
+ , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , ,#
+ , ,d, , ,d,d,d, , ,d, , ,d,d,d,d,d, , ,d, , ,d,d,d, , ,d, , ,#
+ ,d,d,d, ,d,d,d, ,d,d,d, , , ,d, , , ,d,d,d, ,d,d,d, ,d,d,d, ,#
+ , ,d, , , ,d, , , ,d, , ,d, ,d, ,d, , ,d, , , ,d, , , ,d, , ,#
+ , , , ,d, ,d, ,d, , , ,d,d,d,d,d,d,d, , , ,d, ,d, ,d, , , , ,#
+ , , ,d,d,d,d,d,d,d, , , ,d, ,d, ,d, , , ,d,d,d,d,d,d,d, , , ,#
+ ,d, , ,d, ,d, ,d, , ,d, , , ,d, , , ,d, , ,d, ,d, ,d, , ,d, ,#
+d,d,d, , , ,d, , , ,d,d,d, ,d,d,d, ,d,d,d, , , ,d, , , ,d,d,d,#
+ ,d, , ,d,d,d,d,d, , ,d, , ,d,d,d, , ,d, , ,d,d,d,d,d, , ,d, ,#
+ ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, ,#
+ ,d, , ,d,d,d,d,d, , ,d, , ,d,d,d, , ,d, , ,d,d,d,d,d, , ,d, ,#
+d,d,d, , , ,d, , , ,d,d,d, ,d,d,d, ,d,d,d, , , ,d, , , ,d,d,d,#
+ ,d, , ,d, ,d, ,d, , ,d, , , ,d, , , ,d, , ,d, ,d, ,d, , ,d, ,#
+ , , ,d,d,d,d,d,d,d, , , ,d, ,d, ,d, , , ,d,d,d,d,d,d,d, , , ,#
+ , , , ,d, , , ,d, , , ,d,d,d,d,d,d,d, , , ,d, , , ,d, , , , ,#
+ , , , , , , , , , , , , ,d, , , ,d, , , , , , , , , , , , , ,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+"#build label(furniture) start(16; 16; central 3x3 stairwell) 48x doors, beds, cabinets, and coffers; 8x statues"
+ , , , , , , , , , , , , ,f, , , ,f, , , , , , , , , , , , , ,#
+ , , , ,h, , , ,h, , , ,b, ,d, ,d, ,b, , , ,h, , , ,h, , , , ,#
+ , , ,b, ,d, ,d, ,b, , , ,h, , , ,h, , , ,b, ,d, ,d, ,b, , , ,#
+ ,b, , ,f, , , ,f, , ,b, , , , , , , ,b, , ,f, , , ,f, , ,b, ,#
+f, ,h, , , , , , , ,h, ,f, , , , , ,f, ,h, , , , , , , ,h, ,f,#
+ ,d, , , , , , , , , ,d, , , , , , , ,d, , , , , , , , , ,d, ,#
+ , , , , , ,s, , , , , , , , ,s, , , , , , , , ,s, , , , , , ,#
+ ,d, , , , , , , , , ,d, , , , , , , ,d, , , , , , , , , ,d, ,#
+f, ,h, , , , , , , ,h, ,f, , , , , ,f, ,h, , , , , , , ,h, ,f,#
+ ,b, , ,f, , , ,f, , ,b, , , , , , , ,b, , ,f, , , ,f, , ,b, ,#
+ , , ,b, ,d, ,d, ,b, , , ,h, , , ,h, , , ,b, ,d, ,d, ,b, , , ,#
+ , , , ,h, , , ,h, , , ,b, ,d, ,d, ,b, , , ,h, , , ,h, , , , ,#
+ , ,b, , , , , , , ,b, , ,f, , , ,f, , ,b, , , , , , , ,b, , ,#
+ ,h, ,f, , , , , ,f, ,h, , , , , , , ,h, ,f, , , , , ,f, ,h, ,#
+ , ,d, , , , , , , ,d, , , , , , , , , ,d, , , , , , , ,d, , ,#
+ , , , , , ,s, , , , , , , , , , , , , , , , , ,s, , , , , , ,#
+ , ,d, , , , , , , ,d, , , , , , , , , ,d, , , , , , , ,d, , ,#
+ ,h, ,f, , , , , ,f, ,h, , , , , , , ,h, ,f, , , , , ,f, ,h, ,#
+ , ,b, , , , , , , ,b, , ,f, , , ,f, , ,b, , , , , , , ,b, , ,#
+ , , , ,h, , , ,h, , , ,b, ,d, ,d, ,b, , , ,h, , , ,h, , , , ,#
+ , , ,b, ,d, ,d, ,b, , , ,h, , , ,h, , , ,b, ,d, ,d, ,b, , , ,#
+ ,b, , ,f, , , ,f, , ,b, , , , , , , ,b, , ,f, , , ,f, , ,b, ,#
+f, ,h, , , , , , , ,h, ,f, , , , , ,f, ,h, , , , , , , ,h, ,f,#
+ ,d, , , , , , , , , ,d, , , , , , , ,d, , , , , , , , , ,d, ,#
+ , , , , , ,s, , , , , , , , ,s, , , , , , , , ,s, , , , , , ,#
+ ,d, , , , , , , , , ,d, , , , , , , ,d, , , , , , , , , ,d, ,#
+f, ,h, , , , , , , ,h, ,f, , , , , ,f, ,h, , , , , , , ,h, ,f,#
+ ,b, , ,f, , , ,f, , ,b, , , , , , , ,b, , ,f, , , ,f, , ,b, ,#
+ , , ,b, ,d, ,d, ,b, , , ,h, , , ,h, , , ,b, ,d, ,d, ,b, , , ,#
+ , , , ,h, , , ,h, , , ,b, ,d, ,d, ,b, , , ,h, , , ,h, , , , ,#
+ , , , , , , , , , , , , ,f, , , ,f, , , , , , , , , , , , , ,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#query label(rooms) start(16; 16; central 3x3 stairwell) room designations
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , ,#
+ , , ,r+,, , , , ,r+,, , , , , , , , , , ,r+,, , , , ,r+,, , ,#
+ ,r+,, , , , , , , , ,r+,, , , , , , ,r+,, , , , , , , , ,r+,,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ ,r+,, , , , , , , , ,r+,, , , , , , ,r+,, , , , , , , , ,r+,,#
+ , , ,r+,, , , , ,r+,, , , , , , , , , , ,r+,, , , , ,r+,, , ,#
+ , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , ,#
+ , ,r+,, , , , , , ,r+,, , , , , , , , ,r+,, , , , , , ,r+,, ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , ,r+,, , , , , , ,r+,, , , , , , , , ,r+,, , , , , , ,r+,, ,#
+ , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , ,#
+ , , ,r+,, , , , ,r+,, , , , , , , , , , ,r+,, , , , ,r+,, , ,#
+ ,r+,, , , , , , , , ,r+,, , , , , , ,r+,, , , , , , , , ,r+,,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ ,r+,, , , , , , , , ,r+,, , , , , , ,r+,, , , , , , , , ,r+,,#
+ , , ,r+,, , , , ,r+,, , , , , , , , , , ,r+,, , , , ,r+,, , ,#
+ , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
diff --git a/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.png b/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.png
new file mode 100644
index 0000000000000000000000000000000000000000..24eb4a22af2addc52ef792038d1145c2a0af2841
GIT binary patch
literal 546
zcmV+-0^R+IP)<h;3K|Lk000e1NJLTq001KZ001Kh1^@s69@(>500001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA0k=s+K~z{r&6Yt<
z12GIm2X27acFBP_DhFcOE#e5^ANni%$H5*!VV-1tJ9eDZ?F`&)+xB602<|U>2!3>#
z_w&oe`$FTrEH6_X#Q5#>G<+!N?#oCo(>dtj^gQ(O{2G+&pwmae4|tdrO}?u7Rjm87
z9PK(8O9b_w5HQxdO1phPc(gG_j@uUzHd@tHd6LzEaG7l5t?`pP=47&_0P7kPtXDCq
z`jGKUhFQVntEykcx<AX&!h41{w4$LHqgSqL9a-h8J|unVv54O%)o-p20-Zie7?m|^
z$MjXz@5Hb$87tVO`Ux3#_fyIA{|v^>ar$B&w91pJF3XeYGT8yQLMMCN$>^pkCRo>)
z?CAr>FPUbA?U=r*`kfdyy=Qn+D;`Q1YaZkFx~e0Z_oOeq>L9>o{NAblkWL@vIwmWc
zd{y<USodc++I2FP2&!Y$v3IrG2ZW~yWBl#Mw%Z3RAML-wPwtqL$(jPJYfP|S#iZ&(
z#xEIW1(UC;eiiHfEJq9P8Q#!}hGL9fxvq6&m9P4E!tH3bp^Ra6K+vr2yI3q;Y}w9(
kN()cZf0O=g`X9FK6PX>3R<Zv}O#lD@07*qoM6N<$g4Le?JOBUy

literal 0
HcmV?d00001

diff --git a/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv b/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
new file mode 100644
index 000000000..37f41fd23
--- /dev/null
+++ b/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
@@ -0,0 +1,231 @@
+"#dig start(36;73) 97 rooms, 9 tiles each (fractal design)"
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , , ,d, , , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d,d, ,d, ,d,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d,d,d,d,d,d,d,d, ,d, ,d,d,d,d,d,d,d,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d,d, ,d, ,d,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , ,d,d,d, , ,d, , , , , , ,d, , , , , , ,d, , , , , , ,d, , , , , , ,d, , ,d,d,d, , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , ,d,d,d, , ,d, , , , , , ,d, , , , , ,d,d,d, , , , , ,d, , , , , , ,d, , ,d,d,d, , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d,d,d,d,d,d,d, ,d,d,d, ,d,d,d,d,d,d,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , ,d,d,d, , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d,d, ,d,d,d, ,d,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d,d,d,d,d,d,d,d,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d,d, ,d,d,d, ,d,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , , ,d, , ,d,d,d, , ,d, , , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, , ,d, , ,d,d,d, , ,d, , ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , ,d,d,d, ,d,d,d, ,d,d,d, , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, , , , , ,d,d,d, , , , , ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , ,d,d,d, ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, ,d,d,d, ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, ,d,d,d, , , , , , , , , , , , ,#
+ , , , , , , , , , , , ,d,d,d, ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, ,d,d,d, ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, ,d,d,d, , , , , , , , , , , , ,#
+ , , , , , , , , , , , ,d,d,d, ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, ,d,d,d, ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, ,d,d,d, , , , , , , , , , , , ,#
+ , , , , , , , , , , , , ,d, , , , , , ,d,d,d, ,d, ,d,d,d, , , , , ,d,d,d, , , , , ,d,d,d, ,d, ,d,d,d, , , , , , ,d, , , , , , , , , , , , , ,#
+ , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , ,#
+ , , , , ,d,d,d, ,d,d,d,d,d,d,d,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d,d,d,d,d,d,d,d, ,d,d,d, , , , , ,#
+ , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d,d, ,d,d,d, ,d, , , , , , ,d, , ,d,d,d, , ,d, , , , , , ,d, ,d,d,d, ,d,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , ,#
+ ,d,d,d, , ,d, , , , , , ,d, , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , ,d, , , , , , ,d, , ,d,d,d, ,#
+ ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, ,#
+ ,d,d,d, , ,d, , , , , , ,d, , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , ,d, , , , , , ,d, , ,d,d,d, ,#
+ , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d,d, ,d,d,d, ,d, , , , , , ,d, , ,d,d,d, , ,d, , , , , , ,d, ,d,d,d, ,d,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , ,#
+ , , , , ,d,d,d, ,d,d,d,d,d,d,d,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d,d,d,d,d,d,d,d, ,d,d,d, , , , , ,#
+ , , , , ,d,d,d, ,d,d,d, ,d, ,d,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, ,d,d,d,d, ,d, ,d,d,d, ,d,d,d, , , , , ,#
+ , , , , , , , , , , , , ,d, , , , , , ,d,d,d, ,d, ,d,d,d, , , , , ,d,d,d, , , , , ,d,d,d, ,d, ,d,d,d, , , , , , ,d, , , , , , , , , , , , , ,#
+ , , , , , , , , , , , ,d,d,d, ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, ,d,d,d, ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, ,d,d,d, , , , , , , , , , , , ,#
+ , , , , , , , , , , , ,d,d,d, ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, ,d,d,d, ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, ,d,d,d, , , , , , , , , , , , ,#
+ , , , , , , , , , , , ,d,d,d, ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, ,d,d,d, ,d,d,d, , ,d, , ,d, , ,d, , ,d,d,d, ,d,d,d, , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, , , , , ,d,d,d, , , , , ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d, , ,d, , ,d,d,d, , ,d, , ,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d,d,d, ,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , , ,d,d, ,d,d,d, ,d,d, , , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d,d, ,d,d,d, ,d,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d,d,d,d, ,d,d,d, ,d,d,d,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, ,d,d,d, ,d,d, ,d,d,d, ,d,d, ,d,d,d, ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,i,i,i,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,i,i,i,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,i,i,i,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+"#build label(furniture) start(36;73) 97 doors; 95 beds, coffers, and cabinets; 190 urns; 14 tables, chairs, weapon racks, armor stands, and statues"
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,h,`,f, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,`,b,`, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,n,`,n, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,f,`,n, ,`, ,n,`,f, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,`,b,`,d,`,d,`,b,`, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,h,`,n, ,`, ,n,`,h, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,`, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,h,`,f, ,`, ,h,`,f, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,`,b,`, ,`, ,`,b,`, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,n,`,n, ,`, ,n,`,n, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , ,f,`,n, , ,d, , ,`, , ,d, , ,n,`,f, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , ,`,b,`,d,`,`,`,`,`,`,`,`,`,d,`,b,`, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , ,h,`,n, , ,d, , ,`, , ,d, , ,n,`,h, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,n,`,n, ,`, ,n,`,n, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , ,h,`,f, ,r,b,t, ,`, ,r,b,t, ,h,`,f, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , ,`,b,`, ,a,`,c, ,`, ,a,`,c, ,`,b,`, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , ,n,`,n, ,h,s,f, ,`, ,h,s,f, ,n,`,n, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , , ,`, , , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,h,`,f, ,f,`,n, ,`, ,n,r,a,h, ,`, ,h,a,r,n, ,`, ,n,`,f, ,h,`,f, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,`,b,`, ,`,b,`,d,`,d,`,b,`,s, ,`, ,s,`,b,`,d,`,d,`,b,`, ,`,b,`, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,n,`,n, ,h,`,n, ,`, ,n,t,c,f, ,`, ,f,c,t,n, ,`, ,n,`,h, ,n,`,n, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , ,f,`,n, , ,d, , , , , , ,`, , , , , , ,`, , , , , , ,`, , , , , , ,d, , ,n,`,f, , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , ,`,b,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,d,`,b,`, , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , ,h,`,n, , ,d, , , , , , ,`, , , , , ,`,`,`, , , , , ,`, , , , , , ,d, , ,n,`,h, , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,n,`,n, ,f,`,n, ,`, ,n,`,f, ,`,`,`, ,f,`,n, ,`, ,n,`,f, ,n,`,n, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,`,b,`, ,`,b,`,d,`,d,`,b,`, ,`,`,`, ,`,b,`,d,`,d,`,b,`, ,`,b,`, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,h,`,f, ,h,`,n, ,`, ,n,`,h, ,`,`,`, ,h,`,n, ,`, ,n,`,h, ,h,`,f, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , ,`,`,`, , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , ,h,`,f, ,n,`,n, ,f,n, ,`,`,`, ,n,f, ,n,`,n, ,h,`,f, , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , ,`,b,`, ,`,b,`, ,b,`,d,`,`,`,d,`,b, ,`,b,`, ,`,b,`, , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , ,n,`,n, ,h,`,f, ,h,n, ,`,`,`, ,n,h, ,h,`,f, ,n,`,n, , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , , ,d, , ,`,`,`, , ,d, , , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,f,`,n, ,`, ,n,`,f, ,n,`,n, ,`,`,`, ,n,`,n, ,f,`,n, ,`, ,n,`,f, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,`,b,`,d,`,d,`,b,`, ,h,b,f, ,`,`,`, ,h,b,f, ,`,b,`,d,`,d,`,b,`, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,h,`,n, ,`, ,n,`,h, , ,d, , ,`,`,`, , ,d, , ,h,`,n, ,`, ,n,`,h, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , ,`, , , , , ,n,`,n, ,`,`,`, ,n,`,n, , , , , ,`, , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,h,`,f, ,`, ,h,`,f, ,`,b,`, ,`,`,`, ,`,b,`, ,h,`,f, ,`, ,h,`,f, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,`,b,`, ,`, ,`,b,`, ,h,`,f, ,`,`,`, ,h,`,f, ,`,b,`, ,`, ,`,b,`, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,n,`,n, ,`, ,n,`,n, , , , , ,`,`,`, , , , , ,n,`,n, ,`, ,n,`,n, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , ,h,`,f, ,f,`,n, , ,d, , ,`, , ,d, , ,n,`,f, ,`,`,`, ,f,`,n, , ,d, , ,`, , ,d, , ,n,`,f, ,h,`,f, , , , , , , , , , , , ,#
+ , , , , , , , , , , , ,`,b,`, ,`,b,`,d,`,`,`,`,`,`,`,`,`,d,`,b,`, ,`,`,`, ,`,b,`,d,`,`,`,`,`,`,`,`,`,d,`,b,`, ,`,b,`, , , , , , , , , , , , ,#
+ , , , , , , , , , , , ,n,`,n, ,h,`,n, , ,d, , ,`, , ,d, , ,n,`,h, ,`,`,`, ,h,`,n, , ,d, , ,`, , ,d, , ,n,`,h, ,n,`,n, , , , , , , , , , , , ,#
+ , , , , , , , , , , , , ,d, , , , , , ,n,`,n, ,`, ,n,`,n, , , , , ,`,`,`, , , , , ,n,`,n, ,`, ,n,`,n, , , , , , ,d, , , , , , , , , , , , , ,#
+ , , , , ,h,`,f, ,f,`,n, ,`, ,n,r,a,h, ,r,b,t, ,`, ,`,b,`, ,h,b,f, ,`,`,`, ,h,b,f, ,`,b,`, ,`, ,r,b,t, ,h,a,r,n, ,`, ,n,`,f, ,h,`,f, , , , , ,#
+ , , , , ,`,b,`, ,`,b,`,d,`,d,`,b,`,s, ,a,`,c, ,`, ,h,`,f, ,n,`,n, ,`,`,`, ,n,`,n, ,h,`,f, ,`, ,a,`,c, ,s,`,b,`,d,`,d,`,b,`, ,`,b,`, , , , , ,#
+ , , , , ,n,`,n, ,h,`,n, ,`, ,n,t,c,f, ,h,s,f, ,`, , , , , , ,d, , ,`,`,`, , ,d, , , , , , ,`, ,h,s,f, ,f,c,t,n, ,`, ,n,`,h, ,n,`,n, , , , , ,#
+ ,f,`,n, , ,d, , , , , , ,`, , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , ,`, , , , , , ,d, , ,n,`,f, ,#
+ ,`,b,`,d,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,d,`,b,`, ,#
+ ,h,`,n, , ,d, , , , , , ,`, , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , ,`, , , , , , ,d, , ,n,`,h, ,#
+ , , , , ,n,`,n, ,f,`,n, ,`, ,n,r,a,h, ,h,s,f, ,`, , , , , , ,d, , ,`,`,`, , ,d, , , , , , ,`, ,h,s,f, ,h,a,r,n, ,`, ,n,`,f, ,n,`,n, , , , , ,#
+ , , , , ,`,b,`, ,`,b,`,d,`,d,`,b,`,s, ,a,`,c, ,`, ,h,`,f, ,n,`,n, ,`,`,`, ,n,`,n, ,h,`,f, ,`, ,a,`,c, ,s,`,b,`,d,`,d,`,b,`, ,`,b,`, , , , , ,#
+ , , , , ,h,`,f, ,h,`,n, ,`, ,n,t,c,f, ,r,b,t, ,`, ,`,b,`, ,h,b,f, ,`,`,`, ,h,b,f, ,`,b,`, ,`, ,r,b,t, ,f,c,t,n, ,`, ,n,`,h, ,h,`,f, , , , , ,#
+ , , , , , , , , , , , , ,d, , , , , , ,n,`,n, ,`, ,n,`,n, , , , , ,`,`,`, , , , , ,n,`,n, ,`, ,n,`,n, , , , , , ,d, , , , , , , , , , , , , ,#
+ , , , , , , , , , , , ,n,`,n, ,f,`,n, , ,d, , ,`, , ,d, , ,n,`,f, ,`,`,`, ,f,`,n, , ,d, , ,`, , ,d, , ,n,`,f, ,n,`,n, , , , , , , , , , , , ,#
+ , , , , , , , , , , , ,`,b,`, ,`,b,`,d,`,`,`,`,`,`,`,`,`,d,`,b,`, ,`,`,`, ,`,b,`,d,`,`,`,`,`,`,`,`,`,d,`,b,`, ,`,b,`, , , , , , , , , , , , ,#
+ , , , , , , , , , , , ,h,`,f, ,h,`,n, , ,d, , ,`, , ,d, , ,n,`,h, ,`,`,`, ,h,`,n, , ,d, , ,`, , ,d, , ,n,`,h, ,h,`,f, , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,n,`,n, ,`, ,n,`,n, , , , , ,`,`,`, , , , , ,n,`,n, ,`, ,n,`,n, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,`,b,`, ,`, ,`,b,`, ,h,s,f, ,`,`,`, ,h,s,f, ,`,b,`, ,`, ,`,b,`, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,h,`,f, ,`, ,h,`,f, ,a,`,c, ,`,`,`, ,a,`,c, ,h,`,f, ,`, ,h,`,f, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , ,`, , , , , ,r,b,t,d,`,`,`,d,r,b,t, , , , , ,`, , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,f,`,n, ,`, ,n,`,f, ,n,`,n, ,`,`,`, ,n,`,n, ,f,`,n, ,`, ,n,`,f, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,`,b,`,d,`,d,`,b,`, , ,d, , ,`,`,`, , ,d, , ,`,b,`,d,`,d,`,b,`, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , ,h,`,n, ,`, ,n,`,h, ,`,`,`, ,`,`,`, ,`,`,`, ,h,`,n, ,`, ,n,`,h, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , ,d, , , , , , ,`,`, ,`,`,`, ,`,`, , , , , , ,d, , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , ,n,`,n, ,f,`,n, ,`,`, ,`,`,`, ,`,`, ,n,`,f, ,n,`,n, , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , ,`,b,`, ,`,b,`,d,`,`, ,`,`,`, ,`,`,d,`,b,`, ,`,b,`, , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , ,h,`,f, ,h,`,n, ,`,`, ,`,`,`, ,`,`, ,n,`,h, ,h,`,f, , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,`,`,`, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#query label(rooms) start(36;73) room designations (use burial script to mark urns as usable)
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , , , , , , , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , , , , , , , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , ,r+,, , ,r+,, , , , ,r+,, , , , , , ,r+,, , , , ,r+,, , ,r+,, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , ,r+,, , ,r+,, , , , ,r+,, , , , , , ,r+,, , , , ,r+,, , ,r+,, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , ,r+,, ,r+,, , , , , , ,r+,, ,r+,, , ,r+,, , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , ,r+,, , , , , , ,r+,, , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , ,r+,, , ,r+,, , , , , , , , , , , , ,r+,, , , , , , ,r+,, , , , , , , , , , , , ,r+,, , ,r+,, , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , ,r+,, , , , , , ,r+,, , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , ,r+,, , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , ,r+,, , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , ,r+,, , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , ,r+,, , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , ,r+,, , , , , , ,r+,, , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , ,r+,, , ,r+,, , , , , , , , , , , , ,r+,, , , , , , ,r+,, , , , , , , , , , , , ,r+,, , ,r+,, , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , , , , ,r+,, , , , ,r+,, , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , ,r+,, , , , , , , , , , , , ,r+,, , ,r+,, , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,~,~,~, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,~,~,~, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,~,~,~, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+ , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
diff --git a/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.png b/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.png
new file mode 100644
index 0000000000000000000000000000000000000000..33f422b9b8791b703df0f0db79a756c217214086
GIT binary patch
literal 4312
zcmai2c|4STyT46?8Ny@<<&k|EB|>(MLDtEbW~h*;kRFqLZHmVrOXbNL!eBH;M(LFq
z(-YAuYYZ(jQMLx5rxA^%_x5()^Esb$KIfc2?$7VOuHSuMzia(o*L`PUk2p(7?2-Tg
zK+4s{5eEPwD&Vyj1_3!0^JTlhMI;*Mj0PBeDtwTDhS+250pQ+s$@M@{kXAeGg2Mnn
zk`4f*kO4plvQj<+K&%k}%$@=Os}cZEj3{sOvH<{ux2vN)KH=n-GW#3c7t#(Sfu%5D
zc>PM8fF^3{qHpr!q1h9yJtFmPXMg_a+5<xY5JU<9RRctR-F5^*H+O8R96T_Aswz&&
ztG}FNU1bH8)<n^yef1_DdZu9iYTssMkqc0)ey8MqvlBrtZ%Th2H-eC7@1`H<TZ6(l
zYt~h1T`&Z_YiGB`qMRCjaWO^ue+Ve)7)|-jMyJMp+!B1%a-`gp3{ZA8hd#S_4WJ}l
zGt&)s>mb1+6_Blcb<EJ+kQFG`2tiM-)5`!Qc1d-tE<<4i+oMQn-6}HO%|yj)!c!fq
zphWGHuj{caPm#?)_C^fn9!f_MP8C=kEjcg~0U;_SQ0=%zxtBpBcqV8OksN^19HE}k
zVJm`;?T3j%Pr#RC!hFBtE^3IN%_8S|xNa%fmQU1GM+iCW)5y)Y8XY+jl8QkvE~vsv
zE*90Hfuim8yP_WPzX{w6A$NDCD}l<xIJTPdh`TTZ^8XNET%NM~MiaB(^4|9p)@<S`
zQu(q1cyu9V;JGm<!MNc}9s%?#;h_DV=LjsiC1<*XYV_g*G!CBodgen})!J#8UNFxo
zx(BCp<^qHbJ<N|@#0+d0LuK#Bt&7Eq9^`*3Icxkv6{Kb9ws9WCGN2(c+h&;G;0XG+
z_#SeOT!cfy@{YmA`xZOjrFAUAnSpBf_K@B}2k=<+oZy}raGg08{kjf%BTw&VQ~m5j
z<@=esxvDR6FlI1D5Rj-HTVPaqcX#lc0#qw25f>h|{oN+$-sR*tKX~d-Efmd244Ms|
z7F1P`22eV;A@p=mwCq%zG=wZ6gQ_Y4C`d6kOVCX=Kxz<#OjpvIQd=ra`Fm`_KZrdX
zGlP~9$?7l^`TY4Pgbafirb^#mzzv;ESB1!?`a=c=Z$n{&iBRuL^;PTV1r3WAUiuMx
z9WPhZlzjFKvYYy;rvKO_DMG4IFfrmGIJSg>WKrOpOfZ#=lwP`!XB|8f|6rN#aH^cY
zc3x3?U<Z;~*T72J#q@-)_&F_pze`gHZOBGto+~J2WMB#5<yK#y^3m-0An-AD{1@->
z6eJ{@1?Th^_}LNIHGS1kD>UaT{y0mAa$=Z!p~Z=ou(ndPa?Q3FyMunZcVpxfIUD=e
z)L-F!u@2Q2eOxozg<gfFV_iMhpJo~CYSPBHr>%Lf=94yvI7TyE%RTAUv4uR{<(u=b
zrZP5*p*OT|o$*#2^S!UT78T<7(;d=%V_@ECyx4oZ83{>#n@&`K5I$7(?T72Rqwg!G
z2AoKJMTgCwRcs@`@QG<w?OJ(z`HlPMx@n-3NKQ?m@)f*jeNr_`J#Vk8aVk57Ui#9{
zt)D=;Wb0o4*0%V7^)7TQzw3#L8^9I1VbD`Jl6~dYlh!yw?-@ht4Bajfr~eO`(XB-A
z$zaoe6m7nYmT4XB`FbOd8JO_;&PzYf@0LTcnVz>wu473sEp;32Nt5TA_{zTmNVjLF
zO}4gpfxD=6)vgtQ+XfQzdgkNzQp<{<y`!dX7^jJfx!FQh`K!qb9=D}R+q$-R`6Yz<
z0II7{<xGoZ4f0tOre+v#y1-(b<l7H2XZj*X2VB{hZzGZ^XBb*q3oM85`0sBRaM_Lg
zU>>#qKF=(s?a4)-(Ua+!Ske`#mUrd%;GB@r3nY(Q6Q(-*G$YP>uK?!juB4R{0z^Uq
zh)eS3nHV(`P3QNU%6qg?G}WiQfow!Xdq19U{b6U^@SV2E`A_1)y=qtm*%c{YXTT~<
zmJZ3s7}(Puwa58fswtb6n>GWp8-4bTXgzwo5vxDbw##l)f4B3{5tK2p^*CrCCcg5^
ztML>Q*qu|}RB<N<THn&-_oM$N9<)v<Z+m!l<Qfn&JXt7Iw!0i7fqweF-C4@~qY>JP
zrn9;}s0>%2Bn?LlNzbirRt?9bk(PP&VF6$)L%cv3{4E#<YSnesEYU_AFx*4cp+wbJ
zk7cCD0`W?}h|5<~&W|(zTCofU>2Gst?a$i&(VhK|Nze}mjz%qnscYd$o80E8poJ$M
zFInU;_lDkcR>tNO;efkEPvpBQ*Fr4eoa{G!+n7<GB&=!Lyje8<DU?u39Eu-Z95>nu
zv;SFn>XBAHd(OZFS=zPlX+k!fZpy1$WQ;u)5m$9V8Fv>Rmy<Iv^I-%mC-YK^g0#@f
zUppjJA|}+K-bO<l|4Lnsx=z_aG0G=bv)*s7dK+vA1$FsG@#{Gf)R2|rDqpz`EZA4p
z^22EgO6+WaqJbxztnO=v!W1YP+s&aj77xCB&zj_3Tg1B_f{SlYQcG>^DJXZRNt=Fh
z)zqFovM>OeHmfDBYT+J4L@!f{BP<4RxsG5Q6Cx_f<ZP7<rxffCq=uIVxX^>#y{>^2
z4(kENly#a(iW_Yg?s&-dj5ieQM?_$jif(f4{0oR1trpB^%H`A!!{Dg37_YWvc%gej
z-X%p77OBl3W=;-Syo45>dE33X&!_#KpE~ovQJgbhPP#pr(wtW~dQQ}2qtC;zb+Qf{
zyKR=qx-&7EZWY=4an{pJPG#qTuVIbM>4;^}>Sxw=pOBs=6?hqHzf@NBm{YXED)Jj<
zd?^pJVs-fV!}E63X^CC&hCc0`xo$EGe#w^W=|t-)(BA`E!6zs`>8i5Q`;WzKXcj(Y
z4iuIegmPJa8xkf+TV{0Q;%u??MOmS1z<@vT_M^LrZy%jkT`cY5REFtT+~Ln?w?%;p
z!4;Z@i;aZ&7^ZsUGKg}v{F$jf+@o(y3|sx-?Bm8EUP%0wFU;+WyDV%eLd&)+b#57i
z;ug9;W*-<UoBHf+t~3~jiPhet&R`JKkTc#SKR#`u?@_7UkH`mM@jP4kLwf{K5>@n%
zJgeUVBa$r$W46W3>;+YUyu1OtaP#ZDt2fW{0ntH@zPlB_ucNVM?=!Q?_g(eE1y%ts
zb_Kh>KKLq@ODZg7)P;!<V!1|5b&J#E3qFIowsTo}*tqRA!!c%X>=c7l%4e_Df8s9~
zgIkJ@PWvg_`O;gPL>V6;-RfUy+xwW;RPC8GBIi{#uXMPcA0}I6Q*S4znEaPORlO_O
zC##c7&iwhZr90p4w!lA;<IDL}C?x*;%|`C0)*WuNzxSUX!VL%62x||-V`0?2prm4s
zuQ{aE)2V5`Z`q-`=^Y#IEK;z&ri0WV4j)Lrg4Oq33oR&1$L;$X*nEEN-9jLY(@$>N
zSw|l6k87439q2v|_P)htq5EQnBP&NsDz>ESi*w)s%*25^uj5zk>+9!NqMl6#Q7sjT
z&b_tb>HW~FukN~yeH5qGH6KNv{r$Lz73TD~K_OBkLIxj(T+_yjC5nDFy_(vDr$akz
zv7i8RiNYvg7t8~k4(r0p6W@c4J?@E$(N%y_`XF*TTo;iZmcB=Yx4$Oq5oz~s)x0GS
z2H_-<xm;M<oee9rKl%TkP>fZcRHzy<6?=rMmjzZ(pl$&x+-5{uufNotVOPe6)m;cr
zls=3P_WQWj`2KdaPh5OUO@lD&1Mfnu51`$p7cn-gF5*lpXe60-OC6~%S~YsxLJD6o
zBF~0&f+2#okwV2aSyjnOAb2L=HZsMz&l$3KpNa2xJ2eWG8>XY$Gh-?ndKSWNROE|a
zCp8`@vChQ}ahSFUdVG67bB!R#5}!Y%r5N)oUj`;MLpiL4{90cy9oYd+m4fm!PaZuu
ztppAUt|_wg#r@mp32n(90@waHqZ^V1>iL1P4!Wa%f4y+)`elQ8jh9zQ`zXSjD2^0$
zZKB+_J=t(7;|(wEw+y-@2wk&F0Huv`BGx%_PA}*97wIp3t3{92{LX^qfVWL3YKRs!
zKWECiuags#9Je;lXj1ZLxw1&evHBaO6AW#<@VWb_3NdsGbi8bTm01^9W(pJ}jPUop
zCmSA3<OdEl0(j>2n|{)wJ8hcCl7k#}yd8R($Ms=EACKkw^|?Dfb|kv^fkpdB%X~YT
z-tpP9D8k_rSn`yl*ZuD0QyGqfi`6WNi=5}RaFrsXuVEOyocP|`!+!P?eN(eOC0_i;
zx6Yf%>>u?Mj{#w*^ofUoAb{i08EEOyG?3S<q}Yaw7QJd++z=3Wm?|F6P`JpBk?}+y
z;x`t*`ZBC|(7kM}aoR7MDLmQ>&1_X+KV~s3L3O}t5;LZS4@zY<=;F!rk$d>HiHxP$
z<YM3FPVFbQz=k`}j_NR*^ZgI#9s4xim%b?qVVAu8GUUV`(Zw5nv={pKOn&Dx1{ytS
zew}H83pe#GS7zT$I=`;1oaEYjmzm7^2D|lX<D=JEQ?*&FeCwDfL(03?VbP^WdN4FQ
zfvj|N`N2>edinTwUlp<A;eE6%5yjUp|NDjOw*R$dezNA2*P0$lTCTaBTq`?Gy!!qd
z2cuQr)q+@^lO+97V{PQNLEp@`@{<H-=q7P`#hYUi5D-uQ{KFcu@VvIcItCZg(way-
z^ir~ny|J{iTh^sBuSDN+)Qr?>_wg>}Z0L_`s9$}Wrye<{tFrLDYwUuHnsIzk-K5{B
zfF~q(WfW1Stii#x!PMt3y$i1kRNLkZZ1qanx0Y7Q<ggxCD*qrUeuF4o=9~5Xr)O2S
zp4+XhPVN(oH)SqHK>o9H_kN6M=vDSK?&c_dos>+9BCh0!w_fTDyf!3;DJ`)!J{rY1
zFC>yW1M@i3xxX01co(h^o@sexx9PcGS~B?TWq78&_vztD_jdQD_k!-lQ?C6BEuYnw
z6jO<5Cpk??&4kALX%2)7!*6p@nKu(~;lYr1jo>h5XJc(KOw0~*m!k<kPhI+l`$@p&
zhd}d``}_FbX&7hacE0R8vsPChcZ3?A90u2{7>0r+p!*{+>o_>4dkt+!kMO!=U)5xp
z!DC9AYQUj==uph^9;g*$z$+gcI2I0zfmVU+ch7L9LT`YZr<de3v03qK5r5_h_z{z^
z7E+cWc?rCODJbi2Erfeiy;g{b`5Oa)hYaFaDL^@qWNX^0DS~d982Oxd4*ay^FAtQX
zQO3rlm2kcC!R;ETQ&Et#`A(WdDi?>xTGS{zrnpQ(#onfSDL`0MT2;hhlPkcVFW}po
zC2Nq-D0eUWkGa7J5sg3Pl+Gv~Ccq|(s{iOz?p1?0YUmohFwCVRUhH!cO*bjEhhA|!
zaw^YXiJ+e6n=K&`Vwwg+WR-WQv5n|xwN`lr`MyxG9cr?csrGS!`2YS_AXH=NP>kJO
W$H%k8VDQ%i;Ocb5k%2z-$3FoF3IYlM

literal 0
HcmV?d00001

diff --git a/data/blueprints/library/embark.csv b/data/blueprints/library/embark.csv
index 17289dab6..a92c32839 100644
--- a/data/blueprints/library/embark.csv
+++ b/data/blueprints/library/embark.csv
@@ -1,10 +1,9 @@
-#build start(8;2;center of wagon) basic post embark workshops
-~,~ ,~,~,~ ,~,`,`,`,~,~ ,~,~,~ ,~,#
-~,wc,~,~,wt,~,`,`,`,~,wm,~,~,wr,~,#
-~,~ ,~,~,~ ,~,`,`,`,~,~ ,~,~,~ ,~,#
+#build label(workshops) start(8;2;center of wagon) basic post embark workshops
+`,` ,`,`,` ,`,~,~,~,`,` ,`,`,` ,`,#
+`,wc,`,`,wt,`,~,~,~,`,wm,`,`,wr,`,#
+`,` ,`,`,` ,`,~,~,~,`,` ,`,`,` ,`,#
 #,# ,#,#,# ,#,#,#,#,#,# ,#,#,# ,#,#
-
-#place basic post embark stockpiles
+#place label(stockpiles) basic post embark stockpiles
 w(5x10), , , , ,s(5x1) , , , , ,p(5x1), , , , ,#
        , , , , ,g(5x4) , , , , ,d(5x1), , , , ,#
        , , , , ,       , , , , ,f(5x3), , , , ,#
diff --git a/data/blueprints/library/tombs/Mini_Saracen.csv b/data/blueprints/library/tombs/Mini_Saracen.csv
new file mode 100644
index 000000000..e32381b82
--- /dev/null
+++ b/data/blueprints/library/tombs/Mini_Saracen.csv
@@ -0,0 +1,26 @@
+#dig start(6;6) room for 24 corpses
+d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d,d,d, ,d, ,d,#
+ , , , ,d,d,d, , , , ,#
+d, ,d,d,i,i,i,d,d, ,d,#
+d,d,d,d,i,i,i,d,d,d,d,#
+d, ,d,d,i,i,i,d,d, ,d,#
+ , , , ,d,d,d, , , , ,#
+d, ,d, ,d,d,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d,#
+#,#,#,#,#,#,#,#,#,#,#,#
+#build label(urns) start(6;6) 24 urns (use burial script to mark them as usable)
+n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,`,`,`, ,n, ,n,#
+ , , , ,`,`,`, , , , ,#
+n, ,`,`,~,~,~,`,`, ,n,#
+`,`,`,`,~,~,~,`,`,`,`,#
+n, ,`,`,~,~,~,`,`, ,n,#
+ , , , ,`,`,`, , , , ,#
+n, ,n, ,`,`,`, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n,#
+#,#,#,#,#,#,#,#,#,#,#,#
diff --git a/data/blueprints/library/tombs/The_Saracen_Crypts.csv b/data/blueprints/library/tombs/The_Saracen_Crypts.csv
new file mode 100644
index 000000000..a4bd7fc95
--- /dev/null
+++ b/data/blueprints/library/tombs/The_Saracen_Crypts.csv
@@ -0,0 +1,98 @@
+#dig start(24;24) room for 489 corpses
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d,d,d,d,d,d,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , ,d,d,d, , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d,d,i,i,i,d,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,i,i,i,d,d,d,d, , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d,d,i,i,i,d,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , ,d,d,d, , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d,d,d,d,d,d,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#build label(urns) start(24;24) 489 urns (use burial script to mark them as usable)
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`,`,`,`,`,`,`,`,`,`,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n,`,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , ,`,`,`, , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`,`,`,`,~,~,~,`,`,`,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,~,~,~,`,`,`,`, , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`,`,`,`,~,~,~,`,`,`,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , ,`,`,`, , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n,`,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,`,`,`,`,`,`,`,`,`,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
diff --git a/data/blueprints/library/tombs/The_Saracen_Crypts.png b/data/blueprints/library/tombs/The_Saracen_Crypts.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b8d6e03e5767a73f225323574b1a87ffe06eae1
GIT binary patch
literal 11666
zcmeHN3s@6ZzE6$8-3=OUX#>_rbZxa;(WFp|C=x27)vLgEw+dpJpaSlt8kJViLPm0}
zNF$F*Eum6^bxUt6H3$l|V1^hTBGHIeDTt1MJR~57@W^Xs?wLF=DBHUG)vDb+-v?iE
za^{>f|M&m*|0f3pEF1ra7ydw@P{uERbIDs2${02H!+tjg%uIO>>84PoQI;=x<F9eq
zJ=X(MCpU!mG&k;X_~W$Pc|oBwoIiWbKi${a=`(-rs)pREJ<ZQM-Bg|y<@B$(ky=Ja
z-njIhEWazi?CiezLrVlHd|!G6qpdupY@BILEQ-~l6w3EamB<*%?msgfDHp4S&rl4(
z9EvZC?m+3>Ag53g+*~QSX*4RO|2U7b+lO4#@dZr_6If+>9eXhZu_iRCzLMdQ3G}59
zlCP4TlmsSV=MBvLGC_zWA(|^O7!D20aZSJqeT-KHJ_7@u>QIis5RowWEf(LU=3g!0
z^$*k<x<ifnAL`M3zPwYNInYotsQp@sgrLH@dbYZV-_!9I2riP*j!2=aQRvSdm^lRN
z2TC9T_U({5ZOHCyc5f(W&7j>xl7Xq5XLoa~));spvj)NAe(GfGZKh*EPF<i=Vaqs&
zj~q|0V>*744AnR$vs_<x@82H637RQ*$>T)<FZb-l+6cLCmhPZ3U6+{nM?ZEZjT+Ii
z#@+8Jc(DEzdSs91I><bTDkI>ic?ckqHs;Z5W~G4~2_zNG1Cf$EG>;*Y@#cZaNamRb
zT2FG^JdC86{6d=|o8%Pr!~{h{i7s&ulj*ppQo1tlS#J8pGs46I-NBl_wv2mrZ7|1)
ziMVI2F!?T~(;d#VteN?jWY(LT!sWifrgIx#(NKRs$IbP3A}DL+OM+>KKcrE^HM29m
zu3)@)qJTHeO%UOJ@R4l(-6nZH=Fnv!nwnAh>rw4rVg+(e_{>!g!|%@&3gWbvt&)Aj
zEZMr0A|7v%AN#lPtraLhzjJso-Y5y`Q7wZ|<CoH2Q#DWo=R7I$H}Dm%P3VB-GFt1N
z+iHH}kl;4D9o0hxeEIxvVD$!1Lxz&3Slp#MloKG9;du$YnfRQc&k5R7y9IQDw|ii}
zthqb%3Dcm5P|tNIcvl5fi{Tj<NNV}zOwYfhL_cRFp$O8RVPmJye#-sGPrAHs3jtFU
zR;KXFevT-QgwhYcDJEh%c3^kgznZRLi@(072a(S(9qacEdyS&q%c9P)a9y{Ursz$!
zpDw9ATGD%m8(&7;)m-ji_X_Y1O=>bM2kyq^Ta;r0+R0TDd=l{OuCFFdi6NR>!z(Hf
zUf#3At}F7HS=zP%%or#^%49HMz_AiqjP5v1;djqpF}Hd{<Q}GIPW6oTE7xL~j*NRg
zF{Jzm0{7po#wR<bePn+{!bzFj!46x?@qWebPN^<RtqWU%#O*A6X96LjDURIpoo+Xq
zg<jiqhpsS3Zl$HS-(tvvIobA<$$%N{%|Z>oZ~M|=k1M8S6M`|bw3Wi<C3cg#3#sd7
z*xkX+_1J$|DIgLtm5uydOY9)SgPNYih{R5=j=H(>79EjH+gQnPd~V{dQ*N#=J0k}s
zKFj3<ZR~6-<mIk3t%!WnRPOun;mlfLqPu2x)^rV(>c2N^F5Tf=g>>WIiYNcUV{em8
z`Od-=JcSIrf2G*Zj?xcr)!{nf!~w-2$=-a;yz;lM`lycZ=Nn(Yrr-0o5YFAP^u2S=
z@9+s<%XIXX3&a1r=<`7Fr!;C{0q@64?{+xnMaavY-CT=bdm@&<UndMPj{m_Dlh?C8
zBJ(Trc<e#>sEmOR(x~}S{my&xpSqmrCw<w-yzk^Wk||c6Aeu*={)|fLe<D$1ujQ2Q
zT8eHRobziYJ`WMLJw(bjcP%FxNdyvKav2IWYU|KgBFU3GKC4G9`NkYk@Efi3s4xUX
z=O8=%H=VI%ZiU4<swST2>E`-lk?x?kzQfOyxDt=&MKT?`Lrg1jOxo$V?@ZW-<3V>A
zbQ8Q3i0hr;X&GFWIEzO8fQcNKMa1vprq@UqN~JJykqD~EfPE@hXK$&-MMlcYb1J2`
zYPhTx#>T!5st3pjRV{1!Zb=xLaqfC;Vpa&JAWAcPXP+ubN6j+n%axDk8f`9ScLh?i
zs2I-%STk<>m-eWWs{PKLJLe&yUqTE@19xfbxl@)_eZ%GAzQ=yB!?Cc2rt8<=ac57M
zAli6E!h)x*`5!yX3x79&Srtq4m3R;x3jac#Dvg^y+a4l=UuVE6w@QhS=TVH%whReY
zMKp}E%T(;090d`bNgTT<9OVkZoZ6A6n&w_Aw1>&Kli&lfA@(quBn4S@I)B6qS0S59
zM$V8VsP2`V)~h8s{jEc)fAEeIkfnX#*PQoE(XXg6la6}oEqgRCDkj*~#Zdg_Ripkv
zBKLi~Ew&%sHOfmhtr~<(iR-?$z=QzbDadEtFunF7PAmGR&NKe?+m+i5<bpq$EtWG+
zz7-%eVF+(2v7;a3;(ajQ!w>wPsD>tRQ8dqCY9Vion`>&NRH=4Rb|OKsHSu2aP4UDR
zQ|_kItWVD^<;hBKmX4jw|AfG$#C$F6vyKxu*vhC7CT<SqfH1$hWleh_y`9U}1*FVE
zF7|CcnXSx3jq}7>Oh-M=<4t0&+)Yy)*Bv~i6MDTX>Yb_-c_5;Glo((!I%=~}{{@%R
zxK4D3;&A!cV9sO!H8GV|Xv(^K3%z|IBHAb~H@Jx@^t~H2vtt@)+RwQ)(em<{c2hAq
z$g0iq^0#bLS_7>WIsugJ1KSmLVnV&f7?l~{QOQE!9l<Y3alFF_o7$F>9~3H9S2b%N
zje4!Xjxgbiyl?C3d0`l)3S5BC6W1Cw<JQZ|U$>nS^D!;vFrVJO7-cHk?t5i$-l?q{
zo2Fo~`uK@G_wDV^RC*JY=JST(uAvp|PcIWKj9V*4Nap$LIy5hApre{~_TUI1K2)lK
z>$Z%hWp}EOqvfM1r?+X|f!-X$h18??gL0|u?CqP3L#3wJ51FP1WwS~cvU-FZx5j?_
z>6H<>ugfUAU-LG1MT}H%+`sg`nb_D^u7K!1&|9W^yh>#Q8A3u$iE%y!lm4B|{{vpA
z&x&^=B}nmL2SBUg=_IBNU&b37C22Al{-GPlXs}hr=xEpnL>n%JB#!ObBmEZBgOCC`
zOD3V{iKp%1&M(a2`1mLkAmkTx&F2ICR%7e$!Qjn~bO#+|#TBwOoh$VUmSjp1@8;?X
z3&Os&>d3V=fG-TOd~U!x-ED1VESJ#6Rp%Qj?*(sXCIZ9)EE*^AfxY&N6{)8H1j1QA
z@}&J4`aXbVe5HcIPy|jO@M}UZ(~rVL%!<f2?{C%jf&E*d|Mi;ss`Q2oSUbWBM9gok
zL%F+j8{i2JTNYbUgeY%A5--3T)?5-M9&)l^2WKW$)7$l;Ochk--7q(asI>oy;i61d
zp!vnTn=^-BPEU*JOX7hL<&?FGaACfFh&OevD>0MZls-I1U}FQ?MKtO{7uz|qq8WD)
z+wG3<tq?yN0QWm@EtY~>34Fku6#yuilpN^q*2oloFE3lK*j<!>0U^uiC(~#kbZJ{M
z6^QVC00sf_+`vq#)+rv>>On<?yWIRZdIENbQju9rCH!|k&}qUel!F7Hpb&V;oEdob
zNR*lNL%rMtoTRYYI0Wo>b2XVQ;}gyQ^DukbqWCsdgG>NUUT&_@;Ca|GnCNUy!@S7r
zXsw!%hEEqe14^DCH9=Km(Fd-nc<ZcdZMTey^Y>jrUsa5@*OqXrqRAMXm}*ro8->Bf
z=mtx4&b5(P3NHAP^|TH|QeG2(oIC|iBg;vEa<Mx=-aAY>^Sip-mKKsQwLn;qf6~RZ
zsqk=Sof%UxRRNvP`E7jLc97;_NX|7^)VO|d&xeh8d|sC=^M^t>{<eY~ada4s^stBu
zNJ@#Wx}LtSo>C)&)ys`H_3LX(CB)9M4Ut9z-;y%{*@548hr&)L#NGuer`YG!Ee5L@
zGa`$nM4qj1hp!nOh;#;(Rx<=)fTpN20ZciWctNSzw{u|dbDG_6iwwqP47gh*S6;Lw
zu*j}{hCDkCZ~2nu;b%)=iLN*~P~$$Jw?MM)BEcLFpcmLt17b2<V<Y%gBPr`@)(7A5
z0w&{;CoPX!wnP>nya3#3KP{sN+^L={|0ZD9`vdVs;v{+%QnN4+oPrG2^S(iVyeD8A
zY+_b8Ou^Y`!}0&KVbgGg{JDY0k}kh`*zGXr5m-g`0{lV+$>G%5%q+ickGY6z6M}(%
zP#Lx<cKY+bDdhA%kau+mz%!aH>SOS{@pDA6Y1(6|!Q=jPhhSCbqzkgjM_niXW#FQF
zq0Qk+e=_C^BKsELLpXykc)^|YsYHsoSpoI~76A6Nm;quhuzC0vi{Zn^gU$wEM9dI3
zHi@*mrME47@caSrEB3O5X?)UZ^yXPi2O0zn4Z6x=(~!f!_alcau;8OP=s!5?BWN=L
ze3f<)eQG}NJfXd0{3Vq_jbPSN?J)Pbz?-dp3zY%RL&j*%6$l~AA_7aKM}orktutg<
z5%d#zW+#ZAfM%3`PRagLiF*P|c#o?R$9;#$gkWP^J$j+Sq7NXRx^0UUWr7H+Uetr8
zK8b{lhS&;KDYj4xLZqNBml$ob6xri8kVQErH@zVDZ7wm#b#;_H+m>Gm-CVy9;dEF_
z+6B4GxVMPA)lt=MuI&+atEOI`3lharkZt0MYO-E#)Jv)tM!vj7Ua)}PUS`eTnD31m
z>W;PwMF<csgA7XAi^8FtBvvR#c~<DfwpOZX55&8Q{cd8dH4hBFI9ztmDCAwR=C$E(
z+)JdypU`5$tobW_K^O;QSMhjDTg?tH6PxL1_mId0tWcmp%PpKbSL~dGglv{`{xtkX
zh5Kk8h^+#@vU>P_-RtEm@92uK=6zmSV86@9hc6)#v$YHLaa_Hn6d%5TsoZJJ`rS5N
zQNi@RSM14c8m>8_%i#X1&wAALY+L>zBE6%z2NW1Rd_Cz!&CQ#@RwBWq6EwGZf`FY(
zc7IwLLP5Cmq&;S<mMmWVlvn2Oi!VoZAFPc4$i!Z?8r}Yw+I4@O{$Q6muJZ@UazE&#
lp$t|F!^JeJZxcb?m0lK{p8fLMpx2tR+&^H+vBf;${{z6dat#0g

literal 0
HcmV?d00001


From 486bf2719b49820d3bb1c34c6bb0e47dc82c4e62 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 25 Oct 2020 02:37:22 -0700
Subject: [PATCH 476/547] persist global buildingplan settings

this ensures that a player's preferences are saved across map reloads.
this is particularly important for the building material filters, since
item fulfillment tasks are regenerated on map load, and any changes in
settings when buildingplan is reset will change the item vectors that will
be searched for planned buildings. if the settings were allowed to reset,
then a player who thought all walls would be made out of blocks would be
surprised to find boulders and logs being used after the map is reloaded.
---
 plugins/buildingplan-planner.cpp | 63 +++++++++++++++++++++++++++++++-
 plugins/buildingplan-planner.h   |  1 +
 plugins/buildingplan.cpp         | 36 +++++++++++++++++-
 3 files changed, 97 insertions(+), 3 deletions(-)

diff --git a/plugins/buildingplan-planner.cpp b/plugins/buildingplan-planner.cpp
index 42c84f4dc..963d13153 100644
--- a/plugins/buildingplan-planner.cpp
+++ b/plugins/buildingplan-planner.cpp
@@ -20,6 +20,7 @@
 
 static const std::string planned_building_persistence_key_v1 = "buildingplan/constraints";
 static const std::string planned_building_persistence_key_v2 = "buildingplan/constraints2";
+static const std::string global_settings_persistence_key = "buildingplan/global";
 
 /*
  * ItemFilter
@@ -501,13 +502,69 @@ void migrateV1ToV2()
     }
 }
 
-static void init_global_settings(std::map<std::string, bool> & settings)
+// assumes no setting has '=' or '|' characters
+static std::string serialize_settings(std::map<std::string, bool> & settings)
+{
+    std::ostringstream ser;
+    for (auto & entry : settings)
+    {
+        ser << entry.first << "=" << (entry.second ? "1" : "0") << "|";
+    }
+    return ser.str();
+}
+
+static void deserialize_settings(std::map<std::string, bool> & settings,
+                                 std::string ser)
+{
+    std::vector<std::string> tokens;
+    split_string(&tokens, ser, "|");
+    for (auto token : tokens)
+    {
+        if (token.empty())
+            continue;
+
+        std::vector<std::string> parts;
+        split_string(&parts, token, "=");
+        if (parts.size() != 2)
+        {
+            debug("invalid serialized setting format: '%s'", token.c_str());
+            continue;
+        }
+        std::string key = parts[0];
+        if (settings.count(key) == 0)
+        {
+            debug("unknown serialized setting: '%s", key.c_str());
+            continue;
+        }
+        settings[key] = static_cast<bool>(atoi(parts[1].c_str()));
+        debug("deserialized setting: %s = %d", key.c_str(), settings[key]);
+    }
+}
+
+static DFHack::PersistentDataItem init_global_settings(
+        std::map<std::string, bool> & settings)
 {
     settings.clear();
     settings["blocks"] = true;
     settings["boulders"] = true;
     settings["logs"] = true;
     settings["bars"] = false;
+
+    // load persistent global settings if they exist; otherwise create them
+    std::vector<PersistentDataItem> items;
+    DFHack::World::GetPersistentData(&items, global_settings_persistence_key);
+    if (items.size() == 1)
+    {
+        DFHack::PersistentDataItem & config = items[0];
+        deserialize_settings(settings, config.val());
+        return config;
+    }
+
+    debug("initializing persistent global settings");
+    DFHack::PersistentDataItem config =
+        DFHack::World::AddPersistentData(global_settings_persistence_key);
+    config.val() = serialize_settings(settings);
+    return config;
 }
 
 const std::map<std::string, bool> & Planner::getGlobalSettings() const
@@ -525,6 +582,8 @@ bool Planner::setGlobalSetting(std::string name, bool value)
     debug("global setting '%s' %d -> %d",
           name.c_str(), global_settings[name], value);
     global_settings[name] = value;
+    if (config.isValid())
+        config.val() = serialize_settings(global_settings);
     return true;
 }
 
@@ -535,7 +594,7 @@ void Planner::reset()
     planned_buildings.clear();
     tasks.clear();
 
-    init_global_settings(global_settings);
+    config = init_global_settings(global_settings);
 
     migrateV1ToV2();
 
diff --git a/plugins/buildingplan-planner.h b/plugins/buildingplan-planner.h
index 18cfaf0b1..7b1615704 100644
--- a/plugins/buildingplan-planner.h
+++ b/plugins/buildingplan-planner.h
@@ -120,6 +120,7 @@ public:
     void doCycle();
 
 private:
+    DFHack::PersistentDataItem config;
     std::map<std::string, bool> global_settings;
     std::unordered_map<BuildingTypeKey,
                        std::vector<ItemFilter>,
diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index 52bd5118f..a89c6c8fd 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -7,6 +7,7 @@
 #include "modules/Maps.h"
 #include "modules/World.h"
 
+#include "Core.h"
 #include "LuaTools.h"
 #include "PluginManager.h"
 
@@ -814,6 +815,33 @@ IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_query_hook, render);
 IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_place_hook, render);
 IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_room_hook, render);
 
+static DFHack::PersistentDataItem get_ui_settings_config()
+{
+    static const std::string settings_persistence_key =
+            "buildingplan/ui_settings";
+
+    bool added;
+    DFHack::PersistentDataItem config =
+            DFHack::World::GetPersistentData(settings_persistence_key, &added);
+    if (added)
+    {
+        config.ival(0) = quickfort_mode;
+    }
+    return config;
+}
+
+static void load_settings()
+{
+    DFHack::PersistentDataItem config = get_ui_settings_config();
+    quickfort_mode = config.ival(0);
+}
+
+static void save_settings()
+{
+    DFHack::PersistentDataItem config = get_ui_settings_config();
+    config.ival(0) = quickfort_mode;
+}
+
 static command_result buildingplan_cmd(color_ostream &out, vector <string> & parameters)
 {
     if (!parameters.empty())
@@ -841,7 +869,11 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
 
     if (enable != is_enabled)
     {
-        planner.reset();
+        if (DFHack::Core::getInstance().isMapLoaded())
+        {
+            load_settings();
+            planner.reset();
+        }
 
         if (!INTERPOSE_HOOK(buildingplan_query_hook, feed).apply(enable) ||
             !INTERPOSE_HOOK(buildingplan_place_hook, feed).apply(enable) ||
@@ -871,6 +903,7 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 {
     switch (event) {
     case SC_MAP_LOADED:
+        load_settings();
         planner.reset();
         roomMonitor.reset(out);
         break;
@@ -928,6 +961,7 @@ static void setSetting(std::string name, bool value) {
     {
         debug("setting quickfort_mode %d -> %d", quickfort_mode, value);
         quickfort_mode = value;
+        save_settings();
         return;
     }
     planner.setGlobalSetting(name, value);

From 72b6ac781b2b5996b58a50ab872009fd1b39bf8e Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 25 Oct 2020 02:45:03 -0700
Subject: [PATCH 477/547] on second thought, let UI-related settings reset

no need to have quickfort_mode stay on forever
---
 plugins/buildingplan.cpp | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index a89c6c8fd..528bd86cd 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -815,33 +815,6 @@ IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_query_hook, render);
 IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_place_hook, render);
 IMPLEMENT_VMETHOD_INTERPOSE(buildingplan_room_hook, render);
 
-static DFHack::PersistentDataItem get_ui_settings_config()
-{
-    static const std::string settings_persistence_key =
-            "buildingplan/ui_settings";
-
-    bool added;
-    DFHack::PersistentDataItem config =
-            DFHack::World::GetPersistentData(settings_persistence_key, &added);
-    if (added)
-    {
-        config.ival(0) = quickfort_mode;
-    }
-    return config;
-}
-
-static void load_settings()
-{
-    DFHack::PersistentDataItem config = get_ui_settings_config();
-    quickfort_mode = config.ival(0);
-}
-
-static void save_settings()
-{
-    DFHack::PersistentDataItem config = get_ui_settings_config();
-    config.ival(0) = quickfort_mode;
-}
-
 static command_result buildingplan_cmd(color_ostream &out, vector <string> & parameters)
 {
     if (!parameters.empty())
@@ -870,10 +843,7 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable)
     if (enable != is_enabled)
     {
         if (DFHack::Core::getInstance().isMapLoaded())
-        {
-            load_settings();
             planner.reset();
-        }
 
         if (!INTERPOSE_HOOK(buildingplan_query_hook, feed).apply(enable) ||
             !INTERPOSE_HOOK(buildingplan_place_hook, feed).apply(enable) ||
@@ -903,7 +873,6 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 {
     switch (event) {
     case SC_MAP_LOADED:
-        load_settings();
         planner.reset();
         roomMonitor.reset(out);
         break;
@@ -961,7 +930,6 @@ static void setSetting(std::string name, bool value) {
     {
         debug("setting quickfort_mode %d -> %d", quickfort_mode, value);
         quickfort_mode = value;
-        save_settings();
         return;
     }
     planner.setGlobalSetting(name, value);

From ebba769a0c0df155346982958de3f74eca25a47f Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 25 Oct 2020 09:37:45 -0700
Subject: [PATCH 478/547] blueprint library playtesting fixes

- balance wings of The Saracen Crypts
- add stairs to Whirlpool Housing
- move burial script notes to message()s
---
 .../48-4-Raynard_Whirlpool_Housing.csv        |   6 +-
 .../bedrooms/95-9-Hactar1_3_Branch_Tree.csv   |   2 +-
 .../blueprints/library/tombs/Mini_Saracen.csv |   2 +-
 .../library/tombs/The_Saracen_Crypts.csv      | 196 +++++++++---------
 4 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv b/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
index 9329353f4..8906ae4ba 100644
--- a/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
+++ b/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
@@ -13,9 +13,9 @@ d,d,d, , , ,d, , , ,d,d,d, ,d,d,d, ,d,d,d, , , ,d, , , ,d,d,d,#
  , , , ,d, ,d, ,d, , , ,d,d,d,d,d,d,d, , , ,d, ,d, ,d, , , , ,#
  , ,d, , , ,d, , , ,d, , ,d, ,d, ,d, , ,d, , , ,d, , , ,d, , ,#
  ,d,d,d, ,d,d,d, ,d,d,d, , , ,d, , , ,d,d,d, ,d,d,d, ,d,d,d, ,#
- , ,d, , ,d,d,d, , ,d, , ,d,d,d,d,d, , ,d, , ,d,d,d, , ,d, , ,#
- , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , ,#
- , ,d, , ,d,d,d, , ,d, , ,d,d,d,d,d, , ,d, , ,d,d,d, , ,d, , ,#
+ , ,d, , ,d,d,d, , ,d, , ,d,i,i,i,d, , ,d, , ,d,d,d, , ,d, , ,#
+ , ,d,d,d,d,d,d,d,d,d,d,d,d,i,i,i,d,d,d,d,d,d,d,d,d,d,d,d, , ,#
+ , ,d, , ,d,d,d, , ,d, , ,d,i,i,i,d, , ,d, , ,d,d,d, , ,d, , ,#
  ,d,d,d, ,d,d,d, ,d,d,d, , , ,d, , , ,d,d,d, ,d,d,d, ,d,d,d, ,#
  , ,d, , , ,d, , , ,d, , ,d, ,d, ,d, , ,d, , , ,d, , , ,d, , ,#
  , , , ,d, ,d, ,d, , , ,d,d,d,d,d,d,d, , , ,d, ,d, ,d, , , , ,#
diff --git a/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv b/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
index 37f41fd23..f9e97bc8d 100644
--- a/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
+++ b/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
@@ -152,7 +152,7 @@
  , , , , , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , , , , , ,#
  , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
 #,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
-#query label(rooms) start(36;73) room designations (use burial script to mark urns as usable)
+#query label(rooms) start(36;73) message(use burial script to mark urns as usable) room designations
  , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
  , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
  , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,r+,, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
diff --git a/data/blueprints/library/tombs/Mini_Saracen.csv b/data/blueprints/library/tombs/Mini_Saracen.csv
index e32381b82..f30fbc55d 100644
--- a/data/blueprints/library/tombs/Mini_Saracen.csv
+++ b/data/blueprints/library/tombs/Mini_Saracen.csv
@@ -11,7 +11,7 @@ d, ,d, ,d,d,d, ,d, ,d,#
 d,d,d,d,d,d,d,d,d,d,d,#
 d, ,d, ,d, ,d, ,d, ,d,#
 #,#,#,#,#,#,#,#,#,#,#,#
-#build label(urns) start(6;6) 24 urns (use burial script to mark them as usable)
+#build label(urns) start(6;6) message(use burial script to mark urns as usable) 24 urns
 n, ,n, ,n, ,n, ,n, ,n,#
 `,`,`,`,`,`,`,`,`,`,`,#
 n, ,n, ,`,`,`, ,n, ,n,#
diff --git a/data/blueprints/library/tombs/The_Saracen_Crypts.csv b/data/blueprints/library/tombs/The_Saracen_Crypts.csv
index a4bd7fc95..ae6107894 100644
--- a/data/blueprints/library/tombs/The_Saracen_Crypts.csv
+++ b/data/blueprints/library/tombs/The_Saracen_Crypts.csv
@@ -1,98 +1,98 @@
-#dig start(24;24) room for 489 corpses
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d,d,d,d,d,d,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
-d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
- , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
-d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
- , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
-d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
- , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
-d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
- , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
-d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
- , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
-d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , ,d,d,d, , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d,d,i,i,i,d,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
- , , , , , , , , , , , , , , , , , ,d,d,d,d,i,i,i,d,d,d,d, , , , , , , , , , , , , , , , ,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d,d,i,i,i,d,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
-d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , ,d,d,d, , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
- , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
-d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
- , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
-d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
- , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
-d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
- , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
-d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
- , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , ,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
-d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
-d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d,d,d,d,d,d,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
-#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
-#build label(urns) start(24;24) 489 urns (use burial script to mark them as usable)
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`,`,`,`,`,`,`,`,`,`,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
-`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
- , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
-`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
- , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
-`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
- , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
-`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
- , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
-`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
- , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n,`,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
-`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , ,`,`,`, , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`,`,`,`,~,~,~,`,`,`,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
- , , , , , , , , , , , , , , , , , ,`,`,`,`,~,~,~,`,`,`,`, , , , , , , , , , , , , , , , ,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`,`,`,`,~,~,~,`,`,`,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
-`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , ,`,`,`, , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n,`,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
- , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
-`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
- , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
-`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
- , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
-`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
- , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
-`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
- , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , ,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
-`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
-n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,`,`,`,`,`,`,`,`,`,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
-#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#dig start(24;24) room for 513 corpses
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d,d,d,d,d,d,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , ,d,d,d, , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d,d,i,i,i,d,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,i,i,i,d,d,d,d, , , , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d,d,i,i,i,d,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , ,d,d,d, , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+ , , , , , , , , , , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , , , , , , , , , , ,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d,d,d,d,d,d,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#build label(urns) start(24;24) message(use burial script to mark urns as usable) 513 urns
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`,`,`,`,`,`,`,`,`,`,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n,`,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , ,`,`,`, , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`,`,`,`,~,~,~,`,`,`,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,~,~,~,`,`,`,`, , , , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`,`,`,`,~,~,~,`,`,`,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , ,`,`,`, , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n,`,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+ , , , , , , , , , , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , , , , , , , , , , ,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`, , , , , , , , , ,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,`,`,`,`,`,`,`,`,`,`, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n, ,n,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#

From 0e2d29cd8d44ed4f069b60c302e19f0f3e76a924 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sun, 25 Oct 2020 14:25:02 -0700
Subject: [PATCH 479/547] increase readability of lists in dreamfort help

---
 data/blueprints/library/dreamfort.csv | 160 +++++++++++++++-----------
 1 file changed, 91 insertions(+), 69 deletions(-)

diff --git a/data/blueprints/library/dreamfort.csv b/data/blueprints/library/dreamfort.csv
index 096a6657e..1c0222477 100644
--- a/data/blueprints/library/dreamfort.csv
+++ b/data/blueprints/library/dreamfort.csv
@@ -29,28 +29,34 @@ You are welcome to copy those spreadsheets and make your own modifications!
 "Sets up a large, protected entrance to your fort in a flat area on the surface."
 ""
 Features:
-A starting set of workshops and stockpiles (which you can later remove once you establish your permanent workshops and storage)
-Trade depot area
-"Walls, roof, and lever-controlled gates for security"
-Trap-filled hallways for invaders
-Livestock grazing area with nestbox zones and beehives
-A grid of 1x1 farm plots (meant to be managed with DFHack autofarm)
-An extra room near the entrance for a barracks (once you get your military going)
-Miasma vents for the farming level that is intended to be built in the layer directly beneath the surface
+- A starting set of workshops and stockpiles (which you can later remove once you establish your permanent workshops and storage)
+- Trade depot area
+"- Walls, roof, and lever-controlled gates for security"
+- Trap-filled hallways for invaders
+- Livestock grazing area with nestbox zones and beehives
+- A grid of 1x1 farm plots (meant to be managed with DFHack autofarm)
+- An extra room near the entrance for a barracks (once you get your military going)
+- Miasma vents for the farming level that is intended to be built in the layer directly beneath the surface
 ""
 Manual steps you have to take:
-Assign grazing livestock to the large pasture and dogs to the pasture over the stairwell (DFHack's autonestbox can manage the nestbox zones)
-Connect levers to the gates
+- Assign grazing livestock to the large pasture and dogs to the pasture over the stairwell (DFHack's autonestbox can manage the nestbox zones)
+- Connect levers to the gates
 ""
 Be sure to choose an embark site that has an area flat enough to use these blueprints!
 ""
 Surface Walkthrough:
 "1) Choose a tile for your central staircase. The terrain around that tile should be perfectly flat. Trees are ok, but no slopes, rivers, or lakes. To be sure that the tile you've chosen is in a good spot, set the cursor over that tile and run ""quickfort run library/dreamfort.csv -n /surface4"". This will show you the eventual boundaries of the fort. Some wall segments might be missing due to existing trees, but that's ok. Make sure the area within the exterior wall is flat. Run ""quickfort undo library/dreamfort.csv -n /surface4"" to clean up."
+""
 "2) With the cursor on the chosen tile, run /surface1 to clear surrounding trees and set up your pastures. Remember to assign your dogs to the pasture around the staircase and your grazing animals to the large pasture. You can let your cats roam free."
+""
 "3) Once the trees have been cleared, run /surface2 to set up starting workshops/stockpiles and clear trees from a larger area. Run ""quickfort orders"" for /surface4, /surface5, and /surface6 to get a head start manufacturing items for those blueprints. If you want a consistent color for your walls and floors, remember to set the rock material in the buildingplan UI and in the manager orders for the blocks."
+""
 "4) Once the trees have been cleared from the larger area, run /surface3 to channel out the miasma vents for the farming level."
+""
 "5) When the channels have been dug, run /surface4 to build the protective walls and flooring. You can also start digging out the sub-surface farming level (/farming1) at this point. Although the vents will be covered with flooring, they will still work to prevent miasma."
+""
 "6) Once all the constructions are built, run /surface5 build gates, furniture, the trade depot, and traps."
+""
 "7) When at least the beehives are in place, run /surface6 to configure the hives and construct a roof."
 "#meta label(surface1) start(staircase center)
 message(Once the stairwell is mined out, you should start digging the industry level in a non-aquifer rock layer.
@@ -866,32 +872,35 @@ p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,
 "Sets up farming, food storage, and related industries. Also provides post-embark necessities that can later be disassembed."
 ""
 Features:
-Pairs with the surface blueprints to provide miasma vents
-Farm plots (intended to be managed by DFHack autofarm)
-Plentiful food storage
-Refuse stockpile and quantum dump for useless body parts
-Small dormitory and dining room for post-embark needs
-Small office for your manager
+- Pairs with the surface blueprints to provide miasma vents
+- Farm plots (intended to be managed by DFHack autofarm)
+- Plentiful food storage
+- Refuse stockpile and quantum dump for useless body parts
+- Small dormitory and dining room for post-embark needs
+- Small office for your manager
 ""
 Workshops:
-Kitchen
-Brewery
-Butcher
-Fishery
-Tannery
-Farmer's Workshop
-Quern
-Screw Press
+- Kitchen
+- Brewery
+- Butcher
+- Fishery
+- Tannery
+- Farmer's Workshop
+- Quern
+- Screw Press
 ""
 Manual steps you have to take:
-Assign the office to your manager
-Assign a minecart to your quantum garbage stockpile hauling route
-"If the industry level is already built, configure the jugs, pots, and bags stockpiles to take from the ""Goods"" quantum stockpile on the industry level"
+- Assign the office to your manager
+- Assign a minecart to your quantum garbage stockpile hauling route
+"- If the industry level is already built, configure the jugs, pots, and bags stockpiles to take from the ""Goods"" quantum stockpile on the industry level"
 ""
 Farming Walkthough:
 "1) Wait until you have completed /surface3 before digging out the farming level on the z-level below the surface, otherwise you will likely get caveins as your miners channel out the miasma vents over empty space."
+""
 "2) Start digging with /farming1 and get started on manufacturing furniture by running ""quickfort orders"" on /farming2."
+""
 "3) Once the level is dug out, run /farming2 to build workshops and build and configure stockpiles. Remember to assign a minecart to the newly-designated quantum garbage dump. There are also jugs, pots, and bags stockpiles on this level that should be configured to ""take"" from the industry level stockpiles once we get the industry level built."
+""
 "4) When the furniture is in place, run /farming3 to designate your temporary dining room and dormitory. The blueprint also attempts to assign the office to your manager, but double-check this assignment in case your dwarves are in an unexpected order."
 "#dig label(farming1) start(23; 25; staircase center) message(This would be a good time to queue up manager orders for /farming2. Once the area is dug out, continue with /farming2.)"
 
@@ -1168,45 +1177,49 @@ query_stockpiles/farming_query_stockpiles
 Sets up workshops for all non-farming industries
 ""
 Features:
-Quantum stockpiles
-Space-efficient layout for all workshops
+- Quantum stockpiles
+- Space-efficient layout for all workshops
 with separate stockpiles for:
-A reserve of uncut gems for strange moods that the jeweler's workshop cannot take from
-Steel bars and coal so you can see at a glance if you're low on either
-Liquids that cannot be quantum stockpiled (e.g. lye)
-Meltable weapons and armor
+- A reserve of uncut gems for strange moods that the jeweler's workshop cannot take from
+- Steel bars and coal so you can see at a glance if you're low on either
+- Liquids that cannot be quantum stockpiled (e.g. lye)
+- Meltable weapons and armor
 ""
 Workshops:
-3x Mason
-4x Craftsdwarf
-1x Jeweler
-1x Mechanic
-4x Smelter
-1x Forge
-1x Glassmaker
-1x Kiln
-4x Wood furnace
-1x Ashery
-1x Soap maker
-1x Carpenter
-1x Siege workshop
-1x Bowyer
-1x Dyer
-1x Loom
-1x Clothier
+- 3x Mason
+- 4x Craftsdwarf
+- 1x Jeweler
+- 1x Mechanic
+- 4x Smelter
+- 1x Forge
+- 1x Glassmaker
+- 1x Kiln
+- 4x Wood furnace
+- 1x Ashery
+- 1x Soap maker
+- 1x Carpenter
+- 1x Siege workshop
+- 1x Bowyer
+- 1x Dyer
+- 1x Loom
+- 1x Clothier
 ""
 ""
 Manual steps you have to take:
-Assign minecarts to your quantum stockpile hauling routes
-"Give from the ""Goods"" quantum stockpile to the jugs, pots, and bags stockpiles on the farming level"
-"If desired, set the stockpiles in the bottom right to auto-melt. This results in melting all weapons and armor that are not masterwork steel. This is great for your military, but it takes a *lot* of fuel. If you enable this, be sure you're in a heavily forested area, enable auto-chop, and set up manager orders to keep your coal stocks high."
-Download automation.json from https://drive.google.com/file/d/17WcN5mK-rnADOm2B_JFpPnByYgkYjxhb/view and put it in your dfhack-config/orders/ directory.
+- Assign minecarts to your quantum stockpile hauling routes
+"- Give from the ""Goods"" quantum stockpile to the jugs, pots, and bags stockpiles on the farming level"
+"- If desired, set the stockpiles in the bottom right to auto-melt. This results in melting all weapons and armor that are not masterwork steel. This is great for your military, but it takes a *lot* of fuel. If you enable this, be sure you're in a heavily forested area, enable auto-chop, and set up manager orders to keep your coal stocks high."
+- Download automation.json from https://drive.google.com/file/d/17WcN5mK-rnADOm2B_JFpPnByYgkYjxhb/view and put it in your dfhack-config/orders/ directory.
 ""
 Industry Walkthrough:
 1) You can start digging out /industry1 immediately after embark. It is best to choose a stone layer at least two layers underground so the boulders can be used by your starting workshops to manufacture needed items.
+""
 "2) Queue up manufacturing by running ""quickfort orders"" on /industry2."
+""
 "3) Once the area is dug out, run /industry2. Remember to assign minecarts to to your quantum stockpile hauling routes, and if the farming level is already built, give from the ""Goods"" quantum stockpile to the jugs, pots, and bags stockpiles on the farming level."
+""
 "4) If you want to automatically melt goblinite and other low-quality weapons and armor, mark the south-east stockpiles for auto-melt."
+""
 "5) Run ""orders import automation"" to use the provided automation.json to take care of your fort's basic needs."
 "#dig label(industry1) start(18; 18; staircase center) message(This would be a good time to queue manager orders for /industry2. Once the area is dug out, continue with /industry2.)"
 
@@ -1364,25 +1377,29 @@ query/industry_query
 "Sets up public services (dining, hospital, etc.)"
 ""
 Features:
-Spacious dining room (also usable as a tavern)
-Prepared food and drink stockpiles
-Well system (bring your own water)
-Public baths with soap stockpiles
-Three well-appointed jail cells
-Hospital with beds and storage
-Garbage dump
+- Spacious dining room (also usable as a tavern)
+- Prepared food and drink stockpiles
+- Well system (bring your own water)
+- Public baths with soap stockpiles
+- Three well-appointed jail cells
+- Hospital with beds and storage
+- Garbage dump
 ""
 Manual steps you have to take:
-"If you want to declare the dining room as a tavern, the bedrooms at the top can be assigned to the tavern as rented rooms."
-"Configure the soap stockpiles to take from the industry level ""Metalworker"" quantum stockpile (which holds all the bars)"
-"Activate the bath pond zones when you are ready to fill them with 3-depth water. This is the only really fiddly bit, since you have to carefully disable the pond zone again when the final bucket to bring the water to an even 3-depth is on the way."
-"Fill the cisterns with water, either with a bucket brigade or by plumbing flowing water. Fill so that there are two z-levels of 7-depth water to prevent muddiness. If you want to fill with buckets, designate a pond zone on the level below the main floor. If you feel adventurous and are experienced with water pressure, you can instead route (depressurized!) water to the second-to-bottom level (the one above the up staircases)."
+"- If you want to declare the dining room as a tavern, the bedrooms at the top can be assigned to the tavern as rented rooms."
+"- Configure the soap stockpiles to take from the industry level ""Metalworker"" quantum stockpile (which holds all the bars)"
+"- Activate the bath pond zones when you are ready to fill them with 3-depth water. This is the only really fiddly bit, since you have to carefully disable the pond zone again when the final bucket to bring the water to an even 3-depth is on the way."
+"- Fill the cisterns with water, either with a bucket brigade or by plumbing flowing water. Fill so that there are two z-levels of 7-depth water to prevent muddiness. If you want to fill with buckets, designate a pond zone on the level below the main floor. If you feel adventurous and are experienced with water pressure, you can instead route (depressurized!) water to the second-to-bottom level (the one above the up staircases)."
 ""
 Services Walkthough:
 1) Start this level before your fort grows beyond around 50 dwarves so everyone has a place to eat.
+""
 "2) Start digging with /services1. Note that this digs out the main level and three levels below for the well plumbing. Start manufacturing with ""quickfort orders"" on /services2."
+""
 "3) Once the area is dug out, set up the furniture, stockpiles, and hospital and garbage dump zones with /services2. Fill your soap stockpiles around the bath channels by configuring them to take from the bar quantum stockpile (the one on the right near the forge) on the industry level."
+""
 "4) When all furniture is placed, run /services3 to configure your dining room and jail."
+""
 5) Fill the bath and wells with either a bucket brigade or by carefully routing flowing water to them.
 "#dig label(services1) start(23; 22; staircase center) message(This would be a good time to queue manager orders for /services2. Once the area is dug out, continue with /services2.)"
 
@@ -1701,11 +1718,13 @@ query_stockpiles/services_query_stockpiles
 "Multiple 7x7 rooms for guildhalls, temples, libraries, etc."
 ""
 Features:
-"Big empty rooms. Double-thick walls to ensure engravings add value to the ""correct"" side. Fill with furniture and assign as needed."
+"- Big empty rooms. Double-thick walls to ensure engravings add value to the ""correct"" side. Fill with furniture and assign as needed."
 ""
 Guildhall Walkthrough:
 "1) Dig out the rooms with /guildhall1 and queue up manufacturing by running ""quickfort orders"" on /guildhall2."
+""
 "2) Once the area is dug out, add in generic furniture with /guildhall2."
+""
 "3) Furnish individual rooms as you need specific guildhalls, libraries, and temples."
 "#dig label(guildhall1) start(25; 25; staircase center) message(This would be a good time to queue manager orders for /guildhall2. Once the area is dug out, continue with /guildhall2.)"
 
@@ -1811,17 +1830,20 @@ Guildhall Walkthrough:
 Suites for nobles and apartments for the teeming masses
 ""
 Features:
-Well-appointed suites to satisfy most nobles
-Apartments with beds and storage to keep dwarves happy
-Meta blueprint included for designating 6 levels of apartments for a full 200+ dwarves
+- Well-appointed suites to satisfy most nobles
+- Apartments with beds and storage to keep dwarves happy
+- Meta blueprint included for designating 6 levels of apartments for a full 200+ dwarves
 ""
 Suites Walkthrough:
 "1) Dig out the suites layer with /suites1 and queue up manufacturing by running ""quickfort orders"" on /suites2."
+""
 "2) Once the area is dug out, furnish the suites with /suites2. The rooms are left unconfigured so you can set them up as needed room types and assign them to specific nobles. Each room can serve as a bedroom, a dining hall, an office, or a tomb."
 ""
 Apartments Walkthrough:
 "1) Dig out one layer of apartments with /apartments1, or 6 layers at once (enough for 200 dwarves) with /apartments1_stack. Run ""quickfort orders"" for /apartments2 once for every apartments layer that you are digging."
+""
 "2) Once a layer is dug out, furnish it with /apartments2."
+""
 "3) Once the beds are in place (the other furniture can still be unbuilt), configure the rooms with /apartments3. Once the urns are all in place, run ""burial -pets"" to set them all to accept burials."
 "#dig label(suites1) start(18; 18; staircase center) message(This would be a good time to queue manager orders for /suites2. Once the area is dug out, continue with /suites2) noble suites"
 

From 031f2a2febe605c6e086ec3f93f464b5d2756fae Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 26 Oct 2020 01:23:24 -0400
Subject: [PATCH 480/547] Reduce build matrix entries

---
 .github/workflows/build.yml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f0bb79cda..869ca407e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,17 +15,11 @@ jobs:
         - 4.8
         - 7
         plugins:
-        - supported
+        - default
         include:
         - os: ubuntu-20.04
           gcc: 10
-          plugins: supported
-        - os: ubuntu-20.04
-          gcc: 10
-          plugins: dev
-        - os: ubuntu-20.04
-          gcc: 10
-          plugins: stonesense
+          plugins: all
     steps:
     - name: Set up Python 3
       uses: actions/setup-python@v2
@@ -79,15 +73,14 @@ jobs:
           -G Ninja \
           -DDFHACK_BUILD_ARCH=64 \
           -DBUILD_TESTS:BOOL=ON \
-          -DBUILD_DEV_PLUGINS:BOOL=${{ matrix.plugins == 'dev' }} \
-          -DBUILD_SIZECHECK:BOOL=${{ matrix.plugins == 'dev' }} \
-          -DBUILD_STONESENSE:BOOL=${{ matrix.plugins == 'stonesense' }} \
-          -DBUILD_SUPPORTED:BOOL=${{ matrix.plugins == 'supported' }} \
+          -DBUILD_DEV_PLUGINS:BOOL=${{ matrix.plugins == 'all' }} \
+          -DBUILD_SIZECHECK:BOOL=${{ matrix.plugins == 'all' }} \
+          -DBUILD_STONESENSE:BOOL=${{ matrix.plugins == 'all' }} \
+          -DBUILD_SUPPORTED:BOOL=1 \
           -DCMAKE_INSTALL_PREFIX="$DF_FOLDER"
         ninja -C build-ci install
     - name: Run tests
       id: run_tests
-      if: ${{ matrix.plugins == 'supported' }}
       run: |
         export TERM=dumb
         mv "$DF_FOLDER"/dfhack.init-example "$DF_FOLDER"/dfhack.init

From 292d40a6ba52af0032a48dcca34f405b725f58e6 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 26 Oct 2020 16:11:34 -0700
Subject: [PATCH 481/547] change hotkeys for adjusting min and max quality

to avoid 'q' and 'w' conflicts with the standard DF UI hotkeys for
roller speed.

min quality: 'qw' -> 'QW'
max quality: 'QW' - 'AS'
---
 plugins/buildingplan.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index 501594c4a..b4ec44df1 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -525,6 +525,10 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
         if (input->count(interface_key::CUSTOM_P) ||
             input->count(interface_key::CUSTOM_F) ||
             input->count(interface_key::CUSTOM_D) ||
+            input->count(interface_key::CUSTOM_Q) ||
+            input->count(interface_key::CUSTOM_W) ||
+            input->count(interface_key::CUSTOM_A) ||
+            input->count(interface_key::CUSTOM_S) ||
             input->count(interface_key::CUSTOM_M))
         {
             show_help = true;
@@ -559,13 +563,13 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
 
         if (input->count(interface_key::CUSTOM_SHIFT_M))
             Screen::show(dts::make_unique<ViewscreenChooseMaterial>(*filter), plugin_self);
-        else if (input->count(interface_key::CUSTOM_Q))
+        else if (input->count(interface_key::CUSTOM_SHIFT_Q))
             filter->decMinQuality();
-        else if (input->count(interface_key::CUSTOM_W))
+        else if (input->count(interface_key::CUSTOM_SHIFT_W))
             filter->incMinQuality();
-        else if (input->count(interface_key::CUSTOM_SHIFT_Q))
+        else if (input->count(interface_key::CUSTOM_SHIFT_A))
             filter->decMaxQuality();
-        else if (input->count(interface_key::CUSTOM_SHIFT_W))
+        else if (input->count(interface_key::CUSTOM_SHIFT_S))
             filter->incMaxQuality();
         else if (input->count(interface_key::CUSTOM_SHIFT_D))
             filter->toggleDecoratedOnly();
@@ -669,10 +673,10 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
         OutputString(COLOR_WHITE, x, y, title.c_str(), true, left_margin + 1);
         OutputString(COLOR_WHITE, x, y, get_item_label(key, filter_idx).c_str(), true, left_margin);
 
-        OutputHotkeyString(x, y, "Min Quality: ", "qw");
+        OutputHotkeyString(x, y, "Min Quality: ", "QW");
         OutputString(COLOR_BROWN, x, y, filter->getMinQuality(), true, left_margin);
 
-        OutputHotkeyString(x, y, "Max Quality: ", "QW");
+        OutputHotkeyString(x, y, "Max Quality: ", "AS");
         OutputString(COLOR_BROWN, x, y, filter->getMaxQuality(), true, left_margin);
 
         OutputToggleString(x, y, "Decorated Only", "D", filter->getDecoratedOnly(), true, left_margin);

From 371f68f0a3f5ea2bedab5429cb8137c0ebf4b85c Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 26 Oct 2020 16:22:15 -0700
Subject: [PATCH 482/547] update changelog

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index dbe296c85..27581c1f7 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -41,6 +41,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `buildingplan`: all buildings, furniture, and constructions are now supported (except for the few building types not supported by dfhack itself)
 - `buildingplan`: now respects building job_item filters when matching items
 - `buildingplan`: default filter setting for max quality changed from ``artifact`` to ``masterwork``
+- `buildingplan`: min quality adjustment hotkeys changed from 'qw' to 'QW' to avoid conflict with existing hotkeys for setting roller speed. max quality adjustment hotkeys changed from 'QW' to 'AS' to make room for the min quality hotkey changes.
 
 ## API
 - `buildingplan`: added Lua interface API

From 1a69a9b4833ad2ec6259d582376bf7fadeed5ec5 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 26 Oct 2020 16:54:50 -0700
Subject: [PATCH 483/547] add more important checks for matching items

stolen (with love) from advfort.lua
---
 plugins/buildingplan-planner.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/buildingplan-planner.cpp b/plugins/buildingplan-planner.cpp
index dcdcfb777..9d73ab4c4 100644
--- a/plugins/buildingplan-planner.cpp
+++ b/plugins/buildingplan-planner.cpp
@@ -704,6 +704,7 @@ static bool matchesFilters(df::item * item,
                            df::job_item * job_item,
                            const ItemFilter & item_filter)
 {
+    // check the properties that are not checked by Job::isSuitableItem()
     if (job_item->item_type > -1 && job_item->item_type != item->getType())
         return false;
 
@@ -711,6 +712,12 @@ static bool matchesFilters(df::item * item,
         job_item->item_subtype != item->getSubtype())
         return false;
 
+    if (job_item->flags2.bits.building_material && !item->isBuildMat())
+        return false;
+
+    if (job_item->metal_ore > -1 && !item->isMetalOre(job_item->metal_ore))
+        return false;
+
     if (job_item->has_tool_use > df::tool_uses::NONE
         && !item->hasToolUse(job_item->has_tool_use))
         return false;

From c1af3e281719933148f1a8570ebc6c272bebfc79 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 26 Oct 2020 21:13:11 -0700
Subject: [PATCH 484/547] document what happens if no types are allowed

---
 plugins/lua/buildingplan.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/lua/buildingplan.lua b/plugins/lua/buildingplan.lua
index ac92082f3..aa5a71eba 100644
--- a/plugins/lua/buildingplan.lua
+++ b/plugins/lua/buildingplan.lua
@@ -194,6 +194,7 @@ function GlobalSettings:init()
         self:make_setting_label_token('Bars', 'CUSTOM_R', 'bars', 10),
             self:make_setting_value_token('bars'), '\n',
         '  Changes to these settings will be applied to newly-planned buildings.\n',
+        '  If no types are enabled above, then any building material is allowed.\n',
         '\n',
         self:make_setting_label_token('Legacy Quickfort Mode', 'CUSTOM_F',
                                       'quickfort_mode', 23),

From 5debc43def5878187c90f53d8d551fe26ddefb23 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 26 Oct 2020 21:18:22 -0700
Subject: [PATCH 485/547] add port of Python Quickfort's TheQuickFortress

- some bugs fixed, especially in the query blueprints
- repackaged into a single file for easier distribution
- all blueprints given labels for addressing
- meta blueprints added for blueprints that could be applied as a group
---
 data/blueprints/library/quickfortress.csv | 768 ++++++++++++++++++++++
 1 file changed, 768 insertions(+)
 create mode 100644 data/blueprints/library/quickfortress.csv

diff --git a/data/blueprints/library/quickfortress.csv b/data/blueprints/library/quickfortress.csv
new file mode 100644
index 000000000..9d11ec675
--- /dev/null
+++ b/data/blueprints/library/quickfortress.csv
@@ -0,0 +1,768 @@
+#notes label(help)
+"This is Buketgeshud, or translated from Dwarvish, The Quick Fortress. It is a set of basic blueprints for quickfort, demonstrating its use in assembling an entire basic (if incomplete) fort."
+""
+Buketgeshud is designed around a 30x20 footprint with a common 2x2 central staircase. Blueprints can be repeated in any direction to connect in a modular fashion with adjacent 30x20 areas. A fortresswide example recirculating waterfall/plumbing system is included as an overlay if you're feeling hardcore.
+""
+Walkthrough:
+1) Embark!
+""
+2) Clear a 30 wide x 20 high region of trees on the surface. This should be uninterrupted flat ground with soil (so that we can place farms below). Deconstruct your wagon.
+""
+"3) Run /surface1. You'll want to put the cursor in the middle of the 30x20 cleared area (14 right, 8 down from the top left corner). This digs out stairs on the surface, a farm/depot/workshop level below, as well as the beginnings of an entrance moat. The beginnings of a 3rd z-level are also dug out; don't build anything here if you'd like to put waterfall plumbing in later."
+""
+"4) After /surface1 is dug out, run /surface2 (beginning from the same starting position as you used for /surface1). This puts down a basic set of workshops commonly needed soon after embark, a couple farm plots, and a depot. It also places and configures starting stockpiles."
+""
+"5) If your embark site is near any enemies, run /surface3 to build walls and traps on the surface to protect against invaders."
+""
+"6) Dig out the central shaft and tunnels for several z-levels below our surface/depot level. Place the cursor THREE Z-levels below the surface, where no digging has occurred yet, and run /basic1 for 6 z-levels down starting from that level."
+""
+"7) Optionally run /basic2 to designate booze-only stockpiles around the central stairs on every z-level below the farming level. The stockpiles are configured to take booze from the level above, so be sure to apply /basic2 on the top level first and work your way down."
+""
+"8) Run workshops, bedrooms, and storeroom blueprints on any desired Z-level along our central shaft."
+""
+"9) If desired, add a fortresswide waterfall system, bathing your dwarves in tile after tile of lovely waterfall mist as they go about their day. Run /waterfall1 on the z-level immediately below your farm/depot level (you left that space empty, didn't you?) and run /plumbing1 on z-levels below that, down to the bottom of your fort. Each application of /plumbing1 will dig out two floors. On the bottommost level, the screw pumps that will be placed there require 2 floor tiles to sit on, so remove or refloor the 2 northern channel designations  in the lower right corner on that z-level. You'll also need a reservior in the z-level below that (not included)."
+""
+"10) After all levels are dug out, apply /plumbing2 on the *bottommost* level, just above the reservior. The blueprint will build screw pumps on that level and the level above. Repeat on every alternate level up to the level below where you applied /waterfall1."
+""
+"11) Finally, apply /waterfall2 on the z-level where you applied /waterfall1. Route flowing water to the 2 tiles in lower right."
+"#dig label(surface1) start(15;10; top left corner of central stairs) message(The 3rd z-level just digs stairs; if you want to install the waterfall plumbing system later, leave this 3rd level EMPTY for now and start the base proper below that; use /basic1 to dig out areas for future use below.) Surface and farm/depot levels"
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,h,,,,,~,~,#
+`,,,,,,,,,,,,,,,,,,,,,,`,h,,h,h,,~,~,#
+`,,,,,,,,,,,,,,,,,,,,,,`,h,,,h,,~,~,#
+`,,,,,,,,,,,,,,,,,,,,,,`,h,h,,h,`,`,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,h,,,h,h,h,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,h,,h,h,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,h,,,,h,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,h,h,h,h,h,,`,#
+`,,,,j,,,,,,,,,,j,j,,,,,,,`,h,,,,,,`,#
+`,,,,j,,,,,,,,,,j,j,,,,,,,`,h,,h,h,h,h,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,h,,,,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,h,h,h,h,h,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,h,,,,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,h,,h,h,h,h,`,#
+`,,,,,,,,,,,,`,~,~,~,~,`,,,,,`,h,,,,,,`,#
+`,,,,,,,,,,,,`,~,~,~,~,`,,,,,`,`,h,h,h,h,,`,#
+`,,,,,,,,,,,,`,,,,,`,,,,,~,~,,,,,,`,#
+`,,,,,,,,,,,,`,,,,,`,,,,,`,`,h,h,h,h,h,`,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+#>,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+d,d,d,d,j,d,d,d,d,d,d,d,d,d,j,j,d,d,d,d,d,d,`,`,`,`,`,`,`,`,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,,,,,,,`,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,,,,,,,`,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,,,,,,,`,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,,,,,,,`,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,,,,,,,`,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,,,,,,,`,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,,,,d,d,d,d,d,`,,,,,,,`,#
+`,,,,d,,,,,,,,d,,d,d,,d,,,,,`,,,,,,,`,#
+d,d,d,d,i,d,d,d,d,d,d,d,d,d,i,i,d,d,d,d,d,d,`,,,,,,,`,#
+d,d,d,d,i,d,d,d,d,d,d,d,d,d,i,i,d,d,d,d,d,d,`,,,,,,,`,#
+`,,,,d,,,,d,d,d,d,,d,d,d,d,,d,d,d,d,`,,,,,,,`,#
+d,d,d,d,d,d,d,,d,d,d,d,,d,d,d,d,,d,d,d,d,`,,,,,,,`,#
+d,d,d,d,d,d,d,,,,d,d,,,d,d,,,,,,,`,,,,,,,`,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,,,,,,,`,#
+d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,,,,,,,`,#
+d,d,d,d,d,d,d,,d,d,d,d,,d,d,d,d,d,d,d,d,d,`,,,,,,,`,#
+d,d,d,d,d,d,d,,d,d,d,d,,r,r,r,r,d,d,d,d,d,`,,,,,,,`,#
+d,d,d,d,d,d,d,d,d,d,d,d,,~,~,~,~,d,d,d,d,d,`,,,,,,,`,#
+`,`,`,`,j,`,`,`,`,`,`,`,`,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+#>,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+d,,,,i,,,,,,,,,,i,i,,,,,,,,,,j,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,d,d,,,,,,,,,,,,,,,#
+,,,,i,,,,,,,,,d,i,i,d,,,,,,,,,j,,,,,#
+,,,,i,,,,,,,,,d,i,i,d,,,,,,,,,j,,,,,#
+,,,,,,,,,,,,,,d,d,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,i,,,,,,,,,,j,j,,,,,,,,,,j,,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#meta label(surface2) Build basic workshops and stockpiles
+/surface2_build
+/surface2_place
+/surface2_query
+/surface2_doors
+"#build label(surface2_build) hidden() start(15;10; top left corner of central stairs) Populates the surface and farm/depot levels with farm plots, workshops and a depot"
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,~,#
+`,,,,,,,,wu,,,wr,,,,,,,,,,,`,,,,,,,~,#
+`,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,~,#
+`,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+`,,,,,,,,wn,,,,,,,,,,,,,,`,,,,,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+`,,,,,,,,,,,,`,~,~,~,~,`,,,,,`,,,,,,,`,#
+`,,,,,,,,,,,,`,~,~,~,~,`,,,,,`,,,,,,,`,#
+`,,,,,,,,,,,,`,,,,,`,,,,,~,,,,,,,`,#
+`,,,,,,,,,,,,`,,,,,`,,,,,`,,,,,,,`,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+#>,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+,,,,`,,,,p(6x7),,,,,,`,`,p(6x7),,,,,,`,`,`,`,`,`,`,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,wl,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+`,`,`,`,,`,`,`,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,`,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,`,`,`,,,`,`,,,`,`,`,`,`,`,`,,,,,,,`,#
+,wc,,,,wm,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,`,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,`,,,,,`,,,,,,,D,,,`,,,,,,,`,#
+,wt,,,,wr,,`,,,,,`,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,`,,,,,,,,,,`,,,,,,,`,#
+,,,,`,,,`,,,,,`,`,`,`,`,,,,,,`,`,`,`,`,`,`,`,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#place label(surface2_place) hidden() start(15;10; top left corner of central stairs) Lay stockpiles on surface and depot/farm levels
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+`,r(6x6),,,,,~,,,,,,,r(3x6),,,r(5x6),,,,,z(1x6),`,`,,,,,~,~,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,,`,`,,~,~,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,,,`,,~,~,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,,,`,`,`,`,#
+`,~,,,,,~,,,,,,,~,,,~,,,,,~,`,`,,`,`,,,`,#
+`,,,,,,,,,,,,,,,,,,w(4x8),,,,`,`,,,,`,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,,,,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,,`,`,`,`,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,,,,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,,,,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,,`,`,`,`,`,#
+`,u(11x3),,,,,,,,,,,`,~,~,~,~,`,,,,,`,`,,,,,,`,#
+`,,,,,,,,,,,,`,~,~,~,~,`,,,,,`,`,`,`,`,`,,`,#
+`,,,,,,,,,,,,`,,,,,`,y(4x2),,,,~,~,,,,,,`,#
+`,,,,,,,,,,,,`,~,~,~,~,`,,,,,`,`,`,`,`,`,`,`,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+#>,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+f,f,f,f,,f,f,f,,,,,,,`,`,,,,,,,`,`,`,`,`,`,`,`,#
+f,f,f,f,f,f,f,f,,,,,,,f(2x6),,,,,,,,`,,,,,,,`,#
+f,f,f,f,f,f,f,f,,,,,,,,,,,,,,,`,,,,,,,`,#
+f,f,,,,f,f,f,,,,,,,,,,,,,,,`,,,,,,,`,#
+f,f,,,,f,f,f,,,,,,,,,,,,,,,`,,,,,,,`,#
+f,f,,,,f,f,f,,,,,,,,,,,,,,,`,,,,,,,`,#
+f,f,f,f,f,f,f,f,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,`,,,,,,`,`,`,`,,,,,,`,,,,,,,`,#
+,,,,`,,,,,,,,`,,f(2x1),,,`,,,,,`,,,,,,,`,#
+w(4x2),,,,,f(9x2),,,,,,,,,`,`,f(1x2),,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,`,`,,,,,,,`,,,,,,,`,#
+,,,,`,,,,g(4x2),,,,,,f(2x1),,,,,,,,`,,,,,,,`,#
+,,,s(1x8),,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,`,`,,,,,,,`,,,,,,,`,#
+,,,,,,,,g(4x5),,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,`,,,,,,,,,`,`,`,`,,,,,,`,`,`,`,`,`,`,`,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#query label(surface2_query) hidden() start(15;10; top left corner of central stairs) message(remember to set the farm plots to grow plump helmets) Adjust surface/depot level stockpiles
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+`,bodyparts,,,,,~,,,,,,,rawhides,,,craftrefuse,,,,,,`,`,,,,,~,~,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,,`,`,,~,~,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,,,`,,~,~,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,`,,`,`,`,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,,,`,`,`,`,#
+`,~,,,,,~,,,,,,,~,,,~,,,,,~,`,`,,`,`,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,,,,`,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,,,,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,,`,`,`,`,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,,,,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,,,,,,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,,`,`,`,`,`,#
+`,,,,,,,,,,,,`,~,~,~,~,`,,,,,`,`,,,,,,`,#
+`,,,,,,,,,,,,`,~,~,~,~,`,,,,,`,`,`,`,`,`,,`,#
+`,,,,,,,,,,,,`,,,,,`,,,,,~,~,,,,,,`,#
+`,,,,,,,,,,,,`,,,,,`,,,,,`,`,`,`,`,`,`,`,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+#>,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+noseeds,,,,,,,,,,,,,,`,`,,,,,,,`,`,`,`,`,`,`,`,#
+,,,,,,,,,,,,,,seeds,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,`,,,,,,`,`,`,`,,,,,,`,,,,,,,`,#
+,,,,`,,,,,,,,`,,booze,t{Down}{Left 2}&,,`,,,,,`,,,,,,,`,#
+,,,,,booze,,,,,,,,,`,`,booze,,,,,,`,,,,,,,`,#
+,,,,,t{Up 5}&,,,,,,,,,`,`,t{Left 3}&,,,,,,`,,,,,,,`,#
+,,,,`,,,,,,,,,,booze,t{Up}{Left 2}&,,,,,,,`,,,,,,,`,#
+,,,otherstone,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,`,`,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,~,~,~,~,,,,,,`,,,,,,,`,#
+,,,,`,,,,,,,,,`,`,`,`,,,,,,`,`,`,`,`,`,`,`,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#build label(surface2_doors) hidden() start(15;10; top left corner of central stairs) Just builds doors on the depot level (just below the surface)
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+#>,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,`,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+`,,,,d,,,,,,,,d,,,,,d,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,`,`,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,`,`,,,,,,,`,,,,,,,`,#
+`,,,,d,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,d,d,,,d,d,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,d,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,d,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,,,,,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,`,`,`,`,,,,,,`,,,,,,,`,#
+,,,,,,,,,,,,,~,~,~,~,,,,,,`,,,,,,,`,#
+`,`,`,`,~,`,`,`,`,`,`,`,`,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#meta label(surface3) Build walls and traps to protect against invaders
+/surface3_walls
+/surface3_traps
+#build label(surface3_walls) hidden() start(15;10; top left corner of central stairs) Builds walls and bridges on the surface level. Note that the entrance on the southern wall juts out from the 30x20 footprint by 3 tiles; the southern bridge extends beyond the edge of the blueprint itself.\n\nYou'll need to add and connect levers yourself.
+Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,#
+Cw,,,,,,,,,,,,,,,,,,,,,,Cw,,,,,,gd(2x3),,#
+Cw,,,,,,,,,,,,,,,,,,,,,,Cw,,,,,,,,#
+Cw,,,,,,,,,,,,,,,,,,,,,,Cw,,,,,,,,#
+Cw,,,,,,,,,,,,,,,,,,,,,,Cw,,,,,Cw,Cw,Cw,#
+Cw,,,,,,,,,,,,,,,,,,,,,,Cw,,,,,,,Cw,#
+Cw,,,,,,,,,,,,,,,,,,,,,,Cw,,,,,,,Cw,#
+Cw,,,,,,,,,,,,,,,,,,,,,,Cw,,,,,,,Cw,#
+Cw,,,,,,,,,,,,,,,,,,,,,,Cw,,,,,,,Cw,#
+Cw,,,,,,,,,,,,,,,,,,,,,,Cw,,,,,,,Cw,#
+Cw,,,,,,,,,,,,,,,,,,,,,,Cw,,,,,,,Cw,#
+Cw,,,,,,,,,,,,,,,,,,,,,,Cw,,,,,,,Cw,#
+Cw,,,,,,,,,,,,,,,,,,,,,,Cw,,,,,,,Cw,#
+Cw,,,,,,,,,,,,,,,,,,,,,,Cw,,,,,,,Cw,#
+Cw,,,,,,,,,,,,,,,,,,,,,,Cw,,,,,,,Cw,#
+Cw,,,,,,,,,,,,Cw,gw(4x2),,,,Cw,,,,,Cw,,,,,,,Cw,#
+Cw,,,,,,,,,,,,Cw,,,,,Cw,,,,,Cw,Cw,,,,,,Cw,#
+Cw,,,,,,,,,,,,Cw,,,,,Cw,,,,,ga(2x1),,,,,,,Cw,#
+Cw,,,,,,,,,,,,Cw,,,,,Cw,,,,,Cw,Cw,,,,,,Cw,#
+Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,,,,,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,Cw,#
+,,,,,,,,,,,,Cw,,,,,Cw,,,,,,,,,,,,,#
+,,,,,,,,,,,,Cw,gw(4x2),,,,Cw,,,,,,,,,,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#build label(surface3_traps) hidden() start(15;10; top left corner of central stairs) Put some stone-fall traps down.
+`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,Ts,Ts,Ts,,~,~,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,Ts,`,`,,~,~,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,Ts,Ts,`,,~,~,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,`,Ts,`,`,`,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,Ts,Ts,`,`,`,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,Ts,`,`,Ts,Ts,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,Ts,Ts,Ts,`,Ts,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,Ts,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,Ts,Ts,Ts,Ts,Ts,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,Ts,`,`,`,`,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,Ts,Ts,Ts,Ts,Ts,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,`,`,`,`,Ts,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,Ts,Ts,Ts,Ts,Ts,`,#
+`,,,,,,,,,,,,,,,,,,,,,,`,`,Ts,`,`,`,`,`,#
+`,,,,,,,,,,,,`,~,~,~,~,`,,,,,`,`,Ts,Ts,Ts,Ts,Ts,`,#
+`,,,,,,,,,,,,`,~,~,~,~,`,,,,,`,`,`,`,`,`,Ts,`,#
+`,,,,,,,,,,,,`,,,,,`,,,,,~,~,Ts,Ts,Ts,Ts,Ts,`,#
+`,,,,,,,,,,,,`,,,,,`,,,,,`,`,`,`,`,`,`,`,#
+`,`,`,`,`,`,`,`,`,`,`,`,`,~,~,~,~,`,`,`,`,`,`,`,`,`,`,`,`,`,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#dig label(basic1) start(15;10; top left corner of central stairs) Common stair/shaft digging for all floors below surface/depot levels
+,,,,i,,,,,,,,,,i,i,,,,,,,,,,i,,,,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+d,d,d,d,i,d,d,d,d,d,d,d,d,d,i,i,d,d,d,d,d,d,d,d,d,i,d,d,d,d,#
+d,d,d,d,i,d,d,d,d,d,d,d,d,d,i,i,d,d,d,d,d,d,d,d,d,i,d,d,d,d,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+,,,,i,,,,,,,,,,i,i,,,,,,,,,,i,,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#meta label(basic2) Place and configure food/booze stockpiles around the central staircase
+/basic2_place
+/basic2_query
+#place label(basic2_place) hidden() start(15;10; top left corner of central stairs) Places food stockpiles around the central staircase
+,,,,`,,,,,,,,,,`,`,,,,,,,,,,`,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,f(2x1),,,,,,,,,,,,,,,,#
+,,,,`,,,,,,,,,f(1x2),`,`,f(1x2),,,,,,,,,`,,,,,#
+,,,,`,,,,,,,,,,`,`,,,,,,,,,,`,,,,,#
+,,,,,,,,,,,,,,f(2x1),,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,`,,,,,,,,,,`,`,,,,,,,,,,`,,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+"#query label(basic2_query) hidden() start(15;10; top left corner of central stairs) configures booze stockpiles around stairway, taking from the stockpile on the level above"
+,,,,`,,,,,,,,,,`,`,,,,,,,,,,`,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,booze,t<&,,,,,,,,,,,,,,,#
+,,,,`,,,,,,,,,booze,`,`,booze,,,,,,,,,`,,,,,#
+,,,,`,,,,,,,,,t<&,`,`,t<&,,,,,,,,,`,,,,,#
+,,,,,,,,,,,,,,booze,t<&,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,`,,,,,,,,,,`,`,,,,,,,,,,`,,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+"#dig label(workshops1) start(15;10; top left corner of central stairs) Just four big rooms, suitable for workshops"
+d,d,d,d,i,d,d,d,d,d,d,d,d,,i,i,,d,d,d,d,d,d,d,d,i,d,d,d,,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,#
+,d,,,d,,,,,,,,d,,d,d,,d,,,,,,,,d,,,,,#
+d,d,d,d,i,d,d,d,d,d,d,d,d,d,i,i,d,d,d,d,d,d,d,d,d,i,d,d,d,d,#
+d,d,d,d,i,d,d,d,d,d,d,d,d,d,i,i,d,d,d,d,d,d,d,d,d,i,d,d,d,d,#
+,d,,,d,,,,,,,,d,,d,d,,d,,,,,,,,d,,,,,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,`,`,`,`,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,`,,,,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,`,,,,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,`,,,,#
+,,,,i,,,,,,,,,,i,i,,,,,,,,,,i,`,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#meta label(workshops2) Build commonly needed workshops and associated stockpiles
+/workshops2_build
+/workshops2_place
+/workshops2_doors
+#build label(workshops2_build) hidden() start(15;10; top left corner of central stairs) Sufficient workshops for basic non-food needs
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+,,,wj,,,,we,,,,we,,,`,`,,,es,,,,ew,,,,ek,,,,#
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+,,,wj,,,,we,,,,we,,,`,`,,,es,,,,eg,,,,wf,,,,#
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+`,`,`,`,~,`,`,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`,`,`,~,`,`,`,`,#
+`,`,`,`,~,`,`,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`,`,`,~,`,`,`,`,#
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+,,,wr,,,,wr,,,,wm,,,`,`,,,wc,,,,wc,,,,wb,,,,#
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+`,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+`,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+`,,,wt,,,,wt,,,,wm,,,`,`,,,wc,,,,wc,,,,,,,,#
+`,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+`,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#place label(workshops2_place) hidden() start(15;10; top left corner of central stairs) Workshop source material piles placed around the workshops.
+e,e,e,e,,l,l,l,l,l,l,l,l,,`,`,,b,b,b,b,b,b,b,b,,b,b,b,,#
+e,e,e,e,e,l,l,l,l,l,l,l,l,,`,`,,b,b,b,b,b,b,b,b,b,b,b,b,,#
+e,e,,,,l,,,,l,,,,,`,`,,,,,b,,,,b,,,,b,,#
+e,e,,,,l,,,,l,,,,,`,`,,,,,b,,,,b,,,,b,,#
+e,e,,,,l,,,,l,,,,,`,`,,,,,b,,,,b,,,,b,,#
+,,,,,l,,,,l,,,,,`,`,,,,,b,,,,b,,,,b,,#
+,,,,,l,,,,l,,,,,`,`,,,,,b,,,,b,,,,b,,#
+,,,,,l,,,,l,,,,,`,`,,,,,b,,,,b,,,,b,,#
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+`,`,`,`,~,`,`,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`,`,`,~,`,`,`,`,#
+`,`,`,`,~,`,`,`,`,`,`,`,`,`,~,~,`,`,`,`,`,`,`,`,`,~,`,`,`,`,#
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,`,`,,,,,w,,,,w,,,,,,#
+,,,,,,,,,,,,,,`,`,,,,,w,,,,w,,,,,,#
+,,,,,,,,,,,,,,`,`,,,,,w,,,,w,,,,,,#
+,,,s(10x1),,,,,,,,,,,`,`,,w,w,w,w,w,w,w,w,w,,,,,#
+,,,,,,,,,,,,,,`,`,,,,,w,,,,w,,,,,,#
+,,,,,,,,,,,,,,`,`,,,,,w,,,,w,,,,,,#
+,,,,,,,,,,,,,,`,`,,,,,w,,,,w,,,,,,#
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#build label(workshops2_doors) hidden() start(15;10; top left corner of central stairs) Fill in doors to the workrooms.
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,d,,,d,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,d,,,d,,,,,,,,,,,,,,#
+,d,,,d,,,,,,,,d,,,,,d,,,,,,,,d,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,d,,,d,,,,,,,,d,,,,,d,,,,,,,,d,,,,,#
+,,,,,,,,,,,,,d,,,d,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,d,,,d,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+"#dig label(storeroom1) start(15;10; Top left corner of central stairs) Just four big rooms, suitable for storerooms"
+d,d,d,d,i,d,d,d,d,d,d,d,d,d,i,i,d,d,d,d,d,d,d,d,d,i,d,d,d,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+,,,,d,,,,,,,,d,,d,d,,d,,,,,,,,d,,,,,#
+d,d,d,d,i,d,d,d,d,d,d,d,d,d,i,i,d,d,d,d,d,d,d,d,d,i,d,d,d,d,#
+d,d,d,d,i,d,d,d,d,d,d,d,d,d,i,i,d,d,d,d,d,d,d,d,d,i,d,d,d,d,#
+,,,,d,,,,,,,,d,,d,d,,d,,,,,,,,d,,,,,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,,,,,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,,,,,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,,,,,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,,d,d,,d,d,d,d,d,d,d,d,d,,,,,#
+d,d,d,d,d,d,d,d,d,d,d,d,d,d,i,i,d,d,d,d,d,d,d,d,d,d,,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#meta label(storeroom2a) General stockpiles
+/storeroom2a_place
+/storeroom2_doors
+"#meta label(storeroom2b) Extra storage for wood, food and furniture"
+/storeroom2b_place
+/storeroom2_doors
+#place label(storeroom2a_place) hidden() start(15;10; top left corner of central stairs) General stockpiles
+g(6x8),,,,x(1x1),,l(7x8),,,,,,,,,,,d(7x5),,,,,,,p(6x5),x(1x1),,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,`,,,`,b(7x3),,,,,,,z(6x3),,,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+`,`,`,`,,`,`,`,`,`,`,`,,`,,,`,,`,`,`,`,`,`,`,,`,`,`,`,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+`,`,`,`,,`,`,`,`,`,`,`,,`,,,`,,`,`,`,`,`,`,`,,`,`,`,`,#
+u(13x8),,,,,,,,,,,,,,,,,u(7x8),,,,,,,w(6x8),,,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,x(4x5),,,`,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,`,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,`,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,`,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,`,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+"#place label(storeroom2b_place) hidden() start(15;10; top left corner of central stairs) Extra storage for wood, food and furniture"
+w(13x8),,,,x(1x1),,,,,,,,,,,,,f(13x8),,,,,,,,x(1x1),,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+`,`,`,`,,`,`,`,`,`,`,`,,`,,,`,,`,`,`,`,`,`,`,,`,`,`,`,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+`,`,`,`,,`,`,`,`,`,`,`,,`,,,`,,`,`,`,`,`,`,`,,`,`,`,`,#
+u(13x8),,,,,,,,,,,,,,,,,u(13x8),,,,,,,,,,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,x(4x5),,,`,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,`,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,`,,,,#
+,,,,,,,,,,,,,`,,,`,,,,,,,,,,`,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,`,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#build label(storeroom2_doors) hidden() start(15;10; top left corner of central stairs) Build storeroom doors
+,,,,,,,,,,,,,d,,,d,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,d,,,d,,,,,,,,,,,,,,#
+,,,,d,,,,,,,,d,,,,,d,,,,,,,,d,,,,d,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,d,,,,,,,,d,,,,,d,,,,,,,,d,,,,d,#
+,,,,,,,,,,,,,d,,,d,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,d,,,d,,,,,,,,,,,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#dig label(bedrooms1) start(15;10; top left corner of central stairs) Bedroom complex
+d,d,d,,i,,d,d,d,,d,d,d,,i,i,,d,d,d,,d,d,d,,i,,,,,#
+d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,,d,d,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,d,d,,#
+d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+d,,d,,d,,d,,d,,d,d,d,d,d,d,d,d,d,d,,d,,d,,d,,d,d,,#
+d,,d,,d,,d,,d,,,,,,d,d,,,,,,d,,d,,d,,d,d,,#
+d,,d,,d,,d,,d,,,d,d,d,d,d,d,d,d,,,d,,d,,d,d,d,d,,#
+d,,d,,d,,d,,d,,d,d,d,d,d,d,d,d,d,d,,d,,d,,d,,,,,#
+d,d,d,d,i,d,d,d,d,d,d,d,d,d,i,i,d,d,d,d,d,d,d,d,d,i,d,d,d,d,#
+d,d,d,d,i,d,d,d,d,d,d,d,d,d,i,i,d,d,d,d,d,d,d,d,d,i,d,d,d,d,#
+d,,d,,d,,d,,d,,d,d,d,d,d,d,d,d,d,d,,d,,d,,d,,,,,#
+d,,d,,d,,d,,d,,,d,d,d,d,d,d,d,d,,,d,,d,,d,d,d,d,,#
+d,,d,,d,,d,,d,,,,,,d,d,,,,,,d,,d,,d,,d,d,,#
+d,,d,,d,,d,,d,,d,d,d,d,d,d,d,d,d,d,,d,,d,,d,,d,d,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,,,,,#
+,,,,d,,,,,,,,,,d,d,,,,,,,,,,d,,,,,#
+d,d,d,d,d,d,d,d,d,,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,,,,,#
+,,,,i,,,,,,,,,,i,i,,,,,,,,,,i,,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#build label(bedrooms2) start(15;10; top left corner of central stairs) Bedroom furniture
+f,h,h,,,,h,h,f,,f,h,h,,,,,h,h,f,,f,h,h,,,,,,,#
+b,,,d,,d,,,b,,b,,,d,,,d,,,b,,b,,,d,,,f,h,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,h,,#
+b,f,h,d,,d,h,f,b,,b,f,h,d,,,d,h,f,b,,b,f,h,d,,d,,b,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+b,,b,,,,b,,b,,b,f,h,d,,,d,h,f,b,,b,,b,,,,f,h,,#
+f,,f,,,,f,,f,,,,,,,,,,,,,f,,f,,,,,h,,#
+h,,h,,,,h,,h,,,t,t,,,,,,,,,h,,h,,,d,,b,,#
+d,,d,,,,d,,d,,,c,c,,,,,,,,,d,,d,,,,,,,#
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+d,,d,,,,d,,d,,,,,,,,,c,c,,,d,,d,,,,,,,#
+h,,h,,,,h,,h,,,,,,,,,t,t,,,h,,h,,,d,,h,,#
+f,,f,,,,f,,f,,,,,,,,,,,,,f,,f,,,,,h,,#
+b,,b,,,,b,,b,,b,f,h,d,,,d,h,f,b,,b,,b,,,,f,b,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+b,f,h,d,,d,h,f,b,,b,f,h,d,,,d,h,f,b,,b,f,h,d,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+b,f,h,d,,d,h,f,b,,b,f,h,d,,,d,h,f,b,,b,f,h,d,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#query label(bedrooms3) start(15;10; top left corner of central stairs) Makes bedrooms and small dining rooms from beds and tables
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+r+,,,,,,,,r+,,r+,,,,,,,,,r+,,r+,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+r+,,,,,,,,r+,,r+,,,,,,,,,r+,,r+,,,,,,,r+,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+r+,,r+,,,,r+,,r+,,r+,,,,,,,,,r+,,r+,,r+,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,r++&,,,,,,,,,,,,,,,,,r+,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,r++&,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+r+,,r+,,,,r+,,r+,,r+,,,,,,,,,r+,,r+,,r+,,,,,r+,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+r+,,,,,,,,r+,,r+,,,,,,,,,r+,,r+,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+r+,,,,,,,,r+,,r+,,,,,,,,,r+,,r+,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#dig label(plumbing1) start(15;10; top left corner of central stairs) Plumbing for the waterfall system
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,h,h,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,h,,,,,,,,,h,,,,,,,,,,,#
+,,,,,,,,,,h,,,,,,,,,h,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,h,h,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,h,h,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d,d,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,d,,h,h,#
+,,,,,,,,,,,,,,,,,,,,,,,,,i,d,,d,d,#
+#>,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,h,h,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,h,,,,,,,,,h,,,,,,,,,,,#
+,,,,,,,,,,h,,,,,,,,,h,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,h,h,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,h,h,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d,d,#
+,,,,,,,,,,,,,,,,,,,,,,,,,i,d,,h,h,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+"#build label(plumbing2) start(15;10; top left corner of central stairs) Grates, doors, and screw pumps for the waterfall plumbing"
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,G,G,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,G,,,,,,,,,G,,,,,,,,,,,#
+,,,,,,,,,,G,,,,,,,,,G,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,G,G,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,`,`,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,d,Msm,Msm,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,~,~,#
+#<,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,G,G,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,G,,,,,,,,,G,,,,,,,,,,,#
+,,,,,,,,,,G,,,,,,,,,G,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,G,G,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,~,~,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,d,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,Msu,Msu,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,`,`,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+#dig label(waterfall1) start(15;10; top left corner of central stairs) Top-level plumbing for the waterfall system
+,,,,i,,,,,,,,,,i,i,,,,,,,,,,i,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
+,,,,,,d,,,,,,,,,,,,,,,,,,,,,,,d,#
+,,,,,,d,,,,,,,,d,d,d,d,d,d,d,d,d,d,d,d,d,d,,d,#
+,,,,,,d,,,,,,,,h,h,,,,,,,,,,,,d,,d,#
+,,,,,,d,,,,,,,,,,,,,,,,,,,,,d,,d,#
+,,,,,,d,,,,,,,,,,,,,,,,,,,,,d,,d,#
+,,,,,,d,,,,,,,,,,,,,,,,,,,,,d,,d,#
+,,,,i,,d,d,d,d,h,,,,i,i,,,,h,d,d,d,d,,i,,d,,d,#
+,,,,i,,d,d,d,d,h,,,,i,i,,,,h,d,d,d,d,,i,,d,d,d,#
+,,,,,,,,,,,,,,,,,,,,,,,d,,,,,d,d,#
+,,,,,,,,,,,,,,,,,,,,,,,d,d,d,d,d,d,d,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,d,d,d,#
+,,,,,,,,,,,,,,h,h,,,,d,d,d,d,d,d,d,d,d,d,d,#
+,,,,,,,,,,,,,,d,d,,,,d,,,,,,,,,d,d,#
+,,,,,,,,,,,,,,d,d,d,d,d,d,,d,d,d,,d,d,d,d,d,#
+,,,,,,,,,,,,,,,,,,,,,d,d,d,d,d,,,d,d,#
+,,,,,,,,,,,,,,d,d,d,d,d,d,d,d,d,d,,d,d,d,d,d,#
+,,,,i,,,,,,,,,,i,i,,,,,,,,,,i,,,d,d,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#
+"#build label(waterfall2) start(15;10; top left corner of central stairs) message(Remember to link the levers and lock the doors manually) Floodgates, screw pumps, bridges and levers to control flow"
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,x,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,x,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,`,`,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,x,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,gw(2x1),,#
+,,,,,,,,,,,,,,,,x,,,,,,Tl,,,,,d,,,#
+,,,,,,,,,,,,,,,,,,,,,Tl,Tl,Tl,d,,,,,,#
+,,,,,,,,,,,,,,,,,,,,,,Tl,,,,,d,Msm,Msm,#
+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#
+#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#,#

From e61839b571f06ee73eb907cf6229e3d4e6ade721 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 28 Oct 2020 00:01:51 -0400
Subject: [PATCH 486/547] Fix ordered list

---
 docs/guides/quickfort-user-guide.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 9e5db34c3..964776f65 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -527,7 +527,7 @@ The valid hospital settings (and their maximum values) are:
     powder   (15000)
     buckets  (100)
     soap     (15000)
-    
+
 To toggle the ``active`` flag for zones, add an ``a`` character to the string.
 For example, to create a *disabled* pond zone (that you later intend to
 carefully fill with 3-depth water for a dwarven bathtub):
@@ -1386,9 +1386,9 @@ There are also good examples in the query blueprint for how to use the
 Most of the baseline aliases distributed with DFHack fall into one of three
 categories:
 
-# Make a stockpile accept only a particular item type in a category
-# Permit an item type, but do not otherwise change the stockpile configuration
-# Forbid an item type, but do not otherwise change the stockpile configuration
+1. Make a stockpile accept only a particular item type in a category
+2. Permit an item type, but do not otherwise change the stockpile configuration
+3. Forbid an item type, but do not otherwise change the stockpile configuration
 
 If you have a stockpile that covers multiple tiles, it might seem natural to put
 one alias per spreadsheet cell. The aliases still all get applied to the

From ccfc1f8a53bf5454bf0bfe9386a1f8433beddf6e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 28 Oct 2020 00:19:26 -0400
Subject: [PATCH 487/547] Use keyboard formatting

---
 docs/Plugins.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index 56dc785ff..73c0e1073 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -722,10 +722,11 @@ While placing a building, you can set filters for what materials you want the bu
 out of, what quality you want the component items to be, and whether you want the items to
 be decorated.
 
-If a building type takes more than one item to construct, use Ctrl+Left and Ctrl+Right to
-select the item that you want to set filters for. Any filters that you set will be used for
-all buildings of the selected type from that point onward (until you set a new filter or
-clear the current one).
+If a building type takes more than one item to construct, use
+:kbd:`Ctrl`:kbd:`Left` and :kbd:`Ctrl`:kbd:`Right` to select the item that you
+want to set filters for. Any filters that you set will be used for all buildings
+of the selected type from that point onward (until you set a new filter or clear
+the current one).
 
 For example, you can be sure that all your constructed walls are the same color by setting
 a filter to accept only certain types of stone.

From cf95c0ee2351fc6cc714a0e0719178f1f7c7ddda Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 28 Oct 2020 00:29:32 -0400
Subject: [PATCH 488/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index a574158ca..3716b2f8d 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit a574158ca3f12ed2911e77632e09972be56beb3a
+Subproject commit 3716b2f8dd18bbfb5141ecefb5debed574178447

From 556c935e2b47d8ee93b3485e2c36df379f3ef08f Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 27 Oct 2020 22:01:27 -0700
Subject: [PATCH 489/547] update changelog

---
 docs/changelog.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 7f289c36d..cec1100c6 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -36,6 +36,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Fixes
 - `dwarfmonitor`: fixed a crash when opening the ``prefs`` screen if units have vague preferences
 
+## Misc Improvements
+- `quickfort`: More blueprints have been added to the blueprints library: several bedroom layouts, the Saracen Crypts, and the complete fortress example from Python Quickfort: TheQuickFortress
+
 # 0.47.04-r3
 
 ## New Plugins

From 5244ca106b0c28ba32950c4eb117a21041ab44a7 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Tue, 27 Oct 2020 22:03:14 -0700
Subject: [PATCH 490/547] attribute dreamfort updates to the quickfort script

---
 docs/changelog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 37cbe6b94..75106bec4 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -41,7 +41,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `buildingplan`: all buildings, furniture, and constructions are now supported (except for the few building types not supported by dfhack itself)
 - `buildingplan`: now respects building job_item filters when matching items
 - `buildingplan`: default filter setting for max quality changed from ``artifact`` to ``masterwork``
-- The Dreamfort sample blueprints now have complete walkthroughs for each fort level and importable orders that automate basic fort stock management
+- `quickfort`: The Dreamfort sample blueprints now have complete walkthroughs for each fort level and importable orders that automate basic fort stock management
 
 ## API
 - `buildingplan`: added Lua interface API

From 08bb6ca35edfc38348afc6f29cf13e55fcc85428 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 29 Oct 2020 00:02:59 -0400
Subject: [PATCH 491/547] Tweak colors

Ref #1684
---
 plugins/lua/buildingplan.lua | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/lua/buildingplan.lua b/plugins/lua/buildingplan.lua
index aa5a71eba..73fe160fb 100644
--- a/plugins/lua/buildingplan.lua
+++ b/plugins/lua/buildingplan.lua
@@ -129,19 +129,25 @@ function GlobalSettings:get_setting_string(name)
     return 'Off'
 end
 
+function GlobalSettings:get_setting_pen(name)
+    if self.settings[name] then return COLOR_LIGHTGREEN end
+    return COLOR_LIGHTRED
+end
+
 function GlobalSettings:is_setting_enabled(name)
     return self.settings[name]
 end
 
 function GlobalSettings:make_setting_label_token(text, key, name, width)
-    return {text=text, key=key, key_sep=': ', key_pen=COLOR_GREEN,
+    return {text=text, key=key, key_sep=': ', key_pen=COLOR_LIGHTGREEN,
             on_activate=self:callback('toggle_setting', name), width=width}
 end
 
 function GlobalSettings:make_setting_value_token(name)
     return {text=self:callback('get_setting_string', name),
             enabled=self:callback('is_setting_enabled', name),
-            pen=COLOR_YELLOW, dpen=COLOR_GRAY}
+            pen=self:callback('get_setting_pen', name),
+            dpen=COLOR_GRAY}
 end
 
 -- mockup:

From 9344e41e0a5dbe80875cd116b2e6d5027b4f204c Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 29 Oct 2020 00:03:22 -0400
Subject: [PATCH 492/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 3716b2f8d..915f88055 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 3716b2f8dd18bbfb5141ecefb5debed574178447
+Subproject commit 915f880558a2ed5775beaa5cecdbf2825483aef9

From 22ac163d55a0b83c9b360a8e916cc1833bf59050 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 29 Oct 2020 11:00:49 -0700
Subject: [PATCH 493/547] improve UX between automaterial and buildingplan

solves the confusing behavior when both automaterial and buildingplan
are enabled for constructions. the two plugins now communicate with each
other over the Lua layer to negotiate consistent behavior.

if neither plugin is enabled, the standard DF UI acts as normal

if automaterial is enabled but buildingplan is not, then automaterial
behavior is unchanged.

if buildingplan is enabled and automaterial is not then behavior is
the same as other buildings with buildingplan (no material selection
screen, screen stays on building placement screen after placement).
this commit fixes a bug, though, where buildingplan would only lay
down a single tile of contruction instead of a solid block when a
block is requested.

if both plugins are enabled but buildingplan is not enabled for the
building type then automaterial is unchanged from previous behavior,
execpt for an additional header showing the separation between
automaterial hotkeys and buildingplan hotkeys.

finally, if both plugins are enabled and buildingplan is enabled for the
building type then buildingplan behavior prevails, but the box select and
hollow designations features of automaterial are still usable and
useful. the 'Auto Mat-select', 'Reselect Type', and "Open Placement"
automaterial hotkeys are hidden in the UI and ignored in the feed. This
is because buildingplan takes over material selection, so 'Auto
Mat-select' doesn't make sense. Buildingplan also already stays on the
placement screen after placement, so 'Reselect Type' is not necessary.
And all buildingplan-placed buildings have relaxed placement
restrictions (e.g. they can be built in mid-air) so 'Open Placement' is
also not necessary. The missing options are replaced with blank lines so
the vertical alignment of all other options stays constant.

we also remove a few extra lua_pop() calls that are made superfluous by
the StackUnwinder.
---
 docs/Lua API.rst             |   5 +-
 plugins/CMakeLists.txt       |   2 +-
 plugins/automaterial.cpp     | 186 ++++++++++++++++++++++++++++++-----
 plugins/buildingplan.cpp     |  69 ++++++++++---
 plugins/lua/automaterial.lua |  23 +++++
 plugins/lua/buildingplan.lua |  53 +++++++---
 6 files changed, 278 insertions(+), 60 deletions(-)
 create mode 100644 plugins/lua/automaterial.lua

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 4c6f0d6fa..e69b13500 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3784,8 +3784,9 @@ buildingplan
 
 Native functions provided by the `buildingplan` plugin:
 
-* ``bool isPlannableBuilding(df::building_type type, int16_t subtype, int32_t custom)`` returns whether the building type is handled by buildingplan
-* ``void addPlannedBuilding(df::building *bld)`` suspends the building jobs and adds the building to the monitor list
+* ``bool isPlannableBuilding(df::building_type type, int16_t subtype, int32_t custom)`` returns whether the building type is handled by buildingplan.
+* ``bool isPlanModeEnabled(df::building_type type, int16_t subtype, int32_t custom)`` returns whether the buildingplan UI is enabled for the specified building type.
+* ``void addPlannedBuilding(df::building *bld)`` suspends the building jobs and adds the building to the monitor list.
 * ``void doCycle()`` runs a check for whether buildlings in the monitor list can be assigned items and unsuspended. This method runs automatically twice a game day, so you only need to call it directly if you want buildingplan to do a check right now.
 * ``void scheduleCycle()`` schedules a cycle to be run during the next non-paused game frame. Can be called multiple times while the game is paused and only one cycle will be scheduled.
 
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 46a7d4097..9f5b2c679 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -90,7 +90,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(autogems autogems.cpp LINK_LIBRARIES jsoncpp_lib_static)
     dfhack_plugin(autohauler autohauler.cpp)
     dfhack_plugin(autolabor autolabor.cpp)
-    dfhack_plugin(automaterial automaterial.cpp)
+    dfhack_plugin(automaterial automaterial.cpp LINK_LIBRARIES lua)
     dfhack_plugin(automelt automelt.cpp)
     dfhack_plugin(autotrade autotrade.cpp)
     dfhack_plugin(blueprint blueprint.cpp LINK_LIBRARIES lua)
diff --git a/plugins/automaterial.cpp b/plugins/automaterial.cpp
index 40dc2bb48..a238216c8 100644
--- a/plugins/automaterial.cpp
+++ b/plugins/automaterial.cpp
@@ -5,6 +5,7 @@
 #include <vector>
 
 #include "Core.h"
+#include "LuaTools.h"
 #include <Console.h>
 #include <Export.h>
 #include <PluginManager.h>
@@ -504,7 +505,7 @@ static bool find_anchor_in_spiral(const df::coord &start)
     return found;
 }
 
-static bool find_valid_building_sites(bool in_future_placement_mode)
+static bool find_valid_building_sites(bool in_future_placement_mode, bool use_buildingplan)
 {
     valid_building_sites.clear();
     open_air_sites.clear();
@@ -519,7 +520,8 @@ static bool find_valid_building_sites(bool in_future_placement_mode)
                 continue;
 
             building_site site(df::coord(xB, yB, box_second.z), false);
-            if (is_valid_building_site(site, false, true, in_future_placement_mode))
+            // if we're using buildingplan, it will take care of filtering out bad tiles
+            if (use_buildingplan || is_valid_building_site(site, false, true, in_future_placement_mode))
                 valid_building_sites.push_back(site);
             else if (site.in_open_air)
             {
@@ -531,25 +533,115 @@ static bool find_valid_building_sites(bool in_future_placement_mode)
         }
     }
 
-    size_t last_open_air_count = 0;
-    while (valid_building_sites.size() > 0 && open_air_sites.size() != last_open_air_count)
+    if (!use_buildingplan)
     {
-        last_open_air_count = open_air_sites.size();
-        deque<building_site> current_open_air_list = open_air_sites;
-        open_air_sites.clear();
-        for (deque<building_site>::iterator it = current_open_air_list.begin(); it != current_open_air_list.end(); it++)
+        size_t last_open_air_count = 0;
+        while (valid_building_sites.size() > 0 && open_air_sites.size() != last_open_air_count)
         {
-            if (is_orthogonal_to_pending_construction(*it))
-                valid_building_sites.push_back(*it);
-            else
-                open_air_sites.push_back(*it);
-        }
+            last_open_air_count = open_air_sites.size();
+            deque<building_site> current_open_air_list = open_air_sites;
+            open_air_sites.clear();
+            for (deque<building_site>::iterator it = current_open_air_list.begin(); it != current_open_air_list.end(); it++)
+            {
+                if (is_orthogonal_to_pending_construction(*it))
+                    valid_building_sites.push_back(*it);
+                else
+                    open_air_sites.push_back(*it);
+            }
 
+        }
     }
 
     return valid_building_sites.size() > 0;
 }
 
+static bool is_buildingplan_enabled()
+{
+    auto L = Lua::Core::State;
+    color_ostream_proxy out(Core::getInstance().getConsole());
+    Lua::StackUnwinder top(L);
+
+    if (!(lua_checkstack(L, 1) &&
+          Lua::PushModulePublic(out, L, "plugins.buildingplan", "isEnabled") &&
+          Lua::SafeCall(out, L, 0, 1)))
+    {
+        return false;
+    }
+
+    return lua_toboolean(L, -1);
+}
+
+static bool is_buildingplan_planmode_enabled(
+        df::building_type type, int16_t subtype, int32_t custom)
+{
+    auto L = Lua::Core::State;
+    color_ostream_proxy out(Core::getInstance().getConsole());
+    Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, 4) ||
+        !Lua::PushModulePublic(
+            out, L, "plugins.buildingplan", "isPlanModeEnabled"))
+        return false;
+
+    Lua::Push(L, type);
+    Lua::Push(L, subtype);
+    Lua::Push(L, custom);
+
+    if (!Lua::SafeCall(out, L, 3, 1))
+        return false;
+
+    return lua_toboolean(L, -1);
+}
+
+static bool is_buildingplan_managed()
+{
+    return is_buildingplan_enabled() &&
+        is_buildingplan_planmode_enabled(ui_build_selector->building_type,
+                                         ui_build_selector->building_subtype,
+                                         ui_build_selector->custom_type);
+}
+
+static bool build_with_buildingplan_box_select(const df::coord &pos)
+{
+    auto L = Lua::Core::State;
+    color_ostream_proxy out(Core::getInstance().getConsole());
+
+    CoreSuspendClaimer suspend;
+    Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, 5) ||
+        !Lua::PushModulePublic(
+                out, L, "plugins.automaterial",
+                "build_with_buildingplan_box_select"))
+    {
+        return false;
+    }
+
+    Lua::Push(L, ui_build_selector->building_subtype);
+    Lua::Push(L, pos.x);
+    Lua::Push(L, pos.y);
+    Lua::Push(L, pos.z);
+
+    if (!Lua::SafeCall(out, L, 4, 1))
+        return false;
+
+    return lua_toboolean(L, -1);
+}
+
+static bool build_with_buildingplan_ui()
+{
+    auto L = Lua::Core::State;
+    color_ostream_proxy out(Core::getInstance().getConsole());
+
+    CoreSuspendClaimer suspend;
+    Lua::StackUnwinder top(L);
+
+    return lua_checkstack(L, 1) &&
+            Lua::PushModulePublic(out, L, "plugins.automaterial",
+                                  "build_with_buildingplan_ui") &&
+            Lua::SafeCall(out, L, 0, 1);
+}
+
 static bool designate_new_construction(df::coord &pos, df::construction_type &type, df::item *item)
 {
     auto newinst = Buildings::allocInstance(pos, building_type::Construction, type);
@@ -722,11 +814,13 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
         }
         else if (in_placement_stage())
         {
-            if (input->count(interface_key::CUSTOM_A))
+            bool use_buildingplan = is_buildingplan_managed();
+
+            if (!use_buildingplan && input->count(interface_key::CUSTOM_A))
             {
                 auto_choose_materials = !auto_choose_materials;
             }
-            else if (input->count(interface_key::CUSTOM_T))
+            else if (!use_buildingplan && input->count(interface_key::CUSTOM_T))
             {
                 revert_to_last_used_type = !revert_to_last_used_type;
             }
@@ -739,7 +833,7 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
 
                 return;
             }
-            else if (input->count(interface_key::CUSTOM_O))
+            else if (!use_buildingplan && input->count(interface_key::CUSTOM_O))
             {
                 allow_future_placement = !allow_future_placement;
             }
@@ -816,6 +910,15 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
                     return;
                 }
             }
+            else if (use_buildingplan
+                     && ui_build_selector->errors.size() == 0
+                     && input->count(interface_key::SELECT))
+            {
+                build_with_buildingplan_ui();
+                Gui::refreshSidebar();
+                input->clear();
+                return;
+            }
         }
     }
     //END UI Methods
@@ -876,16 +979,17 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
         static bool saved_revert_setting = false;
         static bool auto_select_applied = false;
 
+        bool use_buildingplan = is_buildingplan_managed();
         box_select_mode = SELECT_MATERIALS;
         if (new_start)
         {
             bool ok_to_continue = false;
             bool in_future_placement_mode = false;
-            if (!find_valid_building_sites(false))
+            if (!find_valid_building_sites(false, use_buildingplan))
             {
                 if (allow_future_placement)
                 {
-                    in_future_placement_mode = find_valid_building_sites(true);
+                    in_future_placement_mode = find_valid_building_sites(true, use_buildingplan);
                 }
             }
             else
@@ -893,7 +997,8 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
                 ok_to_continue = true;
             }
 
-            if (in_future_placement_mode)
+            // if using buildingplan, we don't need an anchor
+            if (!use_buildingplan && in_future_placement_mode)
             {
                 ok_to_continue = find_anchor_in_spiral(valid_building_sites[0].pos);
             }
@@ -924,6 +1029,15 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
         {
             building_site site = valid_building_sites.front();
             valid_building_sites.pop_front();
+
+            if (use_buildingplan)
+            {
+                // we don't actually care if this fails. buildingplan will return
+                // false when it filters out bad tiles, and that's ok.
+                build_with_buildingplan_box_select(site.pos);
+                continue;
+            }
+
             if (box_select_materials.size() > 0)
             {
                 df::construction_type type = (df::construction_type) ui_build_selector->building_subtype;
@@ -986,8 +1100,10 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
         // Allocation done, reset
         move_cursor(box_second);
 
+        // if we're using buildingplan, we nevef actually leave the placement
+        // screen, so there's no need to re-enter the screen
         revert_to_last_used_type = saved_revert_setting;
-        if (!revert_to_last_used_type)
+        if (!use_buildingplan && !revert_to_last_used_type)
         {
             send_key(df::interface_key::LEAVESCREEN);
         }
@@ -1091,9 +1207,18 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
         }
         else if (in_placement_stage() && ui_build_selector->building_subtype < 7)
         {
-            OutputString(COLOR_BROWN, x, y, "DFHack Options", true, left_margin);
-            AMOutputToggleString(x, y, "Auto Mat-select", "a", auto_choose_materials, true, left_margin);
-            AMOutputToggleString(x, y, "Reselect Type", "t", revert_to_last_used_type, true, left_margin);
+            bool use_buildingplan = is_buildingplan_managed();
+
+            OutputString(COLOR_BROWN, x, y, "DFHack Automaterial Options", true, left_margin);
+            if (use_buildingplan)
+            {
+                y += 2;
+            }
+            else
+            {
+                AMOutputToggleString(x, y, "Auto Mat-select", "a", auto_choose_materials, true, left_margin);
+                AMOutputToggleString(x, y, "Reselect Type", "t", revert_to_last_used_type, true, left_margin);
+            }
 
             ++y;
             AMOutputToggleString(x, y, "Box Select", "b", box_select_enabled, true, left_margin);
@@ -1101,9 +1226,20 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
             {
                 AMOutputToggleString(x, y, "Show Box Mask", "x", show_box_selection, true, left_margin);
                 OutputHotkeyString(x, y, (hollow_selection) ? "Make Solid" : "Make Hollow", "h", true, left_margin);
-                AMOutputToggleString(x, y, "Open Placement", "o", allow_future_placement, true, left_margin);
+
+                if (use_buildingplan)
+                    ++y;
+                else
+                    AMOutputToggleString(x, y, "Open Placement", "o", allow_future_placement, true, left_margin);
             }
-            ++y;
+            else
+            {
+                y += 3;
+            }
+            y += 2;
+            if (is_buildingplan_enabled())
+                OutputString(COLOR_BROWN, x, y, "DFHack Buildingplan Options", true, left_margin);
+
             if (box_select_enabled)
             {
                 Screen::Pen pen(' ',COLOR_BLACK);
diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index ad0bdf358..ecd07a9e9 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -309,7 +309,6 @@ static std::string get_item_label(const BuildingTypeKey &key, int item_idx)
     if (!s)
         return "No string";
 
-    lua_pop(L, 1);
     return s;
 }
 
@@ -323,22 +322,27 @@ static bool construct_planned_building()
 
     if (!(lua_checkstack(L, 1) &&
           Lua::PushModulePublic(out, L, "plugins.buildingplan",
-                                "construct_building_from_ui_state") &&
+                                "construct_buildings_from_ui_state") &&
           Lua::SafeCall(out, L, 0, 1)))
     {
         return false;
     }
 
-    auto bld = Lua::GetDFObject<df::building>(L, -1);
-    lua_pop(L, 1);
-
-    if (!bld)
+    // register all returned buildings with planner
+    lua_pushnil(L);
+    while (lua_next(L, -2) != 0)
     {
-        out.printerr("buildingplan: construct_building_from_ui_state() failed\n");
-        return false;
-    }
+        auto bld = Lua::GetDFObject<df::building>(L, -1);
+        if (!bld)
+        {
+            out.printerr(
+                "buildingplan: construct_buildings_from_ui_state() failed\n");
+            return false;
+        }
 
-    planner.addPlannedBuilding(bld);
+        planner.addPlannedBuilding(bld);
+        lua_pop(L, 1);
+    }
 
     return true;
 }
@@ -373,6 +377,29 @@ static void show_global_settings_dialog()
     }
 }
 
+static bool is_automaterial_enabled()
+{
+    auto L = Lua::Core::State;
+    color_ostream_proxy out(Core::getInstance().getConsole());
+    Lua::StackUnwinder top(L);
+
+    if (!(lua_checkstack(L, 1) &&
+          Lua::PushModulePublic(out, L, "plugins.automaterial", "isEnabled") &&
+          Lua::SafeCall(out, L, 0, 1)))
+    {
+        return false;
+    }
+
+    return lua_toboolean(L, -1);
+}
+
+static bool is_automaterial_managed(df::building_type type, int16_t subtype)
+{
+    return is_automaterial_enabled()
+        && type == df::building_type::Construction
+        && subtype < df::construction_type::TrackN;
+}
+
 struct buildingplan_query_hook : public df::viewscreen_dwarfmodest
 {
     typedef df::viewscreen_dwarfmodest interpose_base;
@@ -583,7 +610,11 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
         if (!is_planmode_enabled(key))
             return false;
 
-        if (input->count(interface_key::SELECT))
+        // if automaterial is enabled, let it handle building allocation and
+        // registration with planner
+        if (input->count(interface_key::SELECT) &&
+            !is_automaterial_managed(ui_build_selector->building_type,
+                                     ui_build_selector->building_subtype))
         {
             if (ui_build_selector->errors.size() == 0 && construct_planned_building())
             {
@@ -679,12 +710,11 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
 
         int y = 23;
 
-        if (ui_build_selector->building_type == df::building_type::Construction
-            && ui_build_selector->building_subtype <
-               df::construction_type::TrackN)
+        if (is_automaterial_managed(ui_build_selector->building_type,
+                                    ui_build_selector->building_subtype))
         {
-            // try not to conflict with the automaterial plugin UI
-            y = 34;
+            // avoid conflict with the automaterial plugin UI
+            y = 36;
         }
 
         if (show_help)
@@ -920,6 +950,12 @@ DFhackCExport command_result plugin_shutdown(color_ostream &)
 
 // Lua API section
 
+static bool isPlanModeEnabled(df::building_type type,
+                              int16_t subtype,
+                              int32_t custom) {
+    return planmode_enabled[toBuildingTypeKey(type, subtype, custom)];
+}
+
 static bool isPlannableBuilding(df::building_type type,
                                 int16_t subtype,
                                 int32_t custom) {
@@ -950,6 +986,7 @@ static void setSetting(std::string name, bool value) {
 }
 
 DFHACK_PLUGIN_LUA_FUNCTIONS {
+    DFHACK_LUA_FUNCTION(isPlanModeEnabled),
     DFHACK_LUA_FUNCTION(isPlannableBuilding),
     DFHACK_LUA_FUNCTION(addPlannedBuilding),
     DFHACK_LUA_FUNCTION(doCycle),
diff --git a/plugins/lua/automaterial.lua b/plugins/lua/automaterial.lua
new file mode 100644
index 000000000..1cd7e9faf
--- /dev/null
+++ b/plugins/lua/automaterial.lua
@@ -0,0 +1,23 @@
+local _ENV = mkmodule('plugins.automaterial')
+
+local buildingplan = require('plugins.buildingplan')
+
+-- construct the building and register it with buildingplan for item selection
+function build_with_buildingplan_box_select(subtype, x, y, z)
+    local pos = xyz2pos(x, y, z)
+    local bld, err = dfhack.buildings.constructBuilding{
+            type=df.building_type.Construction, subtype=subtype, pos=pos}
+    -- it's not a user error if we can't place a building here; just indicate
+    -- that no building was placed by returning false.
+    if err then return false end
+    buildingplan.addPlannedBuilding(bld)
+    return true
+end
+
+function build_with_buildingplan_ui()
+    for _,bld in ipairs(buildingplan.construct_buildings_from_ui_state()) do
+        buildingplan.addPlannedBuilding(bld)
+    end
+end
+
+return _ENV
diff --git a/plugins/lua/buildingplan.lua b/plugins/lua/buildingplan.lua
index 73fe160fb..04f6debff 100644
--- a/plugins/lua/buildingplan.lua
+++ b/plugins/lua/buildingplan.lua
@@ -5,6 +5,7 @@ local _ENV = mkmodule('plugins.buildingplan')
  Native functions:
 
  * void setSetting(string name, boolean value)
+ * bool isPlanModeEnabled(df::building_type type, int16_t subtype, int32_t custom)
  * bool isPlannableBuilding(df::building_type type, int16_t subtype, int32_t custom)
  * void addPlannedBuilding(df::building *bld)
  * void doCycle()
@@ -64,7 +65,9 @@ function get_item_label(btype, subtype, custom, reverse_idx)
 end
 
 -- needs the core suspended
-function construct_building_from_ui_state()
+-- returns a vector of constructed buildings (usually of size 1, but potentially
+-- more for constructions)
+function construct_buildings_from_ui_state()
     local uibs = df.global.ui_build_selector
     local world = df.global.world
     local direction = world.selected_direction
@@ -76,22 +79,40 @@ function construct_building_from_ui_state()
     local pos = guidm.getCursorPos()
     pos.x = pos.x - math.floor(width/2)
     pos.y = pos.y - math.floor(height/2)
-    local bld, err = dfhack.buildings.constructBuilding{
-        type=uibs.building_type, subtype=uibs.building_subtype,
-        custom=uibs.custom_type, pos=pos, width=width, height=height,
-        direction=direction}
-    if err then error(err) end
-    -- assign fields for the types that need them. we can't pass them all in to
-    -- the call to constructBuilding since attempting to assign unrelated
-    -- fields to building types that don't support them causes errors.
-    for k,v in pairs(bld) do
-        if k == 'friction' then bld.friction = uibs.friction end
-        if k == 'use_dump' then bld.use_dump = uibs.use_dump end
-        if k == 'dump_x_shift' then bld.dump_x_shift = uibs.dump_x_shift end
-        if k == 'dump_y_shift' then bld.dump_y_shift = uibs.dump_y_shift end
-        if k == 'speed' then bld.speed = uibs.speed end
+    local min_x, max_x = pos.x, pos.x
+    local min_y, max_y = pos.y, pos.y
+    if width == 1 and height == 1 and
+            (world.building_width > 1 or world.building_height > 1) then
+        min_x = math.ceil(pos.x - world.building_width/2)
+        max_x = math.floor(pos.x + world.building_width/2)
+        min_y = math.ceil(pos.y - world.building_height/2)
+        max_y = math.floor(pos.y + world.building_height/2)
     end
-    return bld
+    local blds = {}
+    for y=min_y,max_y do for x=min_x,max_x do
+        local bld, err = dfhack.buildings.constructBuilding{
+            type=uibs.building_type, subtype=uibs.building_subtype,
+            custom=uibs.custom_type, pos=xyz2pos(x, y, pos.z),
+            width=width, height=height, direction=direction}
+        if err then
+            for _,b in ipairs(blds) do
+                dfhack.buildings.deconstruct(b)
+            end
+            error(err)
+        end
+        -- assign fields for the types that need them. we can't pass them all in
+        -- to the call to constructBuilding since attempting to assign unrelated
+        -- fields to building types that don't support them causes errors.
+        for k,v in pairs(bld) do
+            if k == 'friction' then bld.friction = uibs.friction end
+            if k == 'use_dump' then bld.use_dump = uibs.use_dump end
+            if k == 'dump_x_shift' then bld.dump_x_shift = uibs.dump_x_shift end
+            if k == 'dump_y_shift' then bld.dump_y_shift = uibs.dump_y_shift end
+            if k == 'speed' then bld.speed = uibs.speed end
+        end
+        table.insert(blds, bld)
+    end end
+    return blds
 end
 
 --

From 65114d904c97424c90637a1571c9d224ffc7762c Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 29 Oct 2020 11:53:31 -0700
Subject: [PATCH 494/547] fix typo in comment

---
 plugins/automaterial.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/automaterial.cpp b/plugins/automaterial.cpp
index a238216c8..7940fbdb9 100644
--- a/plugins/automaterial.cpp
+++ b/plugins/automaterial.cpp
@@ -1100,7 +1100,7 @@ struct jobutils_hook : public df::viewscreen_dwarfmodest
         // Allocation done, reset
         move_cursor(box_second);
 
-        // if we're using buildingplan, we nevef actually leave the placement
+        // if we're using buildingplan, we never actually leave the placement
         // screen, so there's no need to re-enter the screen
         revert_to_last_used_type = saved_revert_setting;
         if (!use_buildingplan && !revert_to_last_used_type)

From 821a7f09d58c54887c724249c2bd61af7174d5c0 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 30 Oct 2020 00:58:01 -0400
Subject: [PATCH 495/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 915f88055..861b4349d 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 915f880558a2ed5775beaa5cecdbf2825483aef9
+Subproject commit 861b4349dc7bc542465de3c168af3ca18561e0d6

From fbc26336cf763621f051484bb00bb479e297a220 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 31 Oct 2020 02:25:26 -0700
Subject: [PATCH 496/547] don't show quality properties for no-quality items

for items that cannot have a quality or be decorated:

in place mode, don't show quality adjustment hotkeys (or isDecorated
flag hotkey) and don't interpret the associated keycodes if they are
pressed.

in query mode, don't show quality or decorated fields.
---
 plugins/buildingplan.cpp     | 80 +++++++++++++++++++++++++-----------
 plugins/lua/buildingplan.lua | 32 +++++++++++----
 2 files changed, 82 insertions(+), 30 deletions(-)

diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index ad0bdf358..8b4c94493 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -313,6 +313,28 @@ static std::string get_item_label(const BuildingTypeKey &key, int item_idx)
     return s;
 }
 
+static bool item_can_be_improved(const BuildingTypeKey &key, int item_idx)
+{
+    auto L = Lua::Core::State;
+    color_ostream_proxy out(Core::getInstance().getConsole());
+    Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, 5) ||
+        !Lua::PushModulePublic(
+            out, L, "plugins.buildingplan", "item_can_be_improved"))
+        return false;
+
+    Lua::Push(L, std::get<0>(key));
+    Lua::Push(L, std::get<1>(key));
+    Lua::Push(L, std::get<2>(key));
+    Lua::Push(L, item_idx);
+
+    if (!Lua::SafeCall(out, L, 4, 1))
+        return false;
+
+    return lua_toboolean(L, -1);
+}
+
 static bool construct_planned_building()
 {
     auto L = Lua::Core::State;
@@ -466,13 +488,15 @@ struct buildingplan_query_hook : public df::viewscreen_dwarfmodest
         OutputString(COLOR_WHITE, x, y, item_label.c_str(), true, left_margin + 1);
         OutputString(COLOR_WHITE, x, y, get_item_label(toBuildingTypeKey(bld), filter_idx).c_str(), true, left_margin);
         ++y;
-        OutputString(COLOR_BROWN, x, y, "Min Quality: ", false, left_margin);
-        OutputString(COLOR_BLUE, x, y, filter.getMinQuality(), true, left_margin);
-        OutputString(COLOR_BROWN, x, y, "Max Quality: ", false, left_margin);
-        OutputString(COLOR_BLUE, x, y, filter.getMaxQuality(), true, left_margin);
-
-        if (filter.getDecoratedOnly())
-            OutputString(COLOR_BLUE, x, y, "Decorated Only", true, left_margin);
+        if (item_can_be_improved(toBuildingTypeKey(bld), filter_idx))
+        {
+            OutputString(COLOR_BROWN, x, y, "Min Quality: ", false, left_margin);
+            OutputString(COLOR_BLUE, x, y, filter.getMinQuality(), true, left_margin);
+            OutputString(COLOR_BROWN, x, y, "Max Quality: ", false, left_margin);
+            OutputString(COLOR_BLUE, x, y, filter.getMaxQuality(), true, left_margin);
+            if (filter.getDecoratedOnly())
+                OutputString(COLOR_BLUE, x, y, "Decorated Only", true, left_margin);
+        }
 
         OutputString(COLOR_BROWN, x, y, "Materials:", true, left_margin);
         auto filters = filter.getMaterials();
@@ -594,20 +618,27 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
             return true;
         }
 
+
+
         if (input->count(interface_key::CUSTOM_SHIFT_M))
             Screen::show(dts::make_unique<ViewscreenChooseMaterial>(*filter), plugin_self);
-        else if (input->count(interface_key::CUSTOM_SHIFT_Q))
-            filter->decMinQuality();
-        else if (input->count(interface_key::CUSTOM_SHIFT_W))
-            filter->incMinQuality();
-        else if (input->count(interface_key::CUSTOM_SHIFT_A))
-            filter->decMaxQuality();
-        else if (input->count(interface_key::CUSTOM_SHIFT_S))
-            filter->incMaxQuality();
-        else if (input->count(interface_key::CUSTOM_SHIFT_D))
-            filter->toggleDecoratedOnly();
+
+        if (item_can_be_improved(key, filter_idx))
+        {
+            if (input->count(interface_key::CUSTOM_SHIFT_Q))
+                filter->decMinQuality();
+            else if (input->count(interface_key::CUSTOM_SHIFT_W))
+                filter->incMinQuality();
+            else if (input->count(interface_key::CUSTOM_SHIFT_A))
+                filter->decMaxQuality();
+            else if (input->count(interface_key::CUSTOM_SHIFT_S))
+                filter->incMaxQuality();
+            else if (input->count(interface_key::CUSTOM_SHIFT_D))
+                filter->toggleDecoratedOnly();
+        }
+
         // ctrl+Right
-        else if (input->count(interface_key::A_MOVE_E_DOWN) && hasNextFilter())
+        if (input->count(interface_key::A_MOVE_E_DOWN) && hasNextFilter())
         {
             ++filter;
             --filter_idx;
@@ -706,13 +737,16 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
         OutputString(COLOR_WHITE, x, y, title.c_str(), true, left_margin + 1);
         OutputString(COLOR_WHITE, x, y, get_item_label(key, filter_idx).c_str(), true, left_margin);
 
-        OutputHotkeyString(x, y, "Min Quality: ", "QW");
-        OutputString(COLOR_BROWN, x, y, filter->getMinQuality(), true, left_margin);
+        if (item_can_be_improved(key, filter_idx))
+        {
+            OutputHotkeyString(x, y, "Min Quality: ", "QW");
+            OutputString(COLOR_BROWN, x, y, filter->getMinQuality(), true, left_margin);
 
-        OutputHotkeyString(x, y, "Max Quality: ", "AS");
-        OutputString(COLOR_BROWN, x, y, filter->getMaxQuality(), true, left_margin);
+            OutputHotkeyString(x, y, "Max Quality: ", "AS");
+            OutputString(COLOR_BROWN, x, y, filter->getMaxQuality(), true, left_margin);
 
-        OutputToggleString(x, y, "Decorated Only", "D", filter->getDecoratedOnly(), true, left_margin);
+            OutputToggleString(x, y, "Decorated Only", "D", filter->getDecoratedOnly(), true, left_margin);
+        }
 
         OutputHotkeyString(x, y, "Material Filter:", "M", true, left_margin);
         auto filter_descriptions = filter->getMaterials();
diff --git a/plugins/lua/buildingplan.lua b/plugins/lua/buildingplan.lua
index 73fe160fb..51a918afc 100644
--- a/plugins/lua/buildingplan.lua
+++ b/plugins/lua/buildingplan.lua
@@ -31,17 +31,20 @@ local function to_title_case(str)
     return str
 end
 
+local function get_filter(btype, subtype, custom, reverse_idx)
+    local filters = dfhack.buildings.getFiltersByType(
+        {}, btype, subtype, custom)
+    if not filters or reverse_idx < 0 or reverse_idx >= #filters then
+        error(string.format('invalid index: %d', reverse_idx))
+    end
+    return filters[#filters-reverse_idx]
+end
+
 -- returns a reasonable label for the item based on the qualities of the filter
 -- does not need the core suspended
 -- reverse_idx is 0-based and is expected to be counted from the *last* filter
 function get_item_label(btype, subtype, custom, reverse_idx)
-    local filters = dfhack.buildings.getFiltersByType(
-        {}, btype, subtype, custom)
-    if not filters then return 'No item' end
-    if reverse_idx < 0 or reverse_idx >= #filters then
-        return 'Invalid index'
-    end
-    local filter = filters[#filters-reverse_idx]
+    local filter = get_filter(btype, subtype, custom, reverse_idx)
     if filter.has_tool_use then
         return to_title_case(df.tool_uses[filter.has_tool_use])
     end
@@ -63,6 +66,21 @@ function get_item_label(btype, subtype, custom, reverse_idx)
     return "Unknown";
 end
 
+-- returns whether the items matched by the specified filter can have a quality
+-- rating. This also conveniently indicates whether an item can be decorated.
+-- does not need the core suspended
+-- reverse_idx is 0-based and is expected to be counted from the *last* filter
+function item_can_be_improved(btype, subtype, custom, reverse_idx)
+    local filter = get_filter(btype, subtype, custom, reverse_idx)
+    if filter.flags2 and filter.flags2.building_material then
+        return false;
+    end
+    return filter.item_type ~= df.item_type.WOOD and
+            filter.item_type ~= df.item_type.BLOCKS and
+            filter.item_type ~= df.item_type.BAR and
+            filter.item_type ~= df.item_type.BOULDER
+end
+
 -- needs the core suspended
 function construct_building_from_ui_state()
     local uibs = df.global.ui_build_selector

From 5ac1df96db6f0733cc4eb811469c9ca99948318c Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 31 Oct 2020 02:30:26 -0700
Subject: [PATCH 497/547] update changelog

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 21676d333..f8823c83d 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -44,6 +44,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `buildingplan`: min quality adjustment hotkeys changed from 'qw' to 'QW' to avoid conflict with existing hotkeys for setting roller speed. max quality adjustment hotkeys changed from 'QW' to 'AS' to make room for the min quality hotkey changes.
 - `buildingplan`: new global settings page accessible via ``G`` hotkey when on any building build screen; ``Quickfort Mode`` toggle for legacy Python Quickfort has been moved to this page
 - `buildingplan`: new global settings for whether generic building materials should match blocks, boulders, logs, and/or bars. defaults are everything but bars.
+- `buildingplan`: desired item quality and decoration filters are no longer shown for items that inherently don't have a quality rating and can't be decorated (like blocks).
 - `quickfort`: The Dreamfort sample blueprints now have complete walkthroughs for each fort level and importable orders that automate basic fort stock management
 
 ## API

From 8d1ba5a83a5e69639fd93e8f595372dac4a45aa5 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 31 Oct 2020 02:34:06 -0700
Subject: [PATCH 498/547] remove changelog line -- this is new functionality

---
 docs/changelog.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index f8823c83d..21676d333 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -44,7 +44,6 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `buildingplan`: min quality adjustment hotkeys changed from 'qw' to 'QW' to avoid conflict with existing hotkeys for setting roller speed. max quality adjustment hotkeys changed from 'QW' to 'AS' to make room for the min quality hotkey changes.
 - `buildingplan`: new global settings page accessible via ``G`` hotkey when on any building build screen; ``Quickfort Mode`` toggle for legacy Python Quickfort has been moved to this page
 - `buildingplan`: new global settings for whether generic building materials should match blocks, boulders, logs, and/or bars. defaults are everything but bars.
-- `buildingplan`: desired item quality and decoration filters are no longer shown for items that inherently don't have a quality rating and can't be decorated (like blocks).
 - `quickfort`: The Dreamfort sample blueprints now have complete walkthroughs for each fort level and importable orders that automate basic fort stock management
 
 ## API

From 2c65113bdb2f77b2644e34a50e3509c195514903 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 31 Oct 2020 03:03:05 -0700
Subject: [PATCH 499/547] detect all conditions that make the game pause

---
 plugins/buildingplan.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index ad0bdf358..f5671fe0f 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -897,12 +897,19 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
     return CR_OK;
 }
 
+static bool is_paused()
+{
+    return World::ReadPauseState() ||
+        ui->main.mode > df::ui_sidebar_mode::Squads ||
+        !strict_virtual_cast<df::viewscreen_dwarfmodest>(Gui::getCurViewscreen(true));
+}
+
 static bool cycle_requested = false;
 
 #define DAY_TICKS 1200
 DFhackCExport command_result plugin_onupdate(color_ostream &)
 {
-    if (Maps::IsValid() && !World::ReadPauseState()
+    if (Maps::IsValid() && !is_paused()
         && (cycle_requested || world->frame_counter % (DAY_TICKS/2) == 0))
     {
         planner.doCycle();

From f053ccf14bfb51cf838fef515ee3ec54194ff8fe Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 31 Oct 2020 03:05:55 -0700
Subject: [PATCH 500/547] update changelog

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 21676d333..bad645f87 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -35,6 +35,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Fixes
 - `buildingplan`: artifacts are now successfully matched when max quality is set to ``artifacts``
+- `buildingplan`: no longer erroneously matches items to buildings while the game is paused
 - `dwarfmonitor`: fixed a crash when opening the ``prefs`` screen if units have vague preferences
 
 ## Misc Improvements

From b8e20ed73830656efd7a10b58ec7811a752cf72d Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 31 Oct 2020 21:23:45 -0700
Subject: [PATCH 501/547] remove pngs and add comments to online images

---
 .../bedrooms/28-3-Modified_Windmill_Villas.csv  |   1 +
 .../bedrooms/28-3-Modified_Windmill_Villas.png  | Bin 5757 -> 0 bytes
 .../bedrooms/48-4-Raynard_Whirlpool_Housing.csv |   1 +
 .../bedrooms/48-4-Raynard_Whirlpool_Housing.png | Bin 546 -> 0 bytes
 .../bedrooms/95-9-Hactar1_3_Branch_Tree.csv     |   1 +
 .../bedrooms/95-9-Hactar1_3_Branch_Tree.png     | Bin 4312 -> 0 bytes
 .../library/tombs/The_Saracen_Crypts.csv        |   1 +
 .../library/tombs/The_Saracen_Crypts.png        | Bin 11666 -> 0 bytes
 8 files changed, 4 insertions(+)
 delete mode 100644 data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.png
 delete mode 100644 data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.png
 delete mode 100644 data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.png
 delete mode 100644 data/blueprints/library/tombs/The_Saracen_Crypts.png

diff --git a/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv b/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv
index 006c01f55..4524261d2 100644
--- a/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv
+++ b/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv
@@ -1,3 +1,4 @@
+# see an image of this blueprint at https://i.imgur.com/XD7D4ux.png
 "#dig start(11; 11) 28 bedrooms, 3 tiles each (efficient layout)"
  , , , , , ,d, , , , , ,d, , , , , , , , ,#
  , , , , , ,d, , , , , ,d, , , , , , , , ,#
diff --git a/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.png b/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.png
deleted file mode 100644
index dda3673e26f2926131ebd84013f2eac6e293a3e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5757
zcmZWr1z1#Fw?0Tpi!|Z~(l~T?w}5oVfG{*D4N}q}-3VB8*C5>?$c%*45RxN|gc3t@
z=kvSY{qKG5bIv~d+0R~k@3r3dJ!`M{r#fmRg!F^}0FY>?E9+zWY)l&^z{7kAqiG#5
z-CZwrGj9MOy8m~>0`lL`Vy1MRm6V=7b@KG_^mg*}V$x7jV)A<7>FDf+SrM>UXaF%Z
z*rAp|uN*6C#f4{TdFoRUFzG8MhEt}ob2Hy1*NkI+w?L)WcTYtHhhg+>9CmVYcoLN!
zh&X|89)FYheRAZ7xP-CGwcrn~vz_SeiJO)=S!DH5VG|s`mw-51T}V$PoVY^q;l1yX
zBZI?ho4oQ7gsffwIYHAiX76hjEZ{6uTKe&$Ui@wVD`1+40O-{&=;eP9drP*fm}iL<
z9);EGlP0c35Kalm2PG?(0`jU@;f1;E2Ebb!z;@i;ZUcDA1K4teZBGN?g=cxeSb#+)
zGZog`G=S;8L!2_;Bn4E%jT2M=Q+|NbQEN~FnCAibHB21Uf%;aU7e-Fh2oMkh{CaWG
zTmVimU^~jf5&%Ty0hFr0O{9N4t|douW01;glx|~{P>HZ0;CYU3V#5276Q)7)m{Jsc
z2b?d@+aH)mCm112_WkG!0K843!bE#?9RMS(g~3FVp`<oEyFGZfkL>I=Znof6Uh)92
z<`X)31LA9<50}CVcfWbhwvXdvP4w0mo#@y|Cf@?Q-B~m_^7<Pam3OIa3kzGDoAa83
ziWcB8laL!ozfG^nwcB~9^cDK#d-pnPgrHS~8qV4G{x8Q*N*=(|??%}zZKtSRwG!Q4
zF-|`k)Uaza<)+-wqj;XIoS$?gSn?=dF`a9OZR+;f`YPxWTXt0hsCSXY3QprGx3b4R
z)#4yG_32$l1HkVN&%PN>0_<?7$ThhC?Sb62+FLdt+)*R_IRIEIv+^2_HOY+-0D$t_
z2=00XhT}e3P%qwtKHQ}~qAOd`C`H!6enoOc!e`+RUf6O~zf$CknW$&vw&k0VXB6($
zbBf9EBIWHj`a~+@MRoxuDC*<vjJS)VFiLPA%)A(fWtU*el1xC87k$Rur;bCB$jbCN
zj#BTDR+@;qfPR7@laV^(Z<!Z&Bw{U9+tZ{*0l`;SF`a4xnGub8GBd<2N^Rw0^iits
ziM~Gb5y(%Wep~SMMKirjlIT0+*D5En#S~ek5&qsEwD>}UZv4E%1Bwmept~9N;|-6h
ziK~X`>y4|iJK|65;SK&c6cH-DcSUjh6`8;f71T|inCi@{moq(J6~4E4SL`l!lwLo_
zql|K`X7=`b=YzC%f&#Io>L8X`ij@0&<iT-DgJP@{@k)XmZK-!O8a^6MQB0{$dFZq3
zfGP@v)#+I>J}*9VZN!(z1Tj4xjovKW9M}}vWY}c>Z9!OQC;$B8nZY`z{+Np<-4^+l
z@D`p!uAqX^hkX6z@^^;!L{iKZYu-Wi>-1vF?+g3pOH4#kYiO0!yw94ZccO7ZJJ<d2
zX}`Ce^-w40tI5>(j@pl$AK1tK#3V6Pkt1;sPPzhGd|C*dKW$y^lTy0rM7j|}elY=5
zE;5fS&(p}18_NBXDs7A~OEZf-i-DWZu%fcGa;1{U=*Vc?Fr~uUAf#5+NXTHL;_gg#
zl~HBkQ<MRN0i;5zJhl>2?rA9ZG1Tlj9?xvx$$+lXN4>WVHXEJ8Ohoo{O#vWgSCXn2
z-w2UG_J)atmwwzGxz~&xi87TH?<ACjG=)r>^p7$f<?uIhpP#+)(YcG{EXz3xO<18k
z;9BQmC>4IvCg5P{TA7`bZCa&XrB|hf>JqKpD=RGRQt2?ej38AQ(d4k?P=lnva0`(J
z3kJ(&gk{v)GLk2?yp^sc4DULW{d+vh_H&E6t;36+c$TdMb|Ehwgz#M(Ub|nEov0C;
z;x!So;vtA(w9-Q&&po9X`9=`G^pvay<dsUmS>T+tsI<08=?~vjU#pTOIS*TIux_{y
zyAOY0$75$^*V5kA-p|+9ZY$*~m3kueWMtyY#QTZaJdpw!fjL2B0kUAOV71lOJir_T
zEr)(`&}iH=FE!hTc6vmcOPH0I8kt))sn!(Mu+4VVbd=pIYtzZlsVbU<4AlREeuh@G
z($#Ox;~{FH?$8i0#Eu5iI#fHbpV5^O(jM~qS_Ypac7e2t(VQ{VyZHsBq_N~mKJ3lD
zT*%OI_6{G!6iyDG7utZ{ALkl$E;J~ZR)f$$+Pou=;u7PvUXAnS$nq923@?v%ZEE_Q
zJhxg4nmQ>gXe#L6D@WAri|#w`$1W9r5iaH`G86LtIxwpAU2khrj;J_`-*vS*R98ti
z0@8wH;j`yUGpU)YZ!Ph!M1v1#WKU&Z6mQ6GNQ<oqu9(?;5$kOoZ5`Jg@GP>4UR4TX
zxqWsUbUO)@g|lHnu;U{XA}sD)o&~*R?n#!DL^zx_F6=2Jy=_yVQb>7K^J=TFhS_QK
zXKD>I8kq}AgE^B%KMnmc`xPI&4Ne>gCFY2ZjW&sqOZJL0rJoeY5%Hf~Qu1C^zEI9q
zUMYYG=t|V_Xo_&lR`R+?FN(Dbx62LlI+}g?W?E>f;imOKf|t8i)WfZN^=j`ZcD-<&
zXd{>=mv7X{EASnx|2Vpgx`LMiB$+M$Bu+;>^H71DyPP_S?e~3uwq(M<e#U;tBfd$|
z$+&qXOYVm{zty?5gVKMdb&3SC4hfZjw%VdNDpEV2kUUu~kSwCk_hWJwl#%Qbh)hpQ
zeXdx^tepXc>_WC3{l=>uq8o39JQ7>^9%kWxc5O<n#x>(1gesQ)Ff`|!<Hm1<IG8y0
zOvH~#WLFhEp4j`+G=@kOdvj2HyGPMav6c=kiP19QVKm+Ds&<iRlztwFAl#tBeH>$q
zS1tW10m|+EO}A>#B&RmCi#<r&HNv`Y>{VY2mMe<Lh;S=91hq7`XQgY(XSUh`zKAJg
zkfn-GsHH^E<WPmpb1nsJF~oX~_2eyOHdj;)wmpM8PC4#uukaLEkY-orZ0C@AkSr`V
zldKvy@12~gAoy}7I1wF@P^GpHJ<^{#9m+n#CZyyHKN=nzUKon*Pc65A=gvGP_Zfma
zPlbPeLs)d8uVp`XBaE<&w7)ribGX#FY(mS`##io~Wna2m)#$iC-y6Z6!oJ35A%)Jh
z&3t2=k}=dznSG2>BOUpx`=;=~pNB-0#OU>#;dK@-<-pAy^xakTLlVhFzog*mHT>zn
z{1_pOd@hRlzw=cK4Dv56>@3=KzsOF`?ydw~sUiL%dm}7u7N~h-_}O`J=hbuu<TpI2
zFsm>ml=pne7V#b$jI@WXx{!Guw3GX+O{v@_BBeT|V3xl>`TTA~Y~45cWRhPeY2&`@
zvnzd*F|9k&@unlcw$0MDZ9k~1CD;+Y!%!p!TR!dz{6&2``>jYqX1VJq$P+z;K3Sz+
z4t>FK4IA%R@aNdC>D2ACIhNm3SWsGy{U&E|vowFO6z0<F|MqBdNezt`9SOflJ4qo^
z!cECb8IK`}K^2M1N=U5By|~`FDpP_#gR>XW+`PXTuce{p3qAXWnuAT|PQJ_eos-ey
z{<7qHw--fMhZyc3e%SpvKuEy)*!Xg<&wt6E@!-QMneOIGrZCQ1r}KsrgRf<m8FU#L
zw>a3jM_2YjJP1s^i33s4Rsev8<d>Iv8JIDXy}G_O00glCKzJkooZn*l9RTp<2Y_8$
z0FcZD02<G9n;}(9eVVJGtY8?h__MGtt4fk0Cehzfg5kj{%+qT%%KV+&3up>=-~$U_
z$rG^SnEC+ZccOrT);Z92W^(UW_mfD`{hJ<dakS{XDMgPacP075d(L-k9c~ow0|Z3!
zra=E4%v;yjV_ovr)6-L&3`E`glmLjrWdZ?UtV7qXezu#dbD@sg>ubiXh@m^=)Brhk
zcs<6T*Q2W+GBkQhUEs|FuNtHVH~hN_voIjq#vWx_fI3GTKQsk}za#(mu<wxI=-SSn
zYcsFbmC$E_&}6Dw-_So6|N3%BXyV^W{ieoW?cnFN#MXj1^oQluYx}hNzkU64c6fbn
z;`d2S&(eU|BM-i&#V_UpgSei@W(|`iDAGh+e#$$4B9k}$t}-ue{Hb+*wrQ-1Qpu;T
zw<BY&ZT6sjmWG<hmJ{dS&8mW<U59Rr6Bl@fM^{>T;F=9>dx$l6#A@`=9a=)HDBM4R
z9gcVQvl%D0v<*WaboI21wJmzbC2v_;-uK;@|I4@l>pzx2-J$DBREN~@_9jp5$<k6f
z&1rF1-G<5y`oO(w)FjXz7xWK=7>t=fhr8Bm=AI`0$qPI(V#o{GzM45EUq9rEF&Eh^
z6E0@gKWJl2yGI^dPS6DzyP-5(U$keBw1k|V$|_eY5dI1HAAqgbIAC8B2cb~d)zXE8
z+CP&RKK=mmGJXh6C5yU_wCG8JpI^tox#7bCeJ%3U<bS~ULu_y2k)&&?Y&>LWF}t&;
z#=g!plJY;ZKxcne7lT?Iq=j}tF$w-{9D&F${>S29a!j*^i1kg3Eh1+o8D5007TXVR
zr_;2ZpPO*Qn*<~Nw@4yr){wOd?S@4VnL6}Gv{1ht7I8H2M+O*`t!_|xFlLyeu4)^g
zH47Gjw*M`!Ke`Nvt{a+N$vC>i@&AAN3W#>?vI;@1hGZS}{+}J|wy0`xXDKnH{zt^&
zLoTkVcYwry<o+*E|N1~q9Z*^Sp7T+S$Vo_;KS+aO%G|&#8zu)sZr!%JYbh)1Ywlha
zHP6mKd7NuB2-aSP)`+O+2`?fqZ<a$>Oy*9k&Uf3{OJ*t^&WJD3KmEAI(;Gn@moE{}
zOxDjo+b+7xI1^M?znL4*#@v=$SDAxW(Hfe8a|EubrCf|DBa;#`@DCfm)QgaMbG}tq
zFn;10VUqLiFcW;PEvKH$^vcTjm6gUk1CUQQ)<sCln6>2_CW29P$k@>v7*fcpZZ3p0
z+Q>+c9B12;8ApSw!a09(s2r8wJo~Yw6tO2t;b@k<og2ctpQlHum(Dtz5Cs<BHPYm=
zA1a+?B382BDV>FwlXWPmb5(E>(#L?CZMamlr;~#GvK?m7*X7A6nF<78kW^S5NXx#Z
zWp?=eC-Zb^_-FLBUT|amZ|O2HEp^TE5`kS#id23`wL3zWB%!JP=Y2c{dF|=1{KSrb
z5$$-1f8FtURFWw$t&yHe{wjHdrBJ7AAx3LDb6vc&7PTK#L;lL6m0>GTrwBQD{<4%+
zgOlKn_vExN8~jMsu6Rm#VpOsr{O848W=z<Xl`gX{XjBw1aOqK&vPkRW)!v>2v6WCp
zgVkdPB6xEW>597Tq7&cK-c5`)rW_g=@Jwg*X|o(X>eM^`nEAmT6CCld9JR3?r9aIe
zuei;3)QL;X1JUX30}Mf#NC{snNOD^*Nlt0SJxMVq+8ANtND1nZU$KmX4=(~nUGs;p
z@D7@!CYrIm3J#HfabeFDkM~kX-`?!L<bZqYYv#G$k9oHP;vL|d8|fCE7PR7}k$gak
zx|@jGr>Lj-nh=ItAM7&cyLs7Nad@0d<fh{0J#j>^idI8Di~;|;8sNu(##+K!lDUIp
zWJLF_p+0-DPd3M$P4@ACVfht0J={t)15Ep5B-igkEmdDX+rjZuD+!@R1=O8uym8Xf
zCksL1))H`b<}|wSs?-@1^`xI{agPsk>78}36_@Xvvvq_te4?DW#E1S~fXA2NwHIwk
z$;CPxlErXCBPtAt?ubw)tJ{k)+_eV(#ls~jceox#0E0^cb8Uk&-USbvYDUzMNDT=x
zIs-B-g0&@Q%klc?`b>RFm9*!o52FzgT_bG=#zrc0s4UXhf$FBilqd)EZbb!8!mIXL
zq0)3DqjX9=AN^n6?&1iARDF8gbQzY@ui5*k`PYL=<;x2BrOeEOIn`ONbh9xWzreJT
zWRU~>spS1n#N5czWxV}BXR9faD>?g}-k!Nq0%Tf0(`i(|><vHnTHLjKt)$=$?X@3{
z&fP50?X?xo^qSL|m@$UprS+X_XbGucO{@&4ece2!raF84<FcRX+2V1CXQ_nr$5Lk(
zkE|sRv4oAYfz{pt%J1i5>i?6K|KuYASBog}4>Re`3B!ASm&e20t4Q<5Cd5|&_!py1
zGWK?$j)PhL*HIQRMu{y)c!O+rfz0w)qwt6|W7ift>fC+j$lR3?r_ae|6)l<Y$SS+U
z@jd61CYRM*%Yw;V%V~%W5p(mb`Qs8F+L-o(;AM2zthp=K)(<JO>>A@aG#b6&zTX6<
zb-4~Z5oZj}a`&gM;v~#y?^9Y>^Li_+z4KDGpk5=tG}9sPGmB)QPU0`MRrF3!S2{9~
zeIlmke#}~I-;9h`$FgIS<euAN_ks4ZL}HeZS@Avd#lm{t9HJ6uP5m)FH<#p%Ury_(
z+S4y-gPS88A3WP)o))paTsFYwVq;8E%P>lH$jeK7A?p5MWV>k^cD!7n-El%VEnG6a
zBdnQL7(5ki5YYq*7FUx_w$E_ri}(#Wb`m1X`_fSAwGuSv%Pu8CaEI`fZD!3_9|UnB
z+cfY~)AWiwqR=x7DM6+3oP!?oFT^{KZ2Vfg`XHV>@l;(ImIA5yEbRQ;gSHjbavXMZ
z+4Kcw!&O~bS&nK?qbbi6By*pCJz-IVWH;JMQ=Mo`+HHSWaxZMo-pU5don3MZk3Uqy
z)FTDtcAM7?_@g5ktOA#fAfaNeas3>J3eQ$Vp@~zlsbZX&?(YuNdAUihL!Jl17(>Rv
zWqYkFhNlXaR+2DCElhV&-TuQeVPf3zo*#oR(>{SF*D|zb)*RJ+;7c3R(PkB)EO!{(
zsff8@{`-<a^@*wPy`J;GaAwsI4BAi4A^qM`pW9w5m*n7R<~Yl~0Rb^r;|6Ghk|WqO
z)~~!!D{CALdpbj8uNQxHr_83FeWOP0!LLp^1B(nEjHqIqoLn^YtMiXPMIg`Imdj&N
z7pI~f6Me2~hs)l<LkySk_M!En36BhJ)W+N(%3dF_ysPt8CTQM)v@p3n^OQm*&7e7q
ztU~At=hRRcByQoRNT8WMm{}~fsDJn-a>h?}(4Q=gPb3i8g8S2u&Kf)<ve*+lLl@lD
zkOG=*PP#gP7{^JyDYV7`n|WcsunnSLLvEy~UZT?_2Ogup)J&FS(ofW7>SIJ`_F-43
zZ}|BWO|D8*kT6epJt&~i0H&C$dS>>Nck)K&BkXWY^fdh`sGe2hi=B%m*Ty*}^^RTL
z>oh%F^WsNFViu5QVX`od7)9A5OvYEyOWLN8#?Lz{Kh2aJFm`QUe{JPwZ4c5m$Vk67
zD>w<!)z@U1fy{V{-3u$pESiGuak@L^pQf{Z{&AV2{I`qtIog`er??9Iiz7RNeud{)
z8K7|=v+VphRd)x7a<jXXq#SbxRwp;X&YwE#d(Kf079ew2qc(yFT)@=xfQE{Wa;>86
GtN#L58|9b)

diff --git a/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv b/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
index 8906ae4ba..a690b4cf3 100644
--- a/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
+++ b/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
@@ -1,3 +1,4 @@
+# see an image of this blueprint at: https://i.imgur.com/3pNc0HM.png
 "#dig start(16; 16; central 3x3 stairwell) 48 rooms, 4 tiles each (more aesthetic)"
  , , , , , , , , , , , , ,d, , , ,d, , , , , , , , , , , , , ,#
  , , , ,d, , , ,d, , , ,d,d,d,d,d,d,d, , , ,d, , , ,d, , , , ,#
diff --git a/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.png b/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.png
deleted file mode 100644
index 24eb4a22af2addc52ef792038d1145c2a0af2841..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 546
zcmV+-0^R+IP)<h;3K|Lk000e1NJLTq001KZ001Kh1^@s69@(>500001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA0k=s+K~z{r&6Yt<
z12GIm2X27acFBP_DhFcOE#e5^ANni%$H5*!VV-1tJ9eDZ?F`&)+xB602<|U>2!3>#
z_w&oe`$FTrEH6_X#Q5#>G<+!N?#oCo(>dtj^gQ(O{2G+&pwmae4|tdrO}?u7Rjm87
z9PK(8O9b_w5HQxdO1phPc(gG_j@uUzHd@tHd6LzEaG7l5t?`pP=47&_0P7kPtXDCq
z`jGKUhFQVntEykcx<AX&!h41{w4$LHqgSqL9a-h8J|unVv54O%)o-p20-Zie7?m|^
z$MjXz@5Hb$87tVO`Ux3#_fyIA{|v^>ar$B&w91pJF3XeYGT8yQLMMCN$>^pkCRo>)
z?CAr>FPUbA?U=r*`kfdyy=Qn+D;`Q1YaZkFx~e0Z_oOeq>L9>o{NAblkWL@vIwmWc
zd{y<USodc++I2FP2&!Y$v3IrG2ZW~yWBl#Mw%Z3RAML-wPwtqL$(jPJYfP|S#iZ&(
z#xEIW1(UC;eiiHfEJq9P8Q#!}hGL9fxvq6&m9P4E!tH3bp^Ra6K+vr2yI3q;Y}w9(
kN()cZf0O=g`X9FK6PX>3R<Zv}O#lD@07*qoM6N<$g4Le?JOBUy

diff --git a/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv b/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
index f9e97bc8d..72df2258d 100644
--- a/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
+++ b/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
@@ -1,3 +1,4 @@
+# see an image of this blueprint at: https://i.imgur.com/ENi5QLX.png
 "#dig start(36;73) 97 rooms, 9 tiles each (fractal design)"
  , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
  , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
diff --git a/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.png b/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.png
deleted file mode 100644
index 33f422b9b8791b703df0f0db79a756c217214086..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4312
zcmai2c|4STyT46?8Ny@<<&k|EB|>(MLDtEbW~h*;kRFqLZHmVrOXbNL!eBH;M(LFq
z(-YAuYYZ(jQMLx5rxA^%_x5()^Esb$KIfc2?$7VOuHSuMzia(o*L`PUk2p(7?2-Tg
zK+4s{5eEPwD&Vyj1_3!0^JTlhMI;*Mj0PBeDtwTDhS+250pQ+s$@M@{kXAeGg2Mnn
zk`4f*kO4plvQj<+K&%k}%$@=Os}cZEj3{sOvH<{ux2vN)KH=n-GW#3c7t#(Sfu%5D
zc>PM8fF^3{qHpr!q1h9yJtFmPXMg_a+5<xY5JU<9RRctR-F5^*H+O8R96T_Aswz&&
ztG}FNU1bH8)<n^yef1_DdZu9iYTssMkqc0)ey8MqvlBrtZ%Th2H-eC7@1`H<TZ6(l
zYt~h1T`&Z_YiGB`qMRCjaWO^ue+Ve)7)|-jMyJMp+!B1%a-`gp3{ZA8hd#S_4WJ}l
zGt&)s>mb1+6_Blcb<EJ+kQFG`2tiM-)5`!Qc1d-tE<<4i+oMQn-6}HO%|yj)!c!fq
zphWGHuj{caPm#?)_C^fn9!f_MP8C=kEjcg~0U;_SQ0=%zxtBpBcqV8OksN^19HE}k
zVJm`;?T3j%Pr#RC!hFBtE^3IN%_8S|xNa%fmQU1GM+iCW)5y)Y8XY+jl8QkvE~vsv
zE*90Hfuim8yP_WPzX{w6A$NDCD}l<xIJTPdh`TTZ^8XNET%NM~MiaB(^4|9p)@<S`
zQu(q1cyu9V;JGm<!MNc}9s%?#;h_DV=LjsiC1<*XYV_g*G!CBodgen})!J#8UNFxo
zx(BCp<^qHbJ<N|@#0+d0LuK#Bt&7Eq9^`*3Icxkv6{Kb9ws9WCGN2(c+h&;G;0XG+
z_#SeOT!cfy@{YmA`xZOjrFAUAnSpBf_K@B}2k=<+oZy}raGg08{kjf%BTw&VQ~m5j
z<@=esxvDR6FlI1D5Rj-HTVPaqcX#lc0#qw25f>h|{oN+$-sR*tKX~d-Efmd244Ms|
z7F1P`22eV;A@p=mwCq%zG=wZ6gQ_Y4C`d6kOVCX=Kxz<#OjpvIQd=ra`Fm`_KZrdX
zGlP~9$?7l^`TY4Pgbafirb^#mzzv;ESB1!?`a=c=Z$n{&iBRuL^;PTV1r3WAUiuMx
z9WPhZlzjFKvYYy;rvKO_DMG4IFfrmGIJSg>WKrOpOfZ#=lwP`!XB|8f|6rN#aH^cY
zc3x3?U<Z;~*T72J#q@-)_&F_pze`gHZOBGto+~J2WMB#5<yK#y^3m-0An-AD{1@->
z6eJ{@1?Th^_}LNIHGS1kD>UaT{y0mAa$=Z!p~Z=ou(ndPa?Q3FyMunZcVpxfIUD=e
z)L-F!u@2Q2eOxozg<gfFV_iMhpJo~CYSPBHr>%Lf=94yvI7TyE%RTAUv4uR{<(u=b
zrZP5*p*OT|o$*#2^S!UT78T<7(;d=%V_@ECyx4oZ83{>#n@&`K5I$7(?T72Rqwg!G
z2AoKJMTgCwRcs@`@QG<w?OJ(z`HlPMx@n-3NKQ?m@)f*jeNr_`J#Vk8aVk57Ui#9{
zt)D=;Wb0o4*0%V7^)7TQzw3#L8^9I1VbD`Jl6~dYlh!yw?-@ht4Bajfr~eO`(XB-A
z$zaoe6m7nYmT4XB`FbOd8JO_;&PzYf@0LTcnVz>wu473sEp;32Nt5TA_{zTmNVjLF
zO}4gpfxD=6)vgtQ+XfQzdgkNzQp<{<y`!dX7^jJfx!FQh`K!qb9=D}R+q$-R`6Yz<
z0II7{<xGoZ4f0tOre+v#y1-(b<l7H2XZj*X2VB{hZzGZ^XBb*q3oM85`0sBRaM_Lg
zU>>#qKF=(s?a4)-(Ua+!Ske`#mUrd%;GB@r3nY(Q6Q(-*G$YP>uK?!juB4R{0z^Uq
zh)eS3nHV(`P3QNU%6qg?G}WiQfow!Xdq19U{b6U^@SV2E`A_1)y=qtm*%c{YXTT~<
zmJZ3s7}(Puwa58fswtb6n>GWp8-4bTXgzwo5vxDbw##l)f4B3{5tK2p^*CrCCcg5^
ztML>Q*qu|}RB<N<THn&-_oM$N9<)v<Z+m!l<Qfn&JXt7Iw!0i7fqweF-C4@~qY>JP
zrn9;}s0>%2Bn?LlNzbirRt?9bk(PP&VF6$)L%cv3{4E#<YSnesEYU_AFx*4cp+wbJ
zk7cCD0`W?}h|5<~&W|(zTCofU>2Gst?a$i&(VhK|Nze}mjz%qnscYd$o80E8poJ$M
zFInU;_lDkcR>tNO;efkEPvpBQ*Fr4eoa{G!+n7<GB&=!Lyje8<DU?u39Eu-Z95>nu
zv;SFn>XBAHd(OZFS=zPlX+k!fZpy1$WQ;u)5m$9V8Fv>Rmy<Iv^I-%mC-YK^g0#@f
zUppjJA|}+K-bO<l|4Lnsx=z_aG0G=bv)*s7dK+vA1$FsG@#{Gf)R2|rDqpz`EZA4p
z^22EgO6+WaqJbxztnO=v!W1YP+s&aj77xCB&zj_3Tg1B_f{SlYQcG>^DJXZRNt=Fh
z)zqFovM>OeHmfDBYT+J4L@!f{BP<4RxsG5Q6Cx_f<ZP7<rxffCq=uIVxX^>#y{>^2
z4(kENly#a(iW_Yg?s&-dj5ieQM?_$jif(f4{0oR1trpB^%H`A!!{Dg37_YWvc%gej
z-X%p77OBl3W=;-Syo45>dE33X&!_#KpE~ovQJgbhPP#pr(wtW~dQQ}2qtC;zb+Qf{
zyKR=qx-&7EZWY=4an{pJPG#qTuVIbM>4;^}>Sxw=pOBs=6?hqHzf@NBm{YXED)Jj<
zd?^pJVs-fV!}E63X^CC&hCc0`xo$EGe#w^W=|t-)(BA`E!6zs`>8i5Q`;WzKXcj(Y
z4iuIegmPJa8xkf+TV{0Q;%u??MOmS1z<@vT_M^LrZy%jkT`cY5REFtT+~Ln?w?%;p
z!4;Z@i;aZ&7^ZsUGKg}v{F$jf+@o(y3|sx-?Bm8EUP%0wFU;+WyDV%eLd&)+b#57i
z;ug9;W*-<UoBHf+t~3~jiPhet&R`JKkTc#SKR#`u?@_7UkH`mM@jP4kLwf{K5>@n%
zJgeUVBa$r$W46W3>;+YUyu1OtaP#ZDt2fW{0ntH@zPlB_ucNVM?=!Q?_g(eE1y%ts
zb_Kh>KKLq@ODZg7)P;!<V!1|5b&J#E3qFIowsTo}*tqRA!!c%X>=c7l%4e_Df8s9~
zgIkJ@PWvg_`O;gPL>V6;-RfUy+xwW;RPC8GBIi{#uXMPcA0}I6Q*S4znEaPORlO_O
zC##c7&iwhZr90p4w!lA;<IDL}C?x*;%|`C0)*WuNzxSUX!VL%62x||-V`0?2prm4s
zuQ{aE)2V5`Z`q-`=^Y#IEK;z&ri0WV4j)Lrg4Oq33oR&1$L;$X*nEEN-9jLY(@$>N
zSw|l6k87439q2v|_P)htq5EQnBP&NsDz>ESi*w)s%*25^uj5zk>+9!NqMl6#Q7sjT
z&b_tb>HW~FukN~yeH5qGH6KNv{r$Lz73TD~K_OBkLIxj(T+_yjC5nDFy_(vDr$akz
zv7i8RiNYvg7t8~k4(r0p6W@c4J?@E$(N%y_`XF*TTo;iZmcB=Yx4$Oq5oz~s)x0GS
z2H_-<xm;M<oee9rKl%TkP>fZcRHzy<6?=rMmjzZ(pl$&x+-5{uufNotVOPe6)m;cr
zls=3P_WQWj`2KdaPh5OUO@lD&1Mfnu51`$p7cn-gF5*lpXe60-OC6~%S~YsxLJD6o
zBF~0&f+2#okwV2aSyjnOAb2L=HZsMz&l$3KpNa2xJ2eWG8>XY$Gh-?ndKSWNROE|a
zCp8`@vChQ}ahSFUdVG67bB!R#5}!Y%r5N)oUj`;MLpiL4{90cy9oYd+m4fm!PaZuu
ztppAUt|_wg#r@mp32n(90@waHqZ^V1>iL1P4!Wa%f4y+)`elQ8jh9zQ`zXSjD2^0$
zZKB+_J=t(7;|(wEw+y-@2wk&F0Huv`BGx%_PA}*97wIp3t3{92{LX^qfVWL3YKRs!
zKWECiuags#9Je;lXj1ZLxw1&evHBaO6AW#<@VWb_3NdsGbi8bTm01^9W(pJ}jPUop
zCmSA3<OdEl0(j>2n|{)wJ8hcCl7k#}yd8R($Ms=EACKkw^|?Dfb|kv^fkpdB%X~YT
z-tpP9D8k_rSn`yl*ZuD0QyGqfi`6WNi=5}RaFrsXuVEOyocP|`!+!P?eN(eOC0_i;
zx6Yf%>>u?Mj{#w*^ofUoAb{i08EEOyG?3S<q}Yaw7QJd++z=3Wm?|F6P`JpBk?}+y
z;x`t*`ZBC|(7kM}aoR7MDLmQ>&1_X+KV~s3L3O}t5;LZS4@zY<=;F!rk$d>HiHxP$
z<YM3FPVFbQz=k`}j_NR*^ZgI#9s4xim%b?qVVAu8GUUV`(Zw5nv={pKOn&Dx1{ytS
zew}H83pe#GS7zT$I=`;1oaEYjmzm7^2D|lX<D=JEQ?*&FeCwDfL(03?VbP^WdN4FQ
zfvj|N`N2>edinTwUlp<A;eE6%5yjUp|NDjOw*R$dezNA2*P0$lTCTaBTq`?Gy!!qd
z2cuQr)q+@^lO+97V{PQNLEp@`@{<H-=q7P`#hYUi5D-uQ{KFcu@VvIcItCZg(way-
z^ir~ny|J{iTh^sBuSDN+)Qr?>_wg>}Z0L_`s9$}Wrye<{tFrLDYwUuHnsIzk-K5{B
zfF~q(WfW1Stii#x!PMt3y$i1kRNLkZZ1qanx0Y7Q<ggxCD*qrUeuF4o=9~5Xr)O2S
zp4+XhPVN(oH)SqHK>o9H_kN6M=vDSK?&c_dos>+9BCh0!w_fTDyf!3;DJ`)!J{rY1
zFC>yW1M@i3xxX01co(h^o@sexx9PcGS~B?TWq78&_vztD_jdQD_k!-lQ?C6BEuYnw
z6jO<5Cpk??&4kALX%2)7!*6p@nKu(~;lYr1jo>h5XJc(KOw0~*m!k<kPhI+l`$@p&
zhd}d``}_FbX&7hacE0R8vsPChcZ3?A90u2{7>0r+p!*{+>o_>4dkt+!kMO!=U)5xp
z!DC9AYQUj==uph^9;g*$z$+gcI2I0zfmVU+ch7L9LT`YZr<de3v03qK5r5_h_z{z^
z7E+cWc?rCODJbi2Erfeiy;g{b`5Oa)hYaFaDL^@qWNX^0DS~d982Oxd4*ay^FAtQX
zQO3rlm2kcC!R;ETQ&Et#`A(WdDi?>xTGS{zrnpQ(#onfSDL`0MT2;hhlPkcVFW}po
zC2Nq-D0eUWkGa7J5sg3Pl+Gv~Ccq|(s{iOz?p1?0YUmohFwCVRUhH!cO*bjEhhA|!
zaw^YXiJ+e6n=K&`Vwwg+WR-WQv5n|xwN`lr`MyxG9cr?csrGS!`2YS_AXH=NP>kJO
W$H%k8VDQ%i;Ocb5k%2z-$3FoF3IYlM

diff --git a/data/blueprints/library/tombs/The_Saracen_Crypts.csv b/data/blueprints/library/tombs/The_Saracen_Crypts.csv
index ae6107894..5d66a88c3 100644
--- a/data/blueprints/library/tombs/The_Saracen_Crypts.csv
+++ b/data/blueprints/library/tombs/The_Saracen_Crypts.csv
@@ -1,3 +1,4 @@
+# see an image of this blueprint at https://i.imgur.com/Kcjvx6R.png
 #dig start(24;24) room for 513 corpses
 d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d,d,d,d,d,d,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
 d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
diff --git a/data/blueprints/library/tombs/The_Saracen_Crypts.png b/data/blueprints/library/tombs/The_Saracen_Crypts.png
deleted file mode 100644
index 6b8d6e03e5767a73f225323574b1a87ffe06eae1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11666
zcmeHN3s@6ZzE6$8-3=OUX#>_rbZxa;(WFp|C=x27)vLgEw+dpJpaSlt8kJViLPm0}
zNF$F*Eum6^bxUt6H3$l|V1^hTBGHIeDTt1MJR~57@W^Xs?wLF=DBHUG)vDb+-v?iE
za^{>f|M&m*|0f3pEF1ra7ydw@P{uERbIDs2${02H!+tjg%uIO>>84PoQI;=x<F9eq
zJ=X(MCpU!mG&k;X_~W$Pc|oBwoIiWbKi${a=`(-rs)pREJ<ZQM-Bg|y<@B$(ky=Ja
z-njIhEWazi?CiezLrVlHd|!G6qpdupY@BILEQ-~l6w3EamB<*%?msgfDHp4S&rl4(
z9EvZC?m+3>Ag53g+*~QSX*4RO|2U7b+lO4#@dZr_6If+>9eXhZu_iRCzLMdQ3G}59
zlCP4TlmsSV=MBvLGC_zWA(|^O7!D20aZSJqeT-KHJ_7@u>QIis5RowWEf(LU=3g!0
z^$*k<x<ifnAL`M3zPwYNInYotsQp@sgrLH@dbYZV-_!9I2riP*j!2=aQRvSdm^lRN
z2TC9T_U({5ZOHCyc5f(W&7j>xl7Xq5XLoa~));spvj)NAe(GfGZKh*EPF<i=Vaqs&
zj~q|0V>*744AnR$vs_<x@82H637RQ*$>T)<FZb-l+6cLCmhPZ3U6+{nM?ZEZjT+Ii
z#@+8Jc(DEzdSs91I><bTDkI>ic?ckqHs;Z5W~G4~2_zNG1Cf$EG>;*Y@#cZaNamRb
zT2FG^JdC86{6d=|o8%Pr!~{h{i7s&ulj*ppQo1tlS#J8pGs46I-NBl_wv2mrZ7|1)
ziMVI2F!?T~(;d#VteN?jWY(LT!sWifrgIx#(NKRs$IbP3A}DL+OM+>KKcrE^HM29m
zu3)@)qJTHeO%UOJ@R4l(-6nZH=Fnv!nwnAh>rw4rVg+(e_{>!g!|%@&3gWbvt&)Aj
zEZMr0A|7v%AN#lPtraLhzjJso-Y5y`Q7wZ|<CoH2Q#DWo=R7I$H}Dm%P3VB-GFt1N
z+iHH}kl;4D9o0hxeEIxvVD$!1Lxz&3Slp#MloKG9;du$YnfRQc&k5R7y9IQDw|ii}
zthqb%3Dcm5P|tNIcvl5fi{Tj<NNV}zOwYfhL_cRFp$O8RVPmJye#-sGPrAHs3jtFU
zR;KXFevT-QgwhYcDJEh%c3^kgznZRLi@(072a(S(9qacEdyS&q%c9P)a9y{Ursz$!
zpDw9ATGD%m8(&7;)m-ji_X_Y1O=>bM2kyq^Ta;r0+R0TDd=l{OuCFFdi6NR>!z(Hf
zUf#3At}F7HS=zP%%or#^%49HMz_AiqjP5v1;djqpF}Hd{<Q}GIPW6oTE7xL~j*NRg
zF{Jzm0{7po#wR<bePn+{!bzFj!46x?@qWebPN^<RtqWU%#O*A6X96LjDURIpoo+Xq
zg<jiqhpsS3Zl$HS-(tvvIobA<$$%N{%|Z>oZ~M|=k1M8S6M`|bw3Wi<C3cg#3#sd7
z*xkX+_1J$|DIgLtm5uydOY9)SgPNYih{R5=j=H(>79EjH+gQnPd~V{dQ*N#=J0k}s
zKFj3<ZR~6-<mIk3t%!WnRPOun;mlfLqPu2x)^rV(>c2N^F5Tf=g>>WIiYNcUV{em8
z`Od-=JcSIrf2G*Zj?xcr)!{nf!~w-2$=-a;yz;lM`lycZ=Nn(Yrr-0o5YFAP^u2S=
z@9+s<%XIXX3&a1r=<`7Fr!;C{0q@64?{+xnMaavY-CT=bdm@&<UndMPj{m_Dlh?C8
zBJ(Trc<e#>sEmOR(x~}S{my&xpSqmrCw<w-yzk^Wk||c6Aeu*={)|fLe<D$1ujQ2Q
zT8eHRobziYJ`WMLJw(bjcP%FxNdyvKav2IWYU|KgBFU3GKC4G9`NkYk@Efi3s4xUX
z=O8=%H=VI%ZiU4<swST2>E`-lk?x?kzQfOyxDt=&MKT?`Lrg1jOxo$V?@ZW-<3V>A
zbQ8Q3i0hr;X&GFWIEzO8fQcNKMa1vprq@UqN~JJykqD~EfPE@hXK$&-MMlcYb1J2`
zYPhTx#>T!5st3pjRV{1!Zb=xLaqfC;Vpa&JAWAcPXP+ubN6j+n%axDk8f`9ScLh?i
zs2I-%STk<>m-eWWs{PKLJLe&yUqTE@19xfbxl@)_eZ%GAzQ=yB!?Cc2rt8<=ac57M
zAli6E!h)x*`5!yX3x79&Srtq4m3R;x3jac#Dvg^y+a4l=UuVE6w@QhS=TVH%whReY
zMKp}E%T(;090d`bNgTT<9OVkZoZ6A6n&w_Aw1>&Kli&lfA@(quBn4S@I)B6qS0S59
zM$V8VsP2`V)~h8s{jEc)fAEeIkfnX#*PQoE(XXg6la6}oEqgRCDkj*~#Zdg_Ripkv
zBKLi~Ew&%sHOfmhtr~<(iR-?$z=QzbDadEtFunF7PAmGR&NKe?+m+i5<bpq$EtWG+
zz7-%eVF+(2v7;a3;(ajQ!w>wPsD>tRQ8dqCY9Vion`>&NRH=4Rb|OKsHSu2aP4UDR
zQ|_kItWVD^<;hBKmX4jw|AfG$#C$F6vyKxu*vhC7CT<SqfH1$hWleh_y`9U}1*FVE
zF7|CcnXSx3jq}7>Oh-M=<4t0&+)Yy)*Bv~i6MDTX>Yb_-c_5;Glo((!I%=~}{{@%R
zxK4D3;&A!cV9sO!H8GV|Xv(^K3%z|IBHAb~H@Jx@^t~H2vtt@)+RwQ)(em<{c2hAq
z$g0iq^0#bLS_7>WIsugJ1KSmLVnV&f7?l~{QOQE!9l<Y3alFF_o7$F>9~3H9S2b%N
zje4!Xjxgbiyl?C3d0`l)3S5BC6W1Cw<JQZ|U$>nS^D!;vFrVJO7-cHk?t5i$-l?q{
zo2Fo~`uK@G_wDV^RC*JY=JST(uAvp|PcIWKj9V*4Nap$LIy5hApre{~_TUI1K2)lK
z>$Z%hWp}EOqvfM1r?+X|f!-X$h18??gL0|u?CqP3L#3wJ51FP1WwS~cvU-FZx5j?_
z>6H<>ugfUAU-LG1MT}H%+`sg`nb_D^u7K!1&|9W^yh>#Q8A3u$iE%y!lm4B|{{vpA
z&x&^=B}nmL2SBUg=_IBNU&b37C22Al{-GPlXs}hr=xEpnL>n%JB#!ObBmEZBgOCC`
zOD3V{iKp%1&M(a2`1mLkAmkTx&F2ICR%7e$!Qjn~bO#+|#TBwOoh$VUmSjp1@8;?X
z3&Os&>d3V=fG-TOd~U!x-ED1VESJ#6Rp%Qj?*(sXCIZ9)EE*^AfxY&N6{)8H1j1QA
z@}&J4`aXbVe5HcIPy|jO@M}UZ(~rVL%!<f2?{C%jf&E*d|Mi;ss`Q2oSUbWBM9gok
zL%F+j8{i2JTNYbUgeY%A5--3T)?5-M9&)l^2WKW$)7$l;Ochk--7q(asI>oy;i61d
zp!vnTn=^-BPEU*JOX7hL<&?FGaACfFh&OevD>0MZls-I1U}FQ?MKtO{7uz|qq8WD)
z+wG3<tq?yN0QWm@EtY~>34Fku6#yuilpN^q*2oloFE3lK*j<!>0U^uiC(~#kbZJ{M
z6^QVC00sf_+`vq#)+rv>>On<?yWIRZdIENbQju9rCH!|k&}qUel!F7Hpb&V;oEdob
zNR*lNL%rMtoTRYYI0Wo>b2XVQ;}gyQ^DukbqWCsdgG>NUUT&_@;Ca|GnCNUy!@S7r
zXsw!%hEEqe14^DCH9=Km(Fd-nc<ZcdZMTey^Y>jrUsa5@*OqXrqRAMXm}*ro8->Bf
z=mtx4&b5(P3NHAP^|TH|QeG2(oIC|iBg;vEa<Mx=-aAY>^Sip-mKKsQwLn;qf6~RZ
zsqk=Sof%UxRRNvP`E7jLc97;_NX|7^)VO|d&xeh8d|sC=^M^t>{<eY~ada4s^stBu
zNJ@#Wx}LtSo>C)&)ys`H_3LX(CB)9M4Ut9z-;y%{*@548hr&)L#NGuer`YG!Ee5L@
zGa`$nM4qj1hp!nOh;#;(Rx<=)fTpN20ZciWctNSzw{u|dbDG_6iwwqP47gh*S6;Lw
zu*j}{hCDkCZ~2nu;b%)=iLN*~P~$$Jw?MM)BEcLFpcmLt17b2<V<Y%gBPr`@)(7A5
z0w&{;CoPX!wnP>nya3#3KP{sN+^L={|0ZD9`vdVs;v{+%QnN4+oPrG2^S(iVyeD8A
zY+_b8Ou^Y`!}0&KVbgGg{JDY0k}kh`*zGXr5m-g`0{lV+$>G%5%q+ickGY6z6M}(%
zP#Lx<cKY+bDdhA%kau+mz%!aH>SOS{@pDA6Y1(6|!Q=jPhhSCbqzkgjM_niXW#FQF
zq0Qk+e=_C^BKsELLpXykc)^|YsYHsoSpoI~76A6Nm;quhuzC0vi{Zn^gU$wEM9dI3
zHi@*mrME47@caSrEB3O5X?)UZ^yXPi2O0zn4Z6x=(~!f!_alcau;8OP=s!5?BWN=L
ze3f<)eQG}NJfXd0{3Vq_jbPSN?J)Pbz?-dp3zY%RL&j*%6$l~AA_7aKM}orktutg<
z5%d#zW+#ZAfM%3`PRagLiF*P|c#o?R$9;#$gkWP^J$j+Sq7NXRx^0UUWr7H+Uetr8
zK8b{lhS&;KDYj4xLZqNBml$ob6xri8kVQErH@zVDZ7wm#b#;_H+m>Gm-CVy9;dEF_
z+6B4GxVMPA)lt=MuI&+atEOI`3lharkZt0MYO-E#)Jv)tM!vj7Ua)}PUS`eTnD31m
z>W;PwMF<csgA7XAi^8FtBvvR#c~<DfwpOZX55&8Q{cd8dH4hBFI9ztmDCAwR=C$E(
z+)JdypU`5$tobW_K^O;QSMhjDTg?tH6PxL1_mId0tWcmp%PpKbSL~dGglv{`{xtkX
zh5Kk8h^+#@vU>P_-RtEm@92uK=6zmSV86@9hc6)#v$YHLaa_Hn6d%5TsoZJJ`rS5N
zQNi@RSM14c8m>8_%i#X1&wAALY+L>zBE6%z2NW1Rd_Cz!&CQ#@RwBWq6EwGZf`FY(
zc7IwLLP5Cmq&;S<mMmWVlvn2Oi!VoZAFPc4$i!Z?8r}Yw+I4@O{$Q6muJZ@UazE&#
lp$t|F!^JeJZxcb?m0lK{p8fLMpx2tR+&^H+vBf;${{z6dat#0g


From cd497de5c01cb6dabb324e500202e90382491bd4 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Sat, 31 Oct 2020 21:24:28 -0700
Subject: [PATCH 502/547] remove image links

the blueprints themselves are spaced so they are readable. they are the
text image of themselves
---
 .../library/bedrooms/28-3-Modified_Windmill_Villas.csv           | 1 -
 .../library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv          | 1 -
 data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv  | 1 -
 data/blueprints/library/tombs/The_Saracen_Crypts.csv             | 1 -
 4 files changed, 4 deletions(-)

diff --git a/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv b/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv
index 4524261d2..006c01f55 100644
--- a/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv
+++ b/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv
@@ -1,4 +1,3 @@
-# see an image of this blueprint at https://i.imgur.com/XD7D4ux.png
 "#dig start(11; 11) 28 bedrooms, 3 tiles each (efficient layout)"
  , , , , , ,d, , , , , ,d, , , , , , , , ,#
  , , , , , ,d, , , , , ,d, , , , , , , , ,#
diff --git a/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv b/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
index a690b4cf3..8906ae4ba 100644
--- a/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
+++ b/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
@@ -1,4 +1,3 @@
-# see an image of this blueprint at: https://i.imgur.com/3pNc0HM.png
 "#dig start(16; 16; central 3x3 stairwell) 48 rooms, 4 tiles each (more aesthetic)"
  , , , , , , , , , , , , ,d, , , ,d, , , , , , , , , , , , , ,#
  , , , ,d, , , ,d, , , ,d,d,d,d,d,d,d, , , ,d, , , ,d, , , , ,#
diff --git a/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv b/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
index 72df2258d..f9e97bc8d 100644
--- a/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
+++ b/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
@@ -1,4 +1,3 @@
-# see an image of this blueprint at: https://i.imgur.com/ENi5QLX.png
 "#dig start(36;73) 97 rooms, 9 tiles each (fractal design)"
  , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
  , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
diff --git a/data/blueprints/library/tombs/The_Saracen_Crypts.csv b/data/blueprints/library/tombs/The_Saracen_Crypts.csv
index 5d66a88c3..ae6107894 100644
--- a/data/blueprints/library/tombs/The_Saracen_Crypts.csv
+++ b/data/blueprints/library/tombs/The_Saracen_Crypts.csv
@@ -1,4 +1,3 @@
-# see an image of this blueprint at https://i.imgur.com/Kcjvx6R.png
 #dig start(24;24) room for 513 corpses
 d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d,d,d,d,d,d,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
 d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#

From b123d96ad04e6c536b80a547dc08d3ff5e637e38 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Mon, 2 Nov 2020 03:27:05 -0800
Subject: [PATCH 503/547] add links to images back in

---
 .../library/bedrooms/28-3-Modified_Windmill_Villas.csv         | 3 ++-
 .../library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv        | 3 ++-
 .../blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv | 3 ++-
 data/blueprints/library/tombs/The_Saracen_Crypts.csv           | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv b/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv
index 006c01f55..89363e35f 100644
--- a/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv
+++ b/data/blueprints/library/bedrooms/28-3-Modified_Windmill_Villas.csv
@@ -1,4 +1,5 @@
-"#dig start(11; 11) 28 bedrooms, 3 tiles each (efficient layout)"
+"#dig start(11; 12) 28 bedrooms, 3 tiles each (efficient layout)"
+# see an image of this blueprint at https://i.imgur.com/XD7D4ux.png
  , , , , , ,d, , , , , ,d, , , , , , , , ,#
  , , , , , ,d, , , , , ,d, , , , , , , , ,#
  , , , ,d, ,d, ,d, ,d, ,d, ,d, , , , , , ,#
diff --git a/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv b/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
index 8906ae4ba..881be3dd1 100644
--- a/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
+++ b/data/blueprints/library/bedrooms/48-4-Raynard_Whirlpool_Housing.csv
@@ -1,4 +1,5 @@
-"#dig start(16; 16; central 3x3 stairwell) 48 rooms, 4 tiles each (more aesthetic)"
+"#dig start(16; 17; central 3x3 stairwell) 48 rooms, 4 tiles each (more aesthetic)"
+# see an image of this blueprint at: https://i.imgur.com/3pNc0HM.png
  , , , , , , , , , , , , ,d, , , ,d, , , , , , , , , , , , , ,#
  , , , ,d, , , ,d, , , ,d,d,d,d,d,d,d, , , ,d, , , ,d, , , , ,#
  , , ,d,d,d,d,d,d,d, , , ,d, ,d, ,d, , , ,d,d,d,d,d,d,d, , , ,#
diff --git a/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv b/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
index f9e97bc8d..ec2a1ce1e 100644
--- a/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
+++ b/data/blueprints/library/bedrooms/95-9-Hactar1_3_Branch_Tree.csv
@@ -1,4 +1,5 @@
-"#dig start(36;73) 97 rooms, 9 tiles each (fractal design)"
+"#dig start(36;74) 97 rooms, 9 tiles each (fractal design)"
+# see an image of this blueprint at: https://i.imgur.com/ENi5QLX.png
  , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
  , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
  , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,d,d,d, , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , ,#
diff --git a/data/blueprints/library/tombs/The_Saracen_Crypts.csv b/data/blueprints/library/tombs/The_Saracen_Crypts.csv
index ae6107894..a70b77a09 100644
--- a/data/blueprints/library/tombs/The_Saracen_Crypts.csv
+++ b/data/blueprints/library/tombs/The_Saracen_Crypts.csv
@@ -1,4 +1,5 @@
-#dig start(24;24) room for 513 corpses
+#dig start(24;25) room for 513 corpses
+# see an image of this blueprint at https://i.imgur.com/Kcjvx6R.png
 d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,d,d,d,d,d,d,d,d,d,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#
 d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d, , , , , , , , , ,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,d,#
 d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d, ,d,#

From 1d0e2dc6bcaf18e4cac776dab4850918166939e3 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 3 Nov 2020 14:56:16 -0500
Subject: [PATCH 504/547] Update extents handling to use building_extents_type

---
 library/modules/Buildings.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp
index 6d6d777f7..8fd2b77a1 100644
--- a/library/modules/Buildings.cpp
+++ b/library/modules/Buildings.cpp
@@ -103,7 +103,7 @@ struct CoordHash {
 
 static unordered_map<df::coord, int32_t, CoordHash> locationToBuilding;
 
-static uint8_t *getExtentTile(df::building_extents &extent, df::coord2d tile)
+static df::building_extents_type *getExtentTile(df::building_extents &extent, df::coord2d tile)
 {
     if (!extent.extents)
         return NULL;
@@ -600,7 +600,7 @@ bool Buildings::checkFreeTiles(df::coord pos, df::coord2d size,
         for (int dy = 0; dy < size.y; dy++)
         {
             df::coord tile = pos + df::coord(dx,dy,0);
-            uint8_t *etile = NULL;
+            df::building_extents_type *etile = NULL;
 
             // Exclude using extents
             if (ext && ext->extents)
@@ -640,7 +640,7 @@ bool Buildings::checkFreeTiles(df::coord pos, df::coord2d size,
 
                 if (!ext->extents)
                 {
-                    ext->extents = new uint8_t[size.x*size.y];
+                    ext->extents = new df::building_extents_type[size.x*size.y];
                     ext->x = pos.x;
                     ext->y = pos.y;
                     ext->width = size.x;
@@ -653,7 +653,7 @@ bool Buildings::checkFreeTiles(df::coord pos, df::coord2d size,
                 if (!etile)
                     return false;
 
-                *etile = 0;
+                *etile = df::building_extents_type::None;
             }
         }
     }
@@ -710,7 +710,7 @@ bool Buildings::containsTile(df::building *bld, df::coord2d tile, bool room)
 
     if (bld->room.extents && (room || bld->isExtentShaped()))
     {
-        uint8_t *etile = getExtentTile(bld->room, tile);
+        df::building_extents_type *etile = getExtentTile(bld->room, tile);
         if (!etile || !*etile)
             return false;
     }
@@ -842,7 +842,7 @@ static void markBuildingTiles(df::building *bld, bool remove)
 
             if (use_extents)
             {
-                uint8_t *etile = getExtentTile(bld->room, tile);
+                df::building_extents_type *etile = getExtentTile(bld->room, tile);
                 if (!etile || !*etile)
                     continue;
             }
@@ -883,7 +883,7 @@ static void linkRooms(df::building *bld)
         if (!room->is_room || room->z != bld->z)
             continue;
 
-        uint8_t *pext = getExtentTile(room->room, df::coord2d(bld->x1, bld->y1));
+        df::building_extents_type *pext = getExtentTile(room->room, df::coord2d(bld->x1, bld->y1));
         if (!pext || !*pext)
             continue;
 

From 3aa902bd256591d001cdc9a49485175de0a0e853 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 3 Nov 2020 19:52:24 -0500
Subject: [PATCH 505/547] Update submodules

---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index 00549aca0..72688ee86 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 00549aca0640ca121c20734df667f79b247c93b4
+Subproject commit 72688ee8651ad7ab1f056f7120b0052dc30c1d47
diff --git a/scripts b/scripts
index 861b4349d..1c4f3dd51 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 861b4349dc7bc542465de3c168af3ca18561e0d6
+Subproject commit 1c4f3dd519349ab8140a0e7fa181df51253c43d2

From 276da1063d04945b67b08a2ce28f6300cd37a399 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 4 Nov 2020 21:23:46 -0500
Subject: [PATCH 506/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 1c4f3dd51..eed049ae9 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 1c4f3dd519349ab8140a0e7fa181df51253c43d2
+Subproject commit eed049ae92371d19e8362166851581293e21d79a

From 4efb01142913d5f1d72878e8bb409f6353443b6d Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 5 Nov 2020 16:01:44 -0800
Subject: [PATCH 507/547] quickfort guide: 'c' stockpiles don't make sense

explain why "custom" stockpiles aren't meaningful to create in a
blueprint and what the user should do instead
---
 docs/guides/quickfort-user-guide.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 964776f65..0df4bc24c 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -502,7 +502,12 @@ meeting area all at once:
    #zone main pasture and picnic area
    nmg(10x10)
 
-The order of the individual letters doesn't matter.
+The order of the individual letters doesn't matter. Note that "custom"
+(:kbd:`c`) stockpiles cannot be declared in a blueprint since what would
+get created would depend on what happens to be set in the "custom stockpile
+settings" in your game. Instead, place stockpiles using the keys that
+represent the types you want to store and then use a ``#query`` blueprint to
+customize them.
 
 Detailed configuration for zones, such as the pit/pond toggle, can also be set
 by mimicking the hotkeys used to set them. Note that gather flags default to

From edf55b2ae64a2965ea581436ec19751a8c407ca9 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 5 Nov 2020 16:11:27 -0800
Subject: [PATCH 508/547] use numbered lists in meta blueprints section

---
 docs/guides/quickfort-user-guide.rst | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 0df4bc24c..f8061b766 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -897,13 +897,13 @@ Meta blueprints
 Meta blueprints are blueprints that script a series of other blueprints. Many
 blueprint packages follow this pattern:
 
--  Apply dig blueprint to designate dig areas
--  Wait for miners to dig
--  **Apply build buildprint** to designate buildings
--  **Apply place buildprint** to designate stockpiles
--  **Apply query blueprint** to configure stockpiles
--  Wait for buildings to get built
--  Apply a different query blueprint to configure rooms
+1.  Apply dig blueprint to designate dig areas
+#.  Wait for miners to dig
+#.  **Apply build buildprint** to designate buildings
+#.  **Apply place buildprint** to designate stockpiles
+#.  **Apply query blueprint** to configure stockpiles
+#.  Wait for buildings to get built
+#.  Apply a different query blueprint to configure rooms
 
 Those three "apply"s in the middle might as well get done in one command instead
 of three. A meta blueprint can encode that sequence. A meta blueprint refers to
@@ -947,12 +947,12 @@ blueprints into one:
 
 Now your sequence is shortened to:
 
--  Apply dig blueprint to designate dig areas
--  Wait for miners to dig
--  **Apply meta buildprint** to build buildings and designate/configure
-   stockpiles
--  Wait for buildings to get built
--  Apply the final query blueprint to configure the room
+1.  Apply dig blueprint to designate dig areas
+#.  Wait for miners to dig
+#.  **Apply meta buildprint** to build buildings and designate/configure
+    stockpiles
+#.  Wait for buildings to get built
+#.  Apply the final query blueprint to configure the room
 
 You can use meta blueprints to lay out your fortress at a larger scale as well.
 The ``#<`` and ``#>`` notation is valid in meta blueprints, so you can, for

From e8f4b4016b8dff8dc56c53db9a7eca2e126e35c2 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 5 Nov 2020 16:18:33 -0800
Subject: [PATCH 509/547] reinforce that meta blueprints can't cross files

they must refer to labels that are within the same .xlsx or .csv file
---
 docs/guides/quickfort-user-guide.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index f8061b766..5ab0956f7 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -1015,6 +1015,11 @@ a big fort, so we're planning for a lot of bedrooms):
 Note that for blueprints without an explicit label, we still need to address
 them by their auto-generated numerical label.
 
+It's worth calling out that ``#meta`` blueprints can only refer to blueprints
+that are defined in the same file. This means that all blueprints that a
+``#meta`` blueprint needs to script must be in sheets within the same
+.xlsx spreadsheet or concatenated into the same .csv file.
+
 You can then hide the blueprints that you now manage with the ``#meta``-mode
 blueprint from ``quickfort list`` by adding a ``hidden()`` marker to their
 modelines. That way the output of ``quickfort list`` won't be cluttered by

From aca2be7182fa49be83d5b7d9525a2936f65cff6e Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 9 Nov 2020 23:41:43 -0500
Subject: [PATCH 510/547] Disable MSVC warnings in dependencies

---
 depends/CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 566a4d57f..40bbd2aa3 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -42,6 +42,9 @@ set(LIBZIP_ENABLE_OPENSSL OFF CACHE BOOL "")
 set(LIBZIP_ENABLE_WINDOWS_CRYPTO OFF CACHE BOOL "")
 set(LIBZIP_DO_INSTALL OFF CACHE BOOL "")
 add_subdirectory(libzip)
+if(MSVC)
+    target_compile_options(zip PRIVATE /wd4244)
+endif()
 
 set(XLSXIO_USE_DFHACK_LIBS ON CACHE BOOL "")
 set(XLSXIO_BUILD_STATIC ON CACHE BOOL "")
@@ -55,3 +58,6 @@ set(XLSXIO_LIBZIP_DIR "${CMAKE_CURRENT_BINARY_DIR}/libzip" CACHE PATH "")
 set(XLSXIO_EXPAT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libexpat" CACHE PATH "")
 set(XLSXIO_ENABLE_INSTALL OFF CACHE BOOL "")
 add_subdirectory(xlsxio)
+if(MSVC)
+    target_compile_options(xlsxio_read_STATIC PRIVATE /wd4013 /wd4244)
+endif()

From eee33822e7aac4ae4fc88800581aaafa00d016fc Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 9 Nov 2020 23:41:53 -0500
Subject: [PATCH 511/547] Update submodules

---
 library/xml | 2 +-
 scripts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/xml b/library/xml
index 72688ee86..9eb93c91c 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 72688ee8651ad7ab1f056f7120b0052dc30c1d47
+Subproject commit 9eb93c91c8c69df0860fb9a896742d17a0472f59
diff --git a/scripts b/scripts
index eed049ae9..a2b0c7c41 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit eed049ae92371d19e8362166851581293e21d79a
+Subproject commit a2b0c7c41919b54933858482f1daa1dae6a6664b

From 17432072f247bc0c1e818583c01154a85cd4bdc5 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Mon, 9 Nov 2020 23:48:57 -0500
Subject: [PATCH 512/547] Also apply to xlsxio_write

---
 depends/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
index 40bbd2aa3..3d7e18da7 100644
--- a/depends/CMakeLists.txt
+++ b/depends/CMakeLists.txt
@@ -60,4 +60,5 @@ set(XLSXIO_ENABLE_INSTALL OFF CACHE BOOL "")
 add_subdirectory(xlsxio)
 if(MSVC)
     target_compile_options(xlsxio_read_STATIC PRIVATE /wd4013 /wd4244)
+    target_compile_options(xlsxio_write_STATIC PRIVATE /wd4013 /wd4244)
 endif()

From 0958fdbf4b38791468f69e590793bf9f512a6626 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Tue, 10 Nov 2020 00:48:27 -0500
Subject: [PATCH 513/547] Document script paths

Ref #1690
---
 docs/Core.rst    | 48 ++++++++++++++++++++++++++-
 docs/Lua API.rst | 86 ++++++++++++++++++++++++++++++------------------
 2 files changed, 101 insertions(+), 33 deletions(-)

diff --git a/docs/Core.rst b/docs/Core.rst
index f18adfdc1..4fdecbf63 100644
--- a/docs/Core.rst
+++ b/docs/Core.rst
@@ -454,9 +454,55 @@ Other init files
   directory, will be run when any world or that save is loaded.
 
 
+.. _dfhack-config:
+
+Configuration Files
+===================
+
+Some DFHack settings can be changed by modifying files in the ``dfhack-config``
+folder (which is in the DF folder). The default versions of these files, if they
+exist, are in ``dfhack-config/default`` and are installed when DFHack starts if
+necessary.
+
+.. _script-paths:
+
+Script paths
+------------
+
+Script paths are folders that DFHack searches to find a script when a command is
+run. By default, the following folders are searched, in order (relative to the
+root DF folder):
+
+1. :file:`data/save/{<region folder>}/raw/scripts` (only if a save is loaded)
+2. :file:`raw/scripts`
+3. :file:`hack/scripts`
+
+For example, if ``teleport`` is run, these folders are searched in order for
+``teleport.lua`` or ``teleport.rb``, and the first matching file is run.
+
+Script paths can be added by modifying :file:`dfhack-config/script-paths.txt`.
+Each line should start with one of these characters:
+
+- ``+``: adds a script path that is searched *before* the default paths (above)
+- ``-``: adds a script path that is searched *after* the default paths
+- ``#``: a comment (the line is ignored)
+
+Paths can be absolute or relative - relative paths are interpreted relative to
+the root DF folder.
+
+.. admonition:: Tip
+
+    When developing scripts in the :source:scripts:`dfhack/scripts repo <>`,
+    it may be useful to add the path to your local copy of the repo with ``+``.
+    This will allow you to make changes in the repo and have them take effect
+    immediately, without needing to re-install or copy scripts over manually.
+
+
+Script paths can also be modified programmatically through the `Lua API <lua-api-internal>`.
+
 .. _env-vars:
 
-Environment variables
+Environment Variables
 =====================
 
 DFHack's behavior can be adjusted with some environment variables. For example,
diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 4c6f0d6fa..ffe705d60 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -2213,6 +2213,8 @@ Console API
   Flushes all output to the console. This can be useful when printing text that
   does not end in a newline but should still be displayed.
 
+.. _lua-api-internal:
+
 Internal API
 ------------
 
@@ -2311,7 +2313,7 @@ and are only documented here for completeness:
 
 * ``dfhack.internal.addScriptPath(path, search_before)``
 
-  Adds ``path`` to the list of paths searched for scripts (both in Lua and Ruby).
+  Registers ``path`` as a `script path <script-paths>`.
   If ``search_before`` is passed and ``true``, the path will be searched before
   the default paths (e.g. ``raw/scripts``, ``hack/scripts``); otherwise, it will
   be searched after.
@@ -2321,17 +2323,18 @@ and are only documented here for completeness:
 
 * ``dfhack.internal.removeScriptPath(path)``
 
-  Removes ``path`` from the script search paths and returns ``true`` if successful.
+  Removes ``path`` from the list of `script paths <script-paths>` and returns
+  ``true`` if successful.
 
 * ``dfhack.internal.getScriptPaths()``
 
-  Returns the list of script paths in the order they are searched, including defaults.
-  (This can change if a world is loaded.)
+  Returns the list of `script paths <script-paths>` in the order they are
+  searched, including defaults. (This can change if a world is loaded.)
 
 * ``dfhack.internal.findScript(name)``
 
-  Searches script paths for the script ``name`` and returns the path of the first
-  file found, or ``nil`` on failure.
+  Searches `script paths <script-paths>` for the script ``name`` and returns the
+  path of the first file found, or ``nil`` on failure.
 
   .. note::
     This requires an extension to be specified (``.lua`` or ``.rb``) - use
@@ -4280,35 +4283,54 @@ Scripts
 .. contents::
    :local:
 
-Any files with the .lua extension placed into :file:`hack/scripts/*`
-are automatically used by the DFHack core as commands. The
-matching command name consists of the name of the file without
-the extension. First DFHack searches for the script in the :file:`<save_folder>/raw/scripts/` folder. If it is not found there, it searches in the :file:`<DF>/raw/scripts/` folder. If it is not there, it searches in
-:file:`<DF>/hack/scripts/`. If it is not there, it gives up.
+Any files with the ``.lua`` extension placed into the :file:`hack/scripts` folder
+are automatically made avaiable as DFHack commands. The command corresponding to
+a script is simply the script's filename, relative to the scripts folder, with
+the extension omitted. For example:
 
-If the first line of the script is a one-line comment, it is
-used by the built-in ``ls`` and ``help`` commands.
-Such a comment is required for every script in the official DFHack repository.
+* :file:`hack/scripts/add-thought.lua` is invoked as ``add-thought``
+* :file:`hack/scripts/gui/teleport.lua` is invoked as ``gui/teleport``
 
 .. note::
-    Scripts placed in subdirectories still can be accessed, but
-    do not clutter the `ls` command list (unless ``ls -a``; thus it is preferred
-    for obscure developer-oriented scripts and scripts used by tools.
-    When calling such scripts, always use '/' as the separator for
-    directories, e.g. ``devel/lua-example``.
-
-Scripts are re-read from disk if they have changed since the last time they were read.
-Global variable values persist in memory between calls, unless the file has changed.
-Every script gets its own separate environment for global
-variables.
-
-Arguments are passed in to the scripts via the **...** built-in
-quasi-variable; when the script is called by the DFHack core,
-they are all guaranteed to be non-nil strings.
-
-DFHack core invokes the scripts in the `core context <lua-core-context>`;
-however it is possible to call them from any lua code (including
-from other scripts) in any context, via the same function the core uses:
+    Scripts placed in subdirectories can be run as described above, but are not
+    listed by the `ls` command unless ``-a`` is specified. In general, scripts
+    should be placed in subfolders in the following situations:
+
+    * ``devel``: scripts that are intended exclusively for DFHack development,
+      including examples, or scripts that are experimental and unstable
+    * ``fix``: fixes for specific DF issues
+    * ``gui``: GUI front-ends for existing tools (for example, see the
+      relationship between `teleport` and `gui/teleport`)
+    * ``modtools``: scripts that are intended to be run exclusively as part of
+      mods, not directly by end-users (as a rule of thumb: if someone other than
+      a mod developer would want to run a script from the console, it should
+      not be placed in this folder)
+
+Scripts can also be placed in other folders - by default, these include
+:file:`raw/scripts` and :file:`data/save/{region}/raw/scripts`, but additional
+folders can be added (for example, a copy of the
+:source:scripts:`scripts repository <>` for local development). See
+`script-paths` for more information on how to configure this behavior.
+
+If the first line of the script is a one-line comment (starting with ``--``),
+the content of the comment is used by the built-in ``ls`` and ``help`` commands.
+Such a comment is required for every script in the official DFHack repository.
+
+Scripts are read from disk when run for the first time, or if they have changed
+since the last time they were run.
+
+Each script has an isolated environment where global variables set by the script
+are stored. Values of globals persist across script runs in the same DF session.
+See `devel/lua-example` for an example of this behavior. Note that local
+variables do *not* persist.
+
+Arguments are passed in to the scripts via the ``...`` built-in quasi-variable;
+when the script is called by the DFHack core, they are all guaranteed to be
+non-nil strings.
+
+DFHack invokes the scripts in the `core context <lua-core-context>`; however it
+is possible to call them from any lua code (including from other scripts) in any
+context, via the same function the core uses:
 
 * ``dfhack.run_script(name[,args...])``
 

From c87d5260d3a3ffa9de70c7d96b1ff889a21d95a5 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 11 Nov 2020 16:04:40 -0500
Subject: [PATCH 514/547] buildingplan: make hotkeys added to existing menus
 red

For clarity (per Lua API.rst guidelines)
---
 plugins/buildingplan.cpp | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index 1ce99ea0d..c23d15574 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -505,9 +505,9 @@ struct buildingplan_query_hook : public df::viewscreen_dwarfmodest
 
         ++y;
         if (hasPrevFilter())
-            OutputHotkeyString(x, y, "Prev Item", "Ctrl+Left", true, left_margin);
+            OutputHotkeyString(x, y, "Prev Item", "Ctrl+Left", true, left_margin, COLOR_WHITE, COLOR_LIGHTRED);
         if (hasNextFilter())
-            OutputHotkeyString(x, y, "Next Item", "Ctrl+Right", true, left_margin);
+            OutputHotkeyString(x, y, "Next Item", "Ctrl+Right", true, left_margin, COLOR_WHITE, COLOR_LIGHTRED);
     }
 };
 
@@ -562,7 +562,7 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
             show_help = false;
             return false;
         }
-        
+
         initStatics();
 
         if (in_dummy_screen)
@@ -724,8 +724,10 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
             OutputString(COLOR_WHITE, x, y, "Use Shift-Keys here", true, left_margin);
         }
 
-        OutputToggleString(x, y, "Planning Mode", "P", planmode_enabled[key], true, left_margin);
-        OutputHotkeyString(x, y, "Global Settings", "G", true, left_margin);
+        OutputToggleString(x, y, "Planning Mode", interface_key::CUSTOM_SHIFT_P,
+            planmode_enabled[key], true, left_margin, COLOR_WHITE, COLOR_LIGHTRED);
+        OutputHotkeyString(x, y, "Global Settings", interface_key::CUSTOM_SHIFT_G,
+            true, left_margin, COLOR_WHITE, COLOR_LIGHTRED);
 
         if (!is_planmode_enabled(key))
             return;
@@ -739,16 +741,18 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
 
         if (item_can_be_improved(key, filter_idx))
         {
-            OutputHotkeyString(x, y, "Min Quality: ", "QW");
+            OutputHotkeyString(x, y, "Min Quality: ", "QW", false, 0, COLOR_WHITE, COLOR_LIGHTRED);
             OutputString(COLOR_BROWN, x, y, filter->getMinQuality(), true, left_margin);
 
-            OutputHotkeyString(x, y, "Max Quality: ", "AS");
+            OutputHotkeyString(x, y, "Max Quality: ", "AS", false, 0, COLOR_WHITE, COLOR_LIGHTRED);
             OutputString(COLOR_BROWN, x, y, filter->getMaxQuality(), true, left_margin);
 
-            OutputToggleString(x, y, "Decorated Only", "D", filter->getDecoratedOnly(), true, left_margin);
+            OutputToggleString(x, y, "Decorated Only", interface_key::CUSTOM_SHIFT_D,
+                filter->getDecoratedOnly(), true, left_margin, COLOR_WHITE, COLOR_LIGHTRED);
         }
 
-        OutputHotkeyString(x, y, "Material Filter:", "M", true, left_margin);
+        OutputHotkeyString(x, y, "Material Filter:", interface_key::CUSTOM_SHIFT_M, true,
+            left_margin, COLOR_WHITE, COLOR_LIGHTRED);
         auto filter_descriptions = filter->getMaterials();
         for (auto it = filter_descriptions.begin();
              it != filter_descriptions.end(); ++it)
@@ -756,9 +760,11 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
 
         y += 2;
         if (hasPrevFilter())
-            OutputHotkeyString(x, y, "Prev Item", "Ctrl+Left", true, left_margin);
+            OutputHotkeyString(x, y, "Prev Item", "Ctrl+Left", true,
+                left_margin, COLOR_WHITE, COLOR_LIGHTRED);
         if (hasNextFilter())
-            OutputHotkeyString(x, y, "Next Item", "Ctrl+Right", true, left_margin);
+            OutputHotkeyString(x, y, "Next Item", "Ctrl+Right", true,
+                left_margin, COLOR_WHITE, COLOR_LIGHTRED);
     }
 };
 

From 421844dcb866e693b244b21eebdbe3a114ecdde9 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Wed, 11 Nov 2020 16:05:24 -0500
Subject: [PATCH 515/547] Update xml

---
 library/xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/xml b/library/xml
index 9eb93c91c..dd8b93350 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 9eb93c91c8c69df0860fb9a896742d17a0472f59
+Subproject commit dd8b9335007941c3aea27474b0a08ba31f6bc97f

From 2ec8dd12253aeb99e45fe48085d9e0fbd0cf37a9 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 11 Nov 2020 16:53:29 -0800
Subject: [PATCH 516/547] update quickfort guide and aliases

- move bit of alias documentation from aliases-common to aliases.txt
- document new behavior for 'c'ustom stockpiles
---
 data/quickfort/aliases-common.txt    |  7 +++----
 dfhack-config/quickfort/aliases.txt  |  6 +++++-
 docs/guides/quickfort-user-guide.rst | 11 +++++------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt
index 857160711..59705f9f7 100644
--- a/data/quickfort/aliases-common.txt
+++ b/data/quickfort/aliases-common.txt
@@ -17,10 +17,6 @@
 #
 # Aliases that don't fit into those two categories have comments explaining
 # their usage.
-#
-# There is also a non-alphanumeric alias built into the code for the common
-# shorthand for "make room":
-#   r+   expands to r+&
 
 
 ########################################
@@ -41,6 +37,9 @@ give10down: {give move={Down 10}}
 give10left: {give move={Left 10}}
 give10right: {give move={Right 10}}
 
+# usage example: {givename name="myname"}
+givename: {Ctrl}n{name}&
+
 # use to toggle a sequence of stockpile options. for example: {togglesequence 5}
 togglesequence: &{Down}
 togglesequence2: &{Down 2}
diff --git a/dfhack-config/quickfort/aliases.txt b/dfhack-config/quickfort/aliases.txt
index 2743a39f3..9be32107e 100644
--- a/dfhack-config/quickfort/aliases.txt
+++ b/dfhack-config/quickfort/aliases.txt
@@ -95,8 +95,12 @@
 #   !   expands to {Ctrl}
 #   ^   expands to {ESC}
 #
+# There is also a non-standard alias built into the code for the common
+# shorthand for "make room":
+#   r+  expands to r+&
+#
 # If you need literal verisons of the shorthand characters, surround them in
-# curly brackets, for example: "{~}"
+# curly brackets, for example: "{!}"
 #
 #
 # Add your custom aliases here:
diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 5ab0956f7..1d9c1a024 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -502,12 +502,11 @@ meeting area all at once:
    #zone main pasture and picnic area
    nmg(10x10)
 
-The order of the individual letters doesn't matter. Note that "custom"
-(:kbd:`c`) stockpiles cannot be declared in a blueprint since what would
-get created would depend on what happens to be set in the "custom stockpile
-settings" in your game. Instead, place stockpiles using the keys that
-represent the types you want to store and then use a ``#query`` blueprint to
-customize them.
+The order of the individual letters doesn't matter. If you want to configure the
+stockpile from scratch in a ``#query`` blueprint, you can place unconfigured
+"custom" stockpiles with (:kbd:`c`). It is more efficient, though, to place
+stockpiles using the keys that represent the types you want to store, and
+then only use a ``#query`` blueprint if you need fine-grained customization.
 
 Detailed configuration for zones, such as the pit/pond toggle, can also be set
 by mimicking the hotkeys used to set them. Note that gather flags default to

From 54702085d550a8a5183523e61b8c939bd29cde1f Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 11 Nov 2020 17:12:56 -0800
Subject: [PATCH 517/547] don't eat keys while building is being renamed

allows buildingplan to prevent unsuspension of planned buildings without
also eating the 's' key when the user is trying to use it to give the
building a custom name.
---
 plugins/buildingplan.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index c23d15574..fadd723a7 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -431,7 +431,7 @@ struct buildingplan_query_hook : public df::viewscreen_dwarfmodest
 
     bool handleInput(set<df::interface_key> *input)
     {
-        if (!isInPlannedBuildingQueryMode())
+        if (!isInPlannedBuildingQueryMode() || Gui::inRenameBuilding())
             return false;
 
         initStatics();

From 36110902fa3148904cb108f0ed51f9477dc11024 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 12 Nov 2020 00:11:13 -0800
Subject: [PATCH 518/547] don't use cached iterators across map reloads

---
 plugins/buildingplan.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index 2d1785579..dedc89f62 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -457,6 +457,11 @@ struct buildingplan_query_hook : public df::viewscreen_dwarfmodest
         }
     }
 
+    static void invalidateStatics()
+    {
+        bld = NULL;
+    }
+
     bool handleInput(set<df::interface_key> *input)
     {
         if (!isInPlannedBuildingQueryMode() || Gui::inRenameBuilding())
@@ -583,6 +588,11 @@ struct buildingplan_place_hook : public df::viewscreen_dwarfmodest
         }
     }
 
+    static void invalidateStatics()
+    {
+        key = BuildingTypeKey();
+    }
+
     bool handleInput(set<df::interface_key> *input)
     {
         if (!isInPlannedBuildingPlacementMode())
@@ -959,6 +969,8 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
 {
     switch (event) {
     case SC_MAP_LOADED:
+        buildingplan_place_hook::invalidateStatics();
+        buildingplan_query_hook::invalidateStatics();
         planner.reset();
         roomMonitor.reset(out);
         break;

From 913d860ae47bd8b0e8b24db8520bc33dfd8815d4 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 12 Nov 2020 19:07:51 -0500
Subject: [PATCH 519/547] Use initial working directory as process path on
 Linux, and expose to Lua

---
 docs/Lua API.rst                     |  6 +++-
 library/LuaApi.cpp                   |  3 +-
 library/Process-linux.cpp            | 48 ++++++++--------------------
 library/include/modules/Filesystem.h |  3 +-
 library/modules/Filesystem.cpp       |  9 +++++-
 5 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 5939f50cb..80fd0add6 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -2160,10 +2160,14 @@ unless otherwise noted.
 
   Changes the current directory to ``path``. Use with caution.
 
-* ``dfhack.filesystem.restorecwd()``
+* ``dfhack.filesystem.restore_cwd()``
 
   Restores the current working directory to what it was when DF started.
 
+* ``dfhack.filesystem.get_initial_cwd()``
+
+  Returns the value of the working directory when DF was started.
+
 * ``dfhack.filesystem.mkdir(path)``
 
   Creates a new directory. Returns ``false`` if unsuccessful, including if ``path`` already exists.
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index d38cb31ba..431ab3ae5 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -2371,7 +2371,8 @@ static const luaL_Reg dfhack_screen_funcs[] = {
 
 static const LuaWrapper::FunctionReg dfhack_filesystem_module[] = {
     WRAPM(Filesystem, getcwd),
-    WRAPM(Filesystem, restorecwd),
+    WRAPM(Filesystem, restore_cwd),
+    WRAPM(Filesystem, get_initial_cwd),
     WRAPM(Filesystem, chdir),
     WRAPM(Filesystem, mkdir),
     WRAPM(Filesystem, mkdir_recursive),
diff --git a/library/Process-linux.cpp b/library/Process-linux.cpp
index 45e655948..be3ebb5df 100644
--- a/library/Process-linux.cpp
+++ b/library/Process-linux.cpp
@@ -22,29 +22,28 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include "Internal.h"
-
+#include <cstdio>
+#include <cstring>
 #include <dirent.h>
 #include <errno.h>
+#include <map>
+#include <set>
+#include <string>
 #include <sys/mman.h>
 #include <sys/time.h>
 #include <unistd.h>
-
-#include <string>
 #include <vector>
-#include <map>
-#include <set>
-#include <cstdio>
-#include <cstring>
-using namespace std;
 
-#include <md5wrapper.h>
+#include "Error.h"
+#include "Internal.h"
+#include "md5wrapper.h"
 #include "MemAccess.h"
 #include "Memory.h"
-#include "VersionInfoFactory.h"
+#include "modules/Filesystem.h"
 #include "VersionInfo.h"
-#include "Error.h"
-#include <string.h>
+#include "VersionInfoFactory.h"
+
+using namespace std;
 using namespace DFHack;
 
 Process::Process(const VersionInfoFactory& known_versions) : identified(false), my_pe(0)
@@ -181,28 +180,7 @@ uint32_t Process::getTickCount()
 
 string Process::getPath()
 {
-    static string cached_path;
-    if (cached_path.empty())
-    {
-        const char *exe_name = "/proc/self/exe";
-        char exe_path[1024];
-        int length = readlink(exe_name, exe_path, sizeof(exe_path));
-        if (length > 0)
-        {
-            exe_path[length] = '\0';
-            string path_string = exe_path;
-            // DF lives in libs, so move up a folder
-            cached_path = path_string.substr(0, path_string.find_last_of("/", path_string.find_last_of("/") - 1));
-        }
-        else
-        {
-            perror("readlink(/proc/self/exe) failed");
-            fprintf(stderr, "  length=%i\n", length);
-            cached_path = ".";
-        }
-        fprintf(stderr, "Resolved DF root to %s\n", cached_path.c_str());
-    }
-    return cached_path;
+    return Filesystem::get_initial_cwd();
 }
 
 int Process::getPID()
diff --git a/library/include/modules/Filesystem.h b/library/include/modules/Filesystem.h
index eac8a1102..8e7bab9b2 100644
--- a/library/include/modules/Filesystem.h
+++ b/library/include/modules/Filesystem.h
@@ -149,7 +149,8 @@ namespace DFHack {
         DFHACK_EXPORT void init ();
         DFHACK_EXPORT bool chdir (std::string path);
         DFHACK_EXPORT std::string getcwd ();
-        DFHACK_EXPORT bool restorecwd ();
+        DFHACK_EXPORT bool restore_cwd ();
+        DFHACK_EXPORT std::string get_initial_cwd ();
         DFHACK_EXPORT bool mkdir (std::string path);
         // returns true on success or if directory already exists
         DFHACK_EXPORT bool mkdir_recursive (std::string path);
diff --git a/library/modules/Filesystem.cpp b/library/modules/Filesystem.cpp
index 7738bfd5e..e0d0bc8c2 100644
--- a/library/modules/Filesystem.cpp
+++ b/library/modules/Filesystem.cpp
@@ -66,6 +66,7 @@ void Filesystem::init ()
 
 bool Filesystem::chdir (std::string path)
 {
+    Filesystem::init();
     return ::chdir(path.c_str()) == 0;
 }
 
@@ -83,11 +84,17 @@ std::string Filesystem::getcwd ()
     return result;
 }
 
-bool Filesystem::restorecwd ()
+bool Filesystem::restore_cwd ()
 {
     return Filesystem::chdir(initial_cwd);
 }
 
+std::string Filesystem::get_initial_cwd ()
+{
+    Filesystem::init();
+    return initial_cwd;
+}
+
 bool Filesystem::mkdir (std::string path)
 {
     int fail;

From b55d844164fd2bfdc9c1088e0a356cdd6a1f3bde Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 12 Nov 2020 21:03:05 -0500
Subject: [PATCH 520/547] Add test for get_initial_cwd()

---
 test/core.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/core.lua b/test/core.lua
index 6cde334d4..ba104c90a 100644
--- a/test/core.lua
+++ b/test/core.lua
@@ -13,6 +13,10 @@ function test.getDFPath()
     expect.eq(clean_path(dfhack.getDFPath()), old_cwd)
 end
 
+function test.get_initial_cwd()
+    expect.eq(clean_path(dfhack.filesystem.get_initial_cwd()), clean_path(dfhack.getDFPath()))
+end
+
 function test.getDFPath_chdir()
     dfhack.with_finalize(restore_cwd, function()
         fs.chdir('data')

From a5e58b766bb83b9530254cfa5b7ed6098f8247f2 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Thu, 12 Nov 2020 21:07:14 -0500
Subject: [PATCH 521/547] Update scripts, changelog

---
 docs/changelog.txt | 1 +
 scripts            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 79179ce5e..9cbecf9ec 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -34,6 +34,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 # Future
 
 ## Fixes
+- Fixed an issue on some Linux systems where DFHack installed through a package manager would attempt to write files to a non-writable folder (notably when running `exportlegends` or `gui/autogems`)
 - `buildingplan`: artifacts are now successfully matched when max quality is set to ``artifacts``
 - `buildingplan`: no longer erroneously matches items to buildings while the game is paused
 - `dwarfmonitor`: fixed a crash when opening the ``prefs`` screen if units have vague preferences
diff --git a/scripts b/scripts
index a2b0c7c41..ccf1d035a 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit a2b0c7c41919b54933858482f1daa1dae6a6664b
+Subproject commit ccf1d035a653c991b669fccc8293ecbab449548f

From 02a86d761aa51e6ec54d179f931fc57b073a2765 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 12 Nov 2020 19:10:06 -0800
Subject: [PATCH 522/547] identify bars as non_economic items

allows Job::isSuitableMaterial() to match metal bars as a building
material
---
 library/include/modules/Job.h       | 2 +-
 library/include/modules/Materials.h | 5 +++--
 library/modules/Job.cpp             | 5 +++--
 library/modules/Materials.cpp       | 9 ++++++---
 plugins/buildingplan-planner.cpp    | 3 ++-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/library/include/modules/Job.h b/library/include/modules/Job.h
index cde5c64dd..4312b7b4e 100644
--- a/library/include/modules/Job.h
+++ b/library/include/modules/Job.h
@@ -102,7 +102,7 @@ namespace DFHack
                                          int filter_idx = -1, int insert_idx = -1);
 
         DFHACK_EXPORT bool isSuitableItem(df::job_item *item, df::item_type itype, int isubtype);
-        DFHACK_EXPORT bool isSuitableMaterial(df::job_item *item, int mat_type, int mat_index);
+        DFHACK_EXPORT bool isSuitableMaterial(df::job_item *item, int mat_type, int mat_index, df::item_type itype = df::item_type::NONE);
         DFHACK_EXPORT std::string getName(df::job *job);
     }
 
diff --git a/library/include/modules/Materials.h b/library/include/modules/Materials.h
index a3b4204e5..b438a0cdb 100644
--- a/library/include/modules/Materials.h
+++ b/library/include/modules/Materials.h
@@ -78,6 +78,7 @@ namespace DFHack
 
         int16_t type;
         int32_t index;
+        df::item_type itype;
 
         df::material *material;
 
@@ -98,7 +99,7 @@ namespace DFHack
         df::historical_figure *figure;
 
     public:
-        MaterialInfo(int16_t type = -1, int32_t index = -1) { decode(type, index); }
+        MaterialInfo(int16_t type = -1, int32_t index = -1, df::item_type itype = df::item_type::NONE) { decode(type, index, itype); }
         MaterialInfo(const t_matpair &mp) { decode(mp.mat_type, mp.mat_index); }
         template<class T> MaterialInfo(T *ptr) { decode(ptr); }
 
@@ -113,7 +114,7 @@ namespace DFHack
         bool isAnyInorganic() const { return type == 0; }
         bool isInorganicWildcard() const { return isAnyInorganic() && isBuiltin(); }
 
-        bool decode(int16_t type, int32_t index = -1);
+        bool decode(int16_t type, int32_t index = -1, df::item_type itype = df::item_type::NONE);
         bool decode(df::item *item);
         bool decode(const df::material_vec_ref &vr, int idx);
         bool decode(const t_matpair &mp) { return decode(mp.mat_type, mp.mat_index); }
diff --git a/library/modules/Job.cpp b/library/modules/Job.cpp
index 0aa01af95..9e04e1a30 100644
--- a/library/modules/Job.cpp
+++ b/library/modules/Job.cpp
@@ -608,7 +608,8 @@ bool Job::isSuitableItem(df::job_item *item, df::item_type itype, int isubtype)
     return iinfo.isValid() && iinfo.matches(*item, &minfo);
 }
 
-bool Job::isSuitableMaterial(df::job_item *item, int mat_type, int mat_index)
+bool Job::isSuitableMaterial(
+    df::job_item *item, int mat_type, int mat_index, df::item_type itype)
 {
     CHECK_NULL_POINTER(item);
 
@@ -616,7 +617,7 @@ bool Job::isSuitableMaterial(df::job_item *item, int mat_type, int mat_index)
         return true;
 
     ItemTypeInfo iinfo(item);
-    MaterialInfo minfo(mat_type, mat_index);
+    MaterialInfo minfo(mat_type, mat_index, itype);
 
     return minfo.isValid() && iinfo.matches(*item, &minfo);
 }
diff --git a/library/modules/Materials.cpp b/library/modules/Materials.cpp
index 909fa56f9..e3a4bf23f 100644
--- a/library/modules/Materials.cpp
+++ b/library/modules/Materials.cpp
@@ -75,7 +75,9 @@ bool MaterialInfo::decode(df::item *item)
     if (!item)
         return decode(-1);
     else
-        return decode(item->getActualMaterial(), item->getActualMaterialIndex());
+        return decode(item->getActualMaterial(),
+                      item->getActualMaterialIndex(),
+                      item->getType());
 }
 
 bool MaterialInfo::decode(const df::material_vec_ref &vr, int idx)
@@ -86,10 +88,11 @@ bool MaterialInfo::decode(const df::material_vec_ref &vr, int idx)
         return decode(vr.mat_type[idx], vr.mat_index[idx]);
 }
 
-bool MaterialInfo::decode(int16_t type, int32_t index)
+bool MaterialInfo::decode(int16_t type, int32_t index, df::item_type itype)
 {
     this->type = type;
     this->index = index;
+    this->itype = itype;
 
     material = NULL;
     mode = Builtin; subtype = 0;
@@ -513,7 +516,7 @@ void MaterialInfo::getMatchBits(df::job_item_flags2 &ok, df::job_item_flags2 &ma
     TEST(fire_safe, material->heat.melting_point > 11000);
     TEST(magma_safe, material->heat.melting_point > 12000);
     TEST(deep_material, FLAG(inorganic, inorganic_flags::SPECIAL));
-    TEST(non_economic, !inorganic || !(ui && vector_get(ui->economic_stone, index)));
+    TEST(non_economic, !inorganic || !(ui && vector_get(ui->economic_stone, index)) || itype == df::item_type::BAR);
 
     TEST(plant, plant);
     TEST(silk, MAT_FLAG(SILK));
diff --git a/plugins/buildingplan-planner.cpp b/plugins/buildingplan-planner.cpp
index 834465275..7aad342e5 100644
--- a/plugins/buildingplan-planner.cpp
+++ b/plugins/buildingplan-planner.cpp
@@ -825,7 +825,8 @@ static bool matchesFilters(df::item * item,
     return DFHack::Job::isSuitableItem(
             job_item, item->getType(), item->getSubtype())
         && DFHack::Job::isSuitableMaterial(
-            job_item, item->getMaterial(), item->getMaterialIndex())
+            job_item, item->getMaterial(), item->getMaterialIndex(),
+            item->getType())
         && item_filter.matches(item);
 }
 

From 6b14a92385535027dc15983ba37ca402d3ded066 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 12 Nov 2020 19:54:00 -0800
Subject: [PATCH 523/547] allow buildingplan to match metal bars

---
 plugins/buildingplan-planner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/buildingplan-planner.cpp b/plugins/buildingplan-planner.cpp
index 7aad342e5..b06ce7f84 100644
--- a/plugins/buildingplan-planner.cpp
+++ b/plugins/buildingplan-planner.cpp
@@ -224,7 +224,7 @@ bool ItemFilter::matches(df::item *item) const
 
     auto imattype = item->getActualMaterial();
     auto imatindex = item->getActualMaterialIndex();
-    auto item_mat = DFHack::MaterialInfo(imattype, imatindex);
+    auto item_mat = DFHack::MaterialInfo(imattype, imatindex, item->getType());
 
     return (materials.size() == 0) ? matchesMask(item_mat) : matches(item_mat);
 }

From 10616a387fcc8b5351e7cb24fbb5ee11caed99a0 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 12 Nov 2020 22:44:38 -0800
Subject: [PATCH 524/547] cleaner mask-based implementation

---
 library/include/modules/Items.h     |  4 +++-
 library/include/modules/Job.h       |  4 +++-
 library/include/modules/Materials.h |  8 ++++----
 library/modules/Items.cpp           |  5 +++--
 library/modules/Job.cpp             |  6 +++---
 library/modules/Materials.cpp       | 16 ++++++++--------
 plugins/buildingplan-planner.cpp    |  2 +-
 7 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/library/include/modules/Items.h b/library/include/modules/Items.h
index 33feea222..66ca9d1cf 100644
--- a/library/include/modules/Items.h
+++ b/library/include/modules/Items.h
@@ -88,7 +88,9 @@ namespace DFHack
         bool find(const std::string &token);
 
         bool matches(df::job_item_vector_id vec_id);
-        bool matches(const df::job_item &item, MaterialInfo *mat = NULL, bool skip_vector = false);
+        bool matches(const df::job_item &item, MaterialInfo *mat = NULL,
+                     bool skip_vector = false,
+                     df::item_type itype = df::item_type::NONE);
     };
 
     inline bool operator== (const ItemTypeInfo &a, const ItemTypeInfo &b) {
diff --git a/library/include/modules/Job.h b/library/include/modules/Job.h
index 4312b7b4e..e2d7ff162 100644
--- a/library/include/modules/Job.h
+++ b/library/include/modules/Job.h
@@ -102,7 +102,9 @@ namespace DFHack
                                          int filter_idx = -1, int insert_idx = -1);
 
         DFHACK_EXPORT bool isSuitableItem(df::job_item *item, df::item_type itype, int isubtype);
-        DFHACK_EXPORT bool isSuitableMaterial(df::job_item *item, int mat_type, int mat_index, df::item_type itype = df::item_type::NONE);
+        DFHACK_EXPORT bool isSuitableMaterial(df::job_item *item, int mat_type,
+                                              int mat_index,
+                                              df::item_type itype);
         DFHACK_EXPORT std::string getName(df::job *job);
     }
 
diff --git a/library/include/modules/Materials.h b/library/include/modules/Materials.h
index b438a0cdb..3217b30ad 100644
--- a/library/include/modules/Materials.h
+++ b/library/include/modules/Materials.h
@@ -78,7 +78,6 @@ namespace DFHack
 
         int16_t type;
         int32_t index;
-        df::item_type itype;
 
         df::material *material;
 
@@ -99,7 +98,7 @@ namespace DFHack
         df::historical_figure *figure;
 
     public:
-        MaterialInfo(int16_t type = -1, int32_t index = -1, df::item_type itype = df::item_type::NONE) { decode(type, index, itype); }
+        MaterialInfo(int16_t type = -1, int32_t index = -1) { decode(type, index); }
         MaterialInfo(const t_matpair &mp) { decode(mp.mat_type, mp.mat_index); }
         template<class T> MaterialInfo(T *ptr) { decode(ptr); }
 
@@ -114,7 +113,7 @@ namespace DFHack
         bool isAnyInorganic() const { return type == 0; }
         bool isInorganicWildcard() const { return isAnyInorganic() && isBuiltin(); }
 
-        bool decode(int16_t type, int32_t index = -1, df::item_type itype = df::item_type::NONE);
+        bool decode(int16_t type, int32_t index = -1);
         bool decode(df::item *item);
         bool decode(const df::material_vec_ref &vr, int idx);
         bool decode(const t_matpair &mp) { return decode(mp.mat_type, mp.mat_index); }
@@ -157,7 +156,8 @@ namespace DFHack
 
         bool matches(const df::job_material_category &cat);
         bool matches(const df::dfhack_material_category &cat);
-        bool matches(const df::job_item &item);
+        bool matches(const df::job_item &item,
+                     df::item_type itype = df::item_type::NONE);
     };
 
     DFHACK_EXPORT bool parseJobMaterialCategory(df::job_material_category *cat, const std::string &token);
diff --git a/library/modules/Items.cpp b/library/modules/Items.cpp
index 3bc468d04..fa8607638 100644
--- a/library/modules/Items.cpp
+++ b/library/modules/Items.cpp
@@ -279,12 +279,13 @@ bool ItemTypeInfo::matches(df::job_item_vector_id vec_id)
     return true;
 }
 
-bool ItemTypeInfo::matches(const df::job_item &item, MaterialInfo *mat, bool skip_vector)
+bool ItemTypeInfo::matches(const df::job_item &item, MaterialInfo *mat,
+                           bool skip_vector, df::item_type itype)
 {
     using namespace df::enums::item_type;
 
     if (!isValid())
-        return mat ? mat->matches(item) : false;
+        return mat ? mat->matches(item, itype) : false;
 
     if (Items::isCasteMaterial(type) && mat && !mat->isNone())
         return false;
diff --git a/library/modules/Job.cpp b/library/modules/Job.cpp
index 9e04e1a30..366384fd2 100644
--- a/library/modules/Job.cpp
+++ b/library/modules/Job.cpp
@@ -605,7 +605,7 @@ bool Job::isSuitableItem(df::job_item *item, df::item_type itype, int isubtype)
     ItemTypeInfo iinfo(itype, isubtype);
     MaterialInfo minfo(item);
 
-    return iinfo.isValid() && iinfo.matches(*item, &minfo);
+    return iinfo.isValid() && iinfo.matches(*item, &minfo, true, itype);
 }
 
 bool Job::isSuitableMaterial(
@@ -617,9 +617,9 @@ bool Job::isSuitableMaterial(
         return true;
 
     ItemTypeInfo iinfo(item);
-    MaterialInfo minfo(mat_type, mat_index, itype);
+    MaterialInfo minfo(mat_type, mat_index);
 
-    return minfo.isValid() && iinfo.matches(*item, &minfo);
+    return minfo.isValid() && iinfo.matches(*item, &minfo, true, itype);
 }
 
 std::string Job::getName(df::job *job)
diff --git a/library/modules/Materials.cpp b/library/modules/Materials.cpp
index e3a4bf23f..56a13fbe2 100644
--- a/library/modules/Materials.cpp
+++ b/library/modules/Materials.cpp
@@ -76,8 +76,7 @@ bool MaterialInfo::decode(df::item *item)
         return decode(-1);
     else
         return decode(item->getActualMaterial(),
-                      item->getActualMaterialIndex(),
-                      item->getType());
+                      item->getActualMaterialIndex());
 }
 
 bool MaterialInfo::decode(const df::material_vec_ref &vr, int idx)
@@ -88,11 +87,10 @@ bool MaterialInfo::decode(const df::material_vec_ref &vr, int idx)
         return decode(vr.mat_type[idx], vr.mat_index[idx]);
 }
 
-bool MaterialInfo::decode(int16_t type, int32_t index, df::item_type itype)
+bool MaterialInfo::decode(int16_t type, int32_t index)
 {
     this->type = type;
     this->index = index;
-    this->itype = itype;
 
     material = NULL;
     mode = Builtin; subtype = 0;
@@ -447,19 +445,22 @@ bool MaterialInfo::matches(const df::dfhack_material_category &cat)
 
 #undef TEST
 
-bool MaterialInfo::matches(const df::job_item &item)
+bool MaterialInfo::matches(const df::job_item &item, df::item_type itype)
 {
     if (!isValid()) return false;
 
     df::job_item_flags1 ok1, mask1;
     getMatchBits(ok1, mask1);
 
-    df::job_item_flags2 ok2, mask2;
+    df::job_item_flags2 ok2, mask2, xmask2;
     getMatchBits(ok2, mask2);
 
     df::job_item_flags3 ok3, mask3;
     getMatchBits(ok3, mask3);
 
+    xmask2.bits.non_economic = itype != df::item_type::BOULDER;
+    mask2.whole &= ~xmask2.whole;
+
     return bits_match(item.flags1.whole, ok1.whole, mask1.whole) &&
            bits_match(item.flags2.whole, ok2.whole, mask2.whole) &&
            bits_match(item.flags3.whole, ok3.whole, mask3.whole);
@@ -516,8 +517,7 @@ void MaterialInfo::getMatchBits(df::job_item_flags2 &ok, df::job_item_flags2 &ma
     TEST(fire_safe, material->heat.melting_point > 11000);
     TEST(magma_safe, material->heat.melting_point > 12000);
     TEST(deep_material, FLAG(inorganic, inorganic_flags::SPECIAL));
-    TEST(non_economic, !inorganic || !(ui && vector_get(ui->economic_stone, index)) || itype == df::item_type::BAR);
-
+    TEST(non_economic, !inorganic || !(ui && vector_get(ui->economic_stone, index)));
     TEST(plant, plant);
     TEST(silk, MAT_FLAG(SILK));
     TEST(leather, MAT_FLAG(LEATHER));
diff --git a/plugins/buildingplan-planner.cpp b/plugins/buildingplan-planner.cpp
index b06ce7f84..7aad342e5 100644
--- a/plugins/buildingplan-planner.cpp
+++ b/plugins/buildingplan-planner.cpp
@@ -224,7 +224,7 @@ bool ItemFilter::matches(df::item *item) const
 
     auto imattype = item->getActualMaterial();
     auto imatindex = item->getActualMaterialIndex();
-    auto item_mat = DFHack::MaterialInfo(imattype, imatindex, item->getType());
+    auto item_mat = DFHack::MaterialInfo(imattype, imatindex);
 
     return (materials.size() == 0) ? matchesMask(item_mat) : matches(item_mat);
 }

From fa126af1fda83a3aa04c73857f0407506cd121bb Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 12 Nov 2020 22:49:06 -0800
Subject: [PATCH 525/547] undo unnecessary edits

---
 library/modules/Materials.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/modules/Materials.cpp b/library/modules/Materials.cpp
index 56a13fbe2..91bb5dc36 100644
--- a/library/modules/Materials.cpp
+++ b/library/modules/Materials.cpp
@@ -75,8 +75,7 @@ bool MaterialInfo::decode(df::item *item)
     if (!item)
         return decode(-1);
     else
-        return decode(item->getActualMaterial(),
-                      item->getActualMaterialIndex());
+        return decode(item->getActualMaterial(), item->getActualMaterialIndex());
 }
 
 bool MaterialInfo::decode(const df::material_vec_ref &vr, int idx)
@@ -518,6 +517,7 @@ void MaterialInfo::getMatchBits(df::job_item_flags2 &ok, df::job_item_flags2 &ma
     TEST(magma_safe, material->heat.melting_point > 12000);
     TEST(deep_material, FLAG(inorganic, inorganic_flags::SPECIAL));
     TEST(non_economic, !inorganic || !(ui && vector_get(ui->economic_stone, index)));
+
     TEST(plant, plant);
     TEST(silk, MAT_FLAG(SILK));
     TEST(leather, MAT_FLAG(LEATHER));

From 93d9ac76be4d50654c0bc98a4869e8eef9a4d6eb Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 12 Nov 2020 23:08:22 -0800
Subject: [PATCH 526/547] update docs

---
 docs/Lua API.rst   | 2 +-
 docs/changelog.txt | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index e017e0a8c..24887cd58 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -1132,7 +1132,7 @@ Job module
   Does basic sanity checks to verify if the suggested item type matches
   the flags in the job item.
 
-* ``dfhack.job.isSuitableMaterial(job_item, mat_type, mat_index)``
+* ``dfhack.job.isSuitableMaterial(job_item, mat_type, mat_index, item_type)``
 
   Likewise, if replacing material.
 
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 79179ce5e..ac2e6b55f 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -50,6 +50,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## API
 - `buildingplan`: added Lua interface API
+- `job-module`: add item type param to dfhack.job.isSuitableMaterial() so the non_economic flag can be properly handled (it was being matched for all item types instead of just boulders)
 
 # 0.47.04-r3
 

From 54eec5d47fa4e0bf962bba92ffec0dd3957be523 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 12 Nov 2020 23:11:55 -0800
Subject: [PATCH 527/547] there is no job-module -- it's just an html anchor

---
 docs/changelog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index ac2e6b55f..4cb325f49 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -50,7 +50,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## API
 - `buildingplan`: added Lua interface API
-- `job-module`: add item type param to dfhack.job.isSuitableMaterial() so the non_economic flag can be properly handled (it was being matched for all item types instead of just boulders)
+- add item type param to dfhack.job.isSuitableMaterial() so the non_economic flag can be properly handled (it was being matched for all item types instead of just boulders)
 
 # 0.47.04-r3
 

From 625f003bc69ce53f2031dc6805a6fa3e08318b9b Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 12 Nov 2020 23:20:53 -0800
Subject: [PATCH 528/547] add names for quantums and zones

---
 data/quickfort/aliases-common.txt   | 15 +++++++++++++--
 dfhack-config/quickfort/aliases.txt | 12 ++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt
index 59705f9f7..e4d2ef1cd 100644
--- a/data/quickfort/aliases-common.txt
+++ b/data/quickfort/aliases-common.txt
@@ -37,7 +37,8 @@ give10down: {give move={Down 10}}
 give10left: {give move={Left 10}}
 give10right: {give move={Right 10}}
 
-# usage example: {givename name="myname"}
+# Keep in mind that building, stockpile, and zone names have a maximum length
+# of 20 characters. usage example: {givename name="myname"}
 givename: {Ctrl}n{name}&
 
 # use to toggle a sequence of stockpile options. for example: {togglesequence 5}
@@ -49,7 +50,9 @@ enablesequence: e{Down}
 # clothes and armor in this quantum stockpile will rot away. If you want bones
 # in your quantum stockpile, apply this alias to a refuse stockpile (but don't
 # put useful clothes or armor in there!)
-quantum: {linksonly}{nocontainers}{enableanimals}{enablefood}{enablefurniture}{enablestone}{enableammo}{enablecoins}{enablebars}{enablegems}{enablefinishedgoods}{enableleather}{enablecloth}{enablewood}{enableweapons}{enablearmor}{enablesheet}
+# Optionally set a name for the stockpile by specifying the 'name' parameter,
+# for example: {quantum name="my name"}
+quantum: {linksonly}{nocontainers}{enableanimals}{enablefood}{enablefurniture}{enablestone}{enableammo}{enablecoins}{enablebars}{enablegems}{enablefinishedgoods}{enableleather}{enablecloth}{enablewood}{enableweapons}{enablearmor}{enablesheet}{givename}
 
 
 ##################################
@@ -84,6 +87,14 @@ quantumstopfromwest: {quantumstopprefix}s{Left}p^{Right}{quantumstopsuffix}
 quantumstopfromnorth: {quantumstopprefix}s{Up}p^{Down}{quantumstopsuffix}
 
 
+##################################
+# zone aliases
+##################################
+
+# usage example: {namezone name="my zone name"}
+namezone: ^i{givename}^q
+
+
 ##################################
 # animal stockpile adjustments
 ##################################
diff --git a/dfhack-config/quickfort/aliases.txt b/dfhack-config/quickfort/aliases.txt
index 9be32107e..1d1ebff9f 100644
--- a/dfhack-config/quickfort/aliases.txt
+++ b/dfhack-config/quickfort/aliases.txt
@@ -58,12 +58,12 @@
 # The syntax for defining aliases is:
 #   aliasname: keystrokes
 #
-# Where aliasname is at least two letters or digits long and keystrokes are
-# whatever you would type into the DF UI. A keystroke can also be a named
-# keycode from the DF interface definition file (data/init/interface.txt),
-# enclosed in curly brackets like an alias, like: "{Right}" or "{Enter}". In
-# order to avoid naming conflicts between aliases and keycodes, the convention
-# is to start aliases with a lowercase letter.
+# Where aliasname is at least two letters or digits long (including dashes and
+# underscores) and keystrokes are whatever you would type into the DF UI. A
+# keystroke can also be a named keycode from the DF interface definition file
+# (data/init/interface.txt), enclosed in curly brackets like an alias, like:
+# "{Right}" or "{Enter}". In # order to avoid naming conflicts between aliases
+# and keycodes, the convention is to start aliases with a lowercase letter.
 #
 # Anything enclosed within curly brackets can also have a number after it,
 # indicating how many times that alias or keycode should be repeated. For

From 647093f5c8b60c1b80d047b29b5db46f189dfa45 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 5 Nov 2020 16:01:44 -0800
Subject: [PATCH 529/547] quickfort guide: 'c' stockpiles don't make sense

explain why "custom" stockpiles aren't meaningful to create in a
blueprint and what the user should do instead
---
 docs/guides/quickfort-user-guide.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 964776f65..0df4bc24c 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -502,7 +502,12 @@ meeting area all at once:
    #zone main pasture and picnic area
    nmg(10x10)
 
-The order of the individual letters doesn't matter.
+The order of the individual letters doesn't matter. Note that "custom"
+(:kbd:`c`) stockpiles cannot be declared in a blueprint since what would
+get created would depend on what happens to be set in the "custom stockpile
+settings" in your game. Instead, place stockpiles using the keys that
+represent the types you want to store and then use a ``#query`` blueprint to
+customize them.
 
 Detailed configuration for zones, such as the pit/pond toggle, can also be set
 by mimicking the hotkeys used to set them. Note that gather flags default to

From 93c8de9b237996aa047f0741af7992a8c4eecc5f Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 5 Nov 2020 16:11:27 -0800
Subject: [PATCH 530/547] use numbered lists in meta blueprints section

---
 docs/guides/quickfort-user-guide.rst | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 0df4bc24c..f8061b766 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -897,13 +897,13 @@ Meta blueprints
 Meta blueprints are blueprints that script a series of other blueprints. Many
 blueprint packages follow this pattern:
 
--  Apply dig blueprint to designate dig areas
--  Wait for miners to dig
--  **Apply build buildprint** to designate buildings
--  **Apply place buildprint** to designate stockpiles
--  **Apply query blueprint** to configure stockpiles
--  Wait for buildings to get built
--  Apply a different query blueprint to configure rooms
+1.  Apply dig blueprint to designate dig areas
+#.  Wait for miners to dig
+#.  **Apply build buildprint** to designate buildings
+#.  **Apply place buildprint** to designate stockpiles
+#.  **Apply query blueprint** to configure stockpiles
+#.  Wait for buildings to get built
+#.  Apply a different query blueprint to configure rooms
 
 Those three "apply"s in the middle might as well get done in one command instead
 of three. A meta blueprint can encode that sequence. A meta blueprint refers to
@@ -947,12 +947,12 @@ blueprints into one:
 
 Now your sequence is shortened to:
 
--  Apply dig blueprint to designate dig areas
--  Wait for miners to dig
--  **Apply meta buildprint** to build buildings and designate/configure
-   stockpiles
--  Wait for buildings to get built
--  Apply the final query blueprint to configure the room
+1.  Apply dig blueprint to designate dig areas
+#.  Wait for miners to dig
+#.  **Apply meta buildprint** to build buildings and designate/configure
+    stockpiles
+#.  Wait for buildings to get built
+#.  Apply the final query blueprint to configure the room
 
 You can use meta blueprints to lay out your fortress at a larger scale as well.
 The ``#<`` and ``#>`` notation is valid in meta blueprints, so you can, for

From 76759184d3f54e6eb3bd9c94f3d3ef3835682afa Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk.taylor@gmail.com>
Date: Thu, 5 Nov 2020 16:18:33 -0800
Subject: [PATCH 531/547] reinforce that meta blueprints can't cross files

they must refer to labels that are within the same .xlsx or .csv file
---
 docs/guides/quickfort-user-guide.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index f8061b766..5ab0956f7 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -1015,6 +1015,11 @@ a big fort, so we're planning for a lot of bedrooms):
 Note that for blueprints without an explicit label, we still need to address
 them by their auto-generated numerical label.
 
+It's worth calling out that ``#meta`` blueprints can only refer to blueprints
+that are defined in the same file. This means that all blueprints that a
+``#meta`` blueprint needs to script must be in sheets within the same
+.xlsx spreadsheet or concatenated into the same .csv file.
+
 You can then hide the blueprints that you now manage with the ``#meta``-mode
 blueprint from ``quickfort list`` by adding a ``hidden()`` marker to their
 modelines. That way the output of ``quickfort list`` won't be cluttered by

From 01741ce6c607995ae9e4456394c2e334061072f3 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Wed, 11 Nov 2020 16:53:29 -0800
Subject: [PATCH 532/547] update quickfort guide and aliases

- move bit of alias documentation from aliases-common to aliases.txt
- document new behavior for 'c'ustom stockpiles
---
 data/quickfort/aliases-common.txt    |  7 +++----
 dfhack-config/quickfort/aliases.txt  |  6 +++++-
 docs/guides/quickfort-user-guide.rst | 11 +++++------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt
index 857160711..59705f9f7 100644
--- a/data/quickfort/aliases-common.txt
+++ b/data/quickfort/aliases-common.txt
@@ -17,10 +17,6 @@
 #
 # Aliases that don't fit into those two categories have comments explaining
 # their usage.
-#
-# There is also a non-alphanumeric alias built into the code for the common
-# shorthand for "make room":
-#   r+   expands to r+&
 
 
 ########################################
@@ -41,6 +37,9 @@ give10down: {give move={Down 10}}
 give10left: {give move={Left 10}}
 give10right: {give move={Right 10}}
 
+# usage example: {givename name="myname"}
+givename: {Ctrl}n{name}&
+
 # use to toggle a sequence of stockpile options. for example: {togglesequence 5}
 togglesequence: &{Down}
 togglesequence2: &{Down 2}
diff --git a/dfhack-config/quickfort/aliases.txt b/dfhack-config/quickfort/aliases.txt
index 2743a39f3..9be32107e 100644
--- a/dfhack-config/quickfort/aliases.txt
+++ b/dfhack-config/quickfort/aliases.txt
@@ -95,8 +95,12 @@
 #   !   expands to {Ctrl}
 #   ^   expands to {ESC}
 #
+# There is also a non-standard alias built into the code for the common
+# shorthand for "make room":
+#   r+  expands to r+&
+#
 # If you need literal verisons of the shorthand characters, surround them in
-# curly brackets, for example: "{~}"
+# curly brackets, for example: "{!}"
 #
 #
 # Add your custom aliases here:
diff --git a/docs/guides/quickfort-user-guide.rst b/docs/guides/quickfort-user-guide.rst
index 5ab0956f7..1d9c1a024 100644
--- a/docs/guides/quickfort-user-guide.rst
+++ b/docs/guides/quickfort-user-guide.rst
@@ -502,12 +502,11 @@ meeting area all at once:
    #zone main pasture and picnic area
    nmg(10x10)
 
-The order of the individual letters doesn't matter. Note that "custom"
-(:kbd:`c`) stockpiles cannot be declared in a blueprint since what would
-get created would depend on what happens to be set in the "custom stockpile
-settings" in your game. Instead, place stockpiles using the keys that
-represent the types you want to store and then use a ``#query`` blueprint to
-customize them.
+The order of the individual letters doesn't matter. If you want to configure the
+stockpile from scratch in a ``#query`` blueprint, you can place unconfigured
+"custom" stockpiles with (:kbd:`c`). It is more efficient, though, to place
+stockpiles using the keys that represent the types you want to store, and
+then only use a ``#query`` blueprint if you need fine-grained customization.
 
 Detailed configuration for zones, such as the pit/pond toggle, can also be set
 by mimicking the hotkeys used to set them. Note that gather flags default to

From d2472335fce9fb431f5ea2dc3859776116176b76 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Thu, 12 Nov 2020 23:20:53 -0800
Subject: [PATCH 533/547] add names for quantums and zones

---
 data/quickfort/aliases-common.txt   | 15 +++++++++++++--
 dfhack-config/quickfort/aliases.txt | 12 ++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt
index 59705f9f7..e4d2ef1cd 100644
--- a/data/quickfort/aliases-common.txt
+++ b/data/quickfort/aliases-common.txt
@@ -37,7 +37,8 @@ give10down: {give move={Down 10}}
 give10left: {give move={Left 10}}
 give10right: {give move={Right 10}}
 
-# usage example: {givename name="myname"}
+# Keep in mind that building, stockpile, and zone names have a maximum length
+# of 20 characters. usage example: {givename name="myname"}
 givename: {Ctrl}n{name}&
 
 # use to toggle a sequence of stockpile options. for example: {togglesequence 5}
@@ -49,7 +50,9 @@ enablesequence: e{Down}
 # clothes and armor in this quantum stockpile will rot away. If you want bones
 # in your quantum stockpile, apply this alias to a refuse stockpile (but don't
 # put useful clothes or armor in there!)
-quantum: {linksonly}{nocontainers}{enableanimals}{enablefood}{enablefurniture}{enablestone}{enableammo}{enablecoins}{enablebars}{enablegems}{enablefinishedgoods}{enableleather}{enablecloth}{enablewood}{enableweapons}{enablearmor}{enablesheet}
+# Optionally set a name for the stockpile by specifying the 'name' parameter,
+# for example: {quantum name="my name"}
+quantum: {linksonly}{nocontainers}{enableanimals}{enablefood}{enablefurniture}{enablestone}{enableammo}{enablecoins}{enablebars}{enablegems}{enablefinishedgoods}{enableleather}{enablecloth}{enablewood}{enableweapons}{enablearmor}{enablesheet}{givename}
 
 
 ##################################
@@ -84,6 +87,14 @@ quantumstopfromwest: {quantumstopprefix}s{Left}p^{Right}{quantumstopsuffix}
 quantumstopfromnorth: {quantumstopprefix}s{Up}p^{Down}{quantumstopsuffix}
 
 
+##################################
+# zone aliases
+##################################
+
+# usage example: {namezone name="my zone name"}
+namezone: ^i{givename}^q
+
+
 ##################################
 # animal stockpile adjustments
 ##################################
diff --git a/dfhack-config/quickfort/aliases.txt b/dfhack-config/quickfort/aliases.txt
index 9be32107e..1d1ebff9f 100644
--- a/dfhack-config/quickfort/aliases.txt
+++ b/dfhack-config/quickfort/aliases.txt
@@ -58,12 +58,12 @@
 # The syntax for defining aliases is:
 #   aliasname: keystrokes
 #
-# Where aliasname is at least two letters or digits long and keystrokes are
-# whatever you would type into the DF UI. A keystroke can also be a named
-# keycode from the DF interface definition file (data/init/interface.txt),
-# enclosed in curly brackets like an alias, like: "{Right}" or "{Enter}". In
-# order to avoid naming conflicts between aliases and keycodes, the convention
-# is to start aliases with a lowercase letter.
+# Where aliasname is at least two letters or digits long (including dashes and
+# underscores) and keystrokes are whatever you would type into the DF UI. A
+# keystroke can also be a named keycode from the DF interface definition file
+# (data/init/interface.txt), enclosed in curly brackets like an alias, like:
+# "{Right}" or "{Enter}". In # order to avoid naming conflicts between aliases
+# and keycodes, the convention is to start aliases with a lowercase letter.
 #
 # Anything enclosed within curly brackets can also have a number after it,
 # indicating how many times that alias or keycode should be repeated. For

From efdba8b596a9696234bcf3e0677a4d76af936ef5 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 13 Nov 2020 10:18:54 -0800
Subject: [PATCH 534/547] add buildingplan.isPlannedBuilding

---
 docs/Lua API.rst             | 1 +
 plugins/buildingplan.cpp     | 5 +++++
 plugins/lua/buildingplan.lua | 1 +
 3 files changed, 7 insertions(+)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 80fd0add6..ea91f9ca3 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -3797,6 +3797,7 @@ Native functions provided by the `buildingplan` plugin:
 
 * ``bool isPlannableBuilding(df::building_type type, int16_t subtype, int32_t custom)`` returns whether the building type is handled by buildingplan.
 * ``bool isPlanModeEnabled(df::building_type type, int16_t subtype, int32_t custom)`` returns whether the buildingplan UI is enabled for the specified building type.
+* ``bool isPlannedBuilding(df::building *bld)`` returns whether the given building is managed by buildingplan.
 * ``void addPlannedBuilding(df::building *bld)`` suspends the building jobs and adds the building to the monitor list.
 * ``void doCycle()`` runs a check for whether buildlings in the monitor list can be assigned items and unsuspended. This method runs automatically twice a game day, so you only need to call it directly if you want buildingplan to do a check right now.
 * ``void scheduleCycle()`` schedules a cycle to be run during the next non-paused game frame. Can be called multiple times while the game is paused and only one cycle will be scheduled.
diff --git a/plugins/buildingplan.cpp b/plugins/buildingplan.cpp
index dedc89f62..aab308a3d 100644
--- a/plugins/buildingplan.cpp
+++ b/plugins/buildingplan.cpp
@@ -1024,6 +1024,10 @@ static bool isPlannableBuilding(df::building_type type,
         toBuildingTypeKey(type, subtype, custom));
 }
 
+static bool isPlannedBuilding(df::building *bld) {
+    return !!planner.getPlannedBuilding(bld);
+}
+
 static void addPlannedBuilding(df::building *bld) {
     planner.addPlannedBuilding(bld);
 }
@@ -1049,6 +1053,7 @@ static void setSetting(std::string name, bool value) {
 DFHACK_PLUGIN_LUA_FUNCTIONS {
     DFHACK_LUA_FUNCTION(isPlanModeEnabled),
     DFHACK_LUA_FUNCTION(isPlannableBuilding),
+    DFHACK_LUA_FUNCTION(isPlannedBuilding),
     DFHACK_LUA_FUNCTION(addPlannedBuilding),
     DFHACK_LUA_FUNCTION(doCycle),
     DFHACK_LUA_FUNCTION(scheduleCycle),
diff --git a/plugins/lua/buildingplan.lua b/plugins/lua/buildingplan.lua
index 9659b4867..f640969b8 100644
--- a/plugins/lua/buildingplan.lua
+++ b/plugins/lua/buildingplan.lua
@@ -7,6 +7,7 @@ local _ENV = mkmodule('plugins.buildingplan')
  * void setSetting(string name, boolean value)
  * bool isPlanModeEnabled(df::building_type type, int16_t subtype, int32_t custom)
  * bool isPlannableBuilding(df::building_type type, int16_t subtype, int32_t custom)
+ * bool isPlannedBuilding(df::building *bld)
  * void addPlannedBuilding(df::building *bld)
  * void doCycle()
  * void scheduleCycle()

From 76e8c495fe3c487f1cc32e35b36b701f981953a8 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 13 Nov 2020 10:45:53 -0800
Subject: [PATCH 535/547] revert skip_vector=true for now

---
 library/modules/Job.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/modules/Job.cpp b/library/modules/Job.cpp
index 366384fd2..4feb33bad 100644
--- a/library/modules/Job.cpp
+++ b/library/modules/Job.cpp
@@ -605,7 +605,7 @@ bool Job::isSuitableItem(df::job_item *item, df::item_type itype, int isubtype)
     ItemTypeInfo iinfo(itype, isubtype);
     MaterialInfo minfo(item);
 
-    return iinfo.isValid() && iinfo.matches(*item, &minfo, true, itype);
+    return iinfo.isValid() && iinfo.matches(*item, &minfo, false, itype);
 }
 
 bool Job::isSuitableMaterial(
@@ -619,7 +619,7 @@ bool Job::isSuitableMaterial(
     ItemTypeInfo iinfo(item);
     MaterialInfo minfo(mat_type, mat_index);
 
-    return minfo.isValid() && iinfo.matches(*item, &minfo, true, itype);
+    return minfo.isValid() && iinfo.matches(*item, &minfo, false, itype);
 }
 
 std::string Job::getName(df::job *job)

From 170f4982b22bc0fce1dc41949750c6272f970db5 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 13 Nov 2020 14:05:48 -0500
Subject: [PATCH 536/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index ccf1d035a..9779422a6 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit ccf1d035a653c991b669fccc8293ecbab449548f
+Subproject commit 9779422a6071110240400f8be8e31c54efb9555e

From 6014a452353b61374408c6fc1bf1a085a3e7981b Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Fri, 13 Nov 2020 20:11:03 +0100
Subject: [PATCH 537/547] Fixed bug missing world tiles lacking incurson
 supplied resources

---
 plugins/embark-assistant/defs.h               |   4 +
 plugins/embark-assistant/embark-assistant.cpp |   4 +
 plugins/embark-assistant/matcher.cpp          | 164 ++++++++++++------
 plugins/embark-assistant/survey.cpp           |   6 +-
 4 files changed, 127 insertions(+), 51 deletions(-)

diff --git a/plugins/embark-assistant/defs.h b/plugins/embark-assistant/defs.h
index d22b7436d..caecc2d49 100644
--- a/plugins/embark-assistant/defs.h
+++ b/plugins/embark-assistant/defs.h
@@ -71,6 +71,10 @@ namespace embark_assist {
 
         struct region_tile_datum {
             bool surveyed = false;
+            bool survey_completed = false;
+            bool neighboring_clay = false;          // These elements are updated after the survey by checking if there are any border MLTs in neighboring tiles that would would provide the resource
+            bool neighboring_sand = false;          // if they actually provided an incursion. This allows the code to add these potential tiles to the ones checked. 
+            aquifer_sizes neighboring_aquifer = aquifer_sizes::NA;
             aquifer_sizes aquifer = aquifer_sizes::NA;
             uint16_t clay_count = 0;
             uint16_t sand_count = 0;
diff --git a/plugins/embark-assistant/embark-assistant.cpp b/plugins/embark-assistant/embark-assistant.cpp
index eb6722640..e6f18f639 100644
--- a/plugins/embark-assistant/embark-assistant.cpp
+++ b/plugins/embark-assistant/embark-assistant.cpp
@@ -311,6 +311,10 @@ command_result embark_assistant(color_ostream &out, std::vector <std::string> &
 
         for (uint16_t k = 0; k < world->worldgen.worldgen_parms.dim_y; k++) {
             embark_assist::main::state->survey_results[i][k].surveyed = false;
+            embark_assist::main::state->survey_results[i][k].survey_completed = false;
+            embark_assist::main::state->survey_results[i][k].neighboring_clay = false;
+            embark_assist::main::state->survey_results[i][k].neighboring_sand = false;
+            embark_assist::main::state->survey_results[i][k].neighboring_aquifer = embark_assist::defs::aquifer_sizes::NA;
             embark_assist::main::state->survey_results[i][k].aquifer = embark_assist::defs::aquifer_sizes::NA;
             embark_assist::main::state->survey_results[i][k].clay_count = 0;
             embark_assist::main::state->survey_results[i][k].sand_count = 0;
diff --git a/plugins/embark-assistant/matcher.cpp b/plugins/embark-assistant/matcher.cpp
index 7575b1287..3c31574f7 100644
--- a/plugins/embark-assistant/matcher.cpp
+++ b/plugins/embark-assistant/matcher.cpp
@@ -1496,6 +1496,9 @@ namespace embark_assist {
                 }
 
                 // Aquifer
+                // Survey can only augment results with incursions, but single results can't be achieved without the native tile matching it,
+                // so extra checks are needed only for combinations. Also note that while two incursions won't be sufficient to actually get a match,
+                // the important thing here is not to miss matches due to aborting too early.
                 switch (finder->aquifer) {
                 case embark_assist::defs::aquifer_ranges::NA:
                     break;
@@ -1515,16 +1518,20 @@ namespace embark_assist {
                     break;
 
                 case embark_assist::defs::aquifer_ranges::None_Plus_Light:
-                    if (!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)) ||
-                        !(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Light))) {
+                    if ((!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)) &&
+                        (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)))) ||
+                        (!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Light)) &&
+                            (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Light))))) {
                         if (trace) out.print("matcher::world_tile_match: Aquifer None_Plus_Light (%i, %i)\n", x, y);
                         return false;
                     }
                     break;
 
                 case embark_assist::defs::aquifer_ranges::None_Plus_At_Least_Light:
-                    if (!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)) ||
-                        !(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Light_Heavy))) {
+                    if ((!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)) &&
+                        (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)))) ||
+                        (!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Light_Heavy)) &&
+                            (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Light_Heavy))))) {
                         if (trace) out.print("matcher::world_tile_match: Aquifer None_Plus_At_Least_Light (%i, %i)\n", x, y);
                         return false;
                     }
@@ -1538,31 +1545,38 @@ namespace embark_assist {
                     break;
 
                 case embark_assist::defs::aquifer_ranges::At_Least_Light:
-                    if (tile->aquifer == embark_assist::defs::aquifer_sizes::None) {
+                    if (tile->aquifer == embark_assist::defs::aquifer_sizes::None &&
+                        ((static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)))) {
                         if (trace) out.print("matcher::world_tile_match: Aquifer At_Least_Light (%i, %i)\n", x, y);
                         return false;
                     }
                     break;
 
                 case embark_assist::defs::aquifer_ranges::None_Plus_Heavy:
-                    if (!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)) ||
-                        !(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Heavy))) {
+                    if ((!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)) &&
+                        (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)))) ||
+                        (!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Heavy)) &&
+                            (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Heavy))))) {
                         if (trace) out.print("matcher::world_tile_match: Aquifer None_Plus_Heavy (%i, %i)\n", x, y);
                         return false;
                     }
                     break;
 
                 case embark_assist::defs::aquifer_ranges::At_Most_Light_Plus_Heavy:
-                    if (!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Heavy)) ||
-                        !(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None_Light))) {
+                    if ((!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Heavy)) &&
+                        (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Heavy)))) ||
+                        (!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None_Light)) &&
+                            (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None_Light))))) {
                         if (trace) out.print("matcher::world_tile_match: Aquifer At_Most_Light_Plus_Heavy (%i, %i)\n", x, y);
                         return false;
                     }
                     break;
 
                 case embark_assist::defs::aquifer_ranges::Light_Plus_Heavy:
-                    if (!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Light)) ||
-                        !(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Heavy))) {
+                    if ((!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Light)) &&
+                        (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Light)))) ||
+                        (!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Heavy)) &&
+                            (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Heavy))))) {
                         if (trace) out.print("matcher::world_tile_match: Aquifer Light_Plus_Heavy (%i, %i)\n", x, y);
                         return false;
                     }
@@ -1648,7 +1662,8 @@ namespace embark_assist {
                     break;  //  No restriction
 
                 case embark_assist::defs::present_absent_ranges::Present:
-                    if (tile->clay_count == 0) {
+                    if (tile->clay_count == 0 &&
+                        !tile->neighboring_clay) {
                         if (trace) out.print("matcher::world_tile_match: Clay Present (%i, %i)\n", x, y);
                         return false;
                     }
@@ -1668,7 +1683,8 @@ namespace embark_assist {
                     break;  //  No restriction
 
                 case embark_assist::defs::present_absent_ranges::Present:
-                    if (tile->sand_count == 0) {
+                    if (tile->sand_count == 0 &&
+                        !tile->neighboring_sand) {
                         if (trace) out.print("matcher::world_tile_match: Sand Present (%i, %i)\n", x, y);
                         return false;
                     }
@@ -2380,46 +2396,12 @@ namespace embark_assist {
                 }
 
                 //  Flat. No world tile checks. Need to look at the details
-
+               
                 //  Clay
-                switch (finder->clay) {
-                case embark_assist::defs::present_absent_ranges::NA:
-                    break;  //  No restriction
-
-                case embark_assist::defs::present_absent_ranges::Present:
-                    if (tile->clay_count == 0) {
-                        if (trace) out.print("matcher::world_tile_match: NS Clay Present (%i, %i)\n", x, y);
-                        return false;
-                    }
-                    break;
-
-                case embark_assist::defs::present_absent_ranges::Absent:
-                    if (tile->clay_count == 256) {
-                        if (trace) out.print("matcher::world_tile_match: NS Clay Absent (%i, %i)\n", x, y);
-                        return false;
-                    }
-                    break;
-                }
+                //  With no preliminary survey we don't know if incursions might bring clay, so we can't really exclude any tiles.
 
                 //  Sand
-                switch (finder->sand) {
-                case embark_assist::defs::present_absent_ranges::NA:
-                    break;  //  No restriction
-
-                case embark_assist::defs::present_absent_ranges::Present:
-                    if (tile->sand_count == 0) {
-                        if (trace) out.print("matcher::world_tile_match: NS Sand Present (%i, %i)\n", x, y);
-                        return false;
-                    }
-                    break;
-
-                case embark_assist::defs::present_absent_ranges::Absent:
-                    if (tile->sand_count == 256) {
-                        if (trace) out.print("matcher::world_tile_match: NS Sand Absent (%i, %i)\n", x, y);
-                        return false;
-                    }
-                    break;
-                }
+                //  Same as with clay.
 
                 //  Flux
                 switch (finder->flux) {
@@ -3181,6 +3163,88 @@ uint16_t embark_assist::matcher::find(embark_assist::defs::match_iterators *iter
 
         if (!iterator->active) {
             embark_assist::matcher::move_cursor(iterator->x, iterator->y);
+
+            if (!survey_results->at(0).at(0).survey_completed) {  // Every world tile has gone through preliminary survey, so add possible incursion resources to each tile.
+                for (uint16_t i = 0; i < world->worldgen.worldgen_parms.dim_x; i++) {
+                    for (uint16_t k = 0; k < world->worldgen.worldgen_parms.dim_y; k++) {
+                        embark_assist::defs::region_tile_datum* current = &survey_results->at(i).at(k);
+
+                        if (i > 0 && k > 0) {
+                            embark_assist::defs::region_tile_datum* target = &survey_results->at(i - 1).at(k - 1);
+
+                            current->neighboring_sand |= target->south_row [15].sand;
+                            current->neighboring_clay |= target->south_row[15].clay;
+                            current->neighboring_aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(current->neighboring_aquifer) | static_cast<int8_t>(target->south_row[15].aquifer));
+                        }
+
+                        if (k > 0) {
+                            embark_assist::defs::region_tile_datum* target = &survey_results->at(i).at(k - 1);
+
+                            for (uint16_t l = 0; l < 16; l++) {
+                                current->neighboring_sand |= target->south_row[l].sand;
+                                current->neighboring_clay |= target->south_row[l].clay;
+                                current->neighboring_aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(current->neighboring_aquifer) | static_cast<int8_t>(target->south_row[l].aquifer));
+                            }
+                        }
+
+                        if (i < world->worldgen.worldgen_parms.dim_x - 1 && k > 0) {
+                            embark_assist::defs::region_tile_datum* target = &survey_results->at(i + 1).at(k - 1);
+
+                            current->neighboring_sand |= target->south_row[0].sand;
+                            current->neighboring_clay |= target->south_row[0].clay;
+                            current->neighboring_aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(current->neighboring_aquifer) | static_cast<int8_t>(target->south_row[0].aquifer));
+                        }
+
+                        if (i > 0) {
+                            embark_assist::defs::region_tile_datum* target = &survey_results->at(i - 1).at(k);
+
+                            for (uint16_t l = 0; l < 16; l++) {
+                                current->neighboring_sand |= target->east_column[l].sand;
+                                current->neighboring_clay |= target->east_column[l].clay;
+                                current->neighboring_aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(current->neighboring_aquifer) | static_cast<int8_t>(target->east_column[l].aquifer));
+                            }
+                        }
+
+                        if (i < world->worldgen.worldgen_parms.dim_x - 1) {
+                            embark_assist::defs::region_tile_datum* target = &survey_results->at(i + 1).at(k);
+
+                            for (uint16_t l = 0; l < 16; l++) {
+                                current->neighboring_sand |= target->west_column[l].sand;
+                                current->neighboring_clay |= target->west_column[l].clay;
+                                current->neighboring_aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(current->neighboring_aquifer) | static_cast<int8_t>(target->west_column[l].aquifer));
+                            }
+                        }
+
+                        if (i > 0 && k < world->worldgen.worldgen_parms.dim_y - 1) {
+                            embark_assist::defs::region_tile_datum* target = &survey_results->at(i - 1).at(k + 1);
+
+                            current->neighboring_sand |= target->north_row[15].sand;
+                            current->neighboring_clay |= target->north_row[15].clay;
+                            current->neighboring_aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(current->neighboring_aquifer) | static_cast<int8_t>(target->north_row[15].aquifer));
+                        }
+
+                        if (k < world->worldgen.worldgen_parms.dim_y - 1) {
+                            embark_assist::defs::region_tile_datum* target = &survey_results->at(i).at(k + 1);
+
+                            for (uint16_t l = 0; l < 16; l++) {
+                                current->neighboring_sand |= target->north_row[l].sand;
+                                current->neighboring_clay |= target->north_row[l].clay;
+                                current->neighboring_aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(current->neighboring_aquifer) | static_cast<int8_t>(target->north_row[l].aquifer));
+                            }
+                        }
+
+                        if (i < world->worldgen.worldgen_parms.dim_x - 1 && k < world->worldgen.worldgen_parms.dim_y - 1) {
+                            embark_assist::defs::region_tile_datum* target = &survey_results->at(i + 1).at(k + 1);
+
+                            current->neighboring_sand |= target->north_row[0].sand;
+                            current->neighboring_clay |= target->north_row[0].clay;
+                            current->neighboring_aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(current->neighboring_aquifer) | static_cast<int8_t>(target->north_row[0].aquifer));
+                        }
+
+                        survey_results->at(i).at(k).survey_completed = true;  //  A bit wasteful to add a flag to every entry when only the very first one is ever read...
+                    }
+                }
+            }
         }
     }
 
diff --git a/plugins/embark-assistant/survey.cpp b/plugins/embark-assistant/survey.cpp
index fb44440a1..c77dbc12c 100644
--- a/plugins/embark-assistant/survey.cpp
+++ b/plugins/embark-assistant/survey.cpp
@@ -802,6 +802,10 @@ void embark_assist::survey::high_level_world_survey(embark_assist::defs::geo_dat
             uint8_t offset_count = 0;
             auto &results = survey_results->at(i).at(k);
             results.surveyed = false;
+            results.survey_completed = false;
+            results.neighboring_sand = false;
+            results.neighboring_clay = false;
+            results.neighboring_aquifer = embark_assist::defs::aquifer_sizes::NA;
             results.aquifer = embark_assist::defs::aquifer_sizes::NA;
             results.clay_count = 0;
             results.sand_count = 0;
@@ -925,7 +929,7 @@ void embark_assist::survey::high_level_world_survey(embark_assist::defs::geo_dat
 void embark_assist::survey::survey_mid_level_tile(embark_assist::defs::geo_data *geo_summary,
     embark_assist::defs::world_tile_data *survey_results,
     embark_assist::defs::mid_level_tiles *mlt) {
-//                color_ostream_proxy out(Core::getInstance().getConsole());
+//              color_ostream_proxy out(Core::getInstance().getConsole());
     auto screen = Gui::getViewscreenByType<df::viewscreen_choose_start_sitest>(0);
     int16_t x = screen->location.region_pos.x;
     int16_t y = screen->location.region_pos.y;

From d51b56c780ecf4bb3bbeb171ec8294ee67216e6a Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Fri, 13 Nov 2020 20:28:22 +0100
Subject: [PATCH 538/547] removed a blank

---
 docs/changelog.txt              | 1 +
 plugins/embark-assistant/defs.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index faec636dd..e907c2d75 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -44,6 +44,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `search`: fixed an issue causing item counts on the trade screen to display inconsistently when searching
 - `stockpiles`: fixed a crash when loading food stockpiles
 - `stockpiles`: fixed an error when saving furniture stockpiles
+- `embark-assistant`: Fixed issue causing incursion resource matching to skip the checks if those resources were provided only through incursions.
 
 ## Misc Improvements
 - `createitem`: added support for plant growths (fruit, berries, leaves, etc.)
diff --git a/plugins/embark-assistant/defs.h b/plugins/embark-assistant/defs.h
index caecc2d49..f571010a1 100644
--- a/plugins/embark-assistant/defs.h
+++ b/plugins/embark-assistant/defs.h
@@ -73,7 +73,7 @@ namespace embark_assist {
             bool surveyed = false;
             bool survey_completed = false;
             bool neighboring_clay = false;          // These elements are updated after the survey by checking if there are any border MLTs in neighboring tiles that would would provide the resource
-            bool neighboring_sand = false;          // if they actually provided an incursion. This allows the code to add these potential tiles to the ones checked. 
+            bool neighboring_sand = false;          // if they actually provided an incursion. This allows the code to add these potential tiles to the ones checked.
             aquifer_sizes neighboring_aquifer = aquifer_sizes::NA;
             aquifer_sizes aquifer = aquifer_sizes::NA;
             uint16_t clay_count = 0;

From 59e76ae407acbfd273a9f45d4a16c8d80b0e5403 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Fri, 13 Nov 2020 12:43:46 -0800
Subject: [PATCH 539/547] detect buildingplan buildings in the resume plugin

---
 plugins/CMakeLists.txt |  2 +-
 plugins/resume.cpp     | 22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 9f5b2c679..822ab531b 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -154,7 +154,7 @@ if(BUILD_SUPPORTED)
     add_subdirectory(remotefortressreader)
     dfhack_plugin(rename rename.cpp LINK_LIBRARIES lua PROTOBUFS rename)
     add_subdirectory(rendermax)
-    dfhack_plugin(resume resume.cpp)
+    dfhack_plugin(resume resume.cpp LINK_LIBRARIES lua)
     dfhack_plugin(reveal reveal.cpp)
     dfhack_plugin(search search.cpp)
     dfhack_plugin(seedwatch seedwatch.cpp)
diff --git a/plugins/resume.cpp b/plugins/resume.cpp
index 5909c0956..b4398dd24 100644
--- a/plugins/resume.cpp
+++ b/plugins/resume.cpp
@@ -11,6 +11,7 @@
 
 // DF data structure definition headers
 #include "DataDefs.h"
+#include "LuaTools.h"
 #include "MiscUtils.h"
 #include "Types.h"
 #include "df/viewscreen_dwarfmodest.h"
@@ -85,6 +86,25 @@ struct SuspendedBuilding
     }
 };
 
+static bool is_planned_building(df::building *bld)
+{
+    auto L = Lua::Core::State;
+    color_ostream_proxy out(Core::getInstance().getConsole());
+    Lua::StackUnwinder top(L);
+
+    if (!lua_checkstack(L, 2) ||
+        !Lua::PushModulePublic(
+            out, L, "plugins.buildingplan", "isPlannedBuilding"))
+        return false;
+
+    Lua::Push(L, bld);
+
+    if (!Lua::SafeCall(out, L, 1, 1))
+        return false;
+
+    return lua_toboolean(L, -1);
+}
+
 DFHACK_PLUGIN_IS_ENABLED(enabled);
 static bool buildings_scanned = false;
 static vector<SuspendedBuilding> suspended_buildings, resumed_buildings;
@@ -101,7 +121,7 @@ void scan_for_suspended_buildings()
         if (job)
         {
             SuspendedBuilding sb(bld);
-            sb.is_planned = job->job_items.size() == 1 && job->job_items[0]->item_type == item_type::NONE;
+            sb.is_planned = is_planned_building(bld);
 
             auto it = resumed_buildings.begin();
 

From 28d599ee36264a1e6d54ea00df77367d884770c4 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 13 Nov 2020 23:37:08 -0500
Subject: [PATCH 540/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index 9779422a6..acf50cc63 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 9779422a6071110240400f8be8e31c54efb9555e
+Subproject commit acf50cc63897078b96a207c021b4745c1fa8998f

From 46835c9eddf11684b3e2f4e3ef2c5336b61ae764 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Sat, 14 Nov 2020 14:43:43 +0100
Subject: [PATCH 541/547] reworked aquifer bit fiddling

---
 plugins/embark-assistant/defs.h               |  22 ++--
 plugins/embark-assistant/embark-assistant.cpp |   4 +-
 plugins/embark-assistant/matcher.cpp          | 108 ++++++++----------
 plugins/embark-assistant/overlay.cpp          |  18 +--
 plugins/embark-assistant/survey.cpp           |  28 ++---
 5 files changed, 82 insertions(+), 98 deletions(-)

diff --git a/plugins/embark-assistant/defs.h b/plugins/embark-assistant/defs.h
index f571010a1..7d85eb6be 100644
--- a/plugins/embark-assistant/defs.h
+++ b/plugins/embark-assistant/defs.h
@@ -26,16 +26,10 @@ namespace embark_assist {
             Major
         };
 
-        enum class aquifer_sizes : int8_t {
-            NA,
-            None,
-            Light,
-            None_Light,
-            Heavy,
-            None_Heavy,
-            Light_Heavy,
-            None_Light_Heavy
-        };
+        const uint8_t Clear_Aquifer_Bits = 0;
+        const uint8_t None_Aquifer_Bit = 1;
+        const uint8_t Light_Aquifer_Bit = 2;
+        const uint8_t Heavy_Aquifer_Bit = 4;
 
         enum class tree_levels : int8_t {
             None,
@@ -46,7 +40,7 @@ namespace embark_assist {
         };
 
         struct mid_level_tile {
-            aquifer_sizes aquifer = aquifer_sizes::NA;
+            uint8_t aquifer = Clear_Aquifer_Bits;
             bool clay = false;
             bool sand = false;
             bool flux = false;
@@ -74,8 +68,8 @@ namespace embark_assist {
             bool survey_completed = false;
             bool neighboring_clay = false;          // These elements are updated after the survey by checking if there are any border MLTs in neighboring tiles that would would provide the resource
             bool neighboring_sand = false;          // if they actually provided an incursion. This allows the code to add these potential tiles to the ones checked.
-            aquifer_sizes neighboring_aquifer = aquifer_sizes::NA;
-            aquifer_sizes aquifer = aquifer_sizes::NA;
+            uint8_t neighboring_aquifer = Clear_Aquifer_Bits;
+            uint8_t aquifer = Clear_Aquifer_Bits;
             uint16_t clay_count = 0;
             uint16_t sand_count = 0;
             uint16_t flux_count = 0;
@@ -151,7 +145,7 @@ namespace embark_assist {
 
         struct site_infos {
             bool incursions_processed;
-            aquifer_sizes aquifer;
+            uint8_t aquifer;
             uint8_t min_soil;
             uint8_t max_soil;
             bool flat;
diff --git a/plugins/embark-assistant/embark-assistant.cpp b/plugins/embark-assistant/embark-assistant.cpp
index e6f18f639..2c7021239 100644
--- a/plugins/embark-assistant/embark-assistant.cpp
+++ b/plugins/embark-assistant/embark-assistant.cpp
@@ -314,8 +314,8 @@ command_result embark_assistant(color_ostream &out, std::vector <std::string> &
             embark_assist::main::state->survey_results[i][k].survey_completed = false;
             embark_assist::main::state->survey_results[i][k].neighboring_clay = false;
             embark_assist::main::state->survey_results[i][k].neighboring_sand = false;
-            embark_assist::main::state->survey_results[i][k].neighboring_aquifer = embark_assist::defs::aquifer_sizes::NA;
-            embark_assist::main::state->survey_results[i][k].aquifer = embark_assist::defs::aquifer_sizes::NA;
+            embark_assist::main::state->survey_results[i][k].neighboring_aquifer = embark_assist::defs::Clear_Aquifer_Bits;
+            embark_assist::main::state->survey_results[i][k].aquifer = embark_assist::defs::Clear_Aquifer_Bits;
             embark_assist::main::state->survey_results[i][k].clay_count = 0;
             embark_assist::main::state->survey_results[i][k].sand_count = 0;
             embark_assist::main::state->survey_results[i][k].flux_count = 0;
diff --git a/plugins/embark-assistant/matcher.cpp b/plugins/embark-assistant/matcher.cpp
index 3c31574f7..903e4ca46 100644
--- a/plugins/embark-assistant/matcher.cpp
+++ b/plugins/embark-assistant/matcher.cpp
@@ -29,7 +29,7 @@ namespace embark_assist {
         struct matcher_info {
             bool savagery_found[3] = { false, false, false };
             bool evilness_found[3] = { false, false, false };
-            embark_assist::defs::aquifer_sizes aquifer = embark_assist::defs::aquifer_sizes::NA;
+            uint8_t aquifer = embark_assist::defs::Clear_Aquifer_Bits;
             bool river_found = false;
             uint8_t max_waterfall = 0;
             uint16_t elevation;
@@ -120,14 +120,14 @@ namespace embark_assist {
                 }
 
                 //  Aquifer
-                result->aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(result->aquifer) | static_cast<int8_t>(mlt->aquifer));
+                result->aquifer |= mlt->aquifer;
 
                 switch (finder->aquifer) {
                 case embark_assist::defs::aquifer_ranges::NA:
                     break;
 
                 case embark_assist::defs::aquifer_ranges::None:
-                    if (result->aquifer != embark_assist::defs::aquifer_sizes::None) {
+                    if (result->aquifer != embark_assist::defs::None_Aquifer_Bit) {
                         *failed_match = true;
                         return;
                     }
@@ -135,14 +135,14 @@ namespace embark_assist {
 
                 case embark_assist::defs::aquifer_ranges::At_Most_Light:
                 case embark_assist::defs::aquifer_ranges::None_Plus_Light:
-                    if (static_cast<int8_t>(result->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Heavy)) {
+                    if (result->aquifer & embark_assist::defs::Heavy_Aquifer_Bit) {
                         *failed_match = true;
                         return;
                     }
                     break;
 
                 case embark_assist::defs::aquifer_ranges::Light:
-                    if (result->aquifer != embark_assist::defs::aquifer_sizes::Light) {
+                    if (result->aquifer != embark_assist::defs::Light_Aquifer_Bit) {
                         *failed_match = true;
                         return;
                     }
@@ -150,14 +150,14 @@ namespace embark_assist {
 
                 case embark_assist::defs::aquifer_ranges::At_Least_Light:
                 case embark_assist::defs::aquifer_ranges::Light_Plus_Heavy:
-                    if (static_cast<int8_t>(result->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)) {
+                    if (result->aquifer & embark_assist::defs::None_Aquifer_Bit) {
                         *failed_match = true;
                         return;
                     }
                     break;
 
                 case embark_assist::defs::aquifer_ranges::None_Plus_Heavy:
-                    if (static_cast<int8_t>(result->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Light)) {
+                    if (result->aquifer & embark_assist::defs::Light_Aquifer_Bit) {
                         *failed_match = true;
                         return;
                     }
@@ -169,7 +169,7 @@ namespace embark_assist {
                     break;
 
                 case embark_assist::defs::aquifer_ranges::Heavy:
-                    if (result->aquifer != embark_assist::defs::aquifer_sizes::Heavy) {
+                    if (result->aquifer != embark_assist::defs::Heavy_Aquifer_Bit) {
                         *failed_match = true;
                         return;
                     }
@@ -645,32 +645,32 @@ namespace embark_assist {
                     }
 
                     //  Aquifer
-                    result.aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(result.aquifer) | static_cast<int8_t>(mlt->at(i).at(k).aquifer));
+                    result.aquifer |= mlt->at(i).at(k).aquifer;
 
                     switch (finder->aquifer) {
                     case embark_assist::defs::aquifer_ranges::NA:
                         break;
 
                     case embark_assist::defs::aquifer_ranges::None:
-                        if (result.aquifer != embark_assist::defs::aquifer_sizes::None) return false;
+                        if (result.aquifer != embark_assist::defs::None_Aquifer_Bit) return false;
                         break;
 
                     case embark_assist::defs::aquifer_ranges::At_Most_Light:
                     case embark_assist::defs::aquifer_ranges::None_Plus_Light:
-                        if (static_cast<int8_t>(result.aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Heavy)) return false;
+                        if (result.aquifer & embark_assist::defs::Heavy_Aquifer_Bit) return false;
                         break;
 
                     case embark_assist::defs::aquifer_ranges::Light:
-                        if (result.aquifer != embark_assist::defs::aquifer_sizes::Light) return false;
+                        if (result.aquifer != embark_assist::defs::Light_Aquifer_Bit) return false;
                         break;
 
                     case embark_assist::defs::aquifer_ranges::At_Least_Light:
                     case embark_assist::defs::aquifer_ranges::Light_Plus_Heavy:
-                        if (static_cast<int8_t>(result.aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)) return false;
+                        if (result.aquifer & embark_assist::defs::None_Aquifer_Bit) return false;
                         break;
 
                     case embark_assist::defs::aquifer_ranges::None_Plus_Heavy:
-                        if (static_cast<int8_t>(result.aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Light)) return false;
+                        if (result.aquifer & embark_assist::defs::Light_Aquifer_Bit) return false;
                         break;
 
                     case embark_assist::defs::aquifer_ranges::None_Plus_At_Least_Light:
@@ -679,7 +679,7 @@ namespace embark_assist {
                         break;
 
                     case embark_assist::defs::aquifer_ranges::Heavy:
-                        if (result.aquifer != embark_assist::defs::aquifer_sizes::Heavy) return false;
+                        if (result.aquifer != embark_assist::defs::Heavy_Aquifer_Bit) return false;
                         break;
                     }
 
@@ -1223,29 +1223,29 @@ namespace embark_assist {
                 break;
 
             case embark_assist::defs::aquifer_ranges::None_Plus_Light:
-                if (result.aquifer != embark_assist::defs::aquifer_sizes::None_Light) return false;
+                if (result.aquifer != (embark_assist::defs::None_Aquifer_Bit | embark_assist::defs::Light_Aquifer_Bit)) return false;
                 break;
 
             case embark_assist::defs::aquifer_ranges::None_Plus_At_Least_Light:
-                if (result.aquifer != embark_assist::defs::aquifer_sizes::None_Light &&
-                    result.aquifer != embark_assist::defs::aquifer_sizes::None_Heavy) return false;
+                if (result.aquifer != (embark_assist::defs::None_Aquifer_Bit | embark_assist::defs::Light_Aquifer_Bit) &&
+                    result.aquifer != (embark_assist::defs::None_Aquifer_Bit | embark_assist::defs::Heavy_Aquifer_Bit)) return false;
                 break;
 
             case embark_assist::defs::aquifer_ranges::None_Plus_Heavy:
-                if (result.aquifer != embark_assist::defs::aquifer_sizes::None_Heavy) return false;
+                if (result.aquifer != (embark_assist::defs::None_Aquifer_Bit | embark_assist::defs::Heavy_Aquifer_Bit)) return false;
                 break;
 
             case embark_assist::defs::aquifer_ranges::At_Most_Light_Plus_Heavy:
-                if (result.aquifer != embark_assist::defs::aquifer_sizes::None_Heavy &&
-                    result.aquifer != embark_assist::defs::aquifer_sizes::Light_Heavy) return false;
+                if (result.aquifer != (embark_assist::defs::None_Aquifer_Bit | embark_assist::defs::Heavy_Aquifer_Bit) &&
+                    result.aquifer != (embark_assist::defs::Light_Aquifer_Bit | embark_assist::defs::Heavy_Aquifer_Bit)) return false;
                 break;
 
             case embark_assist::defs::aquifer_ranges::Light_Plus_Heavy:
-                if (result.aquifer != embark_assist::defs::aquifer_sizes::Light_Heavy) return false;
+                if (result.aquifer != (embark_assist::defs::Light_Aquifer_Bit | embark_assist::defs::Heavy_Aquifer_Bit)) return false;
                 break;
 
             case embark_assist::defs::aquifer_ranges::None_Light_Heavy:
-                if (result.aquifer != embark_assist::defs::aquifer_sizes::None_Light_Heavy) return false;
+                if (result.aquifer != (embark_assist::defs::None_Aquifer_Bit | embark_assist::defs::Light_Aquifer_Bit | embark_assist::defs::Heavy_Aquifer_Bit)) return false;
                 break;
             }
 
@@ -1504,93 +1504,83 @@ namespace embark_assist {
                     break;
 
                 case embark_assist::defs::aquifer_ranges::None:
-                    if (!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None))) {
+                    if (!(tile->aquifer & embark_assist::defs::None_Aquifer_Bit)) {
                         if (trace) out.print("matcher::world_tile_match: Aquifer None (%i, %i)\n", x, y);
                         return false;
                     }
                     break;
 
                 case embark_assist::defs::aquifer_ranges::At_Most_Light:
-                    if (tile->aquifer == embark_assist::defs::aquifer_sizes::Heavy) {
-                        if (trace) out.print("matcher::world_tile_match: Aquifer Heavy (%i, %i)\n", x, y);
+                    if (tile->aquifer == embark_assist::defs::Heavy_Aquifer_Bit) {
+                        if (trace) out.print("matcher::world_tile_match: Aquifer At_Most_Light (%i, %i)\n", x, y);
                         return false;
                     }
                     break;
 
                 case embark_assist::defs::aquifer_ranges::None_Plus_Light:
-                    if ((!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)) &&
-                        (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)))) ||
-                        (!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Light)) &&
-                            (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Light))))) {
+                    if (!((tile->aquifer | tile->neighboring_aquifer) & embark_assist::defs::None_Aquifer_Bit) ||
+                        !((tile->aquifer | tile->neighboring_aquifer) & embark_assist::defs::Light_Aquifer_Bit)) {
                         if (trace) out.print("matcher::world_tile_match: Aquifer None_Plus_Light (%i, %i)\n", x, y);
                         return false;
                     }
                     break;
 
                 case embark_assist::defs::aquifer_ranges::None_Plus_At_Least_Light:
-                    if ((!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)) &&
-                        (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)))) ||
-                        (!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Light_Heavy)) &&
-                            (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Light_Heavy))))) {
+                    if (!((tile->aquifer | tile->neighboring_aquifer) & embark_assist::defs::None_Aquifer_Bit) ||
+                        ((tile->aquifer | tile->neighboring_aquifer) == embark_assist::defs::None_Aquifer_Bit)) {
                         if (trace) out.print("matcher::world_tile_match: Aquifer None_Plus_At_Least_Light (%i, %i)\n", x, y);
                         return false;
                     }
                     break;
 
                 case embark_assist::defs::aquifer_ranges::Light:
-                    if (!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Light))) {
+                    if (!(tile->aquifer & embark_assist::defs::Light_Aquifer_Bit)) {
                         if (trace) out.print("matcher::world_tile_match: Aquifer Light (%i, %i)\n", x, y);
                         return false;
                     }
                     break;
 
                 case embark_assist::defs::aquifer_ranges::At_Least_Light:
-                    if (tile->aquifer == embark_assist::defs::aquifer_sizes::None &&
-                        ((static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)))) {
+                    if ((tile->aquifer | tile->neighboring_aquifer) == embark_assist::defs::None_Aquifer_Bit) {
                         if (trace) out.print("matcher::world_tile_match: Aquifer At_Least_Light (%i, %i)\n", x, y);
                         return false;
                     }
                     break;
 
                 case embark_assist::defs::aquifer_ranges::None_Plus_Heavy:
-                    if ((!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)) &&
-                        (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None)))) ||
-                        (!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Heavy)) &&
-                            (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Heavy))))) {
+                    if (!((tile->aquifer | tile->neighboring_aquifer) & embark_assist::defs::None_Aquifer_Bit) ||
+                        !((tile->aquifer | tile->neighboring_aquifer) & embark_assist::defs::Heavy_Aquifer_Bit)) {
                         if (trace) out.print("matcher::world_tile_match: Aquifer None_Plus_Heavy (%i, %i)\n", x, y);
                         return false;
                     }
                     break;
 
                 case embark_assist::defs::aquifer_ranges::At_Most_Light_Plus_Heavy:
-                    if ((!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Heavy)) &&
-                        (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Heavy)))) ||
-                        (!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None_Light)) &&
-                            (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::None_Light))))) {
+                    if ((tile->aquifer | tile->neighboring_aquifer) == embark_assist::defs::Heavy_Aquifer_Bit ||
+                        !((tile->aquifer | tile->neighboring_aquifer) & embark_assist::defs::Heavy_Aquifer_Bit)) {
                         if (trace) out.print("matcher::world_tile_match: Aquifer At_Most_Light_Plus_Heavy (%i, %i)\n", x, y);
                         return false;
                     }
                     break;
 
                 case embark_assist::defs::aquifer_ranges::Light_Plus_Heavy:
-                    if ((!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Light)) &&
-                        (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Light)))) ||
-                        (!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Heavy)) &&
-                            (!(static_cast<int8_t>(tile->neighboring_aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Heavy))))) {
+                    if (!((tile->aquifer | tile->neighboring_aquifer) & embark_assist::defs::Light_Aquifer_Bit) ||
+                        !((tile->aquifer | tile->neighboring_aquifer) & embark_assist::defs::Heavy_Aquifer_Bit)) {
                         if (trace) out.print("matcher::world_tile_match: Aquifer Light_Plus_Heavy (%i, %i)\n", x, y);
                         return false;
                     }
                     break;
 
                 case embark_assist::defs::aquifer_ranges::None_Light_Heavy:
-                    if (tile->aquifer != embark_assist::defs::aquifer_sizes::None_Light_Heavy) {
+                    if ((tile->aquifer | tile->neighboring_aquifer) != 
+                        (embark_assist::defs::None_Aquifer_Bit | embark_assist::defs::Light_Aquifer_Bit | embark_assist::defs::Heavy_Aquifer_Bit)) {
                         if (trace) out.print("matcher::world_tile_match: Aquifer None_Light_Heavy (%i, %i)\n", x, y);
                         return false;
                     }
                     break;
 
                 case embark_assist::defs::aquifer_ranges::Heavy:
-                    if (!(static_cast<int8_t>(tile->aquifer) & static_cast<int8_t>(embark_assist::defs::aquifer_sizes::Heavy))) {
+                    if (!(tile->aquifer & embark_assist::defs::Heavy_Aquifer_Bit)) {
                         if (trace) out.print("matcher::world_tile_match: Aquifer Heavy (%i, %i)\n", x, y);
                         return false;
                     }
@@ -3174,7 +3164,7 @@ uint16_t embark_assist::matcher::find(embark_assist::defs::match_iterators *iter
 
                             current->neighboring_sand |= target->south_row [15].sand;
                             current->neighboring_clay |= target->south_row[15].clay;
-                            current->neighboring_aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(current->neighboring_aquifer) | static_cast<int8_t>(target->south_row[15].aquifer));
+                            current->neighboring_aquifer |= target->south_row[15].aquifer;
                         }
 
                         if (k > 0) {
@@ -3183,7 +3173,7 @@ uint16_t embark_assist::matcher::find(embark_assist::defs::match_iterators *iter
                             for (uint16_t l = 0; l < 16; l++) {
                                 current->neighboring_sand |= target->south_row[l].sand;
                                 current->neighboring_clay |= target->south_row[l].clay;
-                                current->neighboring_aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(current->neighboring_aquifer) | static_cast<int8_t>(target->south_row[l].aquifer));
+                                current->neighboring_aquifer |= target->south_row[l].aquifer;
                             }
                         }
 
@@ -3192,7 +3182,7 @@ uint16_t embark_assist::matcher::find(embark_assist::defs::match_iterators *iter
 
                             current->neighboring_sand |= target->south_row[0].sand;
                             current->neighboring_clay |= target->south_row[0].clay;
-                            current->neighboring_aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(current->neighboring_aquifer) | static_cast<int8_t>(target->south_row[0].aquifer));
+                            current->neighboring_aquifer |= target->south_row[0].aquifer;
                         }
 
                         if (i > 0) {
@@ -3201,7 +3191,7 @@ uint16_t embark_assist::matcher::find(embark_assist::defs::match_iterators *iter
                             for (uint16_t l = 0; l < 16; l++) {
                                 current->neighboring_sand |= target->east_column[l].sand;
                                 current->neighboring_clay |= target->east_column[l].clay;
-                                current->neighboring_aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(current->neighboring_aquifer) | static_cast<int8_t>(target->east_column[l].aquifer));
+                                current->neighboring_aquifer |= target->east_column[l].aquifer;
                             }
                         }
 
@@ -3211,7 +3201,7 @@ uint16_t embark_assist::matcher::find(embark_assist::defs::match_iterators *iter
                             for (uint16_t l = 0; l < 16; l++) {
                                 current->neighboring_sand |= target->west_column[l].sand;
                                 current->neighboring_clay |= target->west_column[l].clay;
-                                current->neighboring_aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(current->neighboring_aquifer) | static_cast<int8_t>(target->west_column[l].aquifer));
+                                current->neighboring_aquifer |= target->west_column[l].aquifer;
                             }
                         }
 
@@ -3220,7 +3210,7 @@ uint16_t embark_assist::matcher::find(embark_assist::defs::match_iterators *iter
 
                             current->neighboring_sand |= target->north_row[15].sand;
                             current->neighboring_clay |= target->north_row[15].clay;
-                            current->neighboring_aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(current->neighboring_aquifer) | static_cast<int8_t>(target->north_row[15].aquifer));
+                            current->neighboring_aquifer |= target->north_row[15].aquifer;
                         }
 
                         if (k < world->worldgen.worldgen_parms.dim_y - 1) {
@@ -3229,7 +3219,7 @@ uint16_t embark_assist::matcher::find(embark_assist::defs::match_iterators *iter
                             for (uint16_t l = 0; l < 16; l++) {
                                 current->neighboring_sand |= target->north_row[l].sand;
                                 current->neighboring_clay |= target->north_row[l].clay;
-                                current->neighboring_aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(current->neighboring_aquifer) | static_cast<int8_t>(target->north_row[l].aquifer));
+                                current->neighboring_aquifer |= target->north_row[l].aquifer;
                             }
                         }
 
@@ -3238,7 +3228,7 @@ uint16_t embark_assist::matcher::find(embark_assist::defs::match_iterators *iter
 
                             current->neighboring_sand |= target->north_row[0].sand;
                             current->neighboring_clay |= target->north_row[0].clay;
-                            current->neighboring_aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(current->neighboring_aquifer) | static_cast<int8_t>(target->north_row[0].aquifer));
+                            current->neighboring_aquifer |= target->north_row[0].aquifer;
                         }
 
                         survey_results->at(i).at(k).survey_completed = true;  //  A bit wasteful to add a flag to every entry when only the very first one is ever read...
diff --git a/plugins/embark-assistant/overlay.cpp b/plugins/embark-assistant/overlay.cpp
index 554e9a44b..d5b50294a 100644
--- a/plugins/embark-assistant/overlay.cpp
+++ b/plugins/embark-assistant/overlay.cpp
@@ -370,7 +370,7 @@ void embark_assist::overlay::set_embark(embark_assist::defs::site_infos *site_in
         state->embark_info.push_back({ Screen::Pen(' ', COLOR_BROWN), "Flat" });
     }
 
-    if (site_info->aquifer != embark_assist::defs::aquifer_sizes::None) {
+    if (site_info->aquifer != embark_assist::defs::None_Aquifer_Bit) {
         std::string none = "   ";
         std::string light = "   ";
         std::string heavy = "  ";
@@ -379,34 +379,34 @@ void embark_assist::overlay::set_embark(embark_assist::defs::site_infos *site_in
         std::string hv = "Hv";
 
         switch (site_info->aquifer) {
-        case embark_assist::defs::aquifer_sizes::NA:
-        case embark_assist::defs::aquifer_sizes::None:  //  Neither of these should appear
+        case embark_assist::defs::Clear_Aquifer_Bits:
+        case embark_assist::defs::None_Aquifer_Bit:  //  Neither of these should appear
             break;
 
-        case embark_assist::defs::aquifer_sizes::Light:
+        case embark_assist::defs::Light_Aquifer_Bit:
             light = lt;
             break;
 
-        case embark_assist::defs::aquifer_sizes::None_Light:
+            case embark_assist::defs::None_Aquifer_Bit | embark_assist::defs::Light_Aquifer_Bit:
             none = no;
             light = lt;
             break;
 
-        case embark_assist::defs::aquifer_sizes::Heavy:
+        case embark_assist::defs::Heavy_Aquifer_Bit:
             heavy = hv;
             break;
 
-        case embark_assist::defs::aquifer_sizes::None_Heavy:
+            case embark_assist::defs::None_Aquifer_Bit | embark_assist::defs::Heavy_Aquifer_Bit:
             none = no;
             heavy = hv;
             break;
 
-        case embark_assist::defs::aquifer_sizes::Light_Heavy:
+            case embark_assist::defs::Light_Aquifer_Bit | embark_assist::defs::Heavy_Aquifer_Bit:
             light = lt;
             heavy = hv;
             break;
 
-        case embark_assist::defs::aquifer_sizes::None_Light_Heavy:
+            case embark_assist::defs::None_Aquifer_Bit | embark_assist::defs::Light_Aquifer_Bit | embark_assist::defs::Heavy_Aquifer_Bit:
             none = no;
             light = lt;
             heavy = hv;
diff --git a/plugins/embark-assistant/survey.cpp b/plugins/embark-assistant/survey.cpp
index c77dbc12c..dfe87f51e 100644
--- a/plugins/embark-assistant/survey.cpp
+++ b/plugins/embark-assistant/survey.cpp
@@ -507,7 +507,7 @@ namespace embark_assist {
             int16_t elevation,
             uint16_t x,
             uint16_t y) {
-            site_info->aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(mlt->aquifer) | static_cast<int8_t>(site_info->aquifer));
+            site_info->aquifer |= mlt->aquifer;
 
             if (mlt->soil_depth < site_info->min_soil) {
                 site_info->min_soil = mlt->soil_depth;
@@ -805,8 +805,8 @@ void embark_assist::survey::high_level_world_survey(embark_assist::defs::geo_dat
             results.survey_completed = false;
             results.neighboring_sand = false;
             results.neighboring_clay = false;
-            results.neighboring_aquifer = embark_assist::defs::aquifer_sizes::NA;
-            results.aquifer = embark_assist::defs::aquifer_sizes::NA;
+            results.neighboring_aquifer = embark_assist::defs::Clear_Aquifer_Bits;
+            results.aquifer = embark_assist::defs::Clear_Aquifer_Bits;
             results.clay_count = 0;
             results.sand_count = 0;
             results.flux_count = 0;
@@ -855,13 +855,13 @@ void embark_assist::survey::high_level_world_survey(embark_assist::defs::geo_dat
                     geo_index = world_data->region_map[adjusted.x][adjusted.y].geo_index;
 
                     if (geo_summary->at(geo_index).aquifer_absent) {
-                        results.aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(results.aquifer) | 1);
+                        results.aquifer |= embark_assist::defs::None_Aquifer_Bit;
                     }
                     else if (world_data->region_map[adjusted.x][adjusted.y].drainage % 20 == 7) {
-                        results.aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(results.aquifer) | 4);
+                        results.aquifer |= embark_assist::defs::Heavy_Aquifer_Bit;
                     }
                     else {
-                        results.aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(results.aquifer) | 2);
+                        results.aquifer |= embark_assist::defs::Light_Aquifer_Bit;
                     }
 
                     if (!geo_summary->at(geo_index).clay_absent) results.clay_count++;
@@ -1073,7 +1073,7 @@ void embark_assist::survey::survey_mid_level_tile(embark_assist::defs::geo_data
             int16_t cur_shift = elevation + soil_erosion - 1;
 
             aquifer = false;
-            mlt->at(i).at(k).aquifer = embark_assist::defs::aquifer_sizes::NA;
+            mlt->at(i).at(k).aquifer = embark_assist::defs::Clear_Aquifer_Bits;
             mlt->at(i).at(k).clay = false;
             mlt->at(i).at(k).sand = false;
             mlt->at(i).at(k).flux = false;
@@ -1224,13 +1224,13 @@ void embark_assist::survey::survey_mid_level_tile(embark_assist::defs::geo_data
                 }
             }
             if (!aquifer) {
-                mlt->at(i).at(k).aquifer = embark_assist::defs::aquifer_sizes::None;
+                mlt->at(i).at(k).aquifer = embark_assist::defs::None_Aquifer_Bit;
             }
             else if (world_data->region_map[adjusted.x][adjusted.y].drainage % 20 == 7) {
-                mlt->at(i).at(k).aquifer = embark_assist::defs::aquifer_sizes::Heavy;
+                mlt->at(i).at(k).aquifer = embark_assist::defs::Heavy_Aquifer_Bit;
             }
             else {
-                mlt->at(i).at(k).aquifer = embark_assist::defs::aquifer_sizes::Light;
+                mlt->at(i).at(k).aquifer = embark_assist::defs::Light_Aquifer_Bit;
             }
 
             mlt->at(i).at(k).trees = tree_level_of(world_data->regions[world_data->region_map[adjusted.x][adjusted.y].region_id]->type,
@@ -1283,7 +1283,7 @@ void embark_assist::survey::survey_mid_level_tile(embark_assist::defs::geo_data
         }
     }
 
-    survey_results->at(x).at(y).aquifer = embark_assist::defs::aquifer_sizes::NA;
+    survey_results->at(x).at(y).aquifer = embark_assist::defs::Clear_Aquifer_Bits;
     survey_results->at(x).at(y).clay_count = 0;
     survey_results->at(x).at(y).sand_count = 0;
     survey_results->at(x).at(y).flux_count = 0;
@@ -1299,7 +1299,7 @@ void embark_assist::survey::survey_mid_level_tile(embark_assist::defs::geo_data
 
     for (uint8_t i = 0; i < 16; i++) {
         for (uint8_t k = 0; k < 16; k++) {
-            survey_results->at(x).at(y).aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(survey_results->at(x).at(y).aquifer) | static_cast<int8_t>(mlt->at(i).at(k).aquifer));
+            survey_results->at(x).at(y).aquifer |= mlt->at(i).at(k).aquifer;
             if (mlt->at(i).at(k).clay) { survey_results->at(x).at(y).clay_count++; }
             if (mlt->at(i).at(k).sand) { survey_results->at(x).at(y).sand_count++; }
             if (mlt->at(i).at(k).flux) { survey_results->at(x).at(y).flux_count++; }
@@ -2249,7 +2249,7 @@ void embark_assist::survey::survey_embark(embark_assist::defs::mid_level_tiles *
     state->y = y;
 
     site_info->incursions_processed = true;
-    site_info->aquifer = embark_assist::defs::aquifer_sizes::NA;
+    site_info->aquifer = embark_assist::defs::Clear_Aquifer_Bits;
     site_info->min_soil = 10;
     site_info->max_soil = 0;
     site_info->flat = true;
@@ -2270,7 +2270,7 @@ void embark_assist::survey::survey_embark(embark_assist::defs::mid_level_tiles *
 
     for (uint8_t i = state->local_min_x; i <= state->local_max_x; i++) {
         for (uint8_t k = state->local_min_y; k <= state->local_max_y; k++) {
-            site_info->aquifer = static_cast<embark_assist::defs::aquifer_sizes>(static_cast<int8_t>(site_info->aquifer) | static_cast<int8_t>(mlt->at(i).at(k).aquifer));
+            site_info->aquifer |= mlt->at(i).at(k).aquifer;
 
             if (mlt->at(i).at(k).soil_depth < site_info->min_soil) {
                 site_info->min_soil = mlt->at(i).at(k).soil_depth;

From 0ef56ba859c2328957228385112da5f42b44d074 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Sat, 14 Nov 2020 14:53:54 +0100
Subject: [PATCH 542/547] another space character met its demise

---
 plugins/embark-assistant/matcher.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/embark-assistant/matcher.cpp b/plugins/embark-assistant/matcher.cpp
index 903e4ca46..1cdbce11e 100644
--- a/plugins/embark-assistant/matcher.cpp
+++ b/plugins/embark-assistant/matcher.cpp
@@ -1572,7 +1572,7 @@ namespace embark_assist {
                     break;
 
                 case embark_assist::defs::aquifer_ranges::None_Light_Heavy:
-                    if ((tile->aquifer | tile->neighboring_aquifer) != 
+                    if ((tile->aquifer | tile->neighboring_aquifer) !=
                         (embark_assist::defs::None_Aquifer_Bit | embark_assist::defs::Light_Aquifer_Bit | embark_assist::defs::Heavy_Aquifer_Bit)) {
                         if (trace) out.print("matcher::world_tile_match: Aquifer None_Light_Heavy (%i, %i)\n", x, y);
                         return false;

From 85dfb67004afdf9068687bfc3885e016e1262161 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 14 Nov 2020 15:16:25 -0500
Subject: [PATCH 543/547] Move #1704's changelog entry to the correct release

---
 docs/changelog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index c972b586a..0a5909ae3 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -38,6 +38,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `buildingplan`: artifacts are now successfully matched when max quality is set to ``artifacts``
 - `buildingplan`: no longer erroneously matches items to buildings while the game is paused
 - `dwarfmonitor`: fixed a crash when opening the ``prefs`` screen if units have vague preferences
+- `embark-assistant`: fixed an issue causing incursion resource matching (e.g. sand/clay) to skip some tiles if those resources were provided only through incursions
 
 ## Misc Improvements
 - `buildingplan`: all buildings, furniture, and constructions are now supported (except for instruments)
@@ -64,7 +65,6 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `search`: fixed an issue causing item counts on the trade screen to display inconsistently when searching
 - `stockpiles`: fixed a crash when loading food stockpiles
 - `stockpiles`: fixed an error when saving furniture stockpiles
-- `embark-assistant`: Fixed issue causing incursion resource matching to skip the checks if those resources were provided only through incursions.
 
 ## Misc Improvements
 - `createitem`: added support for plant growths (fruit, berries, leaves, etc.)

From 14eeeeedc04203637b6d6e7290f31b6435d34542 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 15 Nov 2020 17:39:31 -0500
Subject: [PATCH 544/547] Remove extra paragraph from generated changelogs,
 restore paragraph margins

The CSS (changed in bca76b8f) was removing space between actual paragraphs in
lists. This was intended to address excess padding in changelogs, but that is
resolved here by removing blank lines surrounding nested lists. This still
displays properly on GitHub/Reddit and presumably other Markdown implementations
as well.
---
 docs/sphinx_extensions/dfhack/changelog.py | 2 --
 docs/styles/dfhack.css                     | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/docs/sphinx_extensions/dfhack/changelog.py b/docs/sphinx_extensions/dfhack/changelog.py
index d38f8c060..37fe289cb 100644
--- a/docs/sphinx_extensions/dfhack/changelog.py
+++ b/docs/sphinx_extensions/dfhack/changelog.py
@@ -201,10 +201,8 @@ def print_changelog(versions, all_entries, path, replace=True, prefix=''):
                         continue
                     elif entry.children:
                         write('- ' + entry.feature + ':')
-                        write('')
                         for child in entry.children:
                             write('    - ' + child)
-                        write('')
                     else:
                         write('- ' + entry.feature)
                 write('')
diff --git a/docs/styles/dfhack.css b/docs/styles/dfhack.css
index 7b735ed42..9b6e523ef 100644
--- a/docs/styles/dfhack.css
+++ b/docs/styles/dfhack.css
@@ -57,11 +57,6 @@ div.body {
     min-width: unset;
 }
 
-div.body li > p {
-    margin-top: 0;
-    margin-bottom: 0;
-}
-
 span.pre {
     overflow-wrap: break-word;
 }

From 8319d71dffd7048dbd9540eb35f9f01bf8ca1181 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 15 Nov 2020 18:42:14 -0500
Subject: [PATCH 545/547] Improve documentation of reqscript, dfhack_flags,
 etc.

---
 docs/Lua API.rst | 143 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 116 insertions(+), 27 deletions(-)

diff --git a/docs/Lua API.rst b/docs/Lua API.rst
index 0a253df9d..ffce7fd4e 100644
--- a/docs/Lua API.rst	
+++ b/docs/Lua API.rst	
@@ -4338,48 +4338,125 @@ Arguments are passed in to the scripts via the ``...`` built-in quasi-variable;
 when the script is called by the DFHack core, they are all guaranteed to be
 non-nil strings.
 
+Additional data about how a script is invoked is passed to the script as a
+special ``dfhack_flags`` global, which is unique to each script. This table
+is guaranteed to exist, but individual entries may be present or absent
+depending on how the script was invoked. Flags that are present are described
+in the subsections below.
+
 DFHack invokes the scripts in the `core context <lua-core-context>`; however it
 is possible to call them from any lua code (including from other scripts) in any
-context, via the same function the core uses:
+context with ``dfhack.run_script()`` below.
+
+General script API
+==================
 
 * ``dfhack.run_script(name[,args...])``
 
-  Run a lua script in hack/scripts/, as if it was started from dfhack command-line.
-  The ``name`` argument should be the name stem, as would be used on the command line.
+  Run a Lua script in hack/scripts/, as if it was started from the DFHack
+  command-line. The ``name`` argument should be the name of the script without
+  its extension, as would be used on the command line.
 
-Note that this function lets errors propagate to the caller.
+  Note that this function lets Lua errors propagate to the caller.
 
-* ``dfhack.script_environment(name)``
+  To run other types of commands (such as built-in commands, plugin commands, or
+  Ruby scripts), see ``dfhack.run_command()``. Note that this is slightly slower
+  than ``dfhack.run_script()`` for Lua scripts.
 
-  Run an Lua script and return its environment.
-  This command allows you to use scripts like modules for increased portability.
-  It is highly recommended that if you are a modder you put your custom modules in ``raw/scripts`` and use ``script_environment`` instead of ``require`` so that saves with your mod installed will be self-contained and can be transferred to people who do have DFHack but do not have your mod installed.
+* ``dfhack.script_help([name, [extension]])``
 
-  You can say ``dfhack.script_environment('add-thought').addEmotionToUnit([arguments go here])`` and it will have the desired effect.
-  It will call the script in question with the global ``moduleMode`` set to ``true`` so that the script can return early.
-  This is useful because if the script is called from the console it should deal with its console arguments and if it is called by ``script_environment`` it should only create its global functions and return.
-  You can also access global variables with, for example ``print(dfhack.script_environment('add-thought').validArgs)``
+  Returns the contents of the embedded documentation of the specified script.
+  ``extension`` defaults to "lua", and ``name`` defaults to the name of the
+  script where this function was called. For example, the following can be used
+  to print the current script's help text::
+
+    local args = {...}
+    if args[1] == 'help' then
+        print(script_help())
+        return
+    end
 
-  The function ``script_environment`` is fast enough that it is recommended that you not store its result in a nonlocal variable, because your script might need to load a different version of that script if the save is unloaded and a save with a different mod that overrides the same script with a slightly different functionality is loaded.
-  This will not be an issue in most cases.
 
-  This function also permits circular dependencies of scripts.
+Importing scripts
+=================
 
 * ``dfhack.reqscript(name)`` or ``reqscript(name)``
 
-  Nearly identical to script_environment() but requires scripts being loaded to
-  include a line similar to::
+  Loads a Lua script and returns its environment (i.e. a table of all global
+  functions and variables). This is similar to the built-in ``require()``, but
+  searches all script paths for the first matching ``name.lua`` file instead
+  of searching the Lua library paths (like ``hack/lua``).
+
+  Most scripts can be made to support ``reqscript()`` without significant
+  changes (in contrast, ``require()`` requires the use of ``mkmodule()`` and
+  some additional boilerplate). However, because scripts can have side effects
+  when they are loaded (such as printing messages or modifying the game state),
+  scripts that intend to support being imported must satisfy some criteria to
+  ensure that they can be imported safely:
+
+  1. Include the following line - ``reqscript()`` will fail if this line is
+     not present::
 
       --@ module = true
 
-  This is intended to only allow scripts that take appropriate action when used
-  as a module to be loaded.
+  2. Include a check for ``dfhack_flags.module``, and avoid running any code
+     that has side-effects if this flag is true. For instance::
 
-* ``dfhack.script_help([name, [extension]])``
+      -- (function definitions)
+      if dfhack_flags.module then
+          return
+      end
+      -- (main script code with side-effects)
 
-  Returns the contents of the embedded documentation of the specified script.
-  ``extension`` defaults to "lua", and ``name`` defaults to the name of the
-  script where this function was called.
+     or::
+
+      -- (function definitions)
+      function main()
+          -- (main script code with side-effects)
+      end
+      if not dfhack_flags.module then
+          main()
+      end
+
+  Example usage::
+
+    local addThought = reqscript('add-thought')
+    addThought.addEmotionToUnit(unit, ...)
+
+  Circular dependencies between scripts are supported, as long as the scripts
+  have no side-effects at load time (which should already be the case per
+  the above criteria).
+
+  .. warning::
+
+    Avoid caching the table returned by ``reqscript()`` beyond storing it in
+    a local or global variable as in the example above. ``reqscript()`` is fast
+    for scripts that have previously been loaded and haven't changed. If you
+    retain a reference to a table returned by an old ``reqscript()`` call, this
+    may lead to unintended behavior if the location of the script changes
+    (e.g. if a save is loaded or unloaded, or if a `script path <script-paths>`
+    is added in some other way).
+
+  .. admonition:: Tip
+
+    Mods that include custom Lua modules can write these modules to support
+    ``reqscript()`` and distribute them as scripts in ``raw/scripts``. Since the
+    entire ``raw`` folder is copied into new saves, this will allow saves to be
+    successfully transferred to other users who do not have the mod installed
+    (as long as they have DFHack installed).
+
+  .. admonition:: Backwards compatibility notes
+
+    For backwards compatibility, ``moduleMode`` is also defined if
+    ``dfhack_flags.module`` is defined, and is set to the same value.
+    Support for this may be removed in a future version.
+
+* ``dfhack.script_environment(name)``
+
+  Similar to ``reqscript()`` but does not enforce the check for module support.
+  This can be used to import scripts that support being used as a module but do
+  not declare support as described above, although it is preferred to update
+  such scripts so that ``reqscript()`` can be used instead.
 
 Enabling and disabling scripts
 ==============================
@@ -4389,11 +4466,23 @@ by including the following line anywhere in their file::
 
     --@ enable = true
 
-When the ``enable`` and ``disable`` commands are invoked, a ``dfhack_flags``
-table will be passed to the script with the following fields set:
+When the ``enable`` and ``disable`` commands are invoked, the ``dfhack_flags``
+table passed to the script will have the following fields set:
 
-* ``enable``: Always true if the script is being enabled *or* disabled
-* ``enable_state``: True if the script is being enabled, false otherwise
+* ``enable``: Always ``true`` if the script is being enabled *or* disabled
+* ``enable_state``: ``true`` if the script is being enabled, ``false`` otherwise
+
+Example usage::
+
+    -- @enable = true
+    -- (function definitions...)
+    if dfhack_flags.enable then
+        if dfhack_flags.enable_state then
+            start()
+        else
+            stop()
+        end
+    end
 
 Save init script
 ================

From 0b886399fe71402ef3ff95a00774f38e6da60f02 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 15 Nov 2020 22:18:54 -0500
Subject: [PATCH 546/547] zone: stop enumnick from taking priority over
 assign/unassign/slaughter

Fixes #1709
Ref #1652
---
 docs/changelog.txt | 1 +
 plugins/zone.cpp   | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 0a5909ae3..8ca5fa316 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -39,6 +39,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - `buildingplan`: no longer erroneously matches items to buildings while the game is paused
 - `dwarfmonitor`: fixed a crash when opening the ``prefs`` screen if units have vague preferences
 - `embark-assistant`: fixed an issue causing incursion resource matching (e.g. sand/clay) to skip some tiles if those resources were provided only through incursions
+- `zone`: fixed an issue causing the ``enumnick`` subcommand to run when attempting to run ``assign``, ``unassign``, or ``slaughter``
 
 ## Misc Improvements
 - `buildingplan`: all buildings, furniture, and constructions are now supported (except for instruments)
diff --git a/plugins/zone.cpp b/plugins/zone.cpp
index c32122241..25b4be950 100644
--- a/plugins/zone.cpp
+++ b/plugins/zone.cpp
@@ -449,7 +449,7 @@ void unitInfo(color_ostream & out, df::unit* unit, bool verbose = false)
         out << ", milkable";
     if(unit->flags2.bits.slaughter)
         out << ", slaughter";
-    
+
     if(verbose)
     {
         out << ". Pos: ("<<unit->pos.x << "/"<< unit->pos.y << "/" << unit->pos.z << ") " << endl;
@@ -1493,7 +1493,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
     bool cagezone_assign = false;
     bool nick_set = false;
     string target_nick;
-    bool enum_nick = true;
+    bool enum_nick = false;
     string enum_prefix;
 
     bool verbose = false;
@@ -1552,8 +1552,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
                 return CR_OK;
             } else {
                 out.color(COLOR_BLUE);
-                out << "Current building unset (no building under"
-                    "cursor)." << endl;
+                out << "Current building unset (no building under cursor)." << endl;
                 out.reset_color();
 
                 return CR_OK;
@@ -2127,7 +2126,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
                 }
                 continue;
             }
-            
+
             matchedCount++;
 
             if(unit_info)

From ddbd22fcf4d33740945885c88d44f39c9ef92b86 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sun, 15 Nov 2020 22:22:18 -0500
Subject: [PATCH 547/547] Update scripts

---
 scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts b/scripts
index acf50cc63..5aaa1ce81 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit acf50cc63897078b96a207c021b4745c1fa8998f
+Subproject commit 5aaa1ce815b2192c6b6a22523a996ed556c04fbd