Kelly Kinkade
082a97a0f6
remove refrence to unused field
...
`wait_timer` is not really there; what we have labeled as `wait_timer` is actually padding so there is no need to do this
2023-10-04 01:13:55 -05:00
Najeeb Al-Shabibi
2a842c0df6
merge develop into plugin_preservetombs
2023-10-03 19:32:03 +01:00
Myk
726828af2b
Merge branch 'develop' into reenable-spectatte
2023-10-03 10:50:24 -07:00
Myk Taylor
5d295400d2
centralize management of mouse state
2023-10-01 16:28:18 -07:00
Najeeb Al-Shabibi
0956c06341
update arg changed to 'now' for consistency
2023-10-01 17:33:53 +01:00
Najeeb Al-Shabibi
f7fd769232
Merge branch 'develop' into plugin_preservetombs
2023-10-01 15:13:52 +01:00
Myk Taylor
6e2adaa3a9
don't conflict with macro recording key
2023-09-30 23:31:56 -07:00
Najeeb Al-Shabibi
f77daafdd5
Merge branch 'develop' into plugin_preservetombs
2023-09-30 14:43:53 +01:00
Najeeb Al-Shabibi
7d3764d3ec
removed option to set tickrate for preserve-tombs, fixed at 100 tick interval
2023-09-30 14:42:29 +01:00
Najeeb Al-Shabibi
e2dcced8ef
preserve-tombs command guarded from using update argument when plugin not enabled
2023-09-30 13:21:04 +01:00
Najeeb Al-Shabibi
6be9de5e51
preserve-tombs added option to change tick rate, changed default update frequency, changed some print to debug statements, some other adjustments
2023-09-30 12:30:40 +01:00
Myk
883ecd1840
Merge pull request #3807 from donhth/make-tubefill-live-again
...
re-enable tubefill.
2023-09-29 10:05:42 -07:00
Myk
424f242823
Merge branch 'develop' into work_orders_manager_enhancement
2023-09-29 09:43:19 -07:00
Myk
7b87219657
Update plugins/lua/orders.lua
2023-09-29 09:40:52 -07:00
Mikhail Panov
51173fb9fe
Removed material and job type sortings.
2023-09-29 17:34:48 +03:00
Najeeb Al-Shabibi
7933e29119
newline at eof - preservetombs.cpp
2023-09-29 14:45:46 +01:00
Najeeb Al-Shabibi
028fbc34ad
using std::erase_if instead of iterator loop
2023-09-29 14:30:01 +01:00
Najeeb Al-Shabibi
579fe6ee76
fixed sign compare issue linux build
2023-09-29 14:24:42 +01:00
Najeeb Al-Shabibi
0b2989fb15
preservetombs status now shows list of all tracked tomb assignments
2023-09-29 14:08:49 +01:00
Najeeb Al-Shabibi
b0a15b2e8a
added command to show status of preservetombs (is enabled or disabled)
2023-09-29 13:38:52 +01:00
Najeeb Al-Shabibi
e713e63ea3
Merge branch 'develop' into plugin_preservetombs
2023-09-29 13:26:07 +01:00
Najeeb Al-Shabibi
2a145d06b6
fixed crash on tomb unassignment (caused by incorrect params passed to formatted string)
2023-09-29 13:11:13 +01:00
Najeeb Al-Shabibi
986e64aed0
new plugin preserve-tombs ensures that units that die keep their tomb assignments in death
2023-09-29 12:27:09 +01:00
Myk
b3c45941fb
Merge pull request #3824 from myk002/myk_translate
...
protect against bad values in TranslateName
2023-09-28 20:55:27 -07:00
lethosor
780fb5483d
check-structures-sanity: Allow running without MALLOC_PERTURB_, and adjust bool check accordingly
2023-09-28 23:01:49 -04:00
Myk
af65f185a1
Remove unneeded capitalize
2023-09-28 17:43:06 -07:00
Myk Taylor
13f83d2f95
protect against bad values in TranslateName
2023-09-28 16:35:29 -07:00
Myk Taylor
bff1b5e7b0
make the ascii DFHack logo easier to read
2023-09-28 14:41:30 -07:00
Myk Taylor
09129ddec0
brighten ascii logo on hover
...
as was originally intended. why is fg "de-bolded" by pens?
2023-09-28 13:56:11 -07:00
Myk
da77be29be
Merge pull request #3816 from myk002/myk_remousify
...
align mouse button semantics to DF
2023-09-26 19:09:23 -07:00
Mikhail Panov
1e4e6ed03f
Merge remote-tracking branch 'main_repository/develop' into combat_skill_rating_polishing
2023-09-26 17:42:27 +03:00
Myk Taylor
eefd38c66c
align mouse button semantics to DF
...
we, um, had it backwards
2023-09-26 03:52:24 -07:00
Kelly Kinkade
0559af9f13
autolabor: fix #3812
...
make sure autolabor resets the work detail bypass flag whenever autolabor is unloaded for _any_ reason
i tested `disable autolabor`, `unload autolabor`, and unloading a fort with autolabor enabled; in all cases the work detail bypass flag was cleared as desired
closes #3812
2023-09-24 19:10:46 -05:00
Najeeb Al-Shabibi
2a5e59134c
Merge branch 'develop' into dig_digtype_nohidden
2023-09-24 20:24:39 +01:00
donhth
ac02483b52
Merge branch 'develop' into make-tubefill-live-again
2023-09-24 07:35:34 -04:00
Najeeb Al-Shabibi
ff03fc1f2d
trailing whitespace removed
2023-09-24 12:17:50 +01:00
Najeeb Al-Shabibi
bf9dbd87a9
Merge branch 'develop' into dig_digtype_nohidden
2023-09-24 12:15:52 +01:00
Najeeb Al-Shabibi
b22ca57f50
added previous 'hidden' and 'no-auto' functionality as options, and adjusted how z-level options are specified
2023-09-24 12:15:46 +01:00
shevernitskiy
be26449ef7
ugh
2023-09-24 13:22:20 +03:00
shevernitskiy
bb5e178756
fix eof
2023-09-24 13:19:48 +03:00
shevernitskiy
9f4f14d025
put back unformatted hotkeys
2023-09-24 13:18:58 +03:00
Kelly Kinkade
9cdfe36aea
reenable `spectate`
...
by request from the community
2023-09-24 04:37:24 -05:00
shevernitskiy
f4348095a3
upstream
2023-09-24 11:45:07 +03:00
shevernitskiy
6f26650255
reserved texpos range
2023-09-24 11:44:03 +03:00
donhth
303ce1fdc3
re-enable tubefill.
2023-09-23 15:54:46 -04:00
Mikhail Panov
a236722a75
Changed hotkeys + orders.cpp compilation error fix.
2023-09-22 18:37:14 +03:00
Mikhail Panov
9c866d5134
Merge remote-tracking branch 'main_repository/develop' into work_orders_manager_enhancement
2023-09-22 18:30:21 +03:00
Mikhail Panov
a500233e0b
Moved onde order recheck to orders plugin.
2023-09-22 18:29:45 +03:00
Mikhail Panov
3fc289cefa
Added single order recheck option to orders recheck. Sorting by material and job type consider frequency as a higher priority.
2023-09-22 16:26:23 +03:00
Najeeb Al-Shabibi
6fe0fb5bf9
removed trailing whitespace
2023-09-22 12:45:33 +01:00
Najeeb Al-Shabibi
2083bab2e9
added a +z option to digtype
2023-09-22 12:41:41 +01:00
Najeeb Al-Shabibi
b7fcf035bc
Stopped setting auto-dig on non-default dig designations as auto-dig doesn't work for anything except for the standard 'mine' designation
2023-09-22 12:18:38 +01:00
Najeeb Al-Shabibi
6f45e347af
digtype now doesn't designate hidden tiles for digging, instead only designating visible tiles in 'auto' mode (also changed MapCache* to unique_ptr<MapCache>)
2023-09-22 12:14:41 +01:00
Najeeb Al-Shabibi
3d6d148ad7
using namespace std removed and replaced with std:: prefix, to resolve naming conflict of lerp with std::lerp in C++20
2023-09-21 02:40:03 +01:00
Mikhail
8826c27fa0
Changed 'reset' to recheck for clarity.
2023-09-18 13:41:02 +03:00
Mikhail
68d94ad715
Removed redundant uppercase in mental stability formula. Reworked thresholds for combat skill effectiveness formulas to have a higher 100 cap (more descriptive about very strong warriors).
2023-09-18 12:49:36 +03:00
Mikhail
7d3786586a
Reverted sort.lua. Changed orders sort by material keybing from T to M.
2023-09-18 12:28:34 +03:00
Myk Taylor
48c48baab4
allow semi-wild units to be butchered
2023-09-17 21:23:45 -07:00
pre-commit-ci[bot]
ebb190e356
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-09-16 11:37:12 +00:00
Mikhail
69be3be359
Added sorting by job type and by material for manager orders. Added shortcuts to the manager menu for new functions.
2023-09-16 14:18:06 +03:00
Mikhail
28b00d9f21
Tweaked military formula to be more informative about strong warriors. Added options to sort and reset manager orders to the 'o' screen.
2023-09-16 01:24:47 +03:00
Myk Taylor
fc88bfcbbc
don't close the logo menu on mouseout
...
now that we no longer open on hover, it doesn't make as much sense, and
the behavior can be frustrating when the mouse is moved unintentionally
2023-09-14 11:46:30 -07:00
Myk Taylor
04999cae8d
unbreak Ctrl-Shift-C
2023-09-14 10:43:35 -07:00
Myk Taylor
3634075df0
make DFHack logo glow on hover
2023-09-14 10:12:25 -07:00
Myk Taylor
b6c4eb7701
realign tooltip ids in confirm
2023-09-14 09:59:51 -07:00
Myk Taylor
b11a3ead1e
make DFHack logo respond to clicks, not mouseover
2023-09-14 01:31:19 -07:00
Myk Taylor
d9cae63e4e
move dfhack logo over a little
2023-09-13 18:02:44 -07:00
lethosor
a43522351f
check-structures-sanity: ignore std::unordered_map
2023-09-12 23:42:50 -04:00
Myk Taylor
70b48dfa6f
let vanilla blinking take over when possible
2023-09-10 21:14:59 -07:00
Myk Taylor
73b5f0ced1
continue to highlight designations once they have become jobs
2023-09-10 20:20:04 -07:00
Myk Taylor
9951e5f505
cast chars to chars
2023-09-10 12:54:06 -07:00
Myk Taylor
898e98bea7
don't display priority if there is no priority block
2023-09-10 12:33:22 -07:00
Myk Taylor
a02d14bb5f
alternate drawing designation and priority
2023-09-10 12:29:31 -07:00
Myk Taylor
24b27c79b6
draw directional tracks
2023-09-10 12:11:06 -07:00
Myk Taylor
a0919ec316
add ASCII-mode highlight for smoothing and carving designations
2023-09-10 05:29:55 -07:00
Myk Taylor
ee61c76bc0
use find method instead of binsearch
2023-09-09 10:42:20 -07:00
Myk Taylor
e4edc9be4e
fix crash on invalid saved seed id
2023-09-09 07:49:35 -07:00
Myk Taylor
45e5168a91
ensure face textures get reloaded on map load
2023-09-09 07:20:59 -07:00
Myk Taylor
9d233e6e34
unify stress face pens and rewrite arrival sort docs
2023-09-09 07:00:17 -07:00
Myk
b8ad8379ef
Merge pull request #3747 from myk002/myk_sort_squad_v2
...
[sort] squad screen v2
2023-09-08 21:12:18 -07:00
Myk
c60d6db36b
Merge pull request #3752 from myk002/myk_overlay
...
[overlay] allow widgets to bump their version and reset their saved settings
2023-09-08 21:10:40 -07:00
Myk Taylor
a061a418a1
allow reset to defaults by changing version attribute
2023-09-08 20:25:20 -07:00
Myk Taylor
8f1889edf2
increment overlay widget version so pos is reset
2023-09-08 20:22:44 -07:00
Myk Taylor
1e9e38a0de
implement ratings for arrival order
2023-09-08 20:06:51 -07:00
Myk Taylor
603f1b16c2
use stress face icons for stress and training need
2023-09-08 18:48:05 -07:00
Myk Taylor
5f32042f1a
adjust colorization of ratings
...
move mental stability from a sort to a filter
2023-09-08 16:44:59 -07:00
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