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
63a7811ba5
Merge branch 'develop' into myk_buildingplan_clay
2023-03-12 15:59:48 -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
468b3b54d4
fix buildingplan typo
2023-03-11 15:36:47 -08:00
Myk Taylor
43b423cd31
make number of weapons in trap configurable
2023-03-10 01:44:33 -08:00
Myk
a37d2c09bf
Merge pull request #3001 from myk002/myk_buildingplan_pressure_plates
...
[buildingplan] fix handling of pressure plates
2023-03-10 00:17:57 -08:00
Myk Taylor
a3f8be3c01
fix pens reference
2023-03-10 00:12:56 -08:00
Myk Taylor
2f0dc4bd25
require correct number of mechanisms when building pressure plates
2023-03-10 00:09:12 -08:00
Myk Taylor
44fb91056b
ensure pressure plate config gets copied to the planned building
2023-03-09 23:41:13 -08:00
Myk Taylor
6373832490
refactor buildingplan into smaller files
2023-03-09 23:05:48 -08:00
Myk Taylor
bc77a91d46
build zero-item buildings with buildingplan
...
so they can be multi-built like all other buildings (the vanilla ui was
handling the build and then exiting out of the build menu)
2023-03-06 20:51:41 -08:00
Myk Taylor
161f84e7b7
turn down automaterial (superseded by buildingplan)
2023-03-06 01:27:27 -08:00
Myk Taylor
e9060624af
use same hotkey for sorting, hide unused elements
2023-03-05 23:04:35 -08:00
Myk Taylor
efb307ed25
remove mock warning
2023-03-05 22:09:45 -08:00
Myk Taylor
d009668339
implement materials search
2023-03-05 22:09:21 -08:00
Myk Taylor
ea549f6572
generate text summary as the filter changes
2023-03-05 19:15:04 -08:00
Myk Taylor
c752223fbc
implement invert and reset
2023-03-05 18:31:03 -08:00
Myk Taylor
2a2141931f
allow material filter to be read and set
2023-03-05 18:17:10 -08:00
Myk Taylor
d07864e5bb
allow material categories to be set from the ui
2023-03-05 16:32:05 -08:00
Myk Taylor
3b116c8061
give global settings page an interior frame
2023-03-05 16:32:05 -08:00
Myk Taylor
c8c1572bc4
fix typo
2023-03-02 06:08:51 -08:00
Myk Taylor
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
Myk Taylor
926bc8b7d4
cache valid materials on world load
2023-03-02 05:00:07 -08:00
Myk Taylor
97e5fdb78e
implement saving and retrieving item quality filters
2023-02-27 12:27:21 -08:00
Myk Taylor
1d855014c2
implement global settings page
2023-02-27 10:32:54 -08:00
Myk Taylor
9f794a0710
filter dialog mock, draft 2; implement Slider
2023-02-27 04:13:29 -08:00
Myk Taylor
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
Myk Taylor
97ee1022c7
note that filter page is a mock
2023-02-26 10:55:50 -08:00
Myk Taylor
fbd3cd44d6
initial mock of filter dialog
2023-02-26 09:49:08 -08:00
Myk Taylor
f0ca7ad425
fix all buildings being identified as constructions
2023-02-26 09:49:08 -08:00
Myk Taylor
4b26454696
start of filters dialog
2023-02-26 09:49:08 -08:00
Myk Taylor
dadecdcf45
fix inspector screen not resetting the description
2023-02-26 09:49:07 -08:00
Myk Taylor
20a0390c50
no building shadow when other windows are up
2023-02-26 09:49:07 -08:00
Myk Taylor
097e955796
infrastructure for item filtering
2023-02-26 09:49:07 -08:00
Myk Taylor
a0798178a6
ensure item quantity is correct when hollow
2023-02-26 09:49:07 -08:00
Myk Taylor
c52b2c27c8
implement automaterial in buildingplan
2023-02-26 09:49:07 -08:00
Myk Taylor
4f2d86f50a
implement hollow area placement for constructions
2023-02-26 09:49:07 -08:00
Myk Taylor
1957ad4cdf
move the filter window a bit to the side, can pause
2023-02-26 09:49:07 -08:00
Myk Taylor
f09eeee864
only enable clear filter hotkey when a filter is set
2023-02-26 09:49:07 -08:00
Myk Taylor
69e9da2e79
keep target area higlighted while choosing items
2023-02-26 09:49:07 -08:00
Myk Taylor
348ac55f4c
allow singleton selection for items
2023-02-26 09:49:07 -08:00
Myk Taylor
e9555c29be
initialize heat safety option to 'Any'
2023-02-26 09:49:07 -08:00
Myk Taylor
273183e864
allow cancel when choosing items
2023-02-26 09:49:07 -08:00
Myk Taylor
a0785bded4
implement heat safety
2023-02-26 09:49:07 -08:00
Myk Taylor
2477a23972
pass correct job_item index for item selection
2023-02-26 09:49:07 -08:00
Myk Taylor
ee827f5ca1
remember mouse pos from before item choosing
2023-02-26 09:49:07 -08:00
Myk Taylor
4001ef3815
implement selecting specific items
2023-02-26 09:49:07 -08:00
Myk Taylor
66a14ecc74
get UI semi-finalized, prep for item choosing
2023-02-26 09:49:07 -08:00
Myk Taylor
daf691839f
item selection, callback skeleton
2023-02-26 09:49:07 -08:00
Myk Taylor
c59ad78f40
more tokens, textures, and colors
2023-02-26 09:49:07 -08:00
Myk Taylor
aa4ebe6398
remove some cruft
2023-02-26 09:49:07 -08:00
Myk Taylor
e92a54deaa
beginning of textures
2023-02-26 09:49:07 -08:00
Myk Taylor
b3198c88a0
only block mouse clicks over exactly the panel area
2023-02-26 09:49:07 -08:00
Myk Taylor
96fa7fa1e2
fix position of errors panel
2023-02-26 09:49:07 -08:00
Myk Taylor
3f8be2cd9e
implement make_top_priority, cache inspector data
2023-02-26 09:49:07 -08:00
Myk Taylor
0d3285678c
separate errors panel, fix pb vectors on load
2023-02-26 09:49:07 -08:00
Myk Taylor
56c8927316
better description string for inspection overlay
2023-02-26 09:49:07 -08:00
Myk Taylor
18ad29dde4
show queue position
2023-02-26 09:49:07 -08:00
Myk Taylor
e5c3a2b519
dynamically count available materials when placing
2023-02-26 09:49:07 -08:00
Myk Taylor
a9d9e0e50c
skeleton for quantity scanning
2023-02-26 09:49:07 -08:00
Myk Taylor
584e891154
more skeleton for inspector
2023-02-26 09:49:07 -08:00
Myk Taylor
dd6f71c665
handle stairs and 3 dimensions
2023-02-26 09:49:07 -08:00
Myk Taylor
1c3a5fa170
initial building placement code
2023-02-26 09:49:07 -08:00
Myk Taylor
0cb1c09549
implement skeletons for buildingplan overlays
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
Kelly Kinkade
7e584df040
misc tailor updates related to adamantine cloth
2023-02-17 12:10:23 -06:00
Myk Taylor
bc76fd02e2
prevent mouse clicks from bleeding through when a window is dismissed
2023-02-13 17:35:02 -08:00
Myk Taylor
766738e102
generate names for nameless burrows; check for nil
2023-02-12 15:21:10 -08:00
Myk
90767b83d2
Merge pull request #2852 from myk002/myk_misery
...
update misery
2023-02-08 14:22:33 -08:00
Myk Taylor
4d4e94c449
convert index
2023-02-08 14:06:19 -08:00
Myk Taylor
5c84d18001
update tailor, persist state, use best practices
2023-02-08 14:06:19 -08:00
Myk Taylor
9f76d64e42
update misery; persist state
2023-02-08 14:02:44 -08:00
pre-commit-ci[bot]
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
eamondo2
02a249fdee
Fixes the lua stack smashing issue
2023-02-08 14:01:32 -05:00
eamondo2
be0cec9520
Current attempt to fix lua stack smashing
2023-02-08 01:59:57 -05:00
Myk
190b5003c8
Merge branch 'develop' into myk_logo_hide
2023-02-06 09:17:48 -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
Myk Taylor
c0cd37ff6f
protect against NULLs and invalid stockpiles
2023-02-06 09:04:50 -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
09e7c14210
hide DFHack logo when it's in the way
2023-02-05 18:27:31 -08:00
Robob27
89761bca0c
Remove unnecessary screen params
2023-02-05 19:04:21 -05:00
Robob27
8a08878fd6
Less messy pause display
2023-02-05 19:04:21 -05:00
Robob27
a5de0fb0de
Add stockpile removal confirm
2023-02-05 19:04:21 -05:00
Robob27
4a0d542b5e
Add more confirms
2023-02-05 19:04:21 -05:00
Robob27
6e442a26ca
More WIP
2023-02-05 19:04:21 -05:00
Robob27
a770a4cae4
WIP
2023-02-05 19:04:21 -05:00
Myk Taylor
43d1a1563b
fix param parsing for setting targets
2023-02-03 15:27:01 -08:00
Myk
987597e0af
add autolabor warning overlay widget
2023-02-02 15:37:36 -06:00
Myk Taylor
be40d55e64
update seedwatch
2023-02-01 04:03:28 -08: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
8b98ba5042
allow windows to be defocused instead of pinned
2023-01-23 17:40:16 -08:00
Eamon Bode
fc861f1328
Merge branch 'develop' into automelt
2023-01-23 14:20:48 -05:00
eamondo2
7536426929
trailing whitespace trim
2023-01-23 13:36:12 -05:00
eamondo2
6592cadc09
Bugfixes, resolved CTD issue.
2023-01-23 13:35:26 -05:00
Myk Taylor
38e6e0a747
ensure orders overlay is on the correct panel
...
even when the total screen size is very small
2023-01-23 08:01:45 -08:00
Myk Taylor
d7e0dcfcf8
use new frames for hotkey hotspot
2023-01-23 04:03:41 -08:00
Myk Taylor
9aaa55cd7f
add textures and frames for various use cases
2023-01-23 03:58:51 -08:00
eamondo2
78c6b3683e
Changes as per GH suggestions. Doc updates.
2023-01-23 01:56:33 -05:00
eamondo2
8f7788ec20
Merge branch 'develop' into automelt
2023-01-22 20:32:43 -05:00
Myk
f2c2fffac5
Merge branch 'develop' into myk_click_logo
2023-01-22 17:10:27 -08:00
Myk
ab10b84de4
Merge pull request #2693 from myk002/myk_revert_always_enabled
...
remove unused always_enabled attribute for overlays
2023-01-22 17:10:04 -08:00
Myk Taylor
f0d44342d8
first attempt at a manager orders overlay
2023-01-22 03:08:36 -08:00
Eamon Bode
e5cbc7fd3c
Merge branch 'develop' into automelt
2023-01-22 04:40:10 -05:00
eamondo2
969f8162a8
Further updates from comments/review.
2023-01-22 04:39:41 -05:00
Myk Taylor
b84bce719d
remove unused always_enabled attribute for overlays
...
it was made for gui/pathable, but that became a ZScreen
this option made me uncomfortable for overlays. it didn't seem like the
right user experience
2023-01-22 01:07:30 -08:00
Myk Taylor
76822ac7b7
remove orphan fortplan.lua file
2023-01-22 00:59:27 -08:00
Myk Taylor
5a4d61e7fc
don't close the hotspot menu if the logo is clicked
...
some people click the logo by mistake. this shouldn't close the menu
2023-01-22 00:43:10 -08:00
eamondo2
0fbf17f1c8
refactor/fix as per GH suggest
2023-01-21 18:22:15 -05:00
eamondo2
3fc4d056c3
initial automelt
2023-01-20 17:58:48 -05:00
Myk
116f9bf8e6
Merge pull request #2641 from myk002/myk_buildingplan
...
minimal implementation of buildingplan
2023-01-20 09:28:26 -08:00
Myk Taylor
2cf0d0769c
fix reference to renamed var
2023-01-18 15:44:47 -08:00
Myk Taylor
bc42f7c73c
get buildingplan minimally functional for quickfort
2023-01-17 04:05:17 -08:00
Myk Taylor
86ddf43230
add hotkey for launching the quickstart guide from the hover menu
2023-01-15 20:17:23 -08:00
Myk Taylor
1eb5dd9a4f
fix incorrect function name for setting targets
2023-01-14 18:30:44 -08:00
Myk Taylor
807f3f6327
update behavior of hotspot menu
...
- disappears on click outside its borders
- disappears on r-click
- mouse over the help panel counts as "over the menu" (so the menu
doesn't close if the player moves the mouse to the help text)
- menu panels appear next to the logo hotspot instead of over it,
allowing players to avoid clicking on the wrong item if they
intend to click on the logo
2023-01-13 12:18:18 -08:00
Myk Taylor
cc0ff6a93d
raise trigger lock screens (if possible)
...
so they don't get stuck under new viewscreens and become lost (and
therefore overlay will be forever locked)
2023-01-13 12:16:49 -08:00
Myk Taylor
2877f87d78
implement new autochop
2023-01-08 23:28:06 -08:00
Myk Taylor
c4a2bdd08e
update lua too
2023-01-05 17:35:33 -08:00
Myk
78be3a6463
Merge pull request #2548 from myk002/myk_logo
...
Display DFHack logo for the hotkeys overlay widget
2023-01-04 19:06:05 -08:00
Myk Taylor
8e62a46009
display new logo for the hotkeys overlay widget
2023-01-04 13:30:33 -08:00
Myk Taylor
1b1bfc40e7
move default hotspot pos one tile to the right
...
so it doesn't overlap with screen borders
2023-01-03 12:07:40 -08:00
Myk
bb1a165d5b
Merge pull request #2544 from myk002/myk_hotkeys_revamp
...
comment out most keybindings and revamp hotkeys widget
2023-01-02 20:43:06 -08:00
Myk
3b572b9a9d
Merge pull request #2541 from myk002/myk_pathable
...
Update pathable plugin to support v50 maps
2023-01-02 20:42:12 -08:00
Myk Taylor
2119d4fb2a
attach hotkeys widget to all viewscreens
...
and introduce new snazzy logo
2023-01-01 17:21:35 -08:00
Myk Taylor
09e240b412
allow overlay widgets to 'all' viewscreens
2023-01-01 17:20:06 -08:00
Myk Taylor
11333e3872
update pathable plugin to support v50 maps
2022-12-31 21:05:03 -08:00
Myk Taylor
c401154393
widgets inherit from Panel and can be perma-enabled
2022-12-31 21:02:00 -08:00
Myk Taylor
ec0b4a9b68
don't let anchor graphics poke through the hotkeys widget
2022-12-27 17:01:39 -08:00
myk002
e88b1fdfe5
move script-manager into core
2022-12-10 21:59:51 -08:00
myk002
0d4d10de08
rename init to reload
2022-12-10 21:59:51 -08:00
myk002
a872cdbcd4
no onChangeState fn, let scripts attach themselves
2022-12-10 21:59:51 -08:00
myk002
426a538e30
refactor overlay to use script-manager code
2022-12-10 21:59:51 -08:00
myk002
b3c8d85637
new plugin: script-manager
...
scans all scripts and discovers onStateChange and isEnabled functions
2022-12-10 21:59:51 -08:00
myk002
1547d527b7
fix off-by-one error in dwarfmonitor.misery widget
2022-12-04 15:34:00 -08:00
lethosor
40f3a3333e
Make Cursor widget prefix and coordinate types configurable
...
e.g. the old behavior can be restored with "coords_type": "mouse_ui" and
"coords_short": true
2022-12-01 00:08:56 -05:00
myk002
ce1ef15bb2
reduce hotspot visuals to a single exclamation mark
2022-11-30 18:13:19 -08:00
myk002
1851a82fe1
close the hotkey menu if the mouse "flicks" onto it
...
also initialize the selected item properly if the widget is anchored to
the bottom of the screen
2022-11-30 18:11:02 -08:00
myk002
f5d20c99a3
prep for usage by gui/overlay
2022-11-29 15:12:02 -08:00
myk002
9d17be84a8
set width to something representative on init
...
so if the widget is enabled in gui/overlay without ever being resized with real data,
it won't be truncated
2022-11-29 15:12:02 -08:00
myk002
24dc879888
adapt library code to newly correct mouse events
2022-11-21 17:36:46 -08:00
Myk
ff447d46bd
don't overcount units for misery widget
...
addendum to #2366
2022-11-20 09:45:23 -08:00
Myk
35cea1b5e1
Merge pull request #2371 from myk002/myk_overlay_hotkeys
...
[hotkeys] implement hotspot menu widget
2022-11-14 16:50:30 -08:00
myk002
6635b6489b
handle commands like ':lua <something>'
2022-11-14 16:46:03 -08:00
myk002
1fc30493c0
right align hotkeys for list items
...
and combine hotkeys for identical commands
and don't hide the menu until the mouse has left the frame
and start the widget one tile closer to the edge so the mouse is already
on the list instead of on the frame
2022-11-14 16:46:02 -08:00
myk002
2b73d6e8e9
allow hotkeys to be invoked as a hotkey
...
also ensure keybindings are always cleaned up
2022-11-14 16:46:02 -08:00
myk002
c630a71c73
click on arrow to launch gui/launcher with command
2022-11-14 16:46:01 -08:00