Commit Graph

968 Commits (9d88bcebbcc0c4cc8744d7460b758583c8b7cd29)

Author SHA1 Message Date
Kelly Kinkade 4a173aac99 tailor: fix #3093, #3103
I significantly restructured the assignment algorithm to eliminate the overproduction issues in #3093

#3103 is addressed by excluding units that don't have the caste-level EQUIPS flag

closes #3093
closes #3103
2023-03-27 00:07:40 -05:00
Myk Taylor 0ba4225d85
support showing a different tile on hover for Labels 2023-03-25 15:19:24 -07:00
Myk 4108c57c0d
Merge pull request #3091 from ab9rf/getplants
reenable getplants
2023-03-25 13:11:04 -07:00
Myk Taylor 76bacee238
dynamically add mod scripts to the script path 2023-03-25 12:56:48 -07:00
Myk 8b7223d1e2
Merge pull request #3086 from myk002/myk_buildingplan_no_filter_items
[buildingplan] allow player to choose any item when choosing items manually
2023-03-25 12:55:37 -07:00
Myk 9a5a259fa9
Merge pull request #3088 from myk002/myk_buildingplan_normalize_stairs
[buildingplan] normalize stairs so they all use the same filter
2023-03-25 12:55:29 -07:00
Myk Taylor 2627820bfa
untested -> unavailable 2023-03-25 12:35:01 -07:00
Kelly Kinkade df286ab71e reenable getplants 2023-03-25 10:18:06 -05:00
Myk Taylor 2bc92042a5
allow enable to interpret aliases 2023-03-24 23:25:24 -07:00
Myk Taylor a8822bdefa
take carved stairs into account when auto building stairs 2023-03-24 15:43:02 -07:00
Myk Taylor 58eaf33b08
normalize stairs so they all use the same filter 2023-03-24 15:26:17 -07:00
Myk Taylor fe0590503f
mark tiles with magma or deep water as "not free" 2023-03-24 15:05:17 -07:00
Myk Taylor c8f590cbac
allow player to choose any item when choosing items manually
that is, ignore the global and building-specific filters
2023-03-24 14:36:06 -07:00
Myk Taylor 99d050d0a8
respect building size limits 2023-03-24 14:06:39 -07:00
Myk da2ef0365d
Merge branch 'develop' into myk_the_case_of_the_missing_mask 2023-03-23 15:48:53 -07:00
Kelly Kinkade 95f6e6e5be tailor: fix material overrun issue
properly track materials required for already-queued jobs

fixes #3056
2023-03-23 16:23:06 -05:00
Myk Taylor 873e94ea5d
actually record the deserialized material mask val 2023-03-23 10:48:33 -07:00
Myk 4d540ba8ab
Merge pull request #3078 from myk002/myk_orders
add minimize button to orders overlay panel
2023-03-23 03:24:30 -07:00
Myk Taylor 05f407e10b
update changelog 2023-03-23 02:40:38 -07:00
Myk Taylor 90aed848bb
add minimize button to orders overlay panel 2023-03-23 02:26:00 -07:00
Myk 5bfd2ee47d
Merge pull request #3076 from myk002/myk_automelt
allow metal chests to be melted
2023-03-23 02:24:21 -07:00
Myk Taylor 0b72b42b7e
allow metal chests to be melted 2023-03-23 00:59:05 -07:00
Myk Taylor 03e44f1e7f
fix initial extended/retracted position for upright spike traps 2023-03-23 00:25:29 -07:00
Kelly Kinkade 959b4b3171 update tailor
`tailor` now properly discriminates between dyed and undyed cloth and no longer defaults to using adamantine
2023-03-22 18:29:47 -05:00
Kelly Kinkade 42e21bf946 reenable prospector in fort mode
fort mode prospect works. embark mode prospect doesn't crash but generates nonsense data, so that code has been disabled for now
2023-03-20 11:00:25 -05:00
Myk Taylor 2bceff76e0
changelog fix 2023-03-17 10:14:11 -07:00
Myk Taylor 779b9bfb6a
bump to 50.07-beta1 2023-03-17 10:08:16 -07:00
Myk Taylor 79dd5a313f
rename Build button to Confirm and update docs 2023-03-17 09:58:20 -07:00
Myk Taylor 52dec0114f
properly count required bars/cloth and don't output confusing total quantities 2023-03-16 23:45:22 -07:00
Myk Taylor e95b6805d0
comment out heat safety feature 2023-03-16 19:55:12 -07:00
Myk Taylor b0f9ad6449
add buildingplan reset for resetting all filters 2023-03-15 14:02:59 -07:00
Myk Taylor 0e1909bad1
update changelog 2023-03-15 01:42:06 -07:00
Myk Taylor 208a3e4ae8
add minimize/restore button 2023-03-15 01:19:34 -07:00
Myk Taylor 4be5ca4e81
filter by whether a slab is engraved
this actually adds an entirely new "specials" filter system that can be
extended later for other types
2023-03-15 00:29:27 -07:00
Myk 7edc686753
Merge pull request #3020 from myk002/myk_save_choice
[buildingplan] remember "choose items" choice per building type
2023-03-15 00:27:20 -07:00
Myk Taylor 4d8580d9e7
remember "choose items" choice per building type 2023-03-14 21:55:43 -07:00
Myk Taylor 039171e01d
support multiple upright spikes in a spike trap 2023-03-14 21:36:41 -07:00
Myk Taylor 543f9ade0d
account for reverse ordering in job_items vector 2023-03-13 13:35:12 -07:00
Myk 63a7811ba5
Merge branch 'develop' into myk_buildingplan_clay 2023-03-12 15:59:48 -07:00
Myk Taylor f549b7178d
update changelog 2023-03-12 15:44:15 -07:00
Myk Taylor 3798a7cb5e
allow clay to be chosen as a filter material 2023-03-12 15:13:57 -07:00
Myk Taylor 097c333f91
move misplaced changelog entries from alpha2 to alpha3 2023-03-11 14:18:30 -08:00
Myk Taylor a5de0fef3e
bump to 50.07-alpha3 2023-03-11 13:56:55 -08:00
Myk 3ba9459883
Merge pull request #2976 from myk002/myk_automaterial
turn down automaterial (superseded by buildingplan)
2023-03-06 15:48:45 -08:00
Myk 8cb3c0cf66
Update changelog.txt 2023-03-06 12:38:14 -08:00
Myk 0459831c6a
Revert "revert recent changes to dig-now due to lockups" 2023-03-06 12:33:02 -08:00
Myk Taylor 161f84e7b7
turn down automaterial (superseded by buildingplan) 2023-03-06 01:27:27 -08:00
Myk Taylor a5d22705e8
add label_below attribute 2023-02-27 04:13:05 -08:00
Myk 663b014eae
Merge pull request #2682 from 20k/squadwork
makeSquad, updateRoomAssignments
2023-02-26 21:40:33 -08:00
Myk 6433f87dd4
Merge pull request #2961 from myk002/myk_case_insensitive
make FilteredList searching case insensitive by default
2023-02-26 21:39:14 -08:00
Myk d2da06acc6
Update docs/changelog.txt 2023-02-26 21:37:02 -08:00
20k 3c1d3ce21c rework docs, comments, clean up unnecessary init 2023-02-27 01:45:10 +00:00
20k 837f32fdee more changelog fixes 2023-02-26 18:09:10 +00:00
20k 19616f7e32 fix changelog issues
# Conflicts:
#	docs/changelog.txt
2023-02-26 18:08:23 +00:00
20k d84b118767 docs, rework, rename 2023-02-26 18:05:35 +00:00
Myk Taylor 656a26504a
make FilteredList searching case insensitive by default 2023-02-26 09:47:15 -08:00
Myk Taylor a536396bd8
update changelog 2023-02-26 09:44:08 -08:00
Myk 3cddea9b61
Merge branch 'develop' into myk_clear_tile 2023-02-26 09:25:05 -08:00
Myk fced215ac2
Merge branch 'develop' into myk_no_disabled_click 2023-02-26 09:24:32 -08:00
Myk 0270766a6d
Merge branch 'develop' into myk_dynamic_tile 2023-02-26 09:24:04 -08:00
Myk e81a45a742
Merge pull request #2952 from myk002/myk_keep_focus
[Gui] don't prefix focus strings that are already properly marked
2023-02-26 09:23:42 -08:00
Myk bf64f1d985
Merge pull request #2948 from myk002/myk_interior_frame
Add standard interior frame to gui.lua
2023-02-26 09:23:09 -08:00
Myk Taylor 49331384df
update changelog 2023-02-24 17:24:20 -08:00
Myk Taylor ab4af88c92
update changelog 2023-02-24 17:21:38 -08:00
Myk Taylor 1cacc526e3
allow token.tile to be a function 2023-02-24 17:16:30 -08:00
Myk Taylor 2e53c5bc6d
update changelog 2023-02-24 17:14:27 -08:00
Myk Taylor dafafefe11
update changelog 2023-02-24 17:11:59 -08:00
Myk Taylor 472cab846f
move changelog entry to next version 2023-02-24 16:58:17 -08:00
Myk Taylor 30ea58374c
better detection of fire and magma safety 2023-02-24 16:57:44 -08:00
Myk ddd0c7b644
Merge branch 'develop' into channel-safely 2023-02-24 15:54:12 -08:00
Josh Cooper 4813a15b35 Updates changelog 2023-02-24 15:51:23 -08:00
Myk Taylor b8fdc985ec
bump version and changelog to 50.07-alpha2 2023-02-24 15:41:54 -08:00
Myk Taylor 934422264e
remove entries for reverted code from changelog 2023-02-24 12:44:26 -08:00
Myk 2659bf2ed4
Merge pull request #2943 from myk002/myk_autobutcher_deannouncement
[autobutcher] log to console instead of announcements
2023-02-24 10:30:48 -08:00
Myk Taylor be54440177
fix up changelog 2023-02-23 22:33:46 -08:00
Myk Taylor 6dbc22350f
log to console instead of announcements 2023-02-23 22:24:32 -08:00
Myk b516c8753e
Merge branch 'develop' into dig-now 2023-02-21 18:59:30 -08:00
Josh Cooper d18911ca5a
Update changelog.txt 2023-02-21 00:01:15 -08:00
Rob Goodberry 016f4dfae3
Update docs/changelog.txt
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-02-17 19:15:01 -05:00
Robob27 5244fce469 Fix confirm performance 2023-02-17 18:41:20 -05:00
Kelly Kinkade 6a0ac8b142 update changelog 2023-02-17 13:08:02 -06:00
Kelly Kinkade f437a83dba add changelog 2023-02-16 15:38:18 -06:00
Myk 070e10a75a
Merge pull request #2875 from robob27/tabs-as-widgets
Add Tab/TabBar to widgets
2023-02-16 00:53:13 -08:00
Myk c077343a23
Merge pull request #2904 from robob27/confirm-persist
Persist confirm config
2023-02-16 00:09:32 -08:00
Robob27 5154eb181a Add Tab/TabBar to widgets 2023-02-16 02:51:09 -05:00
silverflyone 648af1c81c Buildings::StockpileIterator operator change added to FIxes. 2023-02-16 15:03:09 +11:00
silverflyone 80972466a4 Revert "Buildings::StockpileIterator operator change added to FIxes."
This reverts commit 8f190247e9.
2023-02-16 15:01:11 +11:00
silverflyone 8f190247e9 Buildings::StockpileIterator operator change added to FIxes. 2023-02-16 14:55:00 +11:00
Robob27 8e577e7469 Persist confirm config 2023-02-15 16:01:17 -05:00
Myk Taylor bc76fd02e2
prevent mouse clicks from bleeding through when a window is dismissed 2023-02-13 17:35:02 -08:00
Kelvie Wong f8d94afb7d Add getSelectedCivZone to dfhack.gui
Mostly helpful for my own automation in my custom lua scripts.

Tested it with barracks, meeting areas, and pastures.
2023-02-13 15:22:33 -08:00
Myk 14e303d2c3
Merge branch 'develop' into myk_zscreen 2023-02-13 13:14:00 -08:00
Myk 9c58b22913
Merge pull request #2894 from myk002/myk_autochop
generate names for nameless burrows; check for nil
2023-02-13 13:13:34 -08:00
Myk Taylor 853859e119
refine ZScreen behavior around pausing, update docs 2023-02-13 09:09:39 -08:00
Myk Taylor 68d314c9c0
show more understandable units for bars and cloths 2023-02-13 01:17:57 -08:00
Myk 8dd938c5a6
Merge pull request #2891 from robob27/filteredlist-on-change
Add edit_on_change to FilteredList
2023-02-12 18:41:41 -08:00
Myk Taylor 766738e102
generate names for nameless burrows; check for nil 2023-02-12 15:21:10 -08:00
Rob Goodberry 8d63757eea
Update docs/changelog.txt
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-02-12 18:01:35 -05:00
Myk 4bc6e1bec0
Merge branch 'develop' into myk_seedwatch 2023-02-12 14:48:40 -08:00
Robob27 7651f6a91e Add edit_on_change to FilteredList 2023-02-12 17:44:19 -05:00
Myk 1b8565544e
Update docs/changelog.txt 2023-02-12 14:28:37 -08:00
Batt Mush 5c457fc96f [issue-2888] autodump now conditionally removes an item's dump flag and
sets forbid flag IFF the item is successfully dumped. Otherwise, the
item's original flags are kept intact. This avoids impacting any tasks
associated with the item.
2023-02-12 15:49:40 -06:00
Myk Taylor 0c989634ab
properly store the id of seed targets in persisted state 2023-02-12 03:19:31 -08:00
Myk 50e9ad93f3
Merge pull request #2869 from robob27/moar-units-checks
Add isGeldable, isMarkedForGelding and isPet
2023-02-12 01:27:37 -08:00
Janeene Beeforth 4b5836b996 Fix for #2871
* Add check for unit->name.nickname field is not an empty string
* Refactor repeated checks for inappropriate and protected units
2023-02-12 16:43:33 +11:00
Robob27 65f38ec75c Add isGeldable, isMarkedForGelding, isPet 2023-02-11 05:44:45 -05:00
lethosor de1a4fb5be
Update changelog 2023-02-10 23:30:35 -05:00
Myk Taylor 5100a7ea40
bump to 50.07-alpha1 2023-02-10 10:26:37 -08:00
lethosor dd925f7838
Un-dev-ify two changes that appear to be new to end-users since 0.47.05-r8 2023-02-10 13:02:14 -05:00
lethosor 588df3eec8
Update stonesense, changelog for dfhack/stonesense#97 2023-02-10 12:57:08 -05:00
Myk Taylor 823e7e37d8
dev-ify changelog 2023-02-10 09:41:20 -08:00
Myk c8b5f66429
Merge branch 'develop' into detect-manual-save 2023-02-10 08:23:02 -08:00
Myk Taylor 13f96b9ac8
increase frequency of nestbox scanning 2023-02-10 08:20:11 -08:00
Robob27 533ccee099 Detect manual save 2023-02-10 02:55:36 -05:00
Myk dad05a9a9a
Merge branch 'develop' into myk_nestboxes_job 2023-02-08 23:21:52 -08:00
lethosor 1fd807fc4d
Mark as dev-only changes: #2848, #2842, #2816, #2792 2023-02-08 22:16:16 -05:00
Myk Taylor a41afb88fc
remove in-progress jobs when protecting fert eggs 2023-02-08 16:37:46 -08:00
Myk Taylor 6a04b577b0
update changelog 2023-02-08 14:03:22 -08:00
eamondo2 5a5fcbd134 Add changes to changelog.txt 2023-02-08 15:52:58 -05:00
Myk d74f00f7c2
Merge pull request #2847 from robob27/hotkeylabel-enhancements
Add setLabel/setOnActivate to HotkeyLabel
2023-02-08 12:38:35 -08:00
Myk 44428bc06c
Merge pull request #2844 from cppcooper/channel-safely
Implements plugin: channel-safely v1.2.3
2023-02-08 12:37:41 -08:00
Myk 1787d2435c
Merge branch 'develop' into hotkeylabel-enhancements 2023-02-08 12:37:16 -08:00
Josh Cooper caeb6d2f84 Updates changelog 2023-02-08 12:09:32 -08:00
Myk cfc5226aaf
Merge branch 'develop' into myk_logo 2023-02-08 11:21:37 -08:00
Myk ccf57fd961
Merge pull request #2845 from dawnmist/orders/remove-silver-crossbow-from-military
Remove silver crossbow work-order from library/military
2023-02-08 11:19:47 -08:00
Robob27 b950b56926 Add methods to HotkeyLabel 2023-02-08 13:00:13 -05:00
Robob27 22b31bd7f1 Update changelog 2023-02-08 12:40:37 -05:00
Janeene Beeforth 1f38b294cb Add note in changelog about silver crossbows 2023-02-08 21:24:24 +11:00
Myk Taylor 8ee05af6ef
update logo to crisper version provided by TaxiService 2023-02-07 22:55:19 -08:00
Myk c0358d642d
Merge pull request #2833 from myk002/myk_list_recenter
ensure scrollable lists are centered in the visible viewport
2023-02-06 12:57:43 -08:00
Myk Taylor 0b9b258224
ensure scrollable lists are centered in the visible viewport 2023-02-06 12:54:05 -08:00
John Cosker 0769afc961
Merge branch 'develop' into cycle-hotkey-rev 2023-02-06 15:04:57 -05:00
Myk 190b5003c8
Merge branch 'develop' into myk_logo_hide 2023-02-06 09:17:48 -08:00
Myk 041909dfa7
Merge pull request #2822 from myk002/myk_rclick
prevent rclick from bleeding through (again)
2023-02-06 09:17:28 -08:00
Myk 149d7f7795
Merge branch 'develop' into myk_keybindings 2023-02-06 09:17:02 -08:00
Myk 0fc7341ce7
Merge pull request #2825 from myk002/myk_focus_strings
support focus paths for overlay widgets
2023-02-06 09:16:37 -08:00
John Cosker 4e366790c0 Changelog/documentation for key_back 2023-02-06 09:29:31 -05:00
Myk Taylor e285ee31a4
tweak defaults, load initial races immediately 2023-02-06 03:28:19 -08:00
Myk Taylor bf91ffb1fe
support focus paths for overlay widgets
and migrate existing widgets to use them
2023-02-06 02:37:32 -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
Myk Taylor 2ddd23e45d
prevent rclick from bleeding through (again) 2023-02-06 00:57:33 -08:00
Myk Taylor 09e7c14210
hide DFHack logo when it's in the way 2023-02-05 18:27:31 -08:00
Ryan Williams 8253505e4f
Update changelog.txt 2023-02-05 12:07:54 -08:00
Ryan Williams 35c87dfe11
Update changelog.txt 2023-02-05 12:05:22 -08:00
Myk Taylor 2daf1ceca5
make automelt resistent to morphed building ids
i.e. that no longer refer to valid stockiples, which can happen if the
persisted data is from another game
2023-02-04 12:56:19 -08:00
Myk Taylor 71deeb7a48
bump version to 50.05-alpha3.1 2023-02-03 15:48:09 -08:00
Myk Taylor ce16aef29f
update changelog 2023-02-03 15:27:44 -08:00
Myk Taylor 4a21b0843f
bump to 50.05-alpha3 2023-02-03 14:28:17 -08:00
Myk Taylor 5a4ab977a5
update changelog 2023-02-03 12:53:59 -08:00
Myk Taylor 2316615763
react to double clicks on list items 2023-02-03 00:09:10 -08:00