Commit Graph

2265 Commits (a76bed0ed511848484bfeb0d3b94a0a8ac9af211)

Author SHA1 Message Date
Myk 921e08e97a
Merge branch 'develop' into myk_buildingplan_suspendmanager 2023-03-28 06:52:42 -07:00
Myk ab2f3b1373
Merge pull request #3115 from myk002/myk_confirm_burrow
[confirm] add check for removing burrows via the repaint menu
2023-03-28 06:47:27 -07:00
Myk Taylor 02b52fcb3d
confirm for removing burrows via the repaint menu 2023-03-27 16:11:21 -07:00
Tachytaenius df51835b1c
Amend main module code in modding guide 2023-03-27 22:05:06 +01:00
Myk Taylor d5c8237c91
update changelog 2023-03-27 03:53:10 -07:00
Myk Taylor 8da7e216a4
buildingplan - suspendmanager integration 2023-03-27 02:24:56 -07:00
Kelly Kinkade f3862e3eec tailor: gatekeep debugging code 2023-03-27 00:44:20 -05:00
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 6a3e61519a
remove reference to Tachy Guns 2023-03-25 12:56:54 -07:00
Myk Taylor 7cb9d3fe8c
formatting 2023-03-25 12:56:54 -07:00
Myk Taylor e4579a4aa1
update modding guide 2023-03-25 12:56:54 -07:00
Myk Taylor de576b5586
start updating modding guide 2023-03-25 12:56:54 -07:00
Myk Taylor 57d6cab10f
wording 2023-03-25 12:56:54 -07:00
Myk Taylor c3946247d6
update docs for Core 2023-03-25 12:56:54 -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 d67d57af3d
tombstone autounsuspend and add alias 2023-03-24 23:25:14 -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 9154a52d0a
remove spaces and dashes from allowed filename chars
since this will likely make it more difficult to represent stockpile
filenames in quickfort's stockpile configuration language
2023-03-23 02:26:37 -07:00
Myk Taylor 22872f61c4
fix indent 2023-03-23 02:26:37 -07:00
Myk Taylor b95d923b32
finalize docs, clear flags 2023-03-23 02:26:37 -07:00
Myk Taylor b5d4f04d2f
differentiate fish 2023-03-23 02:26:37 -07:00
Myk Taylor 876425fbc8
allow multiple filters 2023-03-23 02:26:37 -07:00
Myk Taylor 114e5d8fa0
in-progress docs 2023-03-23 02:26:37 -07:00
Myk Taylor 5a317820f9
new logic for deserialization 2023-03-23 02:26:37 -07:00
Myk Taylor 3f0a93a9b1
document my aspirations 2023-03-23 02:26:37 -07:00
Myk Taylor e21c55d6ff
update stockpiles command and use new data paths 2023-03-23 02:26:37 -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 d2f97747de
Update Removed.rst 2023-03-19 20:22:05 -07:00
Myk bdd4163d98
Update Removed.rst 2023-03-19 20:21:06 -07:00
John Cosker fa67b7c38f fix underscore 2023-03-19 22:58:38 -04:00
John Cosker c9493dba7e Added entry to Removed.rst 2023-03-19 21:50:28 -04:00
Myk b03a35ba8d
Merge pull request #3040 from myk002/myk_revflood
[reveal] anchor revflood at a unit's position
2023-03-19 14:37:29 -07:00
Myk Taylor 490ffe19ba
fix typos in buildingplan docs 2023-03-18 00:48:55 -07:00
Myk Taylor 3e0b37e922
fix typo in strangemod docs 2023-03-17 23:41:02 -07:00
Myk Taylor 4a3363da9c
anchor revflood at a unit's position
makes it more user friendly and reduces chance of mishap by placing the
cursor in an unforgiving location (like in a closed cavity)
2023-03-17 17:43:58 -07: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 a578614cdd
update docs 2023-03-14 22:28:27 -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 c7a058c308
fix library paths in docs 2023-03-12 15:43:32 -07:00
Myk Taylor c48c9c77c0
use new data directories for blueprints 2023-03-12 15:43:32 -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 Taylor 0f31b9897d
slight editing for the quickstart guide 2023-03-10 16:22:02 -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 e4596e6d2e
Merge pull request #2975 from myk002/myk_stockpiles
[stockpiles] get savestock and loadstock minimally functional
2023-03-06 00:24:30 -08:00
Myk Taylor 2220c5c07e
editing pass 2023-03-06 00:20:02 -08:00
Myk Taylor bb0d4c410d
update docs 2023-03-06 00:00:25 -08:00
Myk Taylor 23d5607835
update docs 2023-03-05 16:21:28 -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 c38a288eee use insert_into_vector, tweak docs again 2023-02-27 02:15:26 +00:00
20k 3c1d3ce21c rework docs, comments, clean up unnecessary init 2023-02-27 01:45:10 +00:00
Myk Taylor 63d752b3f8
update docs 2023-02-26 10:53:30 -08: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 2bd48f1f90 address some review comments 2023-02-26 18:05:35 +00:00
20k d84b118767 docs, rework, rename 2023-02-26 18:05:35 +00:00
20k 3912c6290f Military module start 2023-02-26 18:05:34 +00:00
20k ce3ee386fd makeSquad, updateRoomAssignments 2023-02-26 18:05:34 +00:00
Myk Taylor c490be0271
mark as tested to facilitate testing the commandline 2023-02-26 09:49:07 -08:00
Myk Taylor b443f81ecd
print out more status info for buildingplan 2023-02-26 09:49:07 -08: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 Taylor 2b59d6ee3d
make dfhack.job.attachJobItem available to Lua 2023-02-26 09:40:02 -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 0febce5e8f
add docs 2023-02-24 17:09:11 -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 Taylor 29e0698177
re-mark channel-safely as untested 2023-02-23 21:14:37 -08:00
Myk Taylor b976097ccf
sync spreadsheet to tags 2023-02-23 21:01:58 -08:00
Myk 3fa9babb48
Merge pull request #2911 from kelvie/label-hover
Usability: Show mouse hover on all clickable Labels/Lists
2023-02-22 20:39:02 -08:00
Kelvie Wong 3c24e67a9a Address additional PR comments
on_activate is likely to happen first so we shouldn't need to check the
other.
2023-02-22 17:22:04 -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
silverflyone 5deac65be1
Merge branch 'DFHack:develop' into develop 2023-02-19 13:39:41 +11:00
silverflyone ab74cf0af3 tombstone combine-drinks and combine-plants 2023-02-19 13:31:33 +11:00
Kelvie Wong d18700c964 Update List docs as well. 2023-02-18 16:15:16 -08:00
Kelvie Wong 697f15224c Address PR comments, and remove BG fill
BG fill eats up a lot of cycles anyway, and there's not a real tangible
benefit in all cases, as it relies on the text label being sized
appropriately (width-wise) to the container, or would otherwise require
padding.
2023-02-18 16:07:40 -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 7e584df040 misc tailor updates related to adamantine cloth 2023-02-17 12:10:23 -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
Robob27 bc47a0b2e4 More prescriptive docs attempt 2023-02-16 03:14:05 -05: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