From 05db72c7b39d0fa45265e705bebaf8f6fc4d968d Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Fri, 2 Jun 2023 13:15:21 -0700 Subject: [PATCH 1/4] add organic stockpile preset --- data/stockpiles/organic.dfstock | Bin 0 -> 9 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 data/stockpiles/organic.dfstock diff --git a/data/stockpiles/organic.dfstock b/data/stockpiles/organic.dfstock new file mode 100644 index 0000000000000000000000000000000000000000..70f0496ca3b21fb297da244a8ac729b839d0fe58 GIT binary patch literal 9 QcmbQh$T)+MVFx1v01D>; Date: Mon, 5 Jun 2023 04:17:13 -0700 Subject: [PATCH 2/4] add barrels stockpile preset --- data/stockpiles/barrels.dfstock | 2 ++ docs/plugins/stockpiles.rst | 1 + 2 files changed, 3 insertions(+) create mode 100644 data/stockpiles/barrels.dfstock diff --git a/data/stockpiles/barrels.dfstock b/data/stockpiles/barrels.dfstock new file mode 100644 index 000000000..70a723903 --- /dev/null +++ b/data/stockpiles/barrels.dfstock @@ -0,0 +1,2 @@ + +BARREL \ No newline at end of file diff --git a/docs/plugins/stockpiles.rst b/docs/plugins/stockpiles.rst index ae77e5cf2..922c3a418 100644 --- a/docs/plugins/stockpiles.rst +++ b/docs/plugins/stockpiles.rst @@ -369,6 +369,7 @@ Subcategory prefixes:: Settings files:: pots + barrels bags buckets sand From 8c1e761f867f6259152cd1dbdfd3417e3544358d Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Wed, 7 Jun 2023 01:28:15 -0700 Subject: [PATCH 3/4] update changelog --- docs/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.txt b/docs/changelog.txt index b010f55b5..cdfe29650 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: ## Misc Improvements - `autonick`: additional nicknames based on burrowing animals, colours, gems and minerals added +- `stockpiles`: added ``barrels`` and ``organic`` stockpile presets ## Documentation From 321941385e94171142c24e1550bc797bafc8041e Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Wed, 7 Jun 2023 11:57:16 -0700 Subject: [PATCH 4/4] add artifacts and masterworks presets --- data/stockpiles/artifacts.dfstock | Bin 0 -> 107 bytes data/stockpiles/masterworks.dfstock | Bin 0 -> 112 bytes docs/changelog.txt | 2 +- docs/plugins/stockpiles.rst | 15 +++++++++++++++ 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 data/stockpiles/artifacts.dfstock create mode 100644 data/stockpiles/masterworks.dfstock diff --git a/data/stockpiles/artifacts.dfstock b/data/stockpiles/artifacts.dfstock new file mode 100644 index 0000000000000000000000000000000000000000..1c7315dfe83ce1f673768a743418c10baa1124fa GIT binary patch literal 107 zcmd;L;b0J85MrLe$RNd~#Nk*}l9`s6T%yGiz!1S;#NdP^=EV@i5XF#$B$CBY#8Ac1 e#K@-w*J#1uz|h6W=LHvtU`Sv%#mI1pkpTehwHf6A literal 0 HcmV?d00001 diff --git a/data/stockpiles/masterworks.dfstock b/data/stockpiles/masterworks.dfstock new file mode 100644 index 0000000000000000000000000000000000000000..fa94c86a936d8852d061758b28f67c069c8d48c5 GIT binary patch literal 112 zcmd;L;b0J85MrLe$RNe7#Oa$@T#{OpR+^*562K6_V8q~rEa=4$#1O@hge;WBP{dHh f(8S2Eh0trk;K0zu$nS*^iC{=zIK{|tiID*Sw*(xB literal 0 HcmV?d00001 diff --git a/docs/changelog.txt b/docs/changelog.txt index cdfe29650..b15f5565e 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -40,7 +40,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## Misc Improvements - `autonick`: additional nicknames based on burrowing animals, colours, gems and minerals added -- `stockpiles`: added ``barrels`` and ``organic`` stockpile presets +- `stockpiles`: added ``barrels``, ``organic``, ``artifacts``, and ``masterworks`` stockpile presets ## Documentation diff --git a/docs/plugins/stockpiles.rst b/docs/plugins/stockpiles.rst index 922c3a418..cc1f3c016 100644 --- a/docs/plugins/stockpiles.rst +++ b/docs/plugins/stockpiles.rst @@ -143,6 +143,21 @@ item properties that you can match with filters. In addition, there are normally at least a few convenient pre-made settings files that manipulate interesting category subsets. +Cross-category stockpile adjustments +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Settings files:: + + artifacts + masterworks + +Example command for a meltable weapons stockpile:: + + stockpiles import cat_weapons + stockpiles import -m disable cat_weapons -f other/ + stockpiles import -m disable artifacts + stockpiles import -m disable masterworks + Ammo stockpile adjustments ~~~~~~~~~~~~~~~~~~~~~~~~~~