From cd476a943c905e59e146066952d246e6cd594fd1 Mon Sep 17 00:00:00 2001 From: myk002 Date: Sun, 24 Jan 2021 09:00:38 -0800 Subject: [PATCH 01/12] fix quickfort library aliases for weapons --- data/quickfort/aliases-common.txt | 6 +++--- docs/changelog.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt index d021a2f5f..39eeed88c 100644 --- a/data/quickfort/aliases-common.txt +++ b/data/quickfort/aliases-common.txt @@ -338,9 +338,9 @@ enableweapons: {weaponsprefix}e^ disableweapons: {weaponsprefix}d^ metalweapons: {forbidtrapcomponents}{forbidstoneweapons}{forbidotherweapons} -ironweapons: {metalweapons}{forbidweapons}{permitironweapons} -copperweapons: {metalweapons}{forbidweapons}{permitcopperweapons} -steelweapons: {metalweapons}{forbidweapons}{permitsteelweapons} +ironweapons: {metalweapons}{forbidmetalweapons}{permitironweapons} +copperweapons: {metalweapons}{forbidmetalweapons}{permitcopperweapons} +steelweapons: {metalweapons}{forbidmetalweapons}{permitsteelweapons} forbidweapons: {weaponsprefix}{Right}f^ forbidtrapcomponents: {weaponsprefix}{Right}{Down}f^ diff --git a/docs/changelog.txt b/docs/changelog.txt index 758a54fb5..3bfb23e91 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -36,6 +36,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## Fixes - `embark-assistant`: fixed order of factors when calculating min temperature - `embark-assistant`: improved performance of surveying +- `quickfort`: fix library aliases for iron, copper, and steel weapons ## Misc Improvements - `buildingplan`: set global settings from the ``DFHack#`` prompt: e.g. ``buildingplan set boulders false`` From cf8f9386f4b6207145edf241eca1c202660e0777 Mon Sep 17 00:00:00 2001 From: myk002 Date: Sun, 24 Jan 2021 17:02:26 -0800 Subject: [PATCH 02/12] add alias for bronze weapons --- data/quickfort/aliases-common.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt index 39eeed88c..650d38a3e 100644 --- a/data/quickfort/aliases-common.txt +++ b/data/quickfort/aliases-common.txt @@ -339,6 +339,7 @@ disableweapons: {weaponsprefix}d^ metalweapons: {forbidtrapcomponents}{forbidstoneweapons}{forbidotherweapons} ironweapons: {metalweapons}{forbidmetalweapons}{permitironweapons} +bronzeweapons: {metalweapons}{forbidmetalweapons}{permitbronzeweapons} copperweapons: {metalweapons}{forbidmetalweapons}{permitcopperweapons} steelweapons: {metalweapons}{forbidmetalweapons}{permitsteelweapons} @@ -348,6 +349,7 @@ forbidmetalweapons: {weaponsprefix}{Right}{Down 2}f^ forbidstoneweapons: {weaponsprefix}{Right}{Down 3}f^ forbidotherweapons: {weaponsprefix}{Right}{Down 4}f^ forbidironweapons: {weaponsprefix}{Right}{Down 2}{Right}&^ +forbidbronzeweapons: {weaponsprefix}{Right}{Down 2}{Right}{Down 6}&^ forbidcopperweapons: {weaponsprefix}{Right}{Down 2}{Right}{Down 3}&^ forbidsteelweapons: {weaponsprefix}{Right}{Down 2}{Right}{Down 8}&^ @@ -357,6 +359,7 @@ permitmetalweapons: {weaponsprefix}{Right}{Down 2}p^ permitstoneweapons: {weaponsprefix}{Right}{Down 3}p^ permitotherweapons: {weaponsprefix}{Right}{Down 4}p^ permitironweapons: {forbidironweapons} +permitbronzeweapons: {forbidbronzeweapons} permitcopperweapons: {forbidcopperweapons} permitsteelweapons: {forbidsteelweapons} From 99fa1916f8f4edd77ae678aa14401d9b381c6bb7 Mon Sep 17 00:00:00 2001 From: myk002 Date: Sun, 24 Jan 2021 17:03:13 -0800 Subject: [PATCH 03/12] update changelog --- docs/changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index 3bfb23e91..51254d116 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -36,7 +36,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## Fixes - `embark-assistant`: fixed order of factors when calculating min temperature - `embark-assistant`: improved performance of surveying -- `quickfort`: fix library aliases for iron, copper, and steel weapons +- `quickfort`: fix library aliases for iron, copper, and steel weapons; add aliases for bronze weapons ## Misc Improvements - `buildingplan`: set global settings from the ``DFHack#`` prompt: e.g. ``buildingplan set boulders false`` From 3372099f964b9ff3ecfe9011e0c607dc9b10cbd8 Mon Sep 17 00:00:00 2001 From: myk002 Date: Sun, 24 Jan 2021 17:11:17 -0800 Subject: [PATCH 04/12] add aliases for bronze armor too --- data/quickfort/aliases-common.txt | 3 +++ docs/changelog.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt index 650d38a3e..609746e50 100644 --- a/data/quickfort/aliases-common.txt +++ b/data/quickfort/aliases-common.txt @@ -384,18 +384,21 @@ disablearmor: {armorprefix}d^ metalarmor: {forbidotherarmor} otherarmor: {forbidmetalarmor} ironarmor: {metalarmor}{forbidmetalarmor}{permitironarmor} +bronzearmor: {metalarmor}{forbidmetalarmor}{permitbronzearmor} 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}&^ +forbidbronzearmor: {armorprefix}{Right}{Down 6}{Right}{Down 6}&^ 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: {forbidbronzearmor} permitcopperarmor: {forbidcopperarmor} permitsteelarmor: {forbidsteelarmor} diff --git a/docs/changelog.txt b/docs/changelog.txt index 51254d116..01dc36faa 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -36,7 +36,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## Fixes - `embark-assistant`: fixed order of factors when calculating min temperature - `embark-assistant`: improved performance of surveying -- `quickfort`: fix library aliases for iron, copper, and steel weapons; add aliases for bronze weapons +- `quickfort`: fix library aliases for iron, copper, and steel weapons; add aliases for bronze weapons and armor ## Misc Improvements - `buildingplan`: set global settings from the ``DFHack#`` prompt: e.g. ``buildingplan set boulders false`` From a32a90570862ac68c5e3139bf37dd1b096719196 Mon Sep 17 00:00:00 2001 From: myk002 Date: Mon, 25 Jan 2021 14:53:10 -0800 Subject: [PATCH 05/12] fix typo --- 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 609746e50..603ee4e15 100644 --- a/data/quickfort/aliases-common.txt +++ b/data/quickfort/aliases-common.txt @@ -398,7 +398,7 @@ forbidsteelarmor: {armorprefix}{Right}{Down 6}{Right}{Down 8}&^ permitmetalarmor: {armorprefix}{Right}{Down 6}p^ permitotherarmor: {armorprefix}{Right}{Down 7}p^ permitironarmor: {forbidironarmor} -permitcopperarmor: {forbidbronzearmor} +permitbronzearmor: {forbidbronzearmor} permitcopperarmor: {forbidcopperarmor} permitsteelarmor: {forbidsteelarmor} From a0151cc157e3b38b86e06095fecbe5b0de3b71fb Mon Sep 17 00:00:00 2001 From: myk002 Date: Wed, 27 Jan 2021 08:20:00 -0800 Subject: [PATCH 06/12] add 'crafts' alias --- data/quickfort/aliases-common.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt index 603ee4e15..e6482b407 100644 --- a/data/quickfort/aliases-common.txt +++ b/data/quickfort/aliases-common.txt @@ -312,7 +312,8 @@ finishedgoodsprefix: {enter_sp_config}{Down 10} enablefinishedgoods: {finishedgoodsprefix}e^ disablefinishedgoods: {finishedgoodsprefix}d^ -jugs: {finishedgoodsprefix}{Right}f{Right}{Up 2}&{Left}{Down 2}f{Down}f{Down}f^ +crafts: {finishedgoodsprefix}{Right}f{Right}{Down 9}{togglesequence 9}^ +jugs: {finishedgoodsprefix}{Right}f{Right}{Up 2}&{Left}{Down 2}f{Down}f{Down}f^ ################################## From b7c598bb07ffdceab107ee6ad885d3919143c21e Mon Sep 17 00:00:00 2001 From: myk002 Date: Wed, 27 Jan 2021 08:21:34 -0800 Subject: [PATCH 07/12] update changelog --- docs/changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index 01dc36faa..3d968f09f 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -36,7 +36,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## Fixes - `embark-assistant`: fixed order of factors when calculating min temperature - `embark-assistant`: improved performance of surveying -- `quickfort`: fix library aliases for iron, copper, and steel weapons; add aliases for bronze weapons and armor +- `quickfort`: fix library aliases for iron, copper, and steel weapons; add aliases for bronze weapons and armor; add alias for tradeable crafts ## Misc Improvements - `buildingplan`: set global settings from the ``DFHack#`` prompt: e.g. ``buildingplan set boulders false`` From bd75c4293f9224ddc88e6fe59f3df59e62454251 Mon Sep 17 00:00:00 2001 From: myk002 Date: Wed, 27 Jan 2021 13:23:17 -0800 Subject: [PATCH 08/12] add forbidcrafts alias --- data/quickfort/aliases-common.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt index e6482b407..9cef22417 100644 --- a/data/quickfort/aliases-common.txt +++ b/data/quickfort/aliases-common.txt @@ -315,6 +315,10 @@ disablefinishedgoods: {finishedgoodsprefix}d^ crafts: {finishedgoodsprefix}{Right}f{Right}{Down 9}{togglesequence 9}^ jugs: {finishedgoodsprefix}{Right}f{Right}{Up 2}&{Left}{Down 2}f{Down}f{Down}f^ +forbidcrafts: {finishedgoodsprefix}{Right 2}{Down 9}{togglesequence 9}^ + +permitcrafts: {forbidcrafts} + ################################## # cloth From aeb911878b69ff7bf7710d115e44f148e79dddd2 Mon Sep 17 00:00:00 2001 From: myk002 Date: Wed, 27 Jan 2021 14:57:03 -0800 Subject: [PATCH 09/12] document new aliases --- docs/guides/quickfort-alias-guide.rst | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/guides/quickfort-alias-guide.rst b/docs/guides/quickfort-alias-guide.rst index 7cd8e26c1..aedb07173 100644 --- a/docs/guides/quickfort-alias-guide.rst +++ b/docs/guides/quickfort-alias-guide.rst @@ -760,11 +760,12 @@ cutstone forbidcutstone Finished goods stockpile adjustments ```````````````````````````````````` -+-----------+ -| Exclusive | -+===========+ -| jugs | -+-----------+ +========= ============ ============ +Exclusive Forbid Permit +========= ============ ============ +jugs +crafts forbidcrafts permitcrafts +========= ============ ============ Cloth stockpile adjustments ``````````````````````````` @@ -793,6 +794,7 @@ metalweapons forbidmetalweapons permitmetalweapons \ forbidstoneweapons permitstoneweapons \ forbidotherweapons permitotherweapons ironweapons forbidironweapons permitironweapons +bronzeweapons forbidbronzeweapons permitbronzeweapons copperweapons forbidcopperweapons permitcopperweapons steelweapons forbidsteelweapons permitsteelweapons masterworkweapons forbidmasterworkweapons permitmasterworkweapons @@ -808,6 +810,7 @@ Exclusive Forbid Permit metalarmor forbidmetalarmor permitmetalarmor otherarmor forbidotherarmor permitotherarmor ironarmor forbidironarmor permitironarmor +bronzearmor forbidbronzearmor permitbronzearmor copperarmor forbidcopperarmor permitcopperarmor steelarmor forbidsteelarmor permitsteelarmor masterworkarmor forbidmasterworkarmor permitmasterworkarmor From 8a728c5170398335a0199f71567de732f63895dc Mon Sep 17 00:00:00 2001 From: myk002 Date: Thu, 28 Jan 2021 12:17:26 -0800 Subject: [PATCH 10/12] fix tallow alias --- data/quickfort/aliases-common.txt | 4 ++-- docs/changelog.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt index 9cef22417..483085bb4 100644 --- a/data/quickfort/aliases-common.txt +++ b/data/quickfort/aliases-common.txt @@ -104,7 +104,7 @@ 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}^ +tallow: {foodprefix}b{Right}{Down 13}{Right}{Down}{togglesequence2 822}^ miscliquid: {foodprefix}b{Right}{Down 18}p^ forbidpreparedfood: {foodprefix}u^ @@ -113,7 +113,7 @@ 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}^ +forbidtallow: {foodprefix}{Right}{Down 13}{Right}{Down}{togglesequence2 822}^ forbidmiscliquid: {foodprefix}{Right}{Down 18}f^ permitpreparedfood: {forbidpreparedfood} diff --git a/docs/changelog.txt b/docs/changelog.txt index 3d968f09f..bf9b9fbfc 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -36,7 +36,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## Fixes - `embark-assistant`: fixed order of factors when calculating min temperature - `embark-assistant`: improved performance of surveying -- `quickfort`: fix library aliases for iron, copper, and steel weapons; add aliases for bronze weapons and armor; add alias for tradeable crafts +- `quickfort`: fix library aliases for tallow and iron, copper, and steel weapons; add aliases for bronze weapons and armor; add alias for tradeable crafts ## Misc Improvements - `buildingplan`: set global settings from the ``DFHack#`` prompt: e.g. ``buildingplan set boulders false`` From 4bad609e3377d7f9171eaff2f77f7fcafa400ebd Mon Sep 17 00:00:00 2001 From: myk002 Date: Fri, 29 Jan 2021 12:20:25 -0800 Subject: [PATCH 11/12] use the search plugin for tallow aliases and document the dependency --- data/quickfort/aliases-common.txt | 6 +++--- docs/guides/quickfort-alias-guide.rst | 14 +++++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/data/quickfort/aliases-common.txt b/data/quickfort/aliases-common.txt index 483085bb4..721aadacf 100644 --- a/data/quickfort/aliases-common.txt +++ b/data/quickfort/aliases-common.txt @@ -104,7 +104,7 @@ 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 822}^ +tallow: {foodprefix}b{Right}{Down 13}{Right}stallow&p^ miscliquid: {foodprefix}b{Right}{Down 18}p^ forbidpreparedfood: {foodprefix}u^ @@ -113,7 +113,7 @@ 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 822}^ +forbidtallow: {foodprefix}{Right}{Down 13}{Right}stallow&f^ forbidmiscliquid: {foodprefix}{Right}{Down 18}f^ permitpreparedfood: {forbidpreparedfood} @@ -122,7 +122,7 @@ permitplants: {foodprefix}{Right}{Down 4}p^ permitbooze: {foodprefix}{Right}{Down 5}p{Down}p^ permitseeds: {foodprefix}{Right}{Down 9}p^ permitdye: {forbiddye} -permittallow: {forbidtallow} +permittallow: {foodprefix}{Right}{Down 13}{Right}stallow&p^ permitmiscliquid: {foodprefix}{Right}{Down 18}p^ # the next two aliases are for compatibility with previous implementations of diff --git a/docs/guides/quickfort-alias-guide.rst b/docs/guides/quickfort-alias-guide.rst index aedb07173..efd8daea1 100644 --- a/docs/guides/quickfort-alias-guide.rst +++ b/docs/guides/quickfort-alias-guide.rst @@ -282,14 +282,18 @@ library, discussing their intended usage and detailing sub-aliases that you can define to customize their behavior. If you do define your own custom aliases in -``dfhack-config/quickfort/aliases.txt``, try to build on the library aliases. -For example, if you create an alias to modify particular furniture stockpile -settings, start your alias with ``{furnitureprefix}`` instead of -``s{Down 2}``. Using library prefixes will allow sub-aliases to work with your -aliases just like they do with library aliases. In this case, using +``dfhack-config/quickfort/aliases.txt``, try to build on library alias +components. For example, if you create an alias to modify particular furniture +stockpile settings, start your alias with ``{furnitureprefix}`` instead of +``s{Down 2}``. Using library prefixes will allow library sub-aliases to work +with your aliases just like they do with library aliases. In this case, using ``{furnitureprefix}`` will allow your stockpile customization alias to work with both stockpiles and hauling routes. +Note that some aliases use the DFHack-provided search prompts. If you get errors +while running ``#query`` blueprints, ensure the DFHack `search ` +plugin is enabled. + Naming aliases ~~~~~~~~~~~~~~ From 8e53fb450cd0b24097a5547c9862e627a6fd1ea0 Mon Sep 17 00:00:00 2001 From: myk002 Date: Sat, 30 Jan 2021 00:56:36 -0800 Subject: [PATCH 12/12] use normal title replacement for search-plugin --- docs/guides/quickfort-alias-guide.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/quickfort-alias-guide.rst b/docs/guides/quickfort-alias-guide.rst index efd8daea1..447f6d236 100644 --- a/docs/guides/quickfort-alias-guide.rst +++ b/docs/guides/quickfort-alias-guide.rst @@ -291,8 +291,8 @@ with your aliases just like they do with library aliases. In this case, using with both stockpiles and hauling routes. Note that some aliases use the DFHack-provided search prompts. If you get errors -while running ``#query`` blueprints, ensure the DFHack `search ` -plugin is enabled. +while running ``#query`` blueprints, ensure the DFHack `search-plugin` plugin is +enabled. Naming aliases ~~~~~~~~~~~~~~