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
4632e04150
Merge pull request #2987 from myk002/myk_no_soft_lock
...
don't softlock the game on modal popups
2023-03-07 10:26:01 -08:00
Myk Taylor
fc4d2605f2
don't softlock the game on modal popups
...
overlays can prevent clicks from being handled by DF. likewise, vanilla
modal popups can prevent clicks from getting handled by DFHack. to
prevent a softlock, overlay will skip sending input to the overlay
widgets when a modal dialog is visible
2023-03-07 08:00:13 -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
3ba9459883
Merge pull request #2976 from myk002/myk_automaterial
...
turn down automaterial (superseded by buildingplan)
2023-03-06 15:48:45 -08:00
Myk
2095843a71
Merge branch 'develop' into dig-now
2023-03-06 12:37:08 -08:00
Myk
0459831c6a
Revert "revert recent changes to dig-now due to lockups"
2023-03-06 12:33:02 -08:00
Josh Cooper
1eaee61044
Fixes dig-now job list iteration/scanning
2023-03-06 11:46:43 -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
e9060624af
use same hotkey for sorting, hide unused elements
2023-03-05 23:04:35 -08:00
Myk Taylor
80addc92d1
remember default max quality for each item
2023-03-05 23:04:03 -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
f9924d9090
implement material filter setting and retrieving
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
090f298a47
init building materials to ordinary max quality
2023-03-05 16:32:05 -08:00
Myk Taylor
8f07a03772
get savestock and loadstock minimally functional
2023-03-05 16:16:32 -08:00
Josh Cooper
9fb7e0d232
Merge branch 'develop' into dig-now
2023-03-03 12:38:22 -08:00
Josh Cooper
dca19e9dad
Adds more logging for dig-now
2023-03-03 11:13:25 -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
982d6a995a
fix signed/unsigned error
2023-03-02 05:29:33 -08:00
Myk Taylor
28599eb2bb
ensure item is on walkable tile
2023-03-02 05:28:12 -08:00
Myk Taylor
4f3cdeaf05
stub out reachability check for now
...
it's more complicated than we thought
2023-03-02 05:00:12 -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
0f2c88265e
scan IN_PLAY last so more specific vectors are scanned first
2023-02-26 23:45:15 -08:00
Myk Taylor
c1ea43244b
order buckets by pickiness
2023-02-26 23:45:15 -08:00
Myk Taylor
4f933e0a36
ensure reachability for selected items
2023-02-26 23:45:15 -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
663b014eae
Merge pull request #2682 from 20k/squadwork
...
makeSquad, updateRoomAssignments
2023-02-26 21:40:33 -08:00
Myk Taylor
8f99b03a53
update stonesense ref
2023-02-26 21:25:05 -08:00
Myk Taylor
851bb50dc8
add SDL_PushEvent shim for RemoteFortressReader
2023-02-26 21:18:08 -08:00
Myk Taylor
97ee1022c7
note that filter page is a mock
2023-02-26 10:55:50 -08:00
20k
d84b118767
docs, rework, rename
2023-02-26 18:05:35 +00:00
Myk Taylor
fbd3cd44d6
initial mock of filter dialog
2023-02-26 09:49:08 -08:00
Myk Taylor
d8e440806c
fix signed/unsigned compare
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
4cc262c796
overhaul serialization; persist item filters
2023-02-26 09:49:07 -08:00
Myk Taylor
60de4619a2
fix signed unsigned compare
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
daa812b21e
pluralize plural plurals
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
c0cdd58b50
fix signed-unsigned compare
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
0faa160eaa
split buildingplan into a project
2023-02-26 09:49:07 -08:00
Myk Taylor
4b7bc937a4
remove old buildingplan files
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
Josh Cooper
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
Myk Taylor
f922be8769
fix more autolabor chattiness
2023-02-24 13:25:04 -08:00
Myk Taylor
69b89e9a6b
revert code changes to dig-now (causing lockups)
2023-02-24 12:44:06 -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
Robob27
5244fce469
Fix confirm performance
2023-02-17 18:41:20 -05:00
Kelly Kinkade
f73634d009
add missing parameter
2023-02-17 14:03:42 -06:00
Kelly Kinkade
4eb3ae566d
unshadow unit size variable
2023-02-17 12:58:48 -06:00
Kelly Kinkade
7e584df040
misc tailor updates related to adamantine cloth
2023-02-17 12:10:23 -06:00
Josh Cooper
1fe0bab9d4
Incorporates code review into dig-now PR
2023-02-17 08:17:35 -08:00