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

Merge remote-tracking branch 'myk002/myk_alias_fix' into develop 

Conflicts:
	docs/changelog.txt
develop
lethosor 2021-01-30 20:58:36 -05:00
parent 7e12f3fd3d 8e53fb450c
commit 472f19e82a
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
3 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
data/quickfort/aliases-common.txt
Unescape Escape View File

@ -104,7 +104,7 @@ plants: {foodprefix}b{Right}{Down 4}p^
booze: {foodprefix}b{Right}{Down 5}p{Down}p^ booze: {foodprefix}b{Right}{Down 5}p{Down}p^
seeds: {foodprefix}b{Right}{Down 9}p^ seeds: {foodprefix}b{Right}{Down 9}p^
dye: {foodprefix}b{Right}{Down 11}{Right}{Down 28}{togglesequence 4}^ 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}stallow&p^
miscliquid: {foodprefix}b{Right}{Down 18}p^ miscliquid: {foodprefix}b{Right}{Down 18}p^
forbidpreparedfood: {foodprefix}u^ forbidpreparedfood: {foodprefix}u^
@ -113,7 +113,7 @@ forbidplants: {foodprefix}{Right}{Down 4}f^
forbidbooze: {foodprefix}{Right}{Down 5}f{Down}f^ forbidbooze: {foodprefix}{Right}{Down 5}f{Down}f^
forbidseeds: {foodprefix}{Right}{Down 9}f^ forbidseeds: {foodprefix}{Right}{Down 9}f^
forbiddye: {foodprefix}{Right}{Down 11}{Right}{Down 28}{togglesequence 4}^ 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}stallow&f^
forbidmiscliquid: {foodprefix}{Right}{Down 18}f^ forbidmiscliquid: {foodprefix}{Right}{Down 18}f^
permitpreparedfood: {forbidpreparedfood} permitpreparedfood: {forbidpreparedfood}
@ -122,7 +122,7 @@ permitplants: {foodprefix}{Right}{Down 4}p^
permitbooze: {foodprefix}{Right}{Down 5}p{Down}p^ permitbooze: {foodprefix}{Right}{Down 5}p{Down}p^
permitseeds: {foodprefix}{Right}{Down 9}p^ permitseeds: {foodprefix}{Right}{Down 9}p^
permitdye: {forbiddye} permitdye: {forbiddye}
permittallow: {forbidtallow} permittallow: {foodprefix}{Right}{Down 13}{Right}stallow&p^
permitmiscliquid: {foodprefix}{Right}{Down 18}p^ permitmiscliquid: {foodprefix}{Right}{Down 18}p^
# the next two aliases are for compatibility with previous implementations of # the next two aliases are for compatibility with previous implementations of
@ -312,8 +312,13 @@ finishedgoodsprefix: {enter_sp_config}{Down 10}
enablefinishedgoods: {finishedgoodsprefix}e^ enablefinishedgoods: {finishedgoodsprefix}e^
disablefinishedgoods: {finishedgoodsprefix}d^ 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^ 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 # cloth
@ -338,9 +343,10 @@ enableweapons: {weaponsprefix}e^
disableweapons: {weaponsprefix}d^ disableweapons: {weaponsprefix}d^
metalweapons: {forbidtrapcomponents}{forbidstoneweapons}{forbidotherweapons} metalweapons: {forbidtrapcomponents}{forbidstoneweapons}{forbidotherweapons}
ironweapons: {metalweapons}{forbidweapons}{permitironweapons} ironweapons: {metalweapons}{forbidmetalweapons}{permitironweapons}
copperweapons: {metalweapons}{forbidweapons}{permitcopperweapons} bronzeweapons: {metalweapons}{forbidmetalweapons}{permitbronzeweapons}
steelweapons: {metalweapons}{forbidweapons}{permitsteelweapons} copperweapons: {metalweapons}{forbidmetalweapons}{permitcopperweapons}
steelweapons: {metalweapons}{forbidmetalweapons}{permitsteelweapons}
forbidweapons: {weaponsprefix}{Right}f^ forbidweapons: {weaponsprefix}{Right}f^
forbidtrapcomponents: {weaponsprefix}{Right}{Down}f^ forbidtrapcomponents: {weaponsprefix}{Right}{Down}f^
@ -348,6 +354,7 @@ forbidmetalweapons: {weaponsprefix}{Right}{Down 2}f^
forbidstoneweapons: {weaponsprefix}{Right}{Down 3}f^ forbidstoneweapons: {weaponsprefix}{Right}{Down 3}f^
forbidotherweapons: {weaponsprefix}{Right}{Down 4}f^ forbidotherweapons: {weaponsprefix}{Right}{Down 4}f^
forbidironweapons: {weaponsprefix}{Right}{Down 2}{Right}&^ forbidironweapons: {weaponsprefix}{Right}{Down 2}{Right}&^
forbidbronzeweapons: {weaponsprefix}{Right}{Down 2}{Right}{Down 6}&^
forbidcopperweapons: {weaponsprefix}{Right}{Down 2}{Right}{Down 3}&^ forbidcopperweapons: {weaponsprefix}{Right}{Down 2}{Right}{Down 3}&^
forbidsteelweapons: {weaponsprefix}{Right}{Down 2}{Right}{Down 8}&^ forbidsteelweapons: {weaponsprefix}{Right}{Down 2}{Right}{Down 8}&^
@ -357,6 +364,7 @@ permitmetalweapons: {weaponsprefix}{Right}{Down 2}p^
permitstoneweapons: {weaponsprefix}{Right}{Down 3}p^ permitstoneweapons: {weaponsprefix}{Right}{Down 3}p^
permitotherweapons: {weaponsprefix}{Right}{Down 4}p^ permitotherweapons: {weaponsprefix}{Right}{Down 4}p^
permitironweapons: {forbidironweapons} permitironweapons: {forbidironweapons}
permitbronzeweapons: {forbidbronzeweapons}
permitcopperweapons: {forbidcopperweapons} permitcopperweapons: {forbidcopperweapons}
permitsteelweapons: {forbidsteelweapons} permitsteelweapons: {forbidsteelweapons}
@ -381,18 +389,21 @@ disablearmor: {armorprefix}d^
metalarmor: {forbidotherarmor} metalarmor: {forbidotherarmor}
otherarmor: {forbidmetalarmor} otherarmor: {forbidmetalarmor}
ironarmor: {metalarmor}{forbidmetalarmor}{permitironarmor} ironarmor: {metalarmor}{forbidmetalarmor}{permitironarmor}
bronzearmor: {metalarmor}{forbidmetalarmor}{permitbronzearmor}
copperarmor: {metalarmor}{forbidmetalarmor}{permitcopperarmor} copperarmor: {metalarmor}{forbidmetalarmor}{permitcopperarmor}
steelarmor: {metalarmor}{forbidmetalarmor}{permitsteelarmor} steelarmor: {metalarmor}{forbidmetalarmor}{permitsteelarmor}
forbidmetalarmor: {armorprefix}{Right}{Down 6}f^ forbidmetalarmor: {armorprefix}{Right}{Down 6}f^
forbidotherarmor: {armorprefix}{Right}{Down 7}f^ forbidotherarmor: {armorprefix}{Right}{Down 7}f^
forbidironarmor: {armorprefix}{Right}{Down 6}{Right}&^ forbidironarmor: {armorprefix}{Right}{Down 6}{Right}&^
forbidbronzearmor: {armorprefix}{Right}{Down 6}{Right}{Down 6}&^
forbidcopperarmor: {armorprefix}{Right}{Down 6}{Right}{Down 3}&^ forbidcopperarmor: {armorprefix}{Right}{Down 6}{Right}{Down 3}&^
forbidsteelarmor: {armorprefix}{Right}{Down 6}{Right}{Down 8}&^ forbidsteelarmor: {armorprefix}{Right}{Down 6}{Right}{Down 8}&^
permitmetalarmor: {armorprefix}{Right}{Down 6}p^ permitmetalarmor: {armorprefix}{Right}{Down 6}p^
permitotherarmor: {armorprefix}{Right}{Down 7}p^ permitotherarmor: {armorprefix}{Right}{Down 7}p^
permitironarmor: {forbidironarmor} permitironarmor: {forbidironarmor}
permitbronzearmor: {forbidbronzearmor}
permitcopperarmor: {forbidcopperarmor} permitcopperarmor: {forbidcopperarmor}
permitsteelarmor: {forbidsteelarmor} permitsteelarmor: {forbidsteelarmor}

1
docs/changelog.txt
Unescape Escape View File

@ -37,6 +37,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
- `embark-assistant`: fixed order of factors when calculating min temperature - `embark-assistant`: fixed order of factors when calculating min temperature
- `embark-assistant`: improved performance of surveying - `embark-assistant`: improved performance of surveying
- `quickfort`: creating zones no longer causes eventual crashes - `quickfort`: creating zones no longer causes eventual crashes
- `quickfort`: fix library aliases for tallow and iron, copper, and steel weapons; add aliases for bronze weapons and armor; add alias for tradeable crafts
- `seedwatch`: fixed an issue where the plugin would disable itself on map load - `seedwatch`: fixed an issue where the plugin would disable itself on map load
- `search`: fixed crash when searching the ``k`` sidebar and navigating to another tile with certain keys, like ``<`` or ``>`` - `search`: fixed crash when searching the ``k`` sidebar and navigating to another tile with certain keys, like ``<`` or ``>``
- `stockflow`: fixed ``j`` character being intercepted when naming stockpiles - `stockflow`: fixed ``j`` character being intercepted when naming stockpiles

27
docs/guides/quickfort-alias-guide.rst
Unescape Escape View File

@ -282,14 +282,18 @@ library, discussing their intended usage and detailing sub-aliases that you
can define to customize their behavior. can define to customize their behavior.
If you do define your own custom aliases in If you do define your own custom aliases in
``dfhack-config/quickfort/aliases.txt``, try to build on the library aliases. ``dfhack-config/quickfort/aliases.txt``, try to build on library alias
For example, if you create an alias to modify particular furniture stockpile components. For example, if you create an alias to modify particular furniture
settings, start your alias with ``{furnitureprefix}`` instead of stockpile settings, start your alias with ``{furnitureprefix}`` instead of
``s{Down 2}``. Using library prefixes will allow sub-aliases to work with your ``s{Down 2}``. Using library prefixes will allow library sub-aliases to work
aliases just like they do with library aliases. In this case, using with your aliases just like they do with library aliases. In this case, using
``{furnitureprefix}`` will allow your stockpile customization alias to work ``{furnitureprefix}`` will allow your stockpile customization alias to work
with both stockpiles and hauling routes. 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` plugin is
enabled.
Naming aliases Naming aliases
~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~
@ -760,11 +764,12 @@ cutstone forbidcutstone
Finished goods stockpile adjustments Finished goods stockpile adjustments
```````````````````````````````````` ````````````````````````````````````
+-----------+ ========= ============ ============
| Exclusive | Exclusive Forbid Permit
+===========+ ========= ============ ============
| jugs | jugs
+-----------+ crafts forbidcrafts permitcrafts
========= ============ ============
Cloth stockpile adjustments Cloth stockpile adjustments
``````````````````````````` ```````````````````````````
@ -793,6 +798,7 @@ metalweapons forbidmetalweapons permitmetalweapons
\ forbidstoneweapons permitstoneweapons \ forbidstoneweapons permitstoneweapons
\ forbidotherweapons permitotherweapons \ forbidotherweapons permitotherweapons
ironweapons forbidironweapons permitironweapons ironweapons forbidironweapons permitironweapons
bronzeweapons forbidbronzeweapons permitbronzeweapons
copperweapons forbidcopperweapons permitcopperweapons copperweapons forbidcopperweapons permitcopperweapons
steelweapons forbidsteelweapons permitsteelweapons steelweapons forbidsteelweapons permitsteelweapons
masterworkweapons forbidmasterworkweapons permitmasterworkweapons masterworkweapons forbidmasterworkweapons permitmasterworkweapons
@ -808,6 +814,7 @@ Exclusive Forbid Permit
metalarmor forbidmetalarmor permitmetalarmor metalarmor forbidmetalarmor permitmetalarmor
otherarmor forbidotherarmor permitotherarmor otherarmor forbidotherarmor permitotherarmor
ironarmor forbidironarmor permitironarmor ironarmor forbidironarmor permitironarmor
bronzearmor forbidbronzearmor permitbronzearmor
copperarmor forbidcopperarmor permitcopperarmor copperarmor forbidcopperarmor permitcopperarmor
steelarmor forbidsteelarmor permitsteelarmor steelarmor forbidsteelarmor permitsteelarmor
masterworkarmor forbidmasterworkarmor permitmasterworkarmor masterworkarmor forbidmasterworkarmor permitmasterworkarmor