Commit Graph

358 Commits (fecebe5d711f7d4a33064b59e2b94be17e261e53)

Author SHA1 Message Date
myk002 e4f951b01d make both easy and lavish meals 2022-05-13 14:36:49 -07:00
myk002 b489a8584f add more prepared meals logic
also remove material matchers for jugs and pots. we only care that we
have enough jugs and pots, not that they are rock
2022-05-13 14:36:49 -07:00
Myk 8703eeef91
[dreamfort] pull in changes from Google Drive sources (#2124)
* update dreamfort from online spreadsheets

* add zones for guildhall level
2022-05-02 09:29:02 -07:00
Myk 24dd4d8ac0
Update init files (#2117)
* update example init files

replace onLoad.init-example with documentation on how to create scripts that run on world/map load
it was confusing to show it being loaded with sc-script since it gets autorun anyway if it is just named properly

* update changelog

* add quickfort keybinding

* move standard tweaks from dreamfort init to main
2022-04-29 20:24:09 -07:00
lethosor d1f0edd33b
Apply initial pre-commit config 2022-04-12 14:48:19 -04:00
myk002 54e8761aa0 capture fortifications and engravings in blueprint 2022-04-01 12:20:37 -07:00
Myk b8c33d8ed0
[quickfort] add documentation and test data for config mode (#2070)
- documents the new config mode
- adds integration test data for [quickfort] implement config mode scripts#361
- adds a note recommending that config mode be used instead of the quickfort query_unsafe setting
- converts the dreamfort /setup blueprint to use config mode; also adjust the aliases used in that blueprint to no longer escape from and re-enter query mode
- adds some more distinctive anchor names for the quickfort and blueprint guides
2022-04-01 09:21:16 -07:00
myk002 8b0928e636 add functional tests for building transformations 2022-03-28 16:00:29 -07:00
myk002 0664524249 update dreamfort blueprints
- update help text
- add statues to corridors on services level
- add optional default furnishings to the guildhall level and update help
- center statue lines in apartment level corridors
2022-03-28 16:00:29 -07:00
myk002 11d5b3f86e update help text for the aquifer_tap blueprint 2022-03-28 16:00:29 -07:00
Myk 17b16d8536
[quickfort] add functional tests for transformed expansion syntax (#2042)
* functional tests for transformed expansion syntax
* test negative extents for tracks
* update scripts tag
2022-03-21 16:24:51 -07:00
myk002 c5c9e3c56d add mug production to "basic" manager orders 2022-03-12 13:45:32 -08:00
myk002 0f33deb0ab add missing label for aquifer_tap.csv 2022-03-01 05:44:36 -08:00
myk002 f0fa8ed625 add prisoner quantum stockpile and related help
adds help text for how to handle a siege and how to manage prisoners
after a siege
2022-03-01 05:44:36 -08:00
myk002 17f400d091 add light aquifer tap library blueprint and docs 2022-02-26 14:54:42 -08:00
myk002 56e8de592c simplify dreamfort with new quickfort features
also:
- add in iron and flux indicators on the industry level
- fix out of date docs for professions
2022-02-19 17:54:01 -08:00
Myk 6a8ceb5a78
Add more whitespace in the pump stack help 2022-02-18 16:08:37 -08:00
myk002 89038ffafa add pump stack blueprint to the libarary, add docs 2022-02-18 15:47:33 -08:00
myk002 94f326804e test transformations in meta blueprint regression 2022-02-18 14:54:45 -08:00
myk002 c330d875d5 use goldens for quickfort track ecosystem test
for more natural expression of the track blueprint
2022-02-12 18:46:10 -08:00
myk002 139d53ebc2 add ecosystem regression tests for meta blueprints 2022-02-12 18:28:47 -08:00
myk002 c8e09f7143 add zone ecosystem tests 2021-10-04 15:32:26 -07:00
myk002 f776219a6f standardize descriptions of ecosystem tests 2021-10-04 15:32:26 -07:00
myk002 15456c523b add "tracks" ecosystem test 2021-10-04 12:53:31 -07:00
myk002 9d2e51c003 add tracks to "basic" ecosystem test 2021-10-04 12:53:31 -07:00
myk002 44fc289b79 remove the "all" prefix from ecosystem tests
so they're easier to tell apart when listing the dir
2021-10-04 12:53:31 -07:00
myk002 089de5f422 support non-rectangular extent-based buildings 2021-10-03 08:54:27 -07:00
myk002 12eb9e48c7 support multi-type and non-rectangular stockpiles
and add integration tests
2021-10-02 12:50:47 -07:00
myk002 9d1f84c6ac add all buildings and convert to minimal
also add adjacent multi-tile buildings to ensure boundaries are detected
properly
2021-10-02 09:25:19 -07:00
myk002 24e5bd7b2c remove orders for gypsum plaster b/c df bug
see: https://www.bay12games.com/dwarves/mantisbt/bug_revision_view_page.php?bugnote_id=0041146#r16745
2021-09-22 10:30:41 -07:00
myk002 91304f4c36 dreamfort docs refresh 2021-09-20 13:01:07 -07:00
myk002 4a00ab19fc update embark suggestions 2021-09-20 13:01:07 -07:00
myk002 346910ecbc set is_validated to false for biz. bronze maces 2021-09-20 13:01:07 -07:00
myk002 3962251edd add iron bolts and biz. bronze weapons/armor/bolts
also fix off-by-one errors in order conditions and rebalance some of the
thresholds
2021-09-20 13:01:07 -07:00
myk002 b7a9f4a95f ensure booze production can keep up with demand
becomes relevant when population nears 200
2021-09-20 13:01:07 -07:00
myk002 0be7bf37d6 reduce limit for flux from 20 to 5 for making iron
and remove non-hauling labors (except mechanics) from military classes
2021-09-20 13:01:07 -07:00
myk002 9f1a7c906e adjust professions to match new embark guidance 2021-09-20 13:01:07 -07:00
myk002 d5a9a9534e dreamfort improvements
- shift seventh dwarf from craftsdwarf to farmer
- give starting miners some skill in engraving to make smoothing the
  cistern go faster
- update embark suggestions and sample profile accordingly
- widen clearcutting area for surface fort so trees don't overhang the
  roof
- move wax from the cookables stockpile to the industry goods pile
- move coins from goods to metal
- move sheets from goods to textiles
2021-09-20 13:01:07 -07:00
myk002 f26c37aa9f add scroll and shell craft orders 2021-09-20 13:01:07 -07:00
myk002 3fa8e06f56 don't produce iron weapons/armor if we have flux 2021-09-20 13:01:07 -07:00
myk002 1fd2eba2db give generated blueprints proper labels 2021-09-10 11:11:44 -07:00
myk002 4a593a489c add reference to dffd file in dreamfort help 2021-09-05 23:54:48 -07:00
myk002 5c444e02d4 add comments to the onMapLoad_dreamfort.init file 2021-09-05 23:54:48 -07:00
myk002 f8d041b9aa dreamfort and supporting files update
- merge otherstock into basic (safe now that we have orders sort)
- don't overproduce weapons and armor
- update dreamfort help and examples guide
2021-09-03 00:31:42 -07:00
myk002 f21ba5c8aa
implement orders sort, document, and add to init 2021-09-01 13:04:23 -07:00
myk002 b1632c0413 alphabetize professions list; add Migrant 2021-08-30 23:52:52 -07:00
myk002 62bbfb1296 update examples documentation 2021-08-30 23:10:28 -07:00
myk002 c33a20c589 add prioritization for hide tanning 2021-08-30 23:10:28 -07:00
myk002 27c901d0d2 add checklist items for *stock orders import 2021-08-30 23:10:28 -07:00
myk002 258874bcd1 move mechanisms to basic add wheelbarrow, minecart 2021-08-30 23:10:28 -07:00
myk002 591db4cf92 modify embark guidance based on new professions 2021-08-30 23:10:28 -07:00
myk002 fafd169e20 remove stonecrafting from startmanager 2021-08-30 23:10:28 -07:00
myk002 9094011d49 move cages to basic, reindex each file from 0 2021-08-30 23:10:28 -07:00
myk002 83dfe1b55a incorporate ldog's rebalanced professions 2021-08-30 23:10:28 -07:00
myk002 8d2eb24f51 dreamfort blueprint improvements
- allow empty cages and traps on the surface animal stockpile
- remove animals from the industry quantum stockpile
- split furniture from the goods feeder stockpile so it can have
  wheelbarrows assigned to it
2021-08-30 23:10:28 -07:00
myk002 3bf6c57a72 restrict lye stockpile to 2 barrels/pots 2021-08-30 23:10:28 -07:00
myk002 9905e5158f use new prioritize param 2021-08-30 23:10:28 -07:00
myk002 166069e5be fix some help text 2021-08-30 23:10:28 -07:00
myk002 c191135884 update dreamfort blueprints
- move orders for /services2 down to where we run /services2
- plan the roof over the surface barracks before the surface flooring to
  encourage the easily-missed-but-important-for-the-next-blueprint roof
  to get built first
- add a fourth craftsdwarf's workshop to the industry level, move some
  workshops around to compensate
- add tip for how to configure mason's workshops
- forbid goblets in the goods feeder stockpile
- use dig priorities to get the guildhall tiles underneath the cistern
  tiles dug quickly before the cistern gets wet
2021-08-30 23:10:28 -07:00
myk002 cc43c0a9c2 remove FillPond from priority list, add CleanSelf and food hauling 2021-08-30 23:10:28 -07:00
myk002 2f0eb04ee1 use "lye" as counter instead of "lye-containing" 2021-08-30 23:10:28 -07:00
myk002 65e5b89d4c add goblet-related aliases 2021-08-30 23:10:28 -07:00
myk002 3a0d5f09ac remove blocks from starting misc pile 2021-08-30 23:10:28 -07:00
myk002 6191b24153 refresh dreamfort blueprints
- move the first apartments level up in the checklist. it's usually needed before some of the "frills" blueprints
- remove unreliable `addcloak` alias from the `/setup` blueprint and replace it with a message that suggests manually adding leather cloaks to uniforms. We'll find a way to automate this someday.
- add instructions for expanding the `Inside` burrow as the fort is built
- add two craftsdwarf's workshops to the industry level, for a total of three. add suggestions for setting their profiles to restrict them individually to wood, stone, and bones
- add suggestion for restricting the mechanic's workshop to only be used by skilled dwarves
- widen the 1-wide corridor in the apartments level to 2-wide. the blueprint still fits within the footprint of the suites level, so we still fit fine in a 1x1 embark.
2021-08-30 23:10:28 -07:00
myk002 6641a56434 add "restock" orders for rock, glass, and wood
also adjust bags and collect sand orders to support glasstock.json
2021-08-30 23:10:28 -07:00
myk002 8fe5ecc30a automatically prioritize fish cleaning 2021-08-30 23:10:28 -07:00
myk002 4b9df5c2db minor adjustments to professions; more to come 2021-08-30 23:10:28 -07:00
myk002 c0146f3795
make /setup blueprint more robust; redesign apts. 2021-08-19 21:58:26 -07:00
myk002 b748c19fde
update docs to point to packaged files
instead of google drive uploads
2021-08-19 21:58:26 -07:00
myk002 e44d496563
add supporting dreamfort files to data/examples
and install them to hack/examples
2021-08-19 21:58:26 -07:00
myk002 55d9b4754d editing pass, remove "Suites" hotkey, add "Cavern" 2021-08-14 21:38:00 -07:00
myk002 fb29bbdc17 break roof down into more stages; add traps 2021-08-14 21:38:00 -07:00
myk002 320286bf69 revise dreamfort according to testing and feedback 2021-08-14 21:38:00 -07:00
lethosor ecad3bfc1a
Merge remote-tracking branch 'myk002/myk_quickfort_integration' into develop 2021-08-05 00:53:39 -04:00
myk002 3225f5ccf8
fix blueprints install pattern 2021-07-09 22:02:14 -07:00
myk002 73413038df
add quickfort ecosystem functional test harness
and a few initial tests
2021-07-09 22:02:14 -07:00
myk002 20206a4925
add files for quickfort list integration tests 2021-07-09 21:57:39 -07:00
myk002 388f23fbf8
move traction benches to earlier hospital stage
so the traction benches don't have to contend with the dining hall for
tables

also fix a misplaced statue on the guildhall level
2021-06-01 04:45:21 -07:00
myk002 bd6efb23e8
reduce size of dreamfort guildhall level
to fit more easily in a 1x1 embark
2021-06-01 04:45:21 -07:00
myk002 b5b4d845b1
clean up extra empty space around blueprints 2021-06-01 04:45:21 -07:00
myk002 a76c89f198
fix quickfortress stockpiles 2021-04-17 14:14:35 -07:00
myk002 23461e17c2
separate sand bags into their own stockpile
since quantum stockpiling them dumps out their contents
2021-02-24 19:50:29 -08:00
myk002 a7440ca478
use wheelbarrows to haul occupied cages 2021-02-18 00:26:11 -08:00
myk002 6a5e6ffa00
add archery targets to services barracks
fix a few alignment problems
fix bolts alias
2021-02-17 08:24:50 -08:00
myk002 d0b259e9fb
set wheelbarrows in stone, corpse stockpiles; pots
also set farming dig to priority 2 instead of 3 so the player can use 3
for other higher-than-default-but lower-than-farming tasks

and make the roughgems stockpile find the newly-moved gems QSP properly
2021-02-13 07:07:41 -08:00
myk002 c5a5812377
embiggen feeder stockpiles on the industry level 2021-02-08 18:47:59 -08:00
myk002 c963da351a
doc updates, move booze further away from kitchen 2021-02-07 13:52:33 -08:00
myk002 64d797b4cf
fix a final few bugs found in playtesting
and doc updates
2021-02-05 12:28:29 -08:00
myk002 330bde7660
add heavy feeder piles
and other minor fixes found during playtesting
refine the embark profile suggestions
2021-02-04 23:01:12 -08:00
myk002 6c6a9968ff
hauling aliases can take from multile stockpiles 2021-02-03 13:51:02 -08:00
myk002 2eea9fd692
change central ramp to central stairs 2021-02-02 22:11:19 -08:00
myk002 5e135d2bb7
update help text and walkthroughs
make hospital and dining room more useful in the first build blueprint
separate out construction of the surface roof into a new stage so
dwarves aren't building too much at once
2021-02-01 19:47:48 -08:00
myk002 4c7e25739f
more dreamfort refinements (details on forum) 2021-01-31 19:36:05 -08:00
myk002 c8397ddaa8
significantly revamp the dreamfort blueprint set
as per the several pages of posts following http://www.bay12forums.com/smf/index.php?topic=176889.msg8239017#msg8239017
2021-01-30 18:45:44 -08:00
lethosor 472f19e82a
Merge remote-tracking branch 'myk002/myk_alias_fix' into develop
Conflicts:
	docs/changelog.txt
2021-01-30 20:58:36 -05:00
myk002 4bad609e33
use the search plugin for tallow aliases
and document the dependency
2021-01-29 12:20:25 -08:00
myk002 8a728c5170
fix tallow alias 2021-01-28 12:17:26 -08:00
myk002 bd75c4293f
add forbidcrafts alias 2021-01-27 13:23:17 -08:00
myk002 a0151cc157
add 'crafts' alias 2021-01-27 08:20:00 -08:00
lethosor 58244ee574
Merge remote-tracking branch 'myk002/myk_dreamfort' into develop 2021-01-26 00:45:05 -05:00
myk002 a32a905708
fix typo 2021-01-25 14:53:10 -08:00
myk002 3372099f96
add aliases for bronze armor too 2021-01-24 17:11:17 -08:00
myk002 cf8f9386f4
add alias for bronze weapons 2021-01-24 17:02:26 -08:00
myk002 cd476a943c
fix quickfort library aliases for weapons 2021-01-24 09:00:38 -08:00
myk002 d43ccf118a
give names to stockpiles levers bridges and zones
and ensure diggers don't dig deeper than they need to using dig
priorities
2021-01-11 15:11:16 -08:00
Myk Taylor fc270677fd
add checklist for all required dreamfort commands 2021-01-11 15:11:16 -08:00
myk002 b49768a7cf
use and document new {Empty} quickfort keycode 2021-01-11 15:04:41 -08:00
myk002 16a8f31b93
high level docs for quickfort blueprint library 2020-12-17 09:59:37 -08:00
myk002 4ac6716abc
add default values for optional sub-aliases 2020-12-06 10:37:09 -08:00
myk002 025c9ff758
overhaul quickfort alias documentation
- move the alias syntax and usage docs from dfhack-config/quickfort/aliases.txt to a proper guide written in RST. Add examples and more details.
- move the alias library docs from data/quickfort/aliases-common.txt to the new guide
- reorder aliases in aliases-common to match the order in the docs
- factor out the character used to enter the stockpile config screen so we can use the same aliases for stockpiles and hauling routes (use 's' for stockpiles and '{Enter}' for hauling routes)
- reference the new guide in the quickfort user guide
- do an editorial pass of the quickfort user guide
  - change name to "Quickfort Blueprint Guide", but only in the text, not the filename, so we don't change the URL
  - add `quickfort-blueprint-guide` as a label, in addition to the existing `quickfort-user-guide`
  - changed table-like lists to actual tables
  - changed "grid" tables into "simple" tables where possible
  - used ':kbd:' markers whenever we refer to a single character
  - turned Meta blueprints and Notes blueprints sections into subsections of a new "Other blueprint modes" section, in preparation for a few new modes coming in -r5.
  - updated out-of date caveat about bookcases, display furniture, and offering places not being supported
2020-12-05 18:36:15 -08:00
myk002 d2472335fc
add names for quantums and zones 2020-11-12 23:23:04 -08:00
myk002 01741ce6c6
update quickfort guide and aliases
- move bit of alias documentation from aliases-common to aliases.txt
- document new behavior for 'c'ustom stockpiles
2020-11-12 23:23:03 -08:00
lethosor 7f68229d10
Merge remote-tracking branch 'myk002/quickfort_library' into develop
Conflicts:
	docs/changelog.txt
2020-11-02 13:21:11 -05:00
Myk Taylor b123d96ad0 add links to images back in 2020-11-02 03:27:05 -08:00
Myk Taylor cd497de5c0 remove image links
the blueprints themselves are spaced so they are readable. they are the
text image of themselves
2020-10-31 21:24:28 -07:00
Myk Taylor b8e20ed738 remove pngs and add comments to online images 2020-10-31 21:23:45 -07:00
lethosor 27e054c9a7
Merge remote-tracking branch 'myk002/quickfort_dreamfort_walkthrough' into develop
Conflicts:
	docs/changelog.txt
2020-10-30 23:53:25 -04:00
Myk Taylor 5debc43def add port of Python Quickfort's TheQuickFortress
- some bugs fixed, especially in the query blueprints
- repackaged into a single file for easier distribution
- all blueprints given labels for addressing
- meta blueprints added for blueprints that could be applied as a group
2020-10-26 21:18:22 -07:00
Myk Taylor 0e2d29cd8d increase readability of lists in dreamfort help 2020-10-25 14:25:02 -07:00
Myk Taylor ebba769a0c blueprint library playtesting fixes
- balance wings of The Saracen Crypts
- add stairs to Whirlpool Housing
- move burial script notes to message()s
2020-10-25 09:37:45 -07:00
Myk Taylor 51f49b1c2c add bedroom and tomb blueprints to the library 2020-10-24 21:17:53 -07:00
Myk Taylor b4498a262c update more dreamfort help, add automation.json 2020-10-23 21:12:04 -07:00
Myk Taylor 83e8755e6d fix typos in quantum alias 2020-10-23 20:26:37 -07:00
Myk Taylor a3bec346a7 clarify text a bit and move stair guide 2020-10-23 20:25:56 -07:00
Myk Taylor bc4dd7b1a3 add walkthroughs for each dreamfort level 2020-10-23 09:41:56 -07:00
Myk Taylor 914c24d873 use new quickfort features in dreamfort
parameterized aliases and configurable zones
2020-10-17 22:22:32 -07:00
Myk Taylor ea5a5414c9 document (and use) parameterized aliases 2020-10-17 22:21:50 -07:00
Myk Taylor 09fbaba726 buildingplan: support all building types
Allow buildingplan to handle all building types, update the docs, and add in little extra fixes to ensure all the new types work correctly.
2020-10-16 14:23:35 -07:00
lethosor d254ff2401
Tweak links to quickfort command docs 2020-10-06 22:02:14 -04:00
lethosor 56d4b72414
Replace blueprints/readme with pointer to docs 2020-10-03 23:57:36 -04:00
Myk Taylor 7cb77e8066 update dreamfort.csv
- use #notes blueprints instead of "invisible" "Notes" sheets
- remove smoothing guildhall blueprint
- rearrange statues in guildhall so no pre-smoothing is required
2020-09-19 15:42:24 -07:00
lethosor 6e9c2093d7
Merge remote-tracking branches 'myk002/quickfort_docs' and 'myk002/quickfort_room_alias_doc' into develop 2020-09-13 23:59:31 -04:00
Myk Taylor da020c72de quickfort: refresh aliases docs and doc r+ -> r+& 2020-09-02 16:53:32 -07:00
Myk Taylor e0fec78481 final cleanup pass; add docs for dig priorities 2020-09-01 19:48:10 -07:00
lethosor d266a13a8e
Merge remote-tracking branches 'myk002/quickfort_hauling_aliases' and 'myk002/quickfort_library' into develop 2020-08-29 17:30:01 -04:00
Myk Taylor 595e07d451 light proofreading pass of quickfort user guide 2020-08-27 13:36:47 -07:00
Myk Taylor 9598d02593 update quickfort blueprint library
- update dreamfort to use the new hauling route naming aliases
- add strategic whitespace to csv files to make them easier to read
- group related library files into subdirectories
- better filenames for exploratory-mining files
- add set of marker-mode layout helpers (inspired by Salford Sal's DF
  tutorial videos
  https://www.youtube.com/channel/UCVLgfAP_1VOlVLUJMJ7ahhA)
2020-08-27 13:20:27 -07:00
Myk Taylor f09b0fa699 quickfort: define useful aliases for hauling 2020-08-26 22:38:49 -07:00
Myk Taylor 5d43ba2178 quickfort: document marker mode and buildingplan
also a bit of cleanup and reorg
2020-08-26 19:59:30 -07:00
lethosor 058f550d72
Merge remote-tracking branch 'myk002/quickfort_library' into develop 2020-08-20 00:32:07 -04:00
Myk Taylor abc5be1cb5 Merge remote-tracking branch 'upstream/develop' into quickfort_library 2020-08-17 21:16:58 -07:00
Myk Taylor c1c3b02e89 make capitalization the same as other blueprints 2020-08-16 20:54:21 -07:00
Myk Taylor a1c731870d initial files for the quickfort blueprint library 2020-08-16 13:49:32 -07:00
Myk Taylor 860f07e994 define quickfort aliases to permit cages and traps 2020-08-16 12:42:16 -07:00
Myk Taylor 4ac51535a0 userguide updates 2020-08-16 11:55:42 -07:00
Myk Taylor 36c643b909 Merge remote-tracking branch 'upstream/develop' into quickfort_no_materials 2020-08-16 11:55:17 -07:00
Myk Taylor 03b28f4e08 document inactive zones and extra lever mechanisms 2020-08-15 17:23:12 -07:00
Myk Taylor 9e31603157 document multi-init for stockpiles and zones 2020-08-15 07:55:16 -07:00
Myk Taylor 861c34a474 document the message() marker 2020-08-14 21:27:16 -07:00
Myk Taylor eeed2381d0 mention zones as one of the major phases 2020-08-14 21:14:15 -07:00