afe99b83c2
corrected orientation bug
2020-11-18 10:43:15 +01:00
90cf6e8587
Merge remote-tracking branch 'quietust/dwarfvet' into develop
2020-11-17 23:38:06 -05:00
53916dbe6b
Use charToKey and clean up logic a bit
...
Ref #1714
2020-11-17 23:33:18 -05:00
4ac3e62e60
ignore input if selection is zero
2020-11-18 02:41:20 +01:00
1cd9babfb7
2 spaces killed
2020-11-17 21:10:40 +01:00
7944026742
fixed help screen misalignment
2020-11-17 20:55:14 +01:00
8f5d9fe1e9
Merge branch 'develop' of https://github.com/DFHack/dfhack into embark-assistant
2020-11-17 19:53:09 +01:00
ab617f67cc
corrected world tile level incursion calculations
2020-11-17 19:52:46 +01:00
877fd42214
dwarfvet - initialize spot_index ( #1711 ), fix types in Patient
2020-11-17 09:13:03 -06:00
0b886399fe
zone: stop enumnick from taking priority over assign/unassign/slaughter
...
Fixes #1709
Ref #1652
2020-11-15 22:21:46 -05:00
4921cb4ac7
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2020-11-14 15:08:22 -05:00
0ef56ba859
another space character met its demise
2020-11-14 14:53:54 +01:00
46835c9edd
reworked aquifer bit fiddling
2020-11-14 14:43:43 +01:00
59e76ae407
detect buildingplan buildings in the resume plugin
2020-11-13 12:43:46 -08:00
d51b56c780
removed a blank
2020-11-13 20:28:22 +01:00
6014a45235
Fixed bug missing world tiles lacking incurson supplied resources
2020-11-13 20:11:03 +01:00
2e4f23d49f
Merge remote-tracking branch 'myk002/myk_isplannedbuilding' into develop
2020-11-13 14:09:36 -05:00
efdba8b596
add buildingplan.isPlannedBuilding
2020-11-13 10:18:54 -08:00
10616a387f
cleaner mask-based implementation
2020-11-12 22:44:38 -08:00
6b14a92385
allow buildingplan to match metal bars
2020-11-12 19:54:00 -08:00
02a86d761a
identify bars as non_economic items
...
allows Job::isSuitableMaterial() to match metal bars as a building
material
2020-11-12 19:10:06 -08:00
36110902fa
don't use cached iterators across map reloads
2020-11-12 00:11:13 -08:00
923b1b14f3
Merge remote-tracking branch 'myk002/buildingplan_persist_global_settings' into develop
2020-11-11 23:59:09 -05:00
9c13b497bf
Merge remote-tracking branch 'myk002/myk_automaterial_buildingplan_fix' into develop
2020-11-11 23:36:42 -05:00
54702085d5
don't eat keys while building is being renamed
...
allows buildingplan to prevent unsuspension of planned buildings without
also eating the 's' key when the user is trying to use it to give the
building a custom name.
2020-11-11 17:12:56 -08:00
c87d5260d3
buildingplan: make hotkeys added to existing menus red
...
For clarity (per Lua API.rst guidelines)
2020-11-11 16:04:40 -05:00
58079217d9
Merge remote-tracking branches 'myk002/myk_buildingplan_no_quality' and 'myk002/myk_buildingplan_pause' into develop
2020-11-03 00:09:03 -05:00
2c65113bdb
detect all conditions that make the game pause
2020-10-31 03:03:05 -07:00
fbc26336cf
don't show quality properties for no-quality items
...
for items that cannot have a quality or be decorated:
in place mode, don't show quality adjustment hotkeys (or isDecorated
flag hotkey) and don't interpret the associated keycodes if they are
pressed.
in query mode, don't show quality or decorated fields.
2020-10-31 02:25:26 -07:00
65114d904c
fix typo in comment
2020-10-29 11:53:31 -07:00
22ac163d55
improve UX between automaterial and buildingplan
...
solves the confusing behavior when both automaterial and buildingplan
are enabled for constructions. the two plugins now communicate with each
other over the Lua layer to negotiate consistent behavior.
if neither plugin is enabled, the standard DF UI acts as normal
if automaterial is enabled but buildingplan is not, then automaterial
behavior is unchanged.
if buildingplan is enabled and automaterial is not then behavior is
the same as other buildings with buildingplan (no material selection
screen, screen stays on building placement screen after placement).
this commit fixes a bug, though, where buildingplan would only lay
down a single tile of contruction instead of a solid block when a
block is requested.
if both plugins are enabled but buildingplan is not enabled for the
building type then automaterial is unchanged from previous behavior,
execpt for an additional header showing the separation between
automaterial hotkeys and buildingplan hotkeys.
finally, if both plugins are enabled and buildingplan is enabled for the
building type then buildingplan behavior prevails, but the box select and
hollow designations features of automaterial are still usable and
useful. the 'Auto Mat-select', 'Reselect Type', and "Open Placement"
automaterial hotkeys are hidden in the UI and ignored in the feed. This
is because buildingplan takes over material selection, so 'Auto
Mat-select' doesn't make sense. Buildingplan also already stays on the
placement screen after placement, so 'Reselect Type' is not necessary.
And all buildingplan-placed buildings have relaxed placement
restrictions (e.g. they can be built in mid-air) so 'Open Placement' is
also not necessary. The missing options are replaced with blank lines so
the vertical alignment of all other options stays constant.
we also remove a few extra lua_pop() calls that are made superfluous by
the StackUnwinder.
2020-10-29 11:00:49 -07:00
08bb6ca35e
Tweak colors
...
Ref #1684
2020-10-29 00:03:07 -04:00
d508ad3c4b
Merge remote-tracking branch 'myk002/buildingplan_building_material_filters' into develop
...
Conflicts:
docs/changelog.txt
2020-10-28 23:57:55 -04:00
c1af3e2817
document what happens if no types are allowed
2020-10-26 21:13:11 -07:00
3ab9157a2d
Merge remote-tracking branch 'myk002/buildingplan_refactor5_allbuildings_squashed2' into develop
2020-10-26 21:37:41 -04:00
b723636fe2
Merge remote-tracking branch 'myk002/buildingplan_refactor4_algorithm_squashed2' into develop
2020-10-26 21:24:05 -04:00
1a69a9b483
add more important checks for matching items
...
stolen (with love) from advfort.lua
2020-10-26 16:54:50 -07:00
292d40a6ba
change hotkeys for adjusting min and max quality
...
to avoid 'q' and 'w' conflicts with the standard DF UI hotkeys for
roller speed.
min quality: 'qw' -> 'QW'
max quality: 'QW' - 'AS'
2020-10-26 16:11:34 -07:00
72b6ac781b
on second thought, let UI-related settings reset
...
no need to have quickfort_mode stay on forever
2020-10-25 02:45:03 -07:00
486bf2719b
persist global buildingplan settings
...
this ensures that a player's preferences are saved across map reloads.
this is particularly important for the building material filters, since
item fulfillment tasks are regenerated on map load, and any changes in
settings when buildingplan is reset will change the item vectors that will
be searched for planned buildings. if the settings were allowed to reset,
then a player who thought all walls would be made out of blocks would be
surprised to find boulders and logs being used after the map is reloaded.
2020-10-25 02:37:22 -07:00
58917b03d1
Switch away from CheckDFObject in unprotected calls
...
See https://github.com/DFHack/dfhack/pull/1674#issuecomment-716028460
2020-10-24 14:27:33 -04:00
a2f943e7e5
don't shift UI down for track constructions
...
automat doesn't have UI there to avoid
2020-10-24 09:19:15 -07:00
e614d16e0e
use Lua::CheckDFObject instead of static cast
2020-10-23 15:30:40 -07:00
55a52554ee
use CheckDFObject instead of static cast
...
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2020-10-23 13:55:14 -07:00
0f517f38f8
don't conflict with automaterial plugin
...
shift buildingplan text down so we don't overwrite each other
2020-10-22 22:01:45 -07:00
7e78d8802e
migrate qf's buildings_use_blocks to buildingplan
...
- remove buildings_use_blocks setting from quickfort config file
- add a new Buildingplan Global Settings dialog to house global settings
- move Quickfort Mode (for legacy Python Quickfort) into that dialog
- add four settings to control how generic building materials are matched:
- blocks
- boulders
- logs
- bars
- ajust the buildingplan algorithm to register duplicate tasks for
building material item filters, one for each type. since we track how
many items we've matched for a filter, the first matched item will
"win" and the extras will get detected as invalid and popped off the
queue.
- ensure boulders, logs, and bars are scanned last, and in that order
- more global settings planned for the future! see
http://www.bay12forums.com/smf/index.php?topic=176889.msg8202679#msg8202679
2020-10-22 21:37:49 -07:00
09fbaba726
buildingplan: support all building types
...
Allow buildingplan to handle all building types, update the docs, and add in little extra fixes to ensure all the new types work correctly.
2020-10-16 14:23:35 -07:00
100b374af7
generalize buildingplan for all building types
...
but restrict to only the currently supported set so we can still assume only one filter is required for each building.
changes:
- update buildingplan plugin version to 2.0
- new serialization format for planned buildings
- old persistent data is automatically migrated to new format on load
- algorithm now respects job_item filters; items must match job_item filter and buildingplan ItemFilter
- more invalid items are now filtered out, like items encased in ice. are there any others we should be checking (see BadFlags struct)
- items are sorted before job is unsuspended so final item ordering is correct regardless of what order the items were matched and attached
- item counts in filters are kept up to date so if buildingplan is disabled before all filters are matched and the building is completed by DF itself, the item counts will come out correct (though the item ordering and building "roughness" may be incorrect)
- fixes two memory leaks in building finalization code
- allows artifacts to be matched (ItemFilter defaults now top out at Masterful -- Artifact is selectable but must be manually specified)
- add gui to switch between items for buildings that require multiple item types
2020-10-16 14:08:52 -07:00
1368fb4003
buildingplan: construct buildings from lua
...
Replace C++ building construction code with lua constructBuilding so we can get the proper job_item filters set. these filters will be used when we replace the core buildingplan algorithm in the next PR.
2020-10-16 14:03:05 -07:00
82013c0c5e
prep buildingplan for core algorithm changes
...
Lots of refactoring and reorganizing, with only cosmetic player-visible changes.
- show quickfort mode hotlkey label regardless of whether the current building type has buildingplan enabled. before, it was only shown after the user enabled buildingplan for the current building. this eliminates the extra step when enabling quickfort mode, which force-enables all building types.
- changed signature of lua-exported isPlannableBuilding to take subtype
and custom type in addition to building type. this is only used by
quickfort, and it already sends all three params in preparation for
this change
- added lua-exported scheduleCycle(), which is like doCycle(), but only
takes effect on the next non-paused frame. this lets quickfort
run only one buildingplan cycle regardless of how many #build
blueprints were run
- declared a few dfhack library methods and params const so buildingplan
could call them from const methods
- converted buildingplan internal debug logging fn to have a printf api
- reshaped buildingplan-planner API and refactored implementation in
preparation for upcoming core algorithm changes for supporing all
building types (no externally-visible functionality changes)
- changed df::building_type params to type, subtype, custom tuple keys
- introduced capability to return multiple filters per building type
(though the current buildings all only have one filter per)
- split monolith hook functions in buildingplan.cpp into one per scope.
this significantly cleans up the code and preps the hooks to handle
iterating through multiple item filters.
- got rid of send_key function and replaced with better reporting of
whether keys have been handled
2020-10-16 13:52:23 -07:00
895fa59c79
Merge branch 'buildingplan_refactor' into develop
2020-10-16 00:05:01 -04:00
93520b4b00
dwarfmonitor prefs: fix segfault if item_subtype is null for some item types
2020-10-11 20:45:56 -04:00
9c8098b4f0
Expose to_search_normalized to Lua, add test, and use in ListColumn (most useful for the `stocks` plugin)
2020-10-10 01:40:00 -04:00
1b53c0e748
Merge remote-tracking branch 'GitOnUp/normalize_search' into develop
2020-10-09 22:18:39 -04:00
e2de358f00
Merge remote-tracking branch 'PassionateAngler/zone-qol-improvements' into develop
2020-10-09 21:43:04 -04:00
2382247398
Update some docs links to use HTTPS
2020-10-09 19:17:59 -04:00
c9609ad590
Make `createitem inspect` consistent for PLANT_GROWTH items
2020-10-09 12:45:49 -04:00
691b35bf04
Merge remote-tracking branch 'quietust/createitem' into develop
2020-10-09 12:35:40 -04:00
a3c565b243
Add to_search_normalized to search for characters with accents
2020-09-24 07:31:10 -07:00
1c2761f903
enable all in quickfort mode
...
and simplify logic since new bool map values are already initialized to
false
2020-09-23 20:00:04 -07:00
323d377f63
Merge remote-tracking branch 'upstream/develop' into buildingplan_refactor
2020-09-23 19:21:49 -07:00
577bb0a258
Merge remote-tracking branch 'myk002/buildingplan_format' into develop
2020-09-23 20:04:17 -04:00
d3520a2f5f
Fix createitem to properly create plant growths ( #898 )
2020-09-20 16:11:41 -06:00
0e6e00af5e
getplants: fix crash when world_object_data is not present for certain blocks
2020-09-20 01:24:46 -04:00
9c37a3a068
Add "createitem inspect" subcommand
2020-09-19 20:33:47 -04:00
8df8eb0c5d
Remove obsolete xlsxio_project dependency
2020-09-19 16:23:21 -04:00
5952c16d87
Merge branch 'develop' into deps-subdirectory
2020-09-19 16:19:47 -04:00
11ee3a223d
enumnick: command added to 'zone' plugin and other QoL improvements
...
zone: enumnick command create nick for creature from given prefix and number
uinfo displays "Matched creatures" i.e number of creatures matched by filter
maxage, and minage filters accept float now
slaughter flag displayed on uinfo cretures list
2020-09-19 14:52:16 +02:00
a4254a4d2c
xlsxreader: Don't link to zlib directly
...
It's complicated on Windows, and xlsxio already links to it directly
2020-09-18 15:04:06 -04:00
b85759620f
Switch libzip and xlsxio to be included with add_subdirectory(), disable xlsxio installation
2020-09-18 00:33:41 -04:00
42d4d33571
Only modify xlsxreader target if it was created
...
Ref #1620
2020-09-17 15:41:29 -04:00
1efa09582a
Change libexpat to be included with add_subdirectory()
...
- Confirmed that libexpat is built statically and linked with xlsxreader
- May need da7cda3a85
2020-09-17 00:25:50 -04:00
8660355838
formally declare used globals in fortplan
2020-09-08 21:30:12 -07:00
3b362294b9
move quickfort logic from Planner to buildingplan
...
where all the other gui-related logic is.
2020-09-08 17:34:11 -07:00
f3da131db7
reorganize buildingplan code - no logic changes
...
- no API or logic changes, just moving code around
- split buildingplan-lib into planner and rooms files
- move business logic from .h files to .cpp files
2020-09-08 00:17:56 -07:00
09b018bea6
stockpiles: remove sand_bags field
...
Fixes #1013
2020-08-29 20:04:09 -04:00
23dc7727b5
Merge remote-tracking branch 'kristjanmoore/develop' into develop
2020-08-29 17:43:46 -04:00
a84a1f0ee9
Switch trade screen search to use search_multicolumn_modifiable so that item counts are updated correctly with other information
2020-08-25 14:15:41 -07:00
293b0253c4
Set min_waterfall special cases outside loop
2020-08-23 17:35:45 +00:00
3ebb812cd5
Allow searches for higher waterfalls
2020-08-23 13:20:45 +00:00
45a0b7b3a6
Fix stockpiles crash when building food map
...
Fixes #1628
Broke due to ecd6bcc9ed
2020-08-18 21:00:10 -04:00
19a4d1df5a
Merge remote-tracking branch 'myk002/quickfort_buildingplan' into develop
2020-08-17 23:43:05 -04:00
7a7aff7745
closing NULL pointers is ok
2020-08-15 23:37:21 -07:00
e4a35514ab
document buildingplan Lua API
2020-08-15 23:03:49 -07:00
4e331ce4ce
much better NULL handling/detection for xlsxreader
2020-08-15 22:35:20 -07:00
42108a64b9
expose basic buildingplan functionality to Lua
2020-08-12 15:24:32 -07:00
0bda289b17
move xlsxreader identity statics to dfhack lib
2020-08-11 14:51:17 -07:00
cfc736caa1
give the identity classes distinctive name fields
...
both would have been represented as "handle" to Lua
2020-08-11 14:18:09 -07:00
c6f9eb519a
remove outdated example code in xlsxreader.cpp
...
there is already good example code in Lua API.rst and in xlsxreader.lua,
so just remove this one
2020-08-11 13:44:07 -07:00
438d264b31
use separate identity classes for each handle type
2020-08-10 23:09:03 -07:00
17c509a596
update sample code for xlsxreader to use finalize
2020-08-10 09:18:49 -07:00
69322ec429
use proper USERDATA instead of LIGHTUSERDATA
2020-08-10 01:13:16 -07:00
679ca41da8
make sure xlsxio knows to link statically
2020-08-09 21:22:17 -07:00
06e3f77e39
fix windows zlib path, hopefully for the last time
2020-08-09 10:47:15 -07:00
e2129673c1
fix zlib path on windows
2020-08-09 10:11:24 -07:00
5294360908
more windows library naming shenanigans
2020-08-09 09:46:54 -07:00
4a04273fae
document xlsxreader functions
2020-08-09 09:28:19 -07:00
a41f7c0998
convert XlsxReader module to xlsxreader plugin
2020-08-09 08:54:42 -07:00
73ba692f15
Fix road building ( #1596 )
...
Paved roads need architecture before road building
2020-08-08 14:46:42 -04:00
b2368b3c34
Merge remote-tracking branch 'ab9rf/labormanager-custom-furnaces' into develop
2020-08-08 14:35:44 -04:00
a28e939370
Recalculate size after toggling columns (goals can be longer than professions)
2020-08-08 00:45:57 -04:00
ee8d130298
Use existing pronoun_type enum
2020-08-08 00:12:59 -04:00
23c22b3b9d
Merge branch 'develop' of https://github.com/DFHack/dfhack into feature/manipulator_goal
2020-08-07 22:17:32 +01:00
a85b77e6f1
Retrieve goal string values from enum attributes and add new Units methods to Lua API and docs
2020-08-07 22:07:48 +01:00
ed9f724117
Use BUILDJOB_NOW key, dim text when no job is selected
2020-08-06 22:44:49 -04:00
c7e4c724e8
Sort tweaks alphabetically
2020-08-06 22:37:04 -04:00
0c53b2b6c5
Add do-job-now tweak
...
Forum thread: http://www.bay12forums.com/smf/index.php?topic=176700
Original source: https://github.com/dlmarquis/dfhack/blob/dojobnow-r1/plugins/dojobnow.cpp
Co-authored-by: dlmarquis <dlmarquis@users.noreply.github.com>
2020-08-06 22:36:57 -04:00
02c0a6c8f6
Update getplants to use new plant_raw.material_defs layout
...
a9f219baf9#1564
2020-08-06 00:53:06 -04:00
d3fc691858
Merge remote-tracking branch 'PatrikLundell/Units' into develop
2020-08-06 00:12:54 -04:00
9510dd52e1
Add Goal to Manipulator Detail Modes
2020-08-04 23:01:28 +01:00
19ad5c92d6
corrected incursion bugs
2020-07-30 10:09:41 +02:00
4554ca35f3
Ruby: add _indexenum wrapper to OtherVectors for compat with devel/scanitemsother
...
Ref #1558
2020-07-26 23:11:04 -04:00
655b363238
Fix some spelling errors
2020-07-22 02:23:29 -04:00
044add2147
Reorder .proto comments
2020-07-18 12:48:20 -04:00
35d659091d
Merge remote-tracking branch 'myk002/blueprint_in_blueprints' into develop
2020-07-17 17:32:59 -04:00
c858f33f61
reaction-gloves: fix warnings
2020-07-17 00:00:57 -04:00
89c24ac8be
Merge remote-tracking branch 'quietust/reaction-gloves' into develop
2020-07-16 22:40:49 -04:00
bb91fdcf8c
Merge remote-tracking branch 'upstream/develop' into blueprint_in_blueprints
2020-07-16 09:24:52 -07:00
a0d627ebc7
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2020-07-16 01:48:07 -04:00
c19fc1f349
gcc-4.8 compatibility
2020-07-15 21:35:21 -07:00
e2334387a9
blueprint: write blueprints to blueprints/ subdir
...
to enable writing to a subdir that may not exist, blueprint now automatically
creates folder trees. E.g. ``blueprint 30 30 1 rooms/dining dig`` will create
the file ``blueprints/rooms/dining-dig.csv``). Previously it would fail if the
``blueprints/rooms/`` directory didn't already exist.
2020-07-15 16:57:14 -07:00
b6de6f12ec
Merge remote-tracking branch 'RosaryMala/remote_reader' into develop
2020-07-13 19:58:33 -04:00
07a2b4a9d7
Use language_name_type enum item names
2020-07-11 02:05:38 -04:00
c30d27cfbd
Silence strangemood warnings
2020-07-11 01:41:38 -04:00
f32757fa09
Update scripts
2020-07-03 22:49:48 -04:00
0a2a16d29c
corrected ripeness calculation
2020-07-03 15:50:18 +02:00
a04c609980
fixed getplants, issue #1479
2020-07-03 13:46:32 +02:00
72ce52e004
update structures
2020-07-01 23:10:34 -05:00
9def098ef9
add enum-attrs to pronoun_type
2020-06-29 21:30:22 -05:00
d13e5a3f31
update structures
...
handle renaming of caste_raw::gender
2020-06-29 20:20:37 -05:00
a9f219baf9
update for DFHack/df-structures#7dfea1f1d4e453b97d5529785701db46360596ce
2020-06-29 16:16:44 -05:00
3dcde1554a
Update xml, fix reaction_product::produce() parms
2020-06-23 13:37:11 -06:00
2597aeab0e
Add a new tweak, "reaction-gloves"
...
When enabled, custom reactions will begin to produce gloves in sets, based
on the number of hands the job performer's race has, and set the
Handedness flags accordingly.
The "createitem" plugin already contains a simpler workaround (which
doesn't check body plan but instead just produces pairs), but it shouldn't
trigger when this tweak is enabled (unless you use it on a creature which
has been modded to only have "neutral" hands).
2020-06-23 13:37:11 -06:00
e2301ecae7
Update structures, fix reaction_productst::produce() parms
2020-06-23 13:31:27 -06:00
61a00f7809
stupid whitespace
2020-06-20 23:10:44 -05:00
7ddc3bb918
fix labor inferences for custom furnaces
...
Also clean up how paved roads are handled (the way it was was stupid)
2020-06-20 23:05:55 -05:00
aee4fcd1a6
Add confirmation for convicting dwarves of crimes
...
Closes #1593
2020-06-20 12:06:50 -04:00
d5a491e852
fixed parameter bugs
2020-06-07 08:38:12 +02:00
4a48c356a9
fixed bug with incursion handling along world tile edges
2020-06-02 15:58:46 +02:00
dda31c06db
merged
2020-06-02 15:08:02 +02:00
ad37354211
Bump version number to make sure the updater works.
2020-05-24 15:42:59 -07:00
b3080c73ca
Merge remote-tracking branch 'DFHack/develop' into remote_reader
2020-05-22 08:06:33 -07:00
6e2f71b10f
Merge branch 'remote_reader' of https://github.com/RosaryMala/dfhack into develop
2020-05-22 08:04:38 -07:00
3db490ee9e
Fix a problem where the block coordinates would sometimes not get copied.
2020-05-22 08:01:34 -07:00
28c34217d8
Ruby implementation of df-other-vectors-type
2020-05-09 18:28:40 -05:00
31d984e934
Fixed 2 incursion handling bugs
2020-05-05 10:21:56 +02:00
be517370a6
rendermax: move to std::mutex
...
fast_mutex can deadlock on Linux with optimization enabled
2020-05-04 18:38:54 -04:00
2dfd7ea0d0
Update labormanager.cpp again
...
These should probably be OTHER rather than BUSY.
2020-05-03 18:19:49 -05:00
319354f6cd
Update labormanager.cpp
...
Add entries for jobs 241-243 to the `dwarf_states` vector as well, derp.
2020-05-03 18:16:31 -05:00
866660169e
Update joblabormapper.cpp
...
Add no-labor mappings for new jobs 241 through 243.
2020-05-03 17:53:32 -05:00
63c7b69b5b
Change item improvement type to bare ints.
2020-05-02 14:38:55 -07:00
60853a543d
Remove the site realization building type from the remote reader spec. It has no business being there.
2020-05-02 13:28:28 -07:00
2762f75d69
Merge remote-tracking branch 'dfhack/develop' into develop
2020-05-02 10:58:41 -07:00
fcc4962052
Update stonesense to not crash.
2020-05-02 10:58:07 -07:00
1dc59d3772
Ruby: use core methods for finding selected item and building
...
Similar to c3d566332Fixes #1563
2020-05-01 22:50:02 -04:00
7c1d1c43e5
Merge remote-tracking branch 'PatrikLundell/stocks' into develop
...
Conflicts:
docs/changelog.txt
2020-04-25 21:12:27 -04:00
f008da32f8
Update submodules
2020-04-25 17:58:09 -04:00
1546d9ec1a
Tweak docs from #1484
2020-04-25 02:41:27 -04:00
4dce9f2010
Merge remote-tracking branch 'PatrikLundell/getplants' into develop
...
Merges #1484
Conflicts:
docs/changelog.txt
2020-04-25 02:39:05 -04:00
55a82e43c6
Update xml, fix stockpiles build
2020-04-24 23:50:35 -04:00
75c8bf1a59
Indent more
2020-04-22 22:05:48 -04:00
07571e9eb4
updated and resolved conflict
2020-04-22 11:43:37 +02:00
2f1e057bc7
check-structures-sanity: report known void* types with a better message
2020-04-19 22:03:03 -05:00
8427f518c9
match capitalization changes I made to df-structures in specific_ref
2020-04-15 20:05:15 -05:00
f4f2aa0d5e
removed underscores, adapted to structure (re)naming
2020-04-15 10:18:37 +02:00
b0d184e2f9
Merge branch 'develop' of https://github.com/DFHack/dfhack into Units
2020-04-15 09:45:54 +02:00
362e49c0bc
autogems: check bin content in linked stockpiles
2020-04-12 11:02:26 +02:00
2b44e52cab
Add intrigue skill to manipulator
2020-04-11 16:47:29 +02:00
55988e3fc4
adapted to updated structures, remote Using units for age
2020-04-08 08:45:40 +02:00
5ce84a76f9
Merge branch 'develop' of https://github.com/DFHack/dfhack into Units
2020-04-08 08:35:58 +02:00
c4853bd6e1
Add search to justice screen
2020-04-06 19:13:18 +02:00
4e957eafe2
Merge remote-tracking branch 'ymber/embark-profile-name' into develop
2020-04-04 18:55:12 -04:00
a0e2abe20a
Units update need coordination with structure identity
2020-04-04 14:00:26 +02:00
9b813aab49
Restore style
2020-04-04 11:17:10 +01:00
5d032b3d9c
Restore esc abort key
2020-04-04 11:12:51 +01:00
845b53d7cd
fix integer signedness differences
2020-04-03 11:50:09 -05:00
6b603bc644
Update embark-profile-name tweak
2020-04-02 17:57:05 +01:00
06201a4c6a
Bail out if MALLOC_PERTURB_ is unset to avoid unexpected behavior
2020-04-02 01:48:21 -04:00
9b1dddc336
Update xml, scripts, change unit_action.data field names back
...
Fixes #1520
Makes part of dfhack/scripts#130 unnecessary
2020-03-30 03:00:41 -04:00
97916fd55e
implement tagged union structures attributes
2020-03-21 14:29:14 -05:00
b29d009b14
update structures; implement struct_field_info_extra
2020-03-21 13:21:35 -05:00
5c913270d6
forgot to update profile save/load
2020-03-15 17:56:13 +01:00
7e2872e607
Merge branch 'develop' of https://github.com/DFHack/dfhack into embark_assistant
2020-03-15 17:33:08 +01:00
ccf92d4b0a
fix check-structures-sanity compile on 64-bit windows
2020-03-13 01:09:04 -05:00
a456b2fcf3
fix windows build
2020-03-13 00:03:56 -05:00
39486083f5
handle overlapping structures in check-structures-sanity better
...
update structures
2020-03-12 22:16:30 -05:00
d456e3db7a
check-structures-sanity: fix unknown pointer type not actually dereferencing the pointer
...
basic attempt at handling overlapping structs
2020-03-12 15:20:46 -05:00
616a57224f
check-structures-sanity: don't report possible pointers by default
2020-03-12 11:35:52 -05:00
08d2ed577e
fix check-structures-sanity compile on windows
2020-03-12 10:02:21 -05:00
469c49c8b9
check-structures-sanity: keep track of whether data is within a larger structure
2020-03-11 17:49:34 -05:00
eabff06eef
check-structures-sanity: warn when an integer might be a pointer
2020-03-11 11:20:10 -05:00
e2138a6cc2
update check-structures-sanity (part 2 of 2)
2020-03-10 23:05:59 -05:00
e5de783c58
rewriting check-structures-sanity to improve performance and remove the need for the lowmem option
2020-03-10 18:53:56 -05:00
e296525983
check-structures-sanity: don't error on unnamed enum values/bits by default
2020-03-09 17:52:47 -05:00
923581b144
fix ghidra script failing if strings overlapped (for example, load_min_version and version could point to the same region of memory)
2020-03-09 17:52:47 -05:00
a2e34a3b71
fix check-structures-sanity picking the wrong type for linked list items
2020-03-08 00:21:18 -06:00
f8f7b52180
fix is_df_linked_list not checking if the type is null
2020-03-06 20:22:18 -06:00
6465037432
fix field order
2020-03-06 20:04:17 -06:00
07aceb1078
correctly handle arrays of linked lists
2020-03-06 19:45:04 -06:00
9b724666f7
check-structures-sanity: check linked lists in a more intelligent way
2020-03-06 17:53:05 -06:00
def86b8058
check-structures-sanity: ignore DfLinkedList element sizes; these can be part of a larger structure
2020-03-06 17:05:36 -06:00
61aeaaf55e
fix typo in check-structures-sanity
2020-03-06 16:51:33 -06:00
a214e00407
allow union vectors to have tags that are bit vectors if they have exactly 2 members
2020-03-06 16:48:33 -06:00
635e709d95
name ui_look_list union
...
update scripts and structures
2020-03-06 16:06:27 -06:00
630aa5abdb
Merge branch 'develop' of https://github.com/DFHack/dfhack into embark_assistant
2020-03-05 08:40:46 +01:00
84cae060b1
move find_union_tag from check-structures-sanity to DataDefs.h
2020-03-04 18:23:49 -06:00
6f9f398e22
blind attempt to silence warnings
2020-03-04 16:54:00 +01:00
8dd89eee8a
Addressed warnings
2020-03-04 10:09:51 +01:00
cd4c7ee422
Updated embark-assistant. Lt aquifer, trees, neighbors
2020-03-03 21:45:20 +01:00
e356925795
update structures
2020-03-02 23:12:03 -06:00
e5c597f869
change two UNEXPECTEDs in check-structures-sanity to FAILs instead
2020-03-02 22:30:23 -06:00
7784e569a5
update structures
2020-03-02 22:29:53 -06:00
c29b606a4a
check-structures-sanity: suggest known structure types for large unknown pointers
...
update structures
2020-03-02 21:33:04 -06:00
269b3cb8eb
add support for finding vtable pointers to check-structures-sanity
...
update structures
2020-03-02 15:34:29 -06:00
0024457167
update structures
...
don't mark lua argument as a pointer (to be revisited at some point)
2020-03-02 02:27:15 -06:00
fe2ea17880
change DF version
...
add -maxerrors and -failfast to check-structures-sanity
2020-03-01 12:15:26 -06:00
0c007c4699
remove std::min usage
2020-03-01 00:18:09 -06:00
85bfa60cf2
allow -1 union values for undefined tags to avoid false positives
2020-02-29 21:57:39 -06:00
cc2c732dd5
insert a new second rule for tagged union discovery
...
1. if the field name ends in "data" and there is a field with the same
prefix ending in "type", the field ending in "type" is the tag.
2. if the field name ends in "_target" and the previous field has the
same prefix and no suffix, the previous field is the tag.
3. if the field is not the last field in the structure, the next field
is the tag.
2020-02-29 18:46:34 -06:00
b0699a1b5e
allow uninitialized data to be all zeroes
2020-02-29 18:36:00 -06:00
0860d81c86
add support for vectors of tagged unions in check-structures-sanity
2020-02-29 18:28:14 -06:00
18523a1821
Convert untagged unions to tagged. Fix some edge cases in check-structures-sanity union checking.
2020-02-29 15:08:39 -06:00
3240b6d897
check-structures-sanity improvements for unidentified fields and unions
...
- not being able to determine the tag for a union is now an error.
- pointer-sized unknown allocations will now be checked recursively as
if they were void pointers. this will help with identifying string
pointers on linux.
- unknown tagged union fields will be checked as void pointers if the
first identified field of the union is a pointer.
- tagged unions can now be of non-pointer types.
- tagged unions can now have complex tag enums.
2020-02-29 14:20:43 -06:00
a30678cee3
subclass struct_identity for unions
2020-02-29 13:11:23 -06:00
97a31c68a8
dwarfvet log only if enabled ( fix #1504 )
2020-02-24 13:54:47 -05:00
e9564a28f5
allow tagged unions to not be union followed by tag
2020-02-23 21:33:32 -06:00
5580d375aa
add more diagnostics that will help in the identification of stl-string fields
2020-02-22 15:34:48 -06:00
37a8bf679e
fix copy/paste error
2020-02-22 14:10:26 -06:00
0711b2569a
in -sizes mode, report sizes of unknown structures behind pointers.
...
update structures
2020-02-22 14:04:53 -06:00
57154e33c8
warn about misidentified generic pointers
...
update structures
2020-02-21 18:49:02 -06:00
53da38ca47
add additional pointer, string, and vector sanity checks
...
update structures and scripts
2020-02-21 17:31:31 -06:00
f383f63eea
fix check-structures-sanity not catching certain types of invalid string on GCC builds.
...
update structures.
2020-02-21 17:31:31 -06:00
81c304f7ee
Update stonesense, isoworld
2020-02-21 08:27:57 -05:00
38410544b0
handle tagged unions in check-structures-sanity
...
update structures
2020-02-20 22:17:25 -06:00
ee6b281ae3
allow check-structures-sanity to check the size of the value explicitly specified in a lua expression rather than just its descendants.
...
print an error if getting the type identity fails.
2020-02-19 11:40:31 -06:00
d149763c1e
fix yet another weird use of the part of speech enum
2020-02-18 16:41:39 -06:00
0d36e62d81
fix some weird uses of the part of speech enum
2020-02-18 16:39:39 -06:00
0f857f1b20
fix msvc warning about 64-bit shift
2020-02-15 18:20:34 -06:00
d0de7865d3
fix compile for gcc 4.8
2020-02-15 18:20:32 -06:00
631b8e772c
update structures; fix -lowmem being enabled due to being uninitialized on the stack.
2020-02-15 16:10:54 -06:00
8756667d99
cursecheck: Fix werecreature detection
...
Fixes #957
2020-02-15 17:09:18 -05:00
e4ff184280
check-structures-sanity: add -lowmem argument to use depth-first search instead of readth-first search
...
add progress indicator if called from the console
2020-02-15 12:54:04 -06:00
122169a559
update scripts and structures
...
fix a crash if check-structures-sanity was called with a lua expression that evaluated to nil
2020-02-15 12:04:00 -06:00
8e5f391d3a
attempt to fix lua calls in check-structures-sanity
2020-02-15 02:42:44 -06:00
9caf6e97e6
add -enums, -sizes, and specific starting point flags to check-structures-sanity
2020-02-14 19:47:26 -06:00
4e69b50bb3
fix use-after-free in memview
2020-02-14 17:38:31 -06:00
fec6f01520
Allow uninitialized raw pointers.
2020-02-13 19:55:49 -06:00
9c34e9e584
properly check fields of the full type heirarchy
2020-02-12 18:01:49 -06:00
24918e5513
check fields of actual virtual type, not just the declared one
2020-02-12 17:57:55 -06:00
40bd55c558
don't check bad pointers
2020-02-11 17:33:33 -06:00
195b933c61
ignore contents of elements of "bad" pointer vectors
2020-02-11 17:17:11 -06:00
62af2952b7
Fix check-structures-sanity mishandling vectors of pointers.
...
Also fix detecting structures that span multiple memory segments as being outside of memory.
2020-02-11 14:11:09 -06:00
3c9f6f79ab
fix some warnings
2020-02-10 19:35:17 -06:00
1a695621c3
Adjusted to int-> enum defs, fixed bug
2020-02-10 18:22:26 -06:00
8122b95144
fix signed integer being compared to an unsigned integer
2020-02-10 11:57:27 -06:00
05a49cbacb
fix a possible SIGABRT when misdetecting a vtable as being valid
...
add enum names enum-based indexes
2020-02-09 15:12:25 -06:00
e9dba1d6ca
fix crash when checking unknown vector types. also remove the warning when unknown vector types were not pointer-aligned
2020-02-09 14:25:48 -06:00
6b828115a7
rewrite check-structures-sanity to use breadth-first search and not overflow the stack
2020-02-09 14:16:19 -06:00
f54c361718
Add an implementation of mifki's sizecheck library (tested on Linux)
2020-02-08 21:18:29 -05:00
359cc2275a
include the windows header rather than winnt
2020-02-05 21:47:25 -06:00
d494eb619d
fix Windows 64-bit compile for check-structures-sanity
...
fix some sprintf size_t-related warnings
2020-02-05 20:29:16 -06:00
860131cf96
fix Windows 32-bit compile for check-structures-sanity
2020-02-05 20:21:32 -06:00
d9abe02b2e
add support for DfArray in check-structures-sanity
2020-02-05 19:06:14 -06:00
d7d0923044
add string checking support to check-structures-sanity
...
try to avoid crashes on bad vtables
2020-02-05 18:52:35 -06:00
3d037db789
add a tool for sanity-checking structures on a running Dwarf Fortress instance.
2020-02-05 16:36:59 -06:00
5db7d518ee
update structures; fix some minor compile warnings
2020-02-05 12:35:43 -06:00
c4b01b53a3
add new building_type enum value to labormanager
2020-02-02 17:15:40 -06:00
876ac6c056
Renamed to getBookTitle, cut down on virtual_cast
2020-01-25 21:46:10 +01:00
c6bbf39c6c
Issue #1262 . Added Items::getTitle and used in stocks
2020-01-25 12:43:02 +01:00
9d4d0b195a
Added switches for farm seeds and plant counts
2020-01-22 17:33:39 +01:00
bcd7974561
Merge branch 'develop' of gh:DFHack/dfhack into develop
2020-01-18 22:31:33 -05:00
815821eb93
Merge branch 'develop' into cmake-cleanup
...
Conflicts:
depends/lua/CMakeLists.txt
plugins/CMakeLists.txt
plugins/devel/CMakeLists.txt
2020-01-18 22:28:43 -05:00
d4d083d8cf
autofarm: fix GCC warnings
2020-01-18 20:53:13 -05:00
f55a1b9990
autofarm: mention runonce and status in built-in help
2020-01-18 18:52:17 -05:00
dc8b8b501b
Move autofarm to supported plugins
...
PR #1468
2020-01-18 17:17:28 -05:00
3e47ba543b
Merge remote-tracking branch 'ab9rf/autofarm-cpp' into develop
...
Ref #1468
2020-01-18 17:11:43 -05:00
e5a5e39c3a
Move getplants issue details to user-facing docs
...
Ref #1479 , #1481
2020-01-18 16:34:29 -05:00
72fd32cb2a
Tweak spelling/wording/style
2020-01-18 16:22:21 -05:00
af1668126d
Merge remote-tracking branch 'PatrikLundell/getplants' into develop
2020-01-18 16:19:40 -05:00
eeacbc80c6
Explicit type conversion with %d warning silencing
2020-01-16 13:59:31 +01:00
ee2259bbca
Replaced poor auto with actual type
2020-01-16 12:57:09 +01:00
cbf5c5459a
Don't print an error about not being able to get the SDL title in text mode.
2020-01-15 16:07:41 -06:00
cd4b00e23e
Merge branch 'getplants' of https://github.com/PatrikLundell/dfhack into getplants
2020-01-15 21:30:56 +01:00
8cebb6cef5
removed trailing whitespace
2020-01-15 21:29:01 +01:00
7797f9979b
Merge branch 'develop' into getplants
2020-01-15 20:00:49 +01:00
8c049389a4
Reverted STOCKPILE_PLANT_GROWTH to LEAF_MAT
2020-01-15 19:31:19 +01:00
15e06640f6
Partial correction of issue 1479 and added verbose flag
2020-01-15 12:40:43 +01:00
4feb0aa21f
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2020-01-14 23:41:22 -05:00
5eca50476e
Merge remote-tracking branch 'nornagon/unit-description' into develop
2020-01-13 23:31:23 -05:00
50e696acf6
getDescription => getPhysicalDescription
2019-12-14 09:36:47 -08:00
910f965838
wip
2019-12-07 22:17:59 -08:00
23b56c4492
Fix "kittens" development plugin not building on Linux due to missing thread library
2019-12-06 12:28:18 -06:00
fd1d490163
Fix tailor plugin switch statement warnings (no functionality change)
2019-12-06 12:24:27 -06:00
07dedfb333
Fixed/improved river tile detection
2019-11-24 21:32:07 +01:00
dfafafdf9b
autofarm.cpp: whitespace, complexity
...
Clean up autofarm.cpp
2019-11-21 18:58:06 -06:00
5d92026bbe
autofarm: make crop assignment more stable
2019-11-18 09:02:39 -06:00
7c8c6546c7
autofarm: suspend while processing
2019-11-18 09:02:39 -06:00
4abd410b1b
Convert autofarm from ruby to C++
...
Reimplement the Ruby autofarm script as a C++ plugin
2019-11-18 09:02:39 -06:00
e7353ba9bf
embark-assistant: clean up "else if" style
...
Ref #1456
2019-11-02 22:13:28 -04:00
267d52bd17
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
...
Closes #1456
2019-11-02 22:10:08 -04:00
a885e3b9be
autoclothing: add docs
...
Ref #1437
2019-11-02 22:00:43 -04:00
487377d5b9
Merge remote-tracking branch 'JapaMala/auto_clothing' into develop
2019-11-02 22:00:18 -04:00
44f3640344
tailor: add another missing c_str() call
2019-11-02 21:46:10 -04:00
6a00510272
tailor: add missing c_str() calls
2019-11-02 21:30:48 -04:00
bf4dec6c6a
Update scripts, stonesense, authors
2019-11-02 21:13:17 -04:00
150edcfff8
Move tailor to supported plugins
2019-11-02 21:12:41 -04:00
c2e5ae844c
tailor: add docs
...
Ref #1398
2019-11-02 21:07:10 -04:00
ba8b828e69
Merge remote-tracking branch 'ab9rf/tailor' into develop
2019-11-02 21:02:23 -04:00
5780075246
Merge remote-tracking branch 'warmist/dfmonitor_lua_fix' into develop
2019-11-02 16:47:29 -04:00
5190257864
createitem: Improve error handling when no caste is specified
...
Extension of #1463
2019-11-01 23:46:42 -04:00
5e1fc0700b
Merge remote-tracking branch 'jimcarreer/createitem-ux' into develop
2019-11-01 23:24:10 -04:00
7e501fd70b
Fixed bug in region type determination in new code
2019-10-31 20:07:34 +01:00
cffc30b433
Output Castes on Error
2019-10-06 14:25:33 -04:00
582169e0a5
eventExample: make unitAttack a bit safer
2019-10-05 21:05:26 -04:00
e8fcc8d5c0
Merge pull request #1460 from JapaMala/remote_reader
...
Smal RFR change
2019-10-04 01:16:05 -04:00
f3658db85f
Merge branch 'develop' into avoid_rebuilding_df_statics_if_core_h_changes
2019-10-03 23:23:36 -04:00
7979150566
Removed trailing blank
2019-09-24 11:14:50 +02:00
5eceab2794
Added 'fileresult' optional parameter, improved world traversal
2019-09-23 13:13:04 +02:00
f00a7f9b39
Bump RFR Version number.
2019-09-08 15:33:39 -05:00
099ae66be8
Merge branch 'develop' into remote_reader
2019-09-08 15:30:14 -05:00
0a42fe0e38
Delete trailing whitespace
2019-09-02 19:50:00 +03:00
62aff6edee
Whitespace fix
2019-09-02 18:40:50 +03:00
df756f22f8
Change dwarfmonitor to use global lua state.
...
This needs more CoreSuspends but they are needed either way. This way
you can access other script environments and access this plugin enviroment
from lua.
2019-09-02 18:35:46 +03:00
7a5902418e
Abbreviate label on narrow screens
2019-08-25 21:49:41 -04:00
417212814d
embark-assistant: add in-game key to activate
...
Closes #1384
2019-08-25 21:33:43 -04:00
ac5a54c8db
Merge branch 'develop' into cmake-cleanup
...
Conflicts:
library/CMakeLists.txt
plugins/CMakeLists.txt
2019-08-23 23:58:00 -04:00
07575095fd
Merge branch 'develop' into persist
2019-08-22 22:00:50 -04:00
0b8eba7d23
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
...
Conflicts:
docs/changelog.txt
2019-08-22 21:50:54 -04:00
d17820a596
Made RemoteFortressReader pulll from the active units list, not from the full units list.
2019-08-22 19:26:19 -06:00
2344e60101
Merge pull request #1181 from warmist/twbt_experiments
...
map-render plugin
2019-08-21 09:33:45 -04:00
a07b568597
Changed the serialization to use the actual enum item names instead of converting them to numbers.
2019-08-13 17:15:06 -05:00
47b43e6dd7
Merge branch 'develop' into auto_clothing
2019-08-06 20:12:26 -05:00
e1661d8404
Merge remote-tracking branch 'remotes/dfhack/develop' into auto_clothing
2019-08-06 20:07:20 -05:00
88757d5c27
Merge branch 'develop' into cmake-cleanup
2019-07-20 19:22:33 -04:00
e86e20717e
Merge remote-tracking branch 'JapaMala/remote_reader' into develop
2019-07-20 19:05:32 -04:00
99038c395a
Merge remote-tracking branch 'ab9rf/biometype' into develop
2019-07-20 16:32:46 -04:00
ab9ad6f93e
Clean up *.cmake style
2019-07-20 16:17:44 -04:00
76da2c2aaf
Clean up CMakeLists.txt style
2019-07-16 22:19:11 -04:00
f7f937e4d3
Merge remote-tracking branch 'janxious/patch-2' into develop
...
Closes #1441
2019-07-15 23:22:43 -04:00
af26f7dc6e
Added intrusion calculations for world edges
2019-07-14 16:11:51 +02:00
6f5abc79e9
Restored install-debug contents and removed offensive white space
2019-07-12 22:38:12 +02:00
8248832cbc
Added detection and use of incursions into embark tiles
2019-07-12 22:09:03 +02:00
c125926727
Update submodules and Authors.rst
...
Ref #1432
Ref dfhack/stonesense#54
Ref dfhack/scripts#93
2019-07-10 19:21:23 -04:00
53cf1136fb
Waterfall detection changed
2019-07-01 13:30:16 +02:00
134bcf09a9
Waterfall detection changed. Aquifer display changed
2019-07-01 13:29:53 +02:00
bcb62697c9
Waterfall detection changed
2019-07-01 13:29:19 +02:00
fae5e894ae
Waterfall detection changed
2019-07-01 13:29:07 +02:00
242f6fbc38
Waterfall detection changed
2019-07-01 13:28:54 +02:00
092c9f965b
Waterfall detection changed
2019-07-01 13:28:40 +02:00
716fe90312
Modified Flat detection options
2019-06-23 18:36:18 +02:00
3139d0d3c7
Modified Flat detection options
2019-06-23 18:36:10 +02:00
8259243d2a
Modified Flat detection options
2019-06-23 18:35:59 +02:00
3f7d11d1c7
Modified Flat detection options
2019-06-23 18:35:48 +02:00
3e97643b37
Modified Flat detection options
2019-06-23 18:35:28 +02:00
b5e38451de
Modified Flat detection options
2019-06-23 18:35:11 +02:00
488f1cd8a1
Fixed bug causing minerals below magma sea being reported
2019-06-20 15:50:11 +02:00
f09f3a2d25
Prettified by adding a blank
2019-06-06 20:57:21 +02:00
cde8ffd0fd
Fixed materials vector length determination
2019-06-06 20:56:47 +02:00
f668914db8
kittens: fix compiling on Windows thanks to @ragundo
2019-06-01 17:30:26 -04:00
5b11d14c6c
Rename save/load to "save data"/"load data"
2019-05-29 19:52:03 -04:00
ceebef5fe2
Merge branch 'develop' into persist
2019-05-28 21:08:16 -04:00
cddfb87e22
Make unit_ishostile always return a non-nil value
...
Have been messing with this function in the dfhack repl and when it returns nil it's hard to know what that means unless you have also already read the code. So this handles a couple spots in `unit_ishostile` that previously just returned false-ey `nil`s to return `false`
2019-05-21 10:48:28 -04:00
8ea3877ace
Merge remote-tracking branch 'dfhack/develop' into auto_clothing
2019-05-18 09:12:22 -05:00
92717a7f71
mousequery: Fix some more instances of map boundary checks
2019-05-16 23:30:03 -04:00
c3b06b81c7
mousequery: use map dimensions to determine edge scrolling locations
...
TWBT modifies the map dimensions, so using the window dimensions to handle edge
scrolling produces the wrong behavior when using a larger map tileset than text
tileset.
2019-05-16 23:22:11 -04:00
f2bd697d64
mousequery: give explicit feedback when enabling/disabling sub-features
...
The behavior of this plugin is somewhat unintuitive - "mousequery edge" disables
the edge-scrolling feature instead of enabling it. This should avoid confusion
without breaking compatibility with existing init scripts.
2019-05-13 19:21:57 -04:00
860be4a04a
Fix issues with following the screen when using TWBT
2019-05-12 17:05:02 -05:00
ae91e17e3e
Consider the unit's current job for facing.
2019-05-04 14:35:28 -05:00
19772b7a43
bump version number for future AV updates to pick up on.
2019-05-04 10:29:02 -05:00
475b07e3ce
Merge branch 'develop' into remote_reader
2019-05-04 10:25:58 -05:00
42226342dc
Save state in persistent data.
2019-04-27 21:01:12 -05:00
6bed392331
Satisfy travis.
2019-04-27 16:58:21 -05:00
64e0884d95
Don't keep re-adding the job orders.
2019-04-27 16:29:30 -05:00
1b387a8ccf
Got initial working version.
2019-04-27 15:56:58 -05:00
51b9d7a275
able to set clothing requirements via console.
2019-04-27 14:31:37 -05:00
c997f666bb
Fix wrong pointer dereference.
2019-04-27 14:15:45 -05:00
f07f65a1a3
Silk, yarn, and strands are also soft.
2019-04-27 13:50:52 -05:00
25f767b96b
match material categories with valid clothing materials.
2019-04-27 13:48:14 -05:00
cae4f6d091
simplified the setItemFromName function
2019-04-27 12:41:25 -05:00
b2d59fd143
Parse item name
2019-04-27 12:22:51 -05:00
74daa6bced
add missing parentheses.
2019-04-27 11:20:36 -05:00
14ff66d551
Split up the big update function to satisfy codefactor.
2019-04-27 11:11:16 -05:00
eb04d513b4
Got basic logic for checking and processing clothing orders. Not done: actually adding orders to the list.
2019-04-27 11:02:50 -05:00
a3eafbbc1b
<map> is not capitalized
2019-04-27 09:24:52 -05:00
f89a3db6fe
Loop through citizens to find owned items.
2019-04-27 08:56:50 -05:00
78bd70c858
Loop through all owned items of all units.
2019-04-27 07:53:23 -05:00
bc05c9b1a1
started work on new plugin
2019-04-27 06:59:27 -05:00
4347fb0be7
Use size_t for vector size comparisons.
2019-04-18 23:30:03 -05:00
6565a3a2ba
Add wounds to RFR
2019-04-18 21:49:18 -05:00
435f92d1bb
Add protobuf files to the build solution so they show up in visual studio
2019-04-18 21:48:36 -05:00
a40adf1f86
Merge pull request #1435 from cppcooper/cxxrandom-rel
...
[Release] cxxrandom v2.0.1
2019-04-16 12:04:40 -04:00
9c403f509d
[Release] cxxrandom v2.0.1
2019-04-15 16:21:54 -07:00
e8624aa814
Fixed a typo.
2019-04-14 01:14:46 -05:00
ffab2d83b9
Update protobuf metadata
2019-04-14 00:23:47 -05:00
9e3b2fce49
Update scripts and stonesense
2019-04-13 23:52:05 -05:00
1d147015a6
Bump RFR api version
2019-04-07 23:05:35 -05:00
61396a57ab
Push over dwarf's ages through protos
2019-04-07 22:52:50 -05:00
c11f2b5ffa
Update stonesense (fix non-Linux builds)
2019-03-28 14:01:28 -04:00
3a9fea9c52
Update stonesense
2019-03-28 11:09:46 -04:00
571ce0f616
Repport if the game is not safe to interact with, namely while saving or loading the game.
2019-03-22 22:52:59 -05:00
064b6959e4
Fixed a crash when a unit has a move action queued, but the path is zero length
2019-03-17 18:05:12 -05:00
f0632347d0
Remove Core.h include from DataDefs.h
...
Core.h isn't required for DataDefs.h which removes Core.h dependency
from DataStatics*.
2018-12-30 17:08:42 -05:00
c01dbc7cd2
Merge remote-tracking branch 'dfhack/master' into remote_reader
...
# Conflicts:
# docs/changelog.txt
# scripts
2018-12-28 00:08:13 -06:00
315852a251
labormanager: fix -Wreorder warning
2018-12-27 19:46:36 -05:00
3e2c898e1a
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
...
Also move changelog entries to misc improvements per #1383
2018-12-27 16:52:30 -05:00
58fd98cb12
Merge pull request #1386 from billw2012/lm-disable-labor
...
labormanager: add option to disable the management of a labor.
2018-12-27 16:49:01 -05:00
32edeffc3f
Remove unused find_package(Threads)
2018-12-27 16:31:57 -05:00
a2f8742128
Merge remote-tracking branch 'suokko/runtime_debug_prints' into develop
...
Also fix and reorganize changelog
2018-12-27 16:28:25 -05:00
368d70c2d7
Use VIRTUAL_CAST_VAR correctly.
2018-12-26 01:10:51 -06:00
84578d7052
Remove both debug dump functions. They aren't needed anymore.
2018-12-26 01:04:31 -06:00
e6f7900c52
Force UTF-8 string literals.
2018-12-26 00:39:16 -06:00
45985fe5a9
Merge remote-tracking branch 'dfhack/develop' into remote_reader
2018-12-26 00:23:05 -06:00
d73124ebf7
Use FOR_ENUM_ITEMS instead of the silly for loop I had.
2018-12-26 00:14:38 -06:00
4b7e0d3c56
Convert unicode to escaped characters, and some formatting niceness
2018-12-26 00:11:08 -06:00
701ac66f8e
Update DF version define. (mainly used to be able to keep backwards compatibility)
2018-12-26 00:06:49 -06:00
95d3086fe6
Remove tabs
2018-12-26 00:05:17 -06:00
0209e76f19
Merge pull request #1385 from ab9rf/labormanager-cleaning
...
labormanager: assign more dwarves to cleaning
2018-12-23 23:14:53 -05:00
92482d63f5
Merge remote-tracking branch 'ab9rf/nestboxes' into develop
2018-12-20 20:57:09 -05:00
b1f9486edd
Update map-render.cpp
...
Remove tabs
2018-12-06 15:21:19 +02:00
ef57295c02
Added coal search to embark-assistant
2018-12-04 14:58:10 +01:00
0916d69373
Added coal search to embark-assistant
2018-12-04 14:57:44 +01:00
8f9cbfeafd
Added coal search to embark-assistant
2018-12-04 14:57:23 +01:00
1ef7f0746c
Added coal search to embark-assistant
2018-12-04 14:56:55 +01:00
efeb0504cc
Added coal search to embark-assistant
2018-12-04 14:55:59 +01:00
5f6376e76e
Added coal search to embark-assistant
2018-12-04 14:55:16 +01:00
435e44d99b
Merge branch 'develop' of https://github.com/DFHack/dfhack into remote_reader
2018-12-02 08:57:15 -06:00
b913076451
Update xml, stonesense, changelog
...
Merged DFHack/df-structures#296 and (modified) attached changelog
entry
2018-11-24 17:09:24 -05:00
368f8d0504
Remove and replace checks for OnBreak
2018-11-24 14:52:26 -05:00
67ce858772
Changed some debug stuff to use new variable names from the xmls
2018-11-11 16:21:15 -06:00
6aea842f1b
Added tree info data to protos, not used yet.
2018-10-28 10:45:32 -05:00
85a4fef1d8
Added unknowns to saved tree export.
2018-10-28 10:22:55 -05:00
d677880131
Fix issues with missing onbreak flag
2018-10-28 10:22:03 -05:00
836c011b33
Changed the plant tiles to more descriptive names.
2018-10-28 09:33:26 -05:00
7b6b83bdcf
added a command to dump all trees in the map for debug.
2018-10-28 02:01:01 -05:00
ff452f9181
Add more comments
2018-10-12 13:37:49 +03:00
5c1b7030e7
Also rename the plugin lua file
2018-10-12 10:44:56 +03:00
d9d470e4b6
Missing REQUIRE_GLOBAL(init)
2018-10-12 10:41:43 +03:00
f74ee143dd
Might as well use REQUIRE_GLOBAL
2018-10-12 10:40:44 +03:00
cb9c964722
Rename twbt-utils to map-render
2018-10-12 10:40:20 +03:00
41856aef37
Merge remote-tracking branch 'origin_DFHACK/develop' into twbt_experiments
2018-10-12 10:31:37 +03:00
3351d78864
Change embark-assistant to biome type from Maps
...
See #1392
2018-09-11 18:27:44 -05:00
fefef2e121
Deprioritize dwarves with unmanged labors assigned, some renaming from disabled to unmanaged.
2018-08-31 20:53:06 +01:00
4e690df96a
Add Persistence module.
...
Alter World to use Persistence instead of storing data in historical figures.
Fake historical figures will be converted to the new format when a world is loaded.
Added plugin_save and plugin_load functions to the plugin API.
Made the weird int7/int28 code that was in the old persistence API slightly safer.
2018-08-26 18:27:58 -05:00
98903d9d71
[tailor] tidy
2018-08-26 09:30:08 -05:00
239d4a8c46
Attempt to full exclude disabled labors from all relevant calculations.
2018-08-26 13:38:03 +01:00
d3b335105c
Add "tailor" plugin, to provide clothing management
2018-08-25 12:02:28 -05:00
1d8e55ea9b
Merge remote-tracking branch 'DFHack/develop' into remote_reader
2018-08-24 12:15:13 +05:30
73e7ffff83
Made cancel state sensitive
2018-08-18 18:03:00 +02:00
2ed6469be8
Made cancel state sensitive
2018-08-18 18:02:19 +02:00
6275905644
nestboxes: Use buildings.others[NEST_BOX]
...
Should minimize performance impact (not that it was much before)
2018-08-16 11:33:59 -05:00
784c3b1590
a pox on invisible whitespace
2018-08-16 10:32:50 -05:00
750b3cb885
the tabmonster strikes again
2018-08-16 10:30:53 -05:00
c840321edf
move nestboxes out of devel
2018-08-16 10:23:15 -05:00
a404ab3096
nestboxes: clean up & update description
2018-08-16 10:21:44 -05:00
76b8f4af0e
Fixing tab
2018-08-10 21:25:40 +01:00
039fb3bc6b
labormanager: add option to disable the management of a labor.
...
Also switching to case insensitive labor name matching.
2018-08-10 20:42:34 +01:00
19a575df3a
labormanager: assign more dwarves to cleaning
...
I am fairly certain that Toady changed how cleaning jobs are spawned; this makes it so that cleaning actually happens with labormanager.
2018-08-09 06:18:01 -05:00
c75a4fe8ee
Used taleden's world map size algorithm
2018-08-06 11:52:22 +02:00
4b8cf7f65e
Added armor raw info.
2018-08-05 21:29:40 +05:30
aa6182a1ee
Added embark-assistant world match indication
2018-08-05 17:28:49 +02:00
136eb0f03a
Added embark-assistant world match indication
2018-08-05 17:23:03 +02:00
f7fadaab37
Added embark-assistant world match indication
2018-08-05 17:11:47 +02:00
4c850cabca
Added embark-assistant world match indication
2018-08-05 17:11:39 +02:00
70630cfd92
Added embark-assistant world match indication
2018-08-05 17:11:26 +02:00
d26b1759a2
Merge remote-tracking branches 'ab9rf/labormanager-1142', 'ab9rf/labormanager-1162' and 'ab9rf/labormanager-respect-nature' into develop
2018-08-04 00:52:59 -04:00
f2664f7926
Add unit facing and sub-tile position when moving.
2018-08-03 23:18:02 +05:30
1c137f9a35
Fix a few Lua 5.3-related errors
...
Reported on bay12:
http://www.bay12forums.com/smf/index.php?topic=164123.msg7821831#msg7821831
2018-08-02 14:36:15 -04:00
efe4926df0
Send equipped item bodypart attachments over RFR
2018-08-02 21:50:29 +05:30
214b0c4bc6
(labormanager) respect NATURE value
...
Units with values regarding NATURE will be preferenced or dispreferenced
for jobs which might give them a good/bad feeling because of that value
2018-07-31 19:12:07 -05:00
5e95bd9cf2
Merge remote-tracking branch 'dfhack/develop' into remote_reader
2018-07-31 19:46:31 +05:30
a6067c20c1
(labormanager) only assign valid labors ( fix #1142 )
...
Add a number of tests to ensure that only assignable labors are assigned
to units, and that only units that are eligible to be assigned labors
are considered at all.
I borrowed logic from Dwarf Manipulator to identify units eligible to be
assigned labors.
This should prevent pets., ghosts, visitors, or any other noneligible
entities from being assigned labors by labormanager, and should thus fix
#1142 .
2018-07-30 22:36:59 -05:00
99490aff41
add support for craft item from pearl jobs ( fixes #1162 )
2018-07-30 21:32:15 -05:00
0a0cbdf2de
Add creature flags to RFR creature raws.
2018-07-28 18:39:45 +05:30
d9fb364b3f
Fix prospector out-of-bounds crash and improve checking
...
Fixes #1370
2018-07-21 00:27:11 -04:00
61df5e5286
Merge remote-tracking branch 'KlonZK/patch-1' into develop
2018-07-20 23:16:28 -04:00
09ec8910ca
Avoid clearing CMAKE_CXX_FLAGS for plugins
2018-07-19 15:32:08 -04:00
af53fe6740
embark-assistant: fix x=16, y=16 dimensions
2018-07-19 14:48:28 -04:00
3e82bd8f35
Ignore CMakeLists.custom.txt and create it if it does not exist during cmake.
2018-07-18 14:00:40 -05:00
29f6131e26
fix custom animation tables
...
move "local frames" from inside the block to outside.
2018-07-16 10:39:05 +02:00
baef5ca319
Added Finder scrolling and Frozen search
2018-07-13 20:44:11 +02:00
1af0ec4006
Added Finder scrolling and Frozen search
2018-07-13 20:43:49 +02:00
3d5cadeb8c
Merge branch 'embark-assistant' of https://github.com/PatrikLundell/dfhack into embark-assistant
2018-07-13 17:53:34 +02:00
4137a17a78
Added Finder scrolling and Frozen search
2018-07-13 17:43:46 +02:00
658fac0b93
Added Finder scrolling and Frozen search
2018-07-13 17:43:22 +02:00
3e47de5b45
Merge branch 'develop' into embark-assistant
2018-07-13 11:33:57 -04:00
fdf52deb36
Added Finder scrolling and Frozen search
2018-07-13 17:23:34 +02:00
02dd97722c
Added Finder scrolling and Frozen search
2018-07-13 17:23:12 +02:00
4d3f9ce13d
Added Finder scrolling and Frozen search
2018-07-13 17:22:49 +02:00
539428b741
Added Finder scrolling and Frozen search
2018-07-13 17:22:26 +02:00
f41715309a
Added Finder scrolling and Frozen search
2018-07-13 17:21:42 +02:00
c82532fd4b
Merge remote-tracking branch 'suokko/ruby_memory_return_calling_convention' into develop
2018-07-12 14:53:20 -04:00
7afa3690bf
Add support for DFHACK_BUILD_ID
...
Used for BuildMaster builds, for example
2018-07-11 11:47:55 -04:00
06511340ab
Merge remote-tracking branch 'BenLubar/proto-docs' into develop
2018-07-10 11:26:31 -04:00
21b9e828d3
embark-assistant: add spaces around keys
...
Further spacing work is tedious without rewriting it to use DFHack::Screen or
uicommon.h as every coordinate needs to be adjusted by hand
2018-07-10 11:22:12 -04:00
eb1f3e1d4c
embark-assistant: add spaces around drawBorder titles
2018-07-10 11:01:22 -04:00
8dec8c332f
embark-assistant: use STANDARDSCROLL keys instead of CURSOR keys for scrolling
2018-07-10 10:59:52 -04:00
2dac3c53c7
Add stress cutoffs to Units module, fix dwarfmonitor/manipulator
...
Fixes #1292
2018-07-09 15:59:12 -04:00
46e53fc3b3
Make df2console only call df2utf if the output stream is a console
...
Fixes output in command-prompt, for example
2018-07-09 11:00:28 -04:00
4b64d2dec6
Merge branch 'develop' of https://github.com/DFHack/dfhack into remote_reader
...
# Conflicts:
# docs/changelog.txt
2018-07-08 19:23:56 +05:30
10abbf8ac2
Update docs for dfhack/stonesense#57
2018-07-08 00:19:58 -04:00
PatrikLundell
lethosor
Nilsolm
Quietust
myk002
Myk Taylor
George Murray
PassionateAngler
kristjanmoore
Ryan Bennitt
Ben Lubar
Kelly Kinkade
Rose
ymber
Pierre-David Belanger
Jeremy Apthorp
jimcarreer
Alan
Warmist
Joel "The Merciless" Meador
Josh Cooper
Pauli
billw2012
KlonZK