finalize docs, clear flags

docs/plugins/stockpiles.rst

@@ -275,113 +275,204 @@ adamantine.
 Finished goods stockpile adjustments
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-stonetools
+Subcategory prefixes::
-woodtools
+
-crafts
+    type/
-goblets
+    mats/
-toys
+    other/
-masterworkfinishedgoods
+    core/
-artifactfinishedgoods
+    total/
+
+Settings files::
+
+    stonetools
+    woodtools
+    crafts
+    goblets
+    toys
+
+Example commands for a toy stockpile::
+
+    stockpiles import cat_furniture -f mats/,other/,core/,total/
+    stockpiles import -m enable toys
 
 Food stockpile adjustments
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-preparedmeals
+Flags and subcategory prefixes::
-unpreparedfish
+
-plants
+    preparedmeals
-booze
+    meat/
-seeds
+    fish/prepared/
-dye
+    fish/unprepared/
-miscliquid
+    egg/
-wax
+    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
+    booze
+    seeds
+    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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-pots
+Subcategory prefixes::
-bags
+
-buckets
+    type/
-sand
+    mats/
-masterworkfurniture
+    other/
-artifactfurniture
+    core/
+    total/
+
+Settings files::
+
+    pots
+    bags
+    buckets
+    sand
 
 * 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
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-roughgems
+Subcategory prefixes::
-roughglass
+
-cutgems
+    mats/rough/
-cutglass
+    mats/cut/
-cutstone
+    other/rough/
+    other/cut/
+
+Settings files::
+
+    roughgems
+    roughglass
+    cutgems
+    cutglass
+    cutstone
 
 Refuse stockpile adjustments
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-===========  ==================  ==================
+Flags and subcategory prefixes::
-Exclusive    Forbid              Permit
+
-===========  ==================  ==================
+    rawhide/fresh
-corpses      forbidcorpses       permitcorpses
+    rawhide/rotten
-skulls       forbidskulls        permitskulls
+    type/
-bones        forbidbones         permitbones
+    corpses/
-shells       forbidshells        permitshells
+    bodyparts/
-teeth        forbidteeth         permitteeth
+    skulls/
-horns        forbidhorns         permithorns
+    bones/
-hair         forbidhair          permithair
+    hair/
-craftrefuse  forbidcraftrefuse   permitcraftrefuse
+    shells/
-===========  ==================  ==================
+    teeth/
+    horns/
+
+Settings files::
+
+    rawhides
+    tannedhides
+    usablehair
 
 Notes:
 
 * ``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).
-
-rawhides
-tannedhides
-usablehair
 
-You can get a stockpile of usable refuse with the following set of commands::
+Example commands for a craftable refuse stockpile::
 
-    stockpiles import cat_refuse -m enable -f skulls
+    stockpiles import cat_refuse -f skulls/,bones/,shells',teeth/,horns/
-    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
     stockpiles import usablehair -m enable
 
+Sheet stockpile adjustments
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Subcategory prefixes::
+
+    paper/
+    parchment/
+
 Stone stockpile adjustments
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-metalore
+Settings files::
-ironore
+
-economic
+    metalore
-flux
+    ironore
-plasterproducing
+    economic
-coalproducing
+    flux
-otherstone
+    plasterproducing
-bauxite
+    coalproducing
-clay
+    otherstone
+    bauxite
+    clay
 
 Weapon stockpile adjustments
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-weapons
+Flags and subcategory prefixes::
-metalweapons
+
-stoneweapons
+    nouse
-otherweapons
+    canuse
-trapcomponents
+    type/weapon/
-ironweapons
+    type/trapcomp/
-silverweapons
+    mats/
-bronzeweapons
+    other/
-copperweapons
+    core/
-steelweapons
+    total/
-platinumweapons
+
-adamantineweapons
+Settings files::
-masterworkweapons
+
-artifactweapons
+    metalweapons
-usableweapons
+    stoneweapons
-unusableweapons
+    otherweapons
+    trapcomponents
+    ironweapons
+    silverweapons
+    bronzeweapons
+    copperweapons
+    steelweapons
+    platinumweapons
+    adamantineweapons
+    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();