Commit Graph

400 Commits (ecbc35b2921fda88ae4b13f5d7a71997b9ff3037)

Author SHA1 Message Date
Myk Taylor e59d60612c
rename traps and cages 2023-03-23 02:26:37 -07:00
Myk Taylor c2a7de232e
use new "all" format categories 2023-03-23 02:26:37 -07:00
Myk Taylor 284d80b076
rename some leftover categories 2023-03-23 02:26:37 -07:00
Myk Taylor 13cd825fed
rename category files to identify them more clearly 2023-03-23 02:26:37 -07:00
Myk Taylor 8c0b59c548
add the stockpiles user data directory 2023-03-23 02:26:37 -07:00
Myk Taylor a4c9a5116f
install the stockpiles settings library 2023-03-23 02:26:37 -07:00
John Cosker e8b9a3acfb Add default alias for gui/dig -> gui/design 2023-03-19 19:43:23 -04:00
John Cosker 4d1e0da1b8 add alias for gui/dig -> gui/design and add default hotkey 2023-03-19 18:38:11 -04:00
Myk Taylor c48c9c77c0
use new data directories for blueprints 2023-03-12 15:43:32 -07:00
Will H 79396c1085 Refuse files
Refuse aliases now complete and nonzero
2023-03-11 16:13:01 +11:00
Will H da1df122b1 [quickfort] new alias structure
Files created with `savestock` for each existing alias. Some aliases missing (search) currently.
2023-03-06 23:21:28 +11:00
Myk cfc5226aaf
Merge branch 'develop' into myk_logo 2023-02-08 11:21:37 -08:00
Janeene Beeforth 24827eabe2 Remove checks for silver from library/military for crossbows. 2023-02-08 21:24:24 +11:00
Janeene Beeforth dd10451c2f Remove library/military silver crossbow work-order
It is not possible to create a work-order for making silver crossbows,
so the silver crossbow recipe belongs in the alternative military library
with other artifact/non-craftable weapon recipes.

It's already present in the library/military_include_artifact_materials
work-orders, so simply needed removal from the vanilla library/military
orders version.
2023-02-08 21:24:24 +11:00
Myk Taylor 0a91166a92
add light AA 2023-02-07 22:55:19 -08:00
Myk Taylor 8ee05af6ef
update logo to crisper version provided by TaxiService 2023-02-07 22:55:19 -08:00
Myk Taylor 5747e9f3f0
set up some keybindings that are ready to go
and reinstate autodump-destroy-item
2023-02-06 01:23:52 -08:00
Robob27 2c817ec4ef Enable confirm by default 2023-02-05 19:04:21 -05:00
Myk Taylor 76712a533c
move control panel hotkey again to Ctrl-Shift-E
Ctrl-Shift-S is too close to the macro save hotkey (Ctrl-S) and can
trigger it sometimes if you're not super careful
2023-02-03 00:02:20 -08:00
Myk Taylor bfc27605cc
use Ctrl-Shift-S instead of tilde for gui/control-panel
since ~ conflicts with the :lua shortcut
2023-02-02 21:03:23 -08:00
Myk Taylor aa22917aeb
add new control panel textures 2023-01-31 23:52:30 -08:00
Myk Taylor 0c92317cce
give gui/control-panel a global hotkey 2023-01-30 14:23:47 -08:00
Myk Taylor c2d6debcd8
add on/off light textures and expose to lua 2023-01-29 00:35:29 -08:00
Myk 49e1d9ff1c
Merge pull request #2722 from myk002/myk_overlay_default_enabled
Allow overlay widgets to set their default enabled state
2023-01-26 13:45:07 -08:00
Scott Ellis 2ae3d7dd85 Stop creating workorders to create platinum weapons
Platinum weapons are normally only created by artifact moods.
Removed creation of platinum weapons from military.json
Altered other weapon work orders to not care about the existance of
platinum.
Renamed original file for those who want to create platinum weapons
anyway.
2023-01-26 08:09:25 -06:00
Myk Taylor 998a63a979
allow overlay widgets to specify a default enabled state
and make relevant library widgets enabled by default
and remove the default overlay.json config file
2023-01-26 00:53:57 -08:00
Myk Taylor 21ebbad669
add keybinding for gui/quickcmd 2023-01-23 15:40:56 -08:00
Eamon Bode fc861f1328
Merge branch 'develop' into automelt 2023-01-23 14:20:48 -05:00
Myk Taylor 9aaa55cd7f
add textures and frames for various use cases 2023-01-23 03:58:51 -08:00
eamondo2 d6c4f15e33 Merge branch 'develop' into automelt 2023-01-22 17:26:55 -05:00
Myk Taylor 740abba621
update comments in quickfort config file 2023-01-22 08:40:16 -08:00
Eamon Bode e5cbc7fd3c
Merge branch 'develop' into automelt 2023-01-22 04:40:10 -05:00
Myk Taylor bb5a3ac8e9
fix library order for minecarts 2023-01-22 00:06:20 -08:00
Janeene Beeforth 3f9f4fe243 Attempt to fix lye order limits 2023-01-22 17:14:48 +11:00
Janeene Beeforth aa4cc8ff41 Update orders related to bags for v50.x
Bags now have their own item type, they're no longer mixed in with boxes
2023-01-22 16:42:19 +11:00
eamondo2 0fbf17f1c8 refactor/fix as per GH suggest 2023-01-21 18:22:15 -05:00
Myk Taylor 226a0ff164
revert autodump hotkeys. we need to discuss how keybindings work more 2023-01-20 09:39:37 -08:00
Myk Taylor 4183bace4d
update autodump, only commands, add hotkeys 2023-01-20 09:31:44 -08:00
Myk Taylor 7d8066f3c7
allow buildingplan to be "always on" 2023-01-17 21:55:27 -08:00
Myk Taylor ac06508d92
add some more icon textures we can use
contributed by TaxiService on the DFHack Discord server
2023-01-12 21:04:41 -08:00
Myk 646acc8b45
Merge pull request #2582 from myk002/myk_init_examples
fix example init file and related doc
2023-01-09 23:50:20 -08:00
Myk 33f68cd92a
Merge pull request #2580 from myk002/myk_keybinding_cleanup
remove twaterlvl from the global keybinding list
2023-01-09 23:50:11 -08:00
Myk Taylor 29506dbd87
remove call go fix/blood-del, which no longer seems useful 2023-01-09 16:13:15 -08:00
Myk Taylor d918e2d9d8
fix example init file and related doc 2023-01-09 15:33:04 -08:00
Myk Taylor 817991f8c9
remove twaterlvl from the global keybinding list
since vanilla df comes with its own keybinding now
2023-01-09 13:48:08 -08:00
Myk Taylor 2234328a91
use an actual pin texture for ZScreen pins 2023-01-09 00:47:13 -08:00
Myk Taylor c70c4131bd
don't include dfhack-config/ in release tarball
create it at runtime
move files around so no dfhack-owned files are in there
2023-01-04 19:41:58 -08:00
Myk Taylor d0fff7692e
move dfhack-config into data 2023-01-04 19:41:10 -08:00
Myk b62cfa3699
Merge pull request #2552 from myk002/myk_mouse
Get correct mouse button down behavior in Lua without overwriting enabler fields
2023-01-04 19:39:43 -08:00
Myk Taylor e9a5ec13af
update logo image 2023-01-04 17:55:01 -08:00
Myk Taylor 5d04b9c4cb
add Textures module and load DFHack logo
undocumented for now since it's internal. in the future, perhaps this
could morph into a dynamic texture loading facility for tools
2023-01-04 13:30:18 -08:00
Myk Taylor 9e38101593
enable the overlay by default
now that gps->enabler is unharmed upon crossing the Lua boundary
2023-01-04 12:09:21 -08:00
Myk Taylor 4b8a173ec4
comment out most keybindings
until we figure out what we want to set. now that everything is just one
viewscreen, we'll have hotkey overload unless we figure something out.
2023-01-01 17:18:39 -08:00
Myk Taylor 990f9f6061
comment out all plugins and default tool init
until we can prove things work in v50
2022-12-18 17:25:18 -08:00
myk002 70ad8a2260
let prioritize restore its state 2022-12-10 21:59:51 -08:00
myk002 a7f7a8d0a1
remap command-prompt's keybinding to gui/launcher 2022-12-04 15:56:12 -08:00
myk002 cb338e4257
remove resume plugin
all functionality has been migrated to unsuspend
2022-11-21 15:27:40 -08:00
myk002 1cc9a4d832
make leggings instead of crafts out of shells
they have a greater average trade price, and "shleggings" is hilarious.
2022-11-16 12:31:24 -08:00
lethosor 899fa3d940
Fix quickfort docs link in data/blueprints/README.md 2022-11-15 15:06:40 -05:00
myk002 4f5cb196a7 scope keybindings closer to their area of use
so they don't clutter the hotkeys list unnecessarily
the better solution for many of these commands is hotkey guards, but we
don't yet support hotkey guards for scripts
2022-11-14 19:54:58 -08:00
myk002 511250afbe reorder keybindings, no definition changes 2022-11-14 19:54:58 -08:00
myk002 89e579239f update dreamfort help, add qsp for training bolts 2022-11-14 19:53:46 -08:00
myk002 bdf201c670
ensure keybinding shows up in hotkeys command
not overlay
2022-11-14 16:46:03 -08:00
myk002 234919ffe1
replace hotkeys keybinding with menu keybinding 2022-11-14 16:46:01 -08:00
myk002 6e0a583e8d
enable overlay from init scripts; self-enable bad
loading other plugin modules during plugin_init results in those other
plugin modules not getting initialized properly. specifically, their
DFHACK_PLUGIN_LUA_FUNCTIONS and commands don't get added to their lua
module namespaces.
2022-11-14 16:40:35 -08:00
myk002 9199f8207f
add global keybinding for on-screen keyboard 2022-10-19 14:05:20 -07:00
myk002 fea0ce0718
fix cvs quoting 2022-10-14 13:11:26 -07:00
myk002 b1bf80e585
support "group" file split strategy for blueprint 2022-10-14 12:27:24 -07:00
myk002 aa83aa4e71
handle construct phase in ecosystem tests 2022-10-12 14:51:36 -07:00
myk002 a0cc040d9c
use new prioritize defaults 2022-09-28 12:15:25 -07:00
Myk Taylor b744d1a8e5
add medical jobs to the priority list
as per discussion on reddit
https://www.reddit.com/r/dwarffortress/comments/xj00e9/science_job_priority/
2022-09-26 22:08:55 -07:00
Myk Taylor ea7326a1c8
add more job types to the example prioritize list 2022-09-24 20:47:16 -07:00
myk002 a392a5371d
add keybinding for gui/workorder-details 2022-09-07 22:02:33 -07:00
myk002 446c321c62
fix spacing error
and floorplan error
2022-09-04 12:27:50 -07:00
myk002 ecb0a470d2
declare zone before building chest for hospital
otherwise the hospital doesn't get stocked
2022-08-31 17:38:12 -07:00
myk002 8804dab182
update dreamfort traffic designations 2022-08-29 22:04:22 -07:00
Myk 36e9af8c2b
Update data/init/dfhack.keybindings.init
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2022-08-19 09:38:03 -07:00
myk002 d0967b7e59
add alt-N keybinding for do-job-now 2022-08-19 09:34:38 -07:00
myk002 471be06995 add secondary hotkey for gui/launcher 2022-08-15 16:47:11 -07:00
myk002 cc5d564b42 support backtick as a keybinding
and bind it to gui/launcher
2022-08-15 16:47:11 -07:00
myk002 6abec116b5
add seed values for command usage frequency
based on the tool popularity survey responses, with some builtin
commands that could not be represented on the survey boosted so they
appear higher
2022-08-15 16:20:20 -07:00
myk002 f98015ae55
ensure we run every N ticks, not frames
add more debug messages
fix watching/unwatching/forgetting races that aren't in the watchlist
2022-08-03 21:44:25 -07:00
Myk 28e15162a5
reorganize init scripts into dfhack-config (#2232)
* reorganize init scripts into dfhack-config

allows player init scripts to build on defaults instead of replace them
this also moves the init scripts out of the main df directory

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* escape asterisks in docs

* remove unneeded dfhack.init file creation for test

* write the test init script to the new init dir

* create the init dir before trying to write a file

* rename default init files for clarity

* Update changelog

* Update docs/changelog.txt

Co-authored-by: Alan <lethosor@users.noreply.github.com>

* Try to get buildmaster to work with old branches

* Update changelog

* get keybindings from all init scripts

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix spacing in changelog

* split default loading into its own file

* update docs with new changes

* update help text wording in default init files

* Apply suggestions from code review

Co-authored-by: Alan <lethosor@users.noreply.github.com>

* Alphabetize changelog

* Update onMapLoad.default.init

* Update onMapLoad.init

* Update Core.rst

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2022-07-10 08:54:55 -07:00
Myk 9f44fd3f72
[manipulator] add the professions library (#2234)
* move professions out of the examples folder

* install professions into professions/library

* guard unguarded header from multiple inclusion

* load and display library professions

* update changelog

* move example professions docs from examples guide

* update dreamfort documentation

* note that professions folder has changed

* Fix bad merge
2022-07-06 07:21:26 -07:00
Myk e0d37a31ae
Make the manager orders library available by default (#2233)
* move orders out of examples directory

* install orders into library dir

* read orders from new library dir

* update documentation

* update dreamfort references to orders import

* update changelog

* ignore json files in pre-commit
2022-07-06 07:03:29 -07:00
myk002 9163728b99
hide blueprints that should be hidden, update help 2022-06-21 12:09:12 -07:00
myk002 4de5b89fa3
don't try to build up stairs on flat ground 2022-06-10 15:59:19 -07:00
myk002 c940f086b5 make the extra_fns functionality clearer 2022-06-06 16:44:11 -07:00
myk002 1424e8c867 remove extra EOF newline 2022-06-04 20:05:11 -07:00
myk002 42c35b05cc update help text for library blueprints
refer users to gui/blueprint for interactive positioning
2022-06-04 20:05:11 -07:00
Myk d9addb0f24
[gui/quantum] add integration test (#2175)
* add integration test for gui/quantum

* exercise the gui/quantum ui a little more
2022-06-03 13:19:56 -07:00
Myk ed2ba69713
Improvements to dreamfort, quickfort keystroke aliases, and example orders (#2162)
* add alt-f as a hotkey for quickfort

to mimic the existing windows hotkey for the old quickfort
hopefully this will ease the transition from the old quickfort to the
new

* add and document new quickfort aliases

* reduce quantity requirement for dyeing

15 is just too high. the counter counts bags, not units

* dreamfort blueprint improvements

most of these suggested by ldog on the forums. Thanks!
- significantly extend the list of hostile creatures that get stashed in the prisoner quantum stockpile
- send adamantine thread to the metalworker stockpiles
- give from thread/cloth stockpiles to clothier, loom, and dyer to protect the adamantine thread
- automatically create tavern, library, and temple locations (restricted to residents only by default)
- automatically associate the rented rooms with the tavern
- place a stockpile under the dump zone so you can set up stockpile links for dumped items
- doc improvements. in particular, point people to the new assign-minecarts tool for assigning minecarts to quantum stockpile dumps

* update changelog

* fix typo in cloth stockpile settings

* fix typo in guildhall location setup

* don't restrict stockpiles for clothiers and dyers

* deprecate jugs alias and add stone|woodentools

* remove dye thread, make jugs wooden

remove dye thread to protect adamantine
make jugs wooden to differentiate them from scroll rollers. that gives
us a chance to actually have a usable jugs-only stockpile

* dreamfort improvements

- move trap corridor gates and levers before the walls and traps so they get
  constructed first
- give useful names to the craftsdwarf's workshops
- redesign the services level to:
  - fit better in a 1x1 embark
  - add doors to the hospital recovery rooms to protect from
    werebeasts-to-be
  - add an interrogation room (sheriff's office) next to the jail

* shape hospital zone to exactly the hospital area

* don't clutter the hospital with statues

* update changelog
2022-06-02 15:51:45 -07:00
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