Commit Graph

5359 Commits (feaf0d6bb35d1e81bb7f70a40c4512913687a914)

Author SHA1 Message Date
Myk Taylor 0d366740e7
move the dimensions readout out from under the heat safety filter 2023-09-07 18:29:29 -07:00
Myk Taylor d0f08dcc0d
implement rating overlay 2023-09-07 16:14:20 -07:00
Myk Taylor f0b0c2093b
flatten sort functions 2023-09-07 11:30:08 -07:00
Myk Taylor 229e7aef87
enable filtering by race 2023-09-05 17:50:17 -07:00
Myk Taylor ff3d4c5b38
support creating items inside of bags 2023-09-05 00:31:35 -07:00
Myk 29ccdcf4b9
Remove leftover debug print 2023-09-04 20:45:53 -07:00
Myk Taylor 1d6ae37a66
fix and reinstate heat safety filter 2023-09-03 11:54:32 -07:00
Myk Taylor a2b50a88a5
reorder branches for better readability 2023-09-03 07:12:41 -07:00
Myk Taylor 3f1eac720f
respect empty and lye_milk_free flags 2023-09-03 07:08:57 -07:00
Myk Taylor 6096165eee
fix handling of ticks parameter 2023-09-02 02:03:03 -07:00
Myk Taylor 426099f82b
label updates for squad sort options 2023-09-01 14:35:55 -07:00
Myk Taylor 702992b6f5
hide the DFHack logo while loading a game
so the textures don't visibly flicker
revert this once textures are flicker free
2023-08-31 23:06:05 -07:00
Myk Taylor ffc884d69d
fix migrant wave ordering
use active index instead of unit id
2023-08-31 19:42:02 -07:00
Myk Taylor 52543f9fc0
clean out unused code/vars 2023-08-31 19:14:47 -07:00
Myk Taylor afb26b9ddd
add requested filters for squad assignment screen
and redo layout as a vertical panel since there's not enough space
otherwise
2023-08-31 19:10:18 -07:00
Myk Taylor 38ece5aa93
fix status output character encoding
so dwarf and item names and item descriptions are printed correctly
2023-08-31 06:03:52 -07:00
Myk 07e8e83837
Merge pull request #3698 from Halifay/advanced_military_sorting
Enhancing Military Candidate Selection
2023-08-30 23:52:18 -07:00
Myk 4a788e79c3
Apply suggestions from code review 2023-08-30 23:26:03 -07:00
Mikhail 2c97ab9c8d Tidying up melee skill and ranged skill funcitons in sort.lua. 2023-08-30 17:16:59 +03:00
Mikhail 26b81cfbbd Merged military rating back into one. Adjusted formulas for melee and ranged rating. Added skill effectiveness ratings for ranged and melee. Changed any melee and any ranged to skill effectiveness ratings. Added info about new ratings and research links to the docs. 2023-08-30 09:39:13 +03:00
Kelly Kinkade c5d30763b9 seedwatch: rewrite configuration cleaning 2023-08-30 00:07:30 -05:00
Kelly Kinkade fa9d2e2175 seedwatch: ignore tree seeds 2023-08-29 22:23:13 -05:00
Myk a740c6628e
Merge pull request #3663 from shevernitskiy/dynamic-texture-loading
feat: dynamic texture loading
2023-08-27 22:45:52 -07:00
shevernitskiy 4fb6b09b30 move textures to separate lua module 2023-08-28 06:58:30 +03:00
Mikhail c91a02ca6a Reworked fallback from rating sortings. Renamed melee potential to solo combat potential. Added group combat potential. 2023-08-27 17:52:09 +03:00
pre-commit-ci[bot] 6fcbf48c84 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-25 13:28:37 +00:00
Mikhail 493be93a4c Fixing conflicts. 2023-08-25 16:26:32 +03:00
Mikhail 25f2c1746a Changed melee and ranged ratings to statistically proven linear formulas. 2023-08-25 16:18:20 +03:00
pre-commit-ci[bot] 771d7f6c6c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-24 15:49:54 +00:00
Mikhail 30488dc310 Trailing space again. My bad. 2023-08-24 18:47:42 +03:00
Mikhail aef60649fe Trim trailing whitespace. 2023-08-24 17:18:46 +03:00
Mikhail a1d68286cd Added melee rating, ranged rating, mental stability rating and stress to sorting options on military screen in sort.lua. Added info about new sorting methods to sort.rst. Added name to Authors.rst. 2023-08-24 16:26:09 +03:00
Kelly Kinkade b76333ae87 `tailor`: remove crash
clothing items may have an invalid maker race; this should not happen but it does so we have to deal with it
2023-08-21 12:46:24 -05:00
Myk Taylor 8e9c6c708a
don't butcher animals who have some kind of training
also use new units functions in logistics
2023-08-20 10:08:42 -07:00
Myk 4f247b79f1
Merge pull request #3684 from myk002/myk_sort_by_race
[zone] offer sort by race on animal assignment screen
2023-08-19 02:20:10 -07:00
Myk Taylor 8b91e84944
offer sort by race on animal assignment screen 2023-08-18 19:28:24 -07:00
Myk Taylor d9fa827b20
support overlays on the load arena screen 2023-08-18 19:27:12 -07:00
Myk Taylor 43f265fb6f
update stonesense ref 2023-08-17 02:33:30 -07:00
Myk Taylor 790f0ff628
fix stonesense 2023-08-16 23:58:00 -07:00
Myk Taylor 2620bfbb43
tweak color and layout 2023-08-16 06:07:19 -07:00
Myk Taylor 614bc546a8
clear text buffer when input is handled by the overlay 2023-08-16 06:07:19 -07:00
Myk Taylor 7544641377
first draft of squad assignment search and sort 2023-08-16 06:07:19 -07:00
shevernitskiy bbbb8fbb9c invalid texpos is nil now 2023-08-15 21:18:52 +03:00
Myk Taylor a521b54da1
normalize input for animal assignment search 2023-08-14 16:38:43 -07:00
shevernitskiy 0e725be046 support closure as tile arg to get texpos 2023-08-14 12:07:27 +03:00
shevernitskiy 91f4c3d561 mirgate preloaded assets to lua 2023-08-14 08:17:57 +03:00
shevernitskiy 1409af67de expose api to lua 2023-08-13 20:09:12 +03:00
Myk Taylor 463a8647e6
complete vermin and small animal support 2023-08-13 02:45:04 -07:00
Myk Taylor 296a34834c
expose and use casteFlagSet 2023-08-13 00:20:08 -07:00
Myk Taylor 93ed45d6e7
handle small pets, similar to vermin 2023-08-12 23:29:45 -07:00
shevernitskiy 20460fecca tiny refactor texpos methods 2023-08-13 07:40:35 +03:00
shevernitskiy 4bc3a9b552 single quotes 2023-08-13 07:36:39 +03:00
shevernitskiy fe8bd4fa78 assets use dynamic texture loading 2023-08-12 16:11:42 +03:00
Myk Taylor 214b78ba3c
add unit assignment screens for pits/cages/chains
refactor the existing Pasture assignment screen to handle variations
2023-08-11 18:32:52 -07:00
Myk cd2d408006
Merge pull request #3642 from randombk/remotefortressreader-reload
Add option to force-fetch world blocks in RemoteFortressReader
2023-08-07 20:01:56 -07:00
David Li 8b5321fe86 Add option to force-fetch world blocks in RemoteFortressReader
The current behavior of GetBlockList in the RemoteFortressReader
  Protobuf RPC API is to only return blocks that have changed since
  the last fetch. This causes problems when the RPC client (i.e. a
  world renderer) wants to restart, as it can no longer fetch the
  full world state.

  This patch adds a `force_reload` option to BlockRequest, defaulting
  to `false` (the current behavior). When passed, it returns all
  requested blocks regardless of whether they have changed or not.

Signed-off-by: David Li <jiawei.davidli@gmail.com>
2023-08-07 19:17:04 -07:00
Myk 139a3a5ae8
Merge pull request #3649 from myk002/myk_bannerpanel
[widgets] factor banner out into reusable panel class
2023-08-07 12:54:32 -07:00
Myk Taylor 8c166935d5
factor banner out into reusable panel class 2023-08-07 12:40:48 -07:00
Myk Taylor e80884459c
don't display dfhack logo in legends mode 2023-08-07 12:39:20 -07:00
lethosor 8dc13b8b25
check-structures-sanity: also skip temp_save vectors 2023-08-05 23:46:07 -04:00
lethosor 0abdf0148f
Merge branch 'develop' of DFHack/dfhack into develop 2023-08-05 17:03:29 -04:00
lethosor d152e86013
check-structures-sanity: Set debugger-friendly compiler options 2023-08-05 17:03:18 -04:00
Myk Taylor 3358a2b516
enable more tests 2023-08-04 20:40:33 -07:00
Myk Taylor 415a2f654b
update stonesense ref 2023-08-04 12:24:04 -07:00
Myk Taylor ec461bcce5
zero tests mean pass 2023-08-03 22:48:23 -07:00
lethosor 1411c5e8aa
Disable RPC API docs for plugins that aren't currently built
This allows ci/check-rpc.py to pass, and will cause it to fail if the plugins
are re-enabled and we forget to un-disable the docs.
2023-08-04 01:28:15 -04:00
lethosor 1f9b248f8a
check-structures-sanity: add no-op handler for std::map 2023-08-02 23:49:10 -04:00
lethosor a3916cdbb6
check-structures-sanity: update detection for GCC C++11 std::string 2023-08-01 01:54:35 -04:00
lethosor 0c6441619f
Re-enable build of check-structures-sanity 2023-08-01 00:59:52 -04:00
lethosor 94dae7a1f1
dts::make_unique -> std::make_unique in unbuilt plugins
Followup to #3537
2023-08-01 00:59:26 -04:00
lethosor 199191e9d4
Re-add BUILD_SUPPORTED flag so that devel plugins can be built by themselves 2023-08-01 00:52:22 -04:00
lethosor 031a61a436
Re-enable devel plugins that compile 2023-08-01 00:52:22 -04:00
Myk Taylor 6a50ae42ce
more deduplication of installed files 2023-07-29 00:35:12 -07:00
Myk Taylor ac633da050
de-duplicate stonesense resources 2023-07-29 00:35:12 -07:00
DFHack-Urist via GitHub Actions aaf511b5ea Auto-update submodules
plugins/stonesense: master
2023-07-29 07:12:04 +00:00
DFHack-Urist via GitHub Actions f3da973c09 Auto-update submodules
scripts: master
plugins/stonesense: master
2023-07-24 07:14:05 +00:00
Myk Taylor 383966511d
don't modify container while iterating 2023-07-21 17:45:45 -07:00
Myk Taylor ac8211a9c7
add autobutcher link to pasture screen 2023-07-21 14:35:59 -07:00
Myk 65fc79c5e2
Merge branch 'develop' into myk_dwarfvet 2023-07-21 14:23:13 -07:00
Myk Taylor dff4816287
update dwarfvet 2023-07-21 04:12:56 -07:00
Myk Taylor d14054716c
better name for overlay 2023-07-21 00:28:05 -07:00
Myk Taylor a77a6b5943
clean up globals 2023-07-20 19:40:40 -07:00
Myk Taylor d18a1f12f7
allow the color to override box select and cursor 2023-07-20 19:32:38 -07:00
Myk Taylor a6b304d9b4
fix box select bounds logic 2023-07-20 19:28:49 -07:00
Myk Taylor 2370750809
add warm/damp highlight overlay for ascii mode 2023-07-20 19:17:09 -07:00
Myk Taylor 7ec34ec5f8
remove unneeded linkage to SDL 2023-07-18 23:15:22 -07:00
Myk Taylor 9e720b2de7
properly handle animals in cages in non-cage buildings 2023-07-18 03:39:03 -07:00
Myk Taylor 27f1a4443c
rearrange pastures dialog according to feedback 2023-07-17 13:34:49 -07:00
Myk 62b311c6d7
Merge pull request #3575 from plule/cleanup_open_tiles
Remove redundant checks on open tiles
2023-07-17 12:59:23 -07:00
plule b8346cb069 Remove redundant checks on open tiles 2023-07-17 15:42:08 +02:00
Myk Taylor e1946018f8
use TextButton in zone overlay 2023-07-16 20:24:46 -07:00
Myk 2cd226d879
Merge pull request #3566 from myk002/myk_pasture
[zone] initial implementation of pasture assignment screen
2023-07-16 14:36:57 -07:00
Myk ce12cd6e29
colorize! 2023-07-16 14:22:10 -07:00
Myk Taylor a017700dc6
convert egg and graze sliders into tristates 2023-07-16 13:43:52 -07:00
Myk Taylor 5fb299c6df
expand egg-laying filter to the entire race, not just the unit 2023-07-16 12:30:12 -07:00
Myk Taylor b10ef79a29
tag units that are opposed to life as hostile 2023-07-16 12:16:45 -07:00
Myk Taylor 2fa4efbb8a
initial implementation of pasture assignment screen 2023-07-16 12:16:45 -07:00
Myk Taylor 39612f0d5a
trade a bin if any contents can be traded
the new trade screens will make it easy to filter out unwanted items
later
2023-07-16 12:15:51 -07:00
Myk Taylor 5c7aea0775
fix logic for autotrain and autotrade 2023-07-16 12:15:48 -07:00
Myk Taylor a820b95d8c
include exotic pets as tameable 2023-07-15 14:40:04 -07:00