Commit Graph

5156 Commits (b4a804ca0cc70c8bbb541a58b4a87d1d98bac463)

Author SHA1 Message Date
Myk Taylor 9461e609a0
adjust text margin in hotkey menu for wide scrollbar 2023-04-01 22:53:35 -07:00
Myk Taylor d13dfd7d49
interpret shrubbery as floor instead of wall 2023-03-31 19:29:01 -07:00
Myk Taylor 99e2e596c0
use normalized specials vector 2023-03-31 04:47:54 -07:00
Myk Taylor 44adae24ab
fix items not being filtered correctly in item selection screen 2023-03-31 04:45:59 -07:00
John Cosker 7ff9d73a4c Technically drawing works 2023-03-30 15:17:08 -04:00
Myk Taylor 0db93762cf
bounds check the choice data
old forts that persisted data before this attribute existed will have an
invalid value
2023-03-29 15:09:18 -07:00
Myk Taylor f2958a5529
implement automaterial selection for buildingplan 2023-03-28 23:51:52 -07:00
Myk 921e08e97a
Merge branch 'develop' into myk_buildingplan_suspendmanager 2023-03-28 06:52:42 -07:00
Myk Taylor 02b52fcb3d
confirm for removing burrows via the repaint menu 2023-03-27 16:11:21 -07:00
Myk Taylor b515b337ea
silence noisy buildingplan warning
about itemless buildings not having items
2023-03-27 08:38:18 -07:00
Myk Taylor 0ed311c108
allow exported orders files to be deleted from the import dialog 2023-03-27 03:52:12 -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 0f5456c45b tidy up after self
remove a couple of no-longer-used variables that i missed last time
2023-03-27 00:31:47 -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 4090a66eb2
Merge pull request #3094 from ab9rf/autoclothing
autoclothing: support disable
2023-03-25 15:02:12 -07:00
Myk 4108c57c0d
Merge pull request #3091 from ab9rf/getplants
reenable getplants
2023-03-25 13:11:04 -07:00
Myk 2538324008
Merge pull request #3096 from ab9rf/5007-tailor
tailor: add inventory sanity check debug mode
2023-03-25 13:04:47 -07:00
Myk Taylor 42b18d001b
refresh overlay and helpdb on new world to pick up mod content 2023-03-25 12:56:54 -07:00
Kelly Kinkade c8c0040678 tailor: add inventory sanity check debug mode
enable with "tailor debugging on" disable with "tailor debugging off"

this setting is not persisted
2023-03-25 14:56:04 -05: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
Kelly Kinkade 1c25c9b80c autoclothing: support disable
this also includes some minor refactorings:
* some debug messages have been "tagged" so it's obvious they're from autoclothing
* a serialized list of flag checks has been replaced with a maskcheck
* partial lua api added, currently only supports enable/disable
2023-03-25 12:42:30 -05:00
Kelly Kinkade df286ab71e reenable getplants 2023-03-25 10:18:06 -05: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 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 Taylor 013c6fe02a
don't render footprint if we're minmized 2023-03-23 17:30:18 -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 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 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 581c7370ca
prepend searchable prefix 2023-03-23 02:26:37 -07:00
Myk Taylor 0f5d3fd4a6
spacing 2023-03-23 02:26:37 -07:00
Myk Taylor fde51e5948
fix some debug strings 2023-03-23 02:26:37 -07:00
Myk Taylor f13df882b6
properly filter when setting gems 2023-03-23 02:26:37 -07:00
Myk Taylor a545bc8120
it compiles! 2023-03-23 02:26:37 -07:00
Myk Taylor 0a9e81418e
port two helper functions 2023-03-23 02:26:37 -07:00
Myk Taylor 06fa43932c
animals works 2023-03-23 02:26:37 -07:00
Myk Taylor 1c527ab3d8
rejiggered 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 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 Taylor 0b72b42b7e
allow metal chests to be melted 2023-03-23 00:59:05 -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 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 1984cf4469
remove unnecessary reload 2023-03-17 21:07:38 -07:00
Myk Taylor b55a19f859
make the planner panel un-minimizable again 2023-03-17 21:07:25 -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 181b930070
allow inputs to pass through when minimized 2023-03-17 14:59:39 -07:00
Myk Taylor 79dd5a313f
rename Build button to Confirm and update docs 2023-03-17 09:58:20 -07:00
Myk Taylor a9e853188c
better minimize widget for the planner panel 2023-03-17 08:33:55 -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 73e65f2d94
use proper widgets for the minimize button 2023-03-15 13:40:34 -07:00
Myk Taylor a4365f47f5
don't pick up empty specials 2023-03-15 13:40:08 -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 306d300edf
persist choose items choice per building type 2023-03-14 22:26:56 -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 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 c56e248034
cleanup stockpiles plugin and don't bork on empty type vectors 2023-03-10 14:28:24 -08:00
Myk Taylor 6ad2922aca
filter displayed materials if building heat safety is set 2023-03-10 02:34:05 -08:00
Myk Taylor 43b423cd31
make number of weapons in trap configurable 2023-03-10 01:44:33 -08:00
Myk Taylor b884fab7b6
fix freeze when printing status and there are defunct planned buildings 2023-03-10 01:04:23 -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 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