e9060624af
use same hotkey for sorting, hide unused elements
2023-03-05 23:04:35 -08:00
80addc92d1
remember default max quality for each item
2023-03-05 23:04:03 -08:00
efb307ed25
remove mock warning
2023-03-05 22:09:45 -08:00
d009668339
implement materials search
2023-03-05 22:09:21 -08:00
ea549f6572
generate text summary as the filter changes
2023-03-05 19:15:04 -08:00
c752223fbc
implement invert and reset
2023-03-05 18:31:03 -08:00
2a2141931f
allow material filter to be read and set
2023-03-05 18:17:10 -08:00
d07864e5bb
allow material categories to be set from the ui
2023-03-05 16:32:05 -08:00
f9924d9090
implement material filter setting and retrieving
2023-03-05 16:32:05 -08:00
3b116c8061
give global settings page an interior frame
2023-03-05 16:32:05 -08:00
090f298a47
init building materials to ordinary max quality
2023-03-05 16:32:05 -08:00
8f07a03772
get savestock and loadstock minimally functional
2023-03-05 16:16:32 -08:00
9fb7e0d232
Merge branch 'develop' into dig-now
2023-03-03 12:38:22 -08:00
dca19e9dad
Adds more logging for dig-now
2023-03-03 11:13:25 -08:00
c8c1572bc4
fix typo
2023-03-02 06:08:51 -08:00
80da035186
always allow constructions to be placed
...
even if some tiles are invalid. the first selected tile must still be
valid
2023-03-02 06:00:21 -08:00
982d6a995a
fix signed/unsigned error
2023-03-02 05:29:33 -08:00
28599eb2bb
ensure item is on walkable tile
2023-03-02 05:28:12 -08:00
4f3cdeaf05
stub out reachability check for now
...
it's more complicated than we thought
2023-03-02 05:00:12 -08:00
926bc8b7d4
cache valid materials on world load
2023-03-02 05:00:07 -08:00
97e5fdb78e
implement saving and retrieving item quality filters
2023-02-27 12:27:21 -08:00
1d855014c2
implement global settings page
2023-02-27 10:32:54 -08:00
9f794a0710
filter dialog mock, draft 2; implement Slider
2023-02-27 04:13:29 -08:00
0f2c88265e
scan IN_PLAY last so more specific vectors are scanned first
2023-02-26 23:45:15 -08:00
c1ea43244b
order buckets by pickiness
2023-02-26 23:45:15 -08:00
4f933e0a36
ensure reachability for selected items
2023-02-26 23:45:15 -08:00
9b8400ab40
prevent planned buildings from being resumed
...
note this only prevents unsuspending from the building sheet panel, not
the tasks screen
2023-02-26 23:45:15 -08:00
663b014eae
Merge pull request #2682 from 20k/squadwork
...
makeSquad, updateRoomAssignments
2023-02-26 21:40:33 -08:00
8f99b03a53
update stonesense ref
2023-02-26 21:25:05 -08:00
851bb50dc8
add SDL_PushEvent shim for RemoteFortressReader
2023-02-26 21:18:08 -08:00
97ee1022c7
note that filter page is a mock
2023-02-26 10:55:50 -08:00
d84b118767
docs, rework, rename
2023-02-26 18:05:35 +00:00
fbd3cd44d6
initial mock of filter dialog
2023-02-26 09:49:08 -08:00
d8e440806c
fix signed/unsigned compare
2023-02-26 09:49:08 -08:00
f0ca7ad425
fix all buildings being identified as constructions
2023-02-26 09:49:08 -08:00
4b26454696
start of filters dialog
2023-02-26 09:49:08 -08:00
dadecdcf45
fix inspector screen not resetting the description
2023-02-26 09:49:07 -08:00
20a0390c50
no building shadow when other windows are up
2023-02-26 09:49:07 -08:00
4cc262c796
overhaul serialization; persist item filters
2023-02-26 09:49:07 -08:00
60de4619a2
fix signed unsigned compare
2023-02-26 09:49:07 -08:00
097e955796
infrastructure for item filtering
2023-02-26 09:49:07 -08:00
a0798178a6
ensure item quantity is correct when hollow
2023-02-26 09:49:07 -08:00
c52b2c27c8
implement automaterial in buildingplan
2023-02-26 09:49:07 -08:00
4f2d86f50a
implement hollow area placement for constructions
2023-02-26 09:49:07 -08:00
1957ad4cdf
move the filter window a bit to the side, can pause
2023-02-26 09:49:07 -08:00
f09eeee864
only enable clear filter hotkey when a filter is set
2023-02-26 09:49:07 -08:00
69e9da2e79
keep target area higlighted while choosing items
2023-02-26 09:49:07 -08:00
348ac55f4c
allow singleton selection for items
2023-02-26 09:49:07 -08:00
e9555c29be
initialize heat safety option to 'Any'
2023-02-26 09:49:07 -08:00
273183e864
allow cancel when choosing items
2023-02-26 09:49:07 -08:00
a0785bded4
implement heat safety
2023-02-26 09:49:07 -08:00
daa812b21e
pluralize plural plurals
2023-02-26 09:49:07 -08:00
2477a23972
pass correct job_item index for item selection
2023-02-26 09:49:07 -08:00
ee827f5ca1
remember mouse pos from before item choosing
2023-02-26 09:49:07 -08:00
4001ef3815
implement selecting specific items
2023-02-26 09:49:07 -08:00
66a14ecc74
get UI semi-finalized, prep for item choosing
2023-02-26 09:49:07 -08:00
daf691839f
item selection, callback skeleton
2023-02-26 09:49:07 -08:00
c59ad78f40
more tokens, textures, and colors
2023-02-26 09:49:07 -08:00
c0cdd58b50
fix signed-unsigned compare
2023-02-26 09:49:07 -08:00
aa4ebe6398
remove some cruft
2023-02-26 09:49:07 -08:00
e92a54deaa
beginning of textures
2023-02-26 09:49:07 -08:00
b3198c88a0
only block mouse clicks over exactly the panel area
2023-02-26 09:49:07 -08:00
96fa7fa1e2
fix position of errors panel
2023-02-26 09:49:07 -08:00
3f8be2cd9e
implement make_top_priority, cache inspector data
2023-02-26 09:49:07 -08:00
0d3285678c
separate errors panel, fix pb vectors on load
2023-02-26 09:49:07 -08:00
56c8927316
better description string for inspection overlay
2023-02-26 09:49:07 -08:00
18ad29dde4
show queue position
2023-02-26 09:49:07 -08:00
e5c3a2b519
dynamically count available materials when placing
2023-02-26 09:49:07 -08:00
0faa160eaa
split buildingplan into a project
2023-02-26 09:49:07 -08:00
4b7bc937a4
remove old buildingplan files
2023-02-26 09:49:07 -08:00
a9d9e0e50c
skeleton for quantity scanning
2023-02-26 09:49:07 -08:00
584e891154
more skeleton for inspector
2023-02-26 09:49:07 -08:00
dd6f71c665
handle stairs and 3 dimensions
2023-02-26 09:49:07 -08:00
1c3a5fa170
initial building placement code
2023-02-26 09:49:07 -08:00
0cb1c09549
implement skeletons for buildingplan overlays
2023-02-26 09:49:07 -08:00
b443f81ecd
print out more status info for buildingplan
2023-02-26 09:49:07 -08:00
00eb02c1bc
Implements plugin: channel-safely v1.2.4
...
- changes report* lookup in `NewReportEvent()`
- adds a nullptr check
- adds df::coord bound checking in various places
- where the `get_*neighbours()` functions are used
- `simulate_fall()`
- `is_safe_to_dig_down()` and `is_safe_fall()`
- adds nullptr checks to the `is_*job()` functions
- added todo comments for `is_safe_to_dig_down()`
2023-02-24 15:51:11 -08:00
f922be8769
fix more autolabor chattiness
2023-02-24 13:25:04 -08:00
69b89e9a6b
revert code changes to dig-now (causing lockups)
2023-02-24 12:44:06 -08:00
6dbc22350f
log to console instead of announcements
2023-02-23 22:24:32 -08:00
b516c8753e
Merge branch 'develop' into dig-now
2023-02-21 18:59:30 -08:00
5244fce469
Fix confirm performance
2023-02-17 18:41:20 -05:00
f73634d009
add missing parameter
2023-02-17 14:03:42 -06:00
4eb3ae566d
unshadow unit size variable
2023-02-17 12:58:48 -06:00
7e584df040
misc tailor updates related to adamantine cloth
2023-02-17 12:10:23 -06:00
1fe0bab9d4
Incorporates code review into dig-now PR
2023-02-17 08:17:35 -08:00
249c659006
Adds coord validity check for job scanning in dig-now
2023-02-17 08:17:35 -08:00
8beb947c82
Revises job scanning for dig-now
2023-02-17 08:17:35 -08:00
1e21f1ece9
Adds validity checks before adding to the dig-now buffer
...
also adds job cancellation for designation jobs, for testing a solution to issue 2471
2023-02-17 08:17:35 -08:00
c990def894
Adds a designation buffer in dig-now's processing algorithm
...
This may fix the issue seen when channeling consecutive layers, needs to be tested
2023-02-17 08:17:35 -08:00
838acfdf22
Adds a few log lines to dig-now
2023-02-17 08:17:35 -08:00
456020fb38
Adds todo comments to dig-now.cpp for issue #2720
2023-02-17 08:17:35 -08:00
f6df3ff335
remove thing i thought i already removed
2023-02-16 15:39:10 -06:00
54013b4400
add support for adamantine cloth
...
off by default because really now
also downgraded "weird cloth item" message from WARN to DEBUG
2023-02-16 15:33:55 -06:00
4d9deb8eca
tailor: try to squash toad clothing bug
...
this adds a test for an unmapped clothing size which will at least stop the making of toad-sized clothing. a diagnostic is issued when this happens as it is a bug
2023-02-16 14:37:10 -06:00
85dfe2a547
Merge remote-tracking branch 'cjhammel/fix-for-Issue-#2864' into develop
2023-02-16 11:49:36 -05:00
b4bd806134
Don't enable confirms on plugin enable
2023-02-15 16:10:22 -05:00
82cc486442
correct autolabor for structure update
...
df-structures#561 changed def'n of `activity_info` which autolabor used
2023-02-15 06:49:00 -06:00
c4aa936c0d
Update autolabor.cpp
2023-02-14 11:37:22 -05:00
bc76fd02e2
prevent mouse clicks from bleeding through when a window is dismissed
2023-02-13 17:35:02 -08:00
6202b29c56
adapt autolabor to new split game structure
2023-02-13 13:39:28 -08:00
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
fbabe5cdb0
Merge pull request #2898 from myk002/myk_showmood
...
[showmood] show more understandable units for bars and cloths
2023-02-13 13:13:24 -08:00
2b3dcee4b0
get strangemood compiling and running
2023-02-13 01:18:45 -08:00
68d314c9c0
show more understandable units for bars and cloths
2023-02-13 01:17:57 -08:00
766738e102
generate names for nameless burrows; check for nil
2023-02-12 15:21:10 -08:00
4bc6e1bec0
Merge branch 'develop' into myk_seedwatch
2023-02-12 14:48:40 -08:00
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
0c989634ab
properly store the id of seed targets in persisted state
2023-02-12 03:19:31 -08:00
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
1390e724b6
nestboxes: avoid forbidding non-eggs
...
The rewrite in #2773 introduced a bug (identified by KMFrench on Discord) where
nestboxes themselves would be forbidden, which prevents egglaying citizens from
using them since the nestboxes would be claimed before use. The previous version
of the plugin handled this by skipping the first item in `contained_items`,
which is the building material (in this case, the nestbox).
This fix limits the `forbid` flag manipulation to egg items only, which should
be a reasonable limitation that still allows the plugin to serve its purpose.
2023-02-10 22:52:01 -05:00
588df3eec8
Update stonesense, changelog for dfhack/stonesense#97
2023-02-10 12:57:08 -05:00
13f96b9ac8
increase frequency of nestbox scanning
2023-02-10 08:20:11 -08:00
497d8e1ff7
Merge pull request #2854 from johncosker/fix-autoslab
...
autoslab: Improve check for existing engraved slab.
2023-02-09 07:59:48 -08:00
f6ab1630b1
Cleanup
2023-02-09 08:30:09 -05:00
99aa4c523a
Merge branch 'fix-autoslab' of https://github.com/johncosker/dfhack into fix-autoslab
2023-02-09 08:29:17 -05:00
6795a4a2c8
Further simplify check for engraved slabs
2023-02-09 08:28:33 -05:00
d27041e206
Remove debug logging
2023-02-08 22:42:28 -05:00
27ff6c9649
Remove debug logging
2023-02-08 22:41:56 -05:00
cf51054f86
Merge branch 'develop' into fix-autoslab
2023-02-08 22:39:46 -05:00
fed3b4ddb4
Hopefully fix CI linux build
2023-02-08 22:25:35 -05:00
5e09a1cbf1
Change autoslab to use slab's "topic" field to compare historical id of slab instead of using str comp
2023-02-08 22:05:08 -05:00
a41afb88fc
remove in-progress jobs when protecting fert eggs
2023-02-08 16:37:46 -08:00
90767b83d2
Merge pull request #2852 from myk002/myk_misery
...
update misery
2023-02-08 14:22:33 -08:00
8bd9853597
make gcc happy
2023-02-08 14:16:11 -08:00
4d4e94c449
convert index
2023-02-08 14:06:19 -08:00
5c84d18001
update tailor, persist state, use best practices
2023-02-08 14:06:19 -08:00
9f76d64e42
update misery; persist state
2023-02-08 14:02:44 -08:00
07fd4b25b1
Merge branch 'develop' into automelt-autochop-lua-stack-fix
2023-02-08 15:45:29 -05:00
1e4a73007e
Apply suggestions from code review
...
Whitespace fixes
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-02-08 15:44:55 -05:00
5d8d378917
Implements plugin: channel-safely v1.2.3
...
- Revises a few log lines
- Adds d_assert macro to replace assert usage
- prints an error to indicate d_assert failed in Release builds as well as Debug builds
- could be added to the Debug utilities to allow use of assertions on necessary code without needing to buffer the results for use in the assert statement
- Fixes bug wherein designations are never put into marker mode (related to the assert statements)
2023-02-08 12:03:40 -08:00
bf0b3f8845
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-02-08 19:06:35 +00:00
02a249fdee
Fixes the lua stack smashing issue
2023-02-08 14:01:32 -05:00
be0cec9520
Current attempt to fix lua stack smashing
2023-02-08 01:59:57 -05:00
0043e05895
enable autonestbox
2023-02-06 16:47:50 -05:00
190b5003c8
Merge branch 'develop' into myk_logo_hide
2023-02-06 09:17:48 -08:00
448598e391
Merge pull request #2823 from myk002/myk_hotkey_guards
...
implement some Gui module hotkey guards
2023-02-06 09:17:18 -08:00
149d7f7795
Merge branch 'develop' into myk_keybindings
2023-02-06 09:17:02 -08:00
0fc7341ce7
Merge pull request #2825 from myk002/myk_focus_strings
...
support focus paths for overlay widgets
2023-02-06 09:16:37 -08:00
408e14d441
Merge pull request #2826 from myk002/myk_cleanowned
...
[cleanowned] don't print out how many items there are in the world
2023-02-06 09:16:27 -08:00
6933306255
Merge pull request #2827 from myk002/myk_autobutcher
...
[autobutcher] tweak defaults, load initial races immediately
2023-02-06 09:16:15 -08:00
1e03582fee
Merge pull request #2828 from myk002/myk_best_practices
...
update auto plugin example, use new best practices
2023-02-06 09:16:05 -08:00
c0cd37ff6f
protect against NULLs and invalid stockpiles
2023-02-06 09:04:50 -08:00
6dbf7b83bd
update auto plugin example, use new best practices
2023-02-06 04:02:18 -08:00
e285ee31a4
tweak defaults, load initial races immediately
2023-02-06 03:28:19 -08:00
397a64c4b5
don't print out how many items there are in the world
2023-02-06 02:58:11 -08:00
bf91ffb1fe
support focus paths for overlay widgets
...
and migrate existing widgets to use them
2023-02-06 02:37:32 -08:00
5747e9f3f0
set up some keybindings that are ready to go
...
and reinstate autodump-destroy-item
2023-02-06 01:23:52 -08:00
9e318842a4
implement some Gui module hotkey guards
...
and clean up focus string matching logic
2023-02-06 00:58:57 -08:00
d6c4d4417e
Add dig to the build
...
Ref: #2743
2023-02-05 21:11:07 -08:00
09e7c14210
hide DFHack logo when it's in the way
2023-02-05 18:27:31 -08:00
52fed5d9ad
Update options command
2023-02-05 19:04:21 -05:00
c09690bb5c
Remove newline in debug
2023-02-05 19:04:21 -05:00
300692750a
Add missing ;
2023-02-05 19:04:21 -05:00
89761bca0c
Remove unnecessary screen params
2023-02-05 19:04:21 -05:00
b5e6da3568
Remove unused import
2023-02-05 19:04:21 -05:00
edbc9300d8
Remove unused function
2023-02-05 19:04:21 -05:00
4e57464f21
Single line debug message
2023-02-05 19:04:21 -05:00
c621c33b93
Initialize paused to false, cleanup comments
2023-02-05 19:04:21 -05:00
8a08878fd6
Less messy pause display
2023-02-05 19:04:21 -05:00
717b133d58
Move unpause detection back to feed
2023-02-05 19:04:21 -05:00
d5ada27ed4
Remove unused variable
2023-02-05 19:04:21 -05:00
6657fb59e5
Fix pausing and warnings
2023-02-05 19:04:21 -05:00
2bf9b86c7b
Fix getCurFocus lua, use where appropriate in c++
2023-02-05 19:04:21 -05:00
36e4bba779
Fixup prefix matching
2023-02-05 19:04:21 -05:00
1c08b56a89
Proper prefix matching in hotkeys?
2023-02-05 19:04:21 -05:00
14f1e4b52f
Per confirm pause maybe?
2023-02-05 19:04:21 -05:00
a5de0fb0de
Add stockpile removal confirm
2023-02-05 19:04:21 -05:00
576fcfbeab
Clean up some nesting
2023-02-05 19:04:21 -05:00
a14de11a13
Clean up artifacts during render
2023-02-05 19:04:21 -05:00
0c80eff087
Remove unnecessary using
2023-02-05 19:04:21 -05:00
86b57380a6
fixup unnecessary changes, remove unnecessary stuff
2023-02-05 19:04:21 -05:00
3da1964c53
Fix another warning, test force_full_display_count
2023-02-05 19:04:21 -05:00
59db67e654
Remove unnecessary invalidate
2023-02-05 19:04:21 -05:00
2cb9830404
Fix default mouse_button value
2023-02-05 19:04:21 -05:00
4a0d542b5e
Add more confirms
2023-02-05 19:04:21 -05:00
6e442a26ca
More WIP
2023-02-05 19:04:21 -05:00
a770a4cae4
WIP
2023-02-05 19:04:21 -05:00
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
43d1a1563b
fix param parsing for setting targets
2023-02-03 15:27:01 -08:00
f2521c4a5c
protect against bad tree data
2023-02-03 12:52:50 -08:00
972df67eee
add more instrumentation to autochop
2023-02-03 12:26:01 -08:00
6831b1a1ae
reset the saved frame counter on new world
...
this allows the plugins to function normally even after one world is
exited and a different world with a lower frame counter is loaded
2023-02-03 00:08:38 -08:00
49246a60f3
properly cast for unsigned comparisons
2023-02-02 23:57:52 -08:00
8c7be9a8c2
don't use negative plant indices
...
and clean up the Kitchen module a bit more
2023-02-02 23:33:24 -08:00
aa2339d2aa
add cxxrandom back to the build
...
and mark channel-safely as tested
2023-02-02 19:42:19 -08:00
987597e0af
add autolabor warning overlay widget
2023-02-02 15:37:36 -06:00
4df7898d18
link autolabor to lua for the overlay
2023-02-02 15:37:36 -06:00
16e6114a86
autolabor: realign labors, improve tick handling
...
realigned the labor table to v50
changed onChange handler to run every 60 in-game ticks instead of every 60 render frames (no reason to run while paused lol)
2023-02-02 15:37:36 -06:00
d780dc6847
reenable autolabor for testing
...
minimum required to make work:
* realign the job table
* add code to flip/flop the work detail enable flag
2023-02-02 15:37:36 -06:00
6e200b831e
Update plugins/autoclothing.cpp
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-02-02 13:33:30 -08:00
b36e5e1dff
Update plugins/autoclothing.cpp
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-02-02 13:33:20 -08:00
840f728c66
Merge remote-tracking branch 'DFHack/develop' into Autoclothing
...
# Conflicts:
# docs/changelog.txt
2023-02-02 13:14:50 -08:00
ea22a23ab7
Clean up autoclothing for release.
2023-02-02 13:06:14 -08:00
5a1c3c7aa8
remove unused vars copypastad from seedwatch
2023-02-01 22:30:56 -08:00
c312a88bea
Merge pull request #2773 from myk002/myk_nestboxes
...
[nestboxes] update and simplify; persist state
2023-02-01 17:50:07 -08:00
fd4b0d7233
update and simplify nestboxes; persist state
2023-02-01 04:58:23 -08:00
febb2bf030
use actual item and unit positions
2023-02-01 04:24:42 -08:00
be40d55e64
update seedwatch
2023-02-01 04:03:28 -08:00
18da23af09
Merge pull request #2755 from ab9rf/autohauler
...
remove autohauler
2023-01-29 20:04:14 -08:00
Myk Taylor
Josh Cooper
Myk
20k
Robob27
Kelly Kinkade
lethosor
Christopher J Hammel
Batt Mush
Janeene Beeforth
John Cosker
Eamon Bode
pre-commit-ci[bot]
Roxy
Rose