MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

differentiate fish

develop
Myk Taylor 2023-03-21 00:19:49 -07:00
parent cdf2c407bc
commit b5d4f04d2f
No known key found for this signature in database
2 changed files with 122 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
docs/plugins/stockpiles.rst
Unescape Escape View File

@ -48,7 +48,7 @@ Examples
exist. exist.
``stockpiles import -m enable plants`` ``stockpiles import -m enable plants``
Enables plants in the selected stockpile. Enables plants in the selected stockpile.
``stockpiles import -m disable category_food -f tallow`` ``stockpiles import -m disable cat_food -f tallow``
Disables all tallow in the selected food stockpile. Disables all tallow in the selected food stockpile.
``stockpiles export mysettings`` ``stockpiles export mysettings``
Export the settings for the currently selected stockpile to a file named Export the settings for the currently selected stockpile to a file named
@ -109,7 +109,7 @@ stockpile configurations can only be achieved with filters since the stockpile
lists are different for each world. For example, to disable all tallow in your lists are different for each world. For example, to disable all tallow in your
main food stockpile, you'd run this command:: main food stockpile, you'd run this command::
stockpiles import category_food -m disable -f tallow stockpiles import cat_food -m disable -f tallow
Top-level categories Top-level categories
~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~
@ -117,27 +117,27 @@ Top-level categories
Each stockpile category has a file that allows you to enable or disable the Each stockpile category has a file that allows you to enable or disable the
entire category, or with a filter, any matchable subset thereof:: entire category, or with a filter, any matchable subset thereof::
category_ammo cat_ammo
category_animals cat_animals
category_armor cat_armor
category_bars_blocks cat_bars_blocks
category_cloth cat_cloth
category_coins cat_coins
category_corpses cat_corpses
category_finished_goods cat_finished_goods
category_food cat_food
category_furniture cat_furniture
category_gems cat_gems
category_leather cat_leather
category_refuse cat_refuse
category_sheets cat_sheets
category_stone cat_stone
category_weapons cat_weapons
category_wood cat_wood
For many of the categories, there are also subcategory prefixes that you can For many of the categories, there are also flags and subcategory prefixes that
match with filters and convenient pre-made settings files that manipulate you can match with filters and convenient pre-made settings files that
interesting category subsets. manipulate interesting category subsets.
Ammo stockpile adjustments Ammo stockpile adjustments
~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -150,7 +150,7 @@ Subcategory prefixes::
core/ core/
total/ total/
Convenience settings files:: Settings files::
bolts bolts
metalammo metalammo
@ -159,35 +159,76 @@ Convenience settings files::
Example commands for a stockpile of metal bolts:: Example commands for a stockpile of metal bolts::
stockpiles import category_ammo stockpiles import cat_ammo -f mats/,core/,total/
stockpiles import -m disable -f other/ category_ammo
stockpiles import -m disable -f type/ category_ammo
stockpiles import -m enable bolts stockpiles import -m enable bolts
Animal stockpile adjustments Animal stockpile adjustments
~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Flags::
cages
traps traps
Settings files::
cages cages
traps
Example commands for a stockpile of empty cages::
stockpiles import cages
Or, using the flag for the same effect::
stockpiles import cat_animals -f cages
Armor stockpile adjustments Armor stockpile adjustments
~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
Flags and subcategory prefixes::
nouse
canuse
body/
head/
feet/
hands/
legs/
shield/
mats/
other/
core/
total/
Settings files::
metalarmor metalarmor
otherarmor otherarmor
ironarmor ironarmor
bronzearmor bronzearmor
copperarmor copperarmor
steelarmor steelarmor
masterworkarmor
artifactarmor
usablearmor usablearmor
unusablearmor unusablearmor
Example commands for a stockpile of sub-masterwork meltable armor::
stockpiles import cat_armor
stockpiles import -m disable -f other/,core/mas,core/art cat_armor
Bar stockpile adjustments Bar stockpile adjustments
~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~
Subcategory prefixes::
mats/bars/
other/bars/
mats/blocks/
other/blocks/
Settings files::
bars bars
metalbars metalbars
ironbars ironbars
@ -201,9 +242,26 @@ pearlash
soap soap
blocks blocks
Example commands for a stockpile of blocks::
stockpiles import blocks
Cloth stockpile adjustments Cloth stockpile adjustments
~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
Subcategory prefixes::
thread/silk/
thread/plant/
thread/yarn/
thread/metal/
cloth/silk/
cloth/plant/
cloth/yarn/
cloth/metal/
Settings files::
thread thread
adamantinethread adamantinethread
cloth cloth
@ -211,7 +269,8 @@ adamantinecloth
Notes: Notes:
* ``thread`` and ``cloth`` refers to all materials that are not adamantine. * ``thread`` and ``cloth`` settings files set all materials that are not
adamantine.
Finished goods stockpile adjustments Finished goods stockpile adjustments
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -287,11 +346,11 @@ usablehair
You can get a stockpile of usable refuse with the following set of commands:: You can get a stockpile of usable refuse with the following set of commands::
stockpiles import category_refuse -m enable -f skulls stockpiles import cat_refuse -m enable -f skulls
stockpiles import category_refuse -m enable -f bones stockpiles import cat_refuse -m enable -f bones
stockpiles import category_refuse -m enable -f shells stockpiles import cat_refuse -m enable -f shells
stockpiles import category_refuse -m enable -f teeth stockpiles import cat_refuse -m enable -f teeth
stockpiles import category_refuse -m enable -f horns stockpiles import cat_refuse -m enable -f horns
stockpiles import usablehair -m enable stockpiles import usablehair -m enable
Stone stockpile adjustments Stone stockpile adjustments

4
plugins/stockpiles/StockpileSerializer.cpp
Unescape Escape View File

@ -1457,7 +1457,7 @@ food_pair StockpileSerializer::food_map(organic_mat_category::organic_mat_catego
mBuffer.mutable_food()->add_fish(id); mBuffer.mutable_food()->add_fish(id);
}; };
FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().fish(idx); }; FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().fish(idx); };
return food_pair("fish", setter, &mPile->settings.food.fish, getter, mBuffer.food().fish_size()); return food_pair("fish/prepared", setter, &mPile->settings.food.fish, getter, mBuffer.food().fish_size());
} }
case organic_mat_category::UnpreparedFish: case organic_mat_category::UnpreparedFish:
{ {
@ -1465,7 +1465,7 @@ food_pair StockpileSerializer::food_map(organic_mat_category::organic_mat_catego
mBuffer.mutable_food()->add_unprepared_fish(id); mBuffer.mutable_food()->add_unprepared_fish(id);
}; };
FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().unprepared_fish(idx); }; FuncReadImport getter = [&](size_t idx) -> string { return mBuffer.food().unprepared_fish(idx); };
return food_pair("unpreparedfish", setter, &mPile->settings.food.unprepared_fish, getter, mBuffer.food().unprepared_fish_size()); return food_pair("fish/unprepared", setter, &mPile->settings.food.unprepared_fish, getter, mBuffer.food().unprepared_fish_size());
} }
case organic_mat_category::Eggs: case organic_mat_category::Eggs:
{ {