finalize docs, clear flags

docs/plugins/stockpiles.rst

@@ -275,17 +275,55 @@ adamantine.
 Finished goods stockpile adjustments
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Subcategory prefixes::
+
+    type/
+    mats/
+    other/
+    core/
+    total/
+
+Settings files::
+
     stonetools
     woodtools
     crafts
     goblets
     toys
-masterworkfinishedgoods
-artifactfinishedgoods
+
+Example commands for a toy stockpile::
+
+    stockpiles import cat_furniture -f mats/,other/,core/,total/
+    stockpiles import -m enable toys
 
 Food stockpile adjustments
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Flags and subcategory prefixes::
+
+    preparedmeals
+    meat/
+    fish/prepared/
+    fish/unprepared/
+    egg/
+    plants/
+    drink/plant/
+    drink/animal/
+    cheese/plant/
+    cheese/animal/
+    seeds/
+    leaves/
+    powder/plant/
+    powder/animal/
+    glob/
+    liquid/plant/
+    liquid/animal/
+    liquid/misc/
+    paste/
+    pressed/
+
+Settings files::
+
     preparedmeals
     unpreparedfish
     plants
@@ -295,22 +333,52 @@ dye
     miscliquid
     wax
 
+Example commands for a kitchen ingredients stockpile::
+
+    stockpiles import cat_food -f meat/,fish/prepared/,egg/,cheese/,leaves/,powder/,glob/,liquid/plant/,paste/,pressed/
+    stockpiles import cat_food -m enable -f milk,royal_jelly
+    stockpiles import dye -m disable
+    stockpiles import cat_food -m disable -f tallow,thread,liquid/misc/
+
 Furniture stockpile adjustments
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Subcategory prefixes::
+
+    type/
+    mats/
+    other/
+    core/
+    total/
+
+Settings files::
+
     pots
     bags
     buckets
     sand
-masterworkfurniture
-artifactfurniture
 
 * Because of the limitations of Dwarf Fortress, ``bags`` cannot distinguish
   between empty bags and bags filled with gypsum powder.
 
+Example commands for a sand bag stockpile::
+
+    stockpiles import cat_furniture
+    stockpiles import cat_furniture -m disable -f type/
+    stockpiles import sand -m enable
+
 Gem stockpile adjustments
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Subcategory prefixes::
+
+    mats/rough/
+    mats/cut/
+    other/rough/
+    other/cut/
+
+Settings files::
+
     roughgems
     roughglass
     cutgems
@@ -320,42 +388,49 @@ cutstone
 Refuse stockpile adjustments
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-===========  ==================  ==================
-Exclusive    Forbid              Permit
-===========  ==================  ==================
-corpses      forbidcorpses       permitcorpses
-skulls       forbidskulls        permitskulls
-bones        forbidbones         permitbones
-shells       forbidshells        permitshells
-teeth        forbidteeth         permitteeth
-horns        forbidhorns         permithorns
-hair         forbidhair          permithair
-craftrefuse  forbidcraftrefuse   permitcraftrefuse
-===========  ==================  ==================
+Flags and subcategory prefixes::
 
-Notes:
+    rawhide/fresh
+    rawhide/rotten
+    type/
+    corpses/
+    bodyparts/
+    skulls/
+    bones/
+    hair/
+    shells/
+    teeth/
+    horns/
 
-* ``usablehair`` Only hair and wool that can make usable clothing is included,
-  i.e. from sheep, llamas, alpacas, and trolls.
-* ``craftrefuse`` includes everything a craftsdwarf or tailor can use: skulls,
-  bones, shells, teeth, horns, and "usable" hair/wool (defined above).
+Settings files::
 
     rawhides
     tannedhides
     usablehair
 
-You can get a stockpile of usable refuse with the following set of commands::
+Notes:
+
+* ``usablehair`` Only hair and wool that can make usable clothing is included,
+  i.e. from sheep, llamas, alpacas, and trolls.
 
-    stockpiles import cat_refuse -m enable -f skulls
-    stockpiles import cat_refuse -m enable -f bones
-    stockpiles import cat_refuse -m enable -f shells
-    stockpiles import cat_refuse -m enable -f teeth
-    stockpiles import cat_refuse -m enable -f horns
+Example commands for a craftable refuse stockpile::
+
+    stockpiles import cat_refuse -f skulls/,bones/,shells',teeth/,horns/
     stockpiles import usablehair -m enable
 
+Sheet stockpile adjustments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Subcategory prefixes::
+
+    paper/
+    parchment/
+
 Stone stockpile adjustments
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Settings files::
+
     metalore
     ironore
     economic
@@ -369,7 +444,19 @@ clay
 Weapon stockpile adjustments
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-weapons
+Flags and subcategory prefixes::
+
+    nouse
+    canuse
+    type/weapon/
+    type/trapcomp/
+    mats/
+    other/
+    core/
+    total/
+
+Settings files::
+
     metalweapons
     stoneweapons
     otherweapons
@@ -381,7 +468,11 @@ copperweapons
     steelweapons
     platinumweapons
     adamantineweapons
-masterworkweapons
-artifactweapons
     usableweapons
     unusableweapons
+
+Example commands for a non-metallic trap components stockpile::
+
+    stockpiles import cat_weapons
+    stockpiles import cat_weapons -m disable -f type/weapon/
+    stockpiles metalweapons -m disable

plugins/stockpiles/StockpileSerializer.cpp

@@ -1090,6 +1090,8 @@ void StockpileSerializer::read_armor(DeserializeMode mode, const vector<string>&
         mPile->settings.flags.whole,
         mPile->settings.flags.mask_armor,
         [&]() {
+            parmor.unusable = false;
+            parmor.usable = false;
             parmor.body.clear();
             parmor.head.clear();
             parmor.feet.clear();
@@ -2158,6 +2160,8 @@ void StockpileSerializer::read_weapons(DeserializeMode mode, const vector<string
         mPile->settings.flags.whole,
         mPile->settings.flags.mask_weapons,
         [&]() {
+            pweapons.unusable = false;
+            pweapons.usable = false;
             pweapons.weapon_type.clear();
             pweapons.trapcomp_type.clear();
             pweapons.other_mats.clear();