98f3142c92
change deactivation message to be more accurate
...
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2021-01-28 18:00:34 +00:00
42ae0727fe
resolve hotkey help text conflict
...
between stockflow and stockpiles
I removed stockpiles's dynamic placement code as well. it attempted to
move the hotkey help text down if it covered any stockpile links, but
this will no longer work since other hotkey text already takes up all
the lines below stockpiles' hotkey text.
2021-01-27 08:37:12 -08:00
ff69665815
keep stockflow from stealing input during rename
2021-01-27 08:25:21 -08:00
1f7cae17ef
Merge branch 'develop' into ea_incursion_struct
2021-01-26 23:22:59 +01:00
10634b8ae5
fix merge error
2021-01-24 09:19:01 -08:00
d0fc448a39
add 'enable all' option for buildingplan
...
This kind of functionality is much more important now than it used to
be since there are so many supported building types.
Also modified the 'Planning Mode' status on the building placement
screen to reflect whether we're in quickfort mode, enable all mode, or
whether just the building type is enabled.
this setting is not persisted (just like quickfort_mode is not
persisted), but it can be set from onMapLoad.init
2021-01-24 09:08:36 -08:00
3c4cb749a3
Merge branch 'develop' of https://github.com/DFHack/dfhack into prevent_repeated_survey_mlt_calls
2021-01-24 13:57:27 +01:00
c525b80dda
Merge branch 'develop' of https://github.com/DFHack/dfhack into ea_incursion_struct
2021-01-24 13:54:25 +01:00
d01e61c658
Fix some error message formatting and add some cross-links to docs
...
Followup to #1747
2021-01-22 21:05:20 -05:00
5ef7a81fd1
Merge remote-tracking branch 'myk002/myk_buildingplan_set_settings' into develop
2021-01-22 20:57:30 -05:00
ad39bb3c33
address review comments
2021-01-22 12:48:36 -08:00
6a1b70ae76
making lint happy by removing trailing whitespace
2021-01-19 17:43:32 +01:00
438811e108
handling special case of the cursor having been positioned in the lower right corner before the search
...
- matcher.cpp: manually moving the cursor to the neighbouring world tile so it can be moved back and embark_update is being called when all (incursion) data has been collected
Co-Authored-By: PatrikLundell <22739822+PatrikLundell@users.noreply.github.com>
2021-01-19 16:37:59 +01:00
9b9373be4f
removing commented out assigments
2021-01-19 12:06:36 +01:00
cb496c3f59
fixing indention/whitespaces
...
- defs.h: replacing tab with space/blank for indents
2021-01-19 00:07:28 +01:00
e99c8faa24
switching to mid_level_tile_incursion_base to store incursion data of world tile edges
...
- defs.h: using mid_level_tile_incursion_base in region_tile_datum to store incursion data of world tile edges
- survey.cpp: commented out "not used" blocks of assignment in survey_mid_level_tile that no longer make sense now
2021-01-19 00:01:54 +01:00
bdfd50cc65
using mid_level_tile_incursion_base instead of mid_level_tile for incursion processing
...
- matcher.cpp, survey.cpp: adapting signatures to use new struct that only contains incursion specific attributes
2021-01-18 23:50:14 +01:00
cc68767336
created struct mid_level_tile_incursion_base that only contains attributes that are relevant for incursion processing
...
- def.h: make attributes/fields of mid_level_tile_incursion_base available in mid_level_tile by inheriting from mid_level_tile_incursion_base which also allows treating mid_level_tile as a mid_level_tile_incursion_base
2021-01-18 23:23:50 +01:00
85fe05b723
early return from embark_update during an active search to improve performance
...
- embark-assistant.cpp: checking if a search is active, if so return early
2021-01-18 22:08:46 +01:00
c300cae2f9
removing 2 dead stores to speed up survey::survey_mid_level_tile
...
- survey.cpp: removing layer_bottom and layer_top, which are never read, but slow down survey_mid_level_tile significantly because entries are added quite often into the tree map structure
- survey.h: removing now obsolete include for map
2021-01-18 19:38:57 +01:00
84b07005d8
tabs to spaces [whoops]
2021-01-16 23:47:41 +00:00
7a14bf475f
don't turn off seedwatch on map load
...
fixes #682
2021-01-16 23:23:05 +00:00
b506f0a240
remove misleading comment
...
per https://github.com/DFHack/dfhack/issues/682#issuecomment-138705257 , seedwatch supports linux and has done for over a decade.
2021-01-16 23:01:25 +00:00
78df890217
factor out functions to get plant names and set individual farms
2021-01-13 08:55:48 +01:00
80674f7697
[feature] autofarm: fallow farms when no further plants requested
2021-01-12 21:37:51 +01:00
339d5ce26b
set buildingplan global settings from prompt
...
allow buildingplan settings to be set from the DFHack# prompt. For
example, if a player knows they'll always want to build with blocks,
they could add the following two lines to onMapLoad.init:
buildingplan set boulders false
buildingplan set logs false
2021-01-10 17:29:53 -08:00
f115767713
add missing `\n` in digFlood's example
2020-12-31 13:47:02 +01:00
b585bca90b
look_menu_search: fix crash due to certain cursor keys not restoring list
...
Fixes #1737
2020-12-30 15:04:43 -05:00
a7232499ac
Silence some warnings from GCC 10
...
Specifically `gcc (Ubuntu 10.2.0-13ubuntu1) 10.2.0`
2020-12-30 00:04:49 -05:00
4a2704665d
Merge branch 'develop' of https://github.com/DFHack/dfhack into embark-assistant
2020-12-27 11:20:18 +01:00
dbfd838786
corrected temperature calculation factor order
2020-12-27 11:07:33 +01:00
8cace1eb06
probe: print more designation and occupancy-related flags
...
This was useful for testing #1729
2020-12-23 15:36:39 -05:00
eff360b49d
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2020-12-20 01:15:40 -05:00
0b7ab90d3d
corrected mismatched indices
2020-12-17 11:49:15 +01:00
de21e0cdb8
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2020-12-16 13:25:25 -05:00
3e3a34af99
corrected index usage
2020-12-16 10:59:27 +01:00
d437cfe649
Add test for invalid job types in workflow's job_outputs
2020-12-15 21:36:57 -05:00
5d3924a8c0
Remove old jobs from plant_products
...
Identified by Quietust in #1722
2020-12-14 00:04:53 -05:00
123c207d9c
Fix error in material_defs lookups
...
Changed in dfhack/df-structures@7dfea1f1d4
Fixes #1722
2020-12-14 00:03:29 -05:00
4e08357aaf
search: reset when screen is dismissed, even if it's still present under gview
...
Fixes #1725
2020-12-08 23:09:07 -05:00
a3d8c5a2ec
revflood docs: clarify that constructed walls are ignored
...
Closes #1719
2020-12-05 19:41:32 -05:00
db03f943c9
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2020-12-04 23:54:50 -05:00
c36fbe4c8b
Corrected river size handling
2020-12-03 15:40:22 +01:00
2a4e16d6da
Cover artifacts at greasing station
...
The inconsistent [DOES_NOT_DETERMINE_PRODUCT_AMOUNT] distribution is right, I assume?
2020-11-28 18:08:04 +00:00
8548295fe5
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2020-11-18 11:12:17 -05:00
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
00fa70dae9
Bump to beta2.1 (stonesense fix)
2018-07-07 21:42:01 -04:00
d2d1501dfd
Merge remote-tracking branch 'suokko/workflow_crafts_advanced' into develop
2018-07-07 19:43:16 -04:00
037e7e4901
Merge remote-tracking branch 'suokko/spotclean_ui_state_fix_1194' into develop
...
Moved/adjusted changelog entry
2018-07-07 18:08:53 -04:00
3bec52b2a7
embark-assistant: some cleanup
2018-07-06 15:16:45 -04:00
ff6d0c4e7d
Fix memory return calling convention in ruby bindings
...
Calling convention for memory return is that caller allocates (in stack)
memory to hold returned object. Then caller passes the pointer to callee
as implicit first parameter.
references:
https://github.com/hjl-tools/x86-psABI/wiki/X86-psABI
https://msdn.microsoft.com/en-us/library/7572ztz4.aspx
Fixes #1209
2018-07-04 23:46:23 +03:00
57dd9e944e
Fix crafts advanced constraints in workflow
...
Fixes #1247
2018-07-04 19:10:51 +03:00
d1a3f1a738
Allow canceling lineedit with ctrl+c
2018-07-04 15:21:25 +03:00
490a855776
Add a test for signal_shared_tag implementation
...
The test cases check that the signal_shared_tag implementation can be
used and destructed safely from multiple threads.
2018-07-04 15:18:20 +03:00
9cfb07f476
Add debug plugin to manage runtime debug filters
2018-07-04 15:18:20 +03:00
5db34339a5
Fix typo
2018-07-03 18:17:04 -05:00
4a0682133e
Annotate plugin proto files with the name of the plugin they are associated with.
2018-07-03 15:54:30 -05:00
df9150f302
Add documentation for RPC functions supported by RemoteFortressReader and ISOWorldRemote.
2018-07-03 15:37:16 -05:00
6839fde555
Remove execute permission on files that are not executables.
2018-07-03 15:37:16 -05:00
616675f0ce
Merge remote-tracking branch 'suokko/kittens_data_race_fix' into develop
2018-07-03 00:30:36 -04:00
81a7ddcf92
Merge remote-tracking branch 'suokko/screen_show_memory_leak' into develop
2018-07-02 22:58:11 -04:00
7e91173289
Merge remote-tracking branch 'origin/develop-cf-autofix' into develop
2018-07-02 13:44:20 -04:00
7fd23d46f0
Send the building preview over RFR
2018-07-02 22:04:47 +05:30
f0ff96f614
Merge remote-tracking branch 'suokko/multibyte_console' into develop
2018-07-02 10:55:03 -04:00
c489147657
Enabled building buildings through RFR
2018-07-02 00:37:02 +05:30
a08f08ae5f
[CodeFactor] Apply fixes
2018-07-01 15:25:53 +00:00
d9b910f79c
Made a function to find building extents for un-built buildings.
2018-07-01 20:36:36 +05:30
9c2e052d4d
More detail in build menu
2018-07-01 14:00:05 +05:30
645ec0d591
Improve kittens thread safety and shutdown with core
...
The bools could use acquire&release memory order or even relaxed but I
didn't think code was worth auditing for such low level optimizations.
Sequantial consistent is fast enough but much harder to use incorrectly.
The timeLast is protected by CoreSuspender lock. plugin_update is only
called when CoreSuspender lock is held.
The last_menu is protected by trackmenu_flg loads and stores.
2018-06-30 21:53:12 +03:00
0727403ac1
Fix devel plugins linking in linux
2018-06-30 21:12:42 +03:00
105ddd86d8
Merge remote-tracking branch 'suokko/jsoncpp_upgrade_to_submodule' into develop
2018-06-29 22:33:00 -04:00
44f461711c
Respond to building selection commands.
2018-06-29 21:59:48 +05:30
897b7b6a47
Send the building menu items over RFR
2018-06-28 20:27:12 +05:30
afd942a94b
ruby: Support automatic array size from index-enum
2018-06-26 23:48:54 +03:00
4970935b9a
fixed sidebar mode numbering.
2018-06-24 16:19:52 +05:30
93c3418f97
Added a simple function to get the current sidebar mode in fort mode.
2018-06-24 14:45:57 +05:30
1fc37f8ddc
Checke Console::lineedit error return values
...
Console::lineedit can return -1 to indicate input error and -2 to
indicate the program is closing. But most users don't check possible
unusual return values which can lead to exit hang.
2018-06-22 17:57:37 +03:00
9c7bd562d4
fix-unit-occupancy, autogems: stop running while embarking
...
Related to #1286 fix
2018-06-21 16:16:54 -04:00
46e31305a1
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2018-06-21 15:54:03 -04:00
f20dae5a4c
Merge remote-tracking branch 'suokko/fix_dramp_to_check_jobs_1228' into develop
2018-06-21 15:20:41 -04:00
8e1a1851be
Removed temporary comments
2018-06-21 21:00:59 +02:00
9a8e251853
Updated evil weather
2018-06-21 20:51:36 +02:00
f02f4b8bcc
Updated evil weather
2018-06-21 20:51:05 +02:00
91aa16216b
Updated evil weather
2018-06-21 20:50:30 +02:00
1382c04696
Updated evil weather
2018-06-21 20:49:49 +02:00
14b0ea5b98
Updated evil weather
2018-06-21 20:49:08 +02:00
ad5328e119
Updated evil weather
2018-06-21 20:48:35 +02:00
42eadf97b0
Update stonesense ( #1302 , dfhack/df-structures#247 )
2018-06-21 12:00:12 -04:00
d9917e9a1d
cxxrandom: remove pragmas, fix format warnings, misc. cleanup
2018-06-21 12:00:04 -04:00
7a5e7c7c86
Rename unit_flags1.dead to killed, update submodules/changelog
...
Follow-up for dfhack/df-structures#247
2018-06-21 11:17:09 -04:00
46b6bfd3f7
Merge remote-tracking branch 'suokko/fix_stocks_to_filter_military_items_1288' into develop
2018-06-21 00:04:06 -04:00
b2fd0b062b
Merge remote-tracking branch 'PatrikLundell/dead_plugins' into develop
2018-06-20 16:18:07 -04:00
72029e7de9
Avoid closing DF if launching command-prompt from prompt
2018-06-20 22:16:23 +03:00
9b6781f0f2
Temporary lower command-prompt when executing the command
...
command-prompt viewscreen may affect command execution if they are
looking for UI state. To make commands execute simillary to hotkeys or
console commands the viewscreen needs to removed from the top position.
Fixes #1194
2018-06-20 21:51:45 +03:00
cdca28ddfa
Merge branch 'develop' of gh:dfhack/dfhack into develop
2018-06-20 12:10:52 -04:00
7036cc376b
Fix warnings in devel plugins introduced by #1302
2018-06-20 12:03:14 -04:00
6077a8ce4c
Merge remote-tracking branch 'suokko/printf_warnings' into develop
2018-06-20 11:25:14 -04:00
862fa08ba6
Merge remote-tracking branch 'cppcooper/cxxrandom-rel' into develop
2018-06-20 11:00:43 -04:00
f90eebdd2d
Add designation job check to deramp
...
Fixes #1228
2018-06-20 15:54:31 +03:00
bd0d36ec82
Fix stockpile inventory not to include inventory items
...
Inventory items have stale position information. The coordinates can be
very old if item is owned and continuesly carried for long time. The fix
checks if item is carried. To avoid filtering carried items that are
assigned (containers) to the stockpile the assignment needs to be
checked.
Fixes #1288
2018-06-19 18:06:28 +03:00
9c59b7ff48
Fix unlikely memory leaks if Screen::show fails
...
The Screen::show takes ownership of the screen pointer. I decided to
switch the parameter to std::unique_ptr to make the pointer ownership
explicit. The unique_ptr then provides automatic screen destruction in
Screen::show unless pointer is inserted or is already in the linked list
that is managed by df.
2018-06-19 16:41:31 +03:00
dc367f212e
Move fortress mode control stuff into a different file.
2018-06-18 22:12:52 +05:30
6ef85908ac
Bump df version
2018-06-18 21:28:56 +05:30
6f7ace1f6d
stockpiles: Fix unusable and usable loading for weapon and armor
...
Fixes #1294
2018-06-14 22:22:51 +03:00
2b79b4cce7
Use jsoncpp 1.8.4 as a submodule
...
This makes jsoncpp a submodule that can be build directly from git
sources. This changes depends/jsoncpp to depends/jsoncpp-sub to avoid
filename conflict if someone tries to use git bisect.
jsoncpp library name changes to jsoncpp_lib_static.
jsoncpp version is the latest tagged release.
2018-06-14 21:20:46 +03:00
aac892c560
Adapted to changed Units functions
...
Squashed version of #1307
Closes #1307
2018-06-14 10:30:35 -04:00
cf780ce035
dead flag -> !isActive
2018-06-14 12:35:17 +02:00
cac749429a
dead flag -> !isActive
2018-06-14 12:34:41 +02:00
3be27a49b5
dead flag -> !isInactive
2018-06-14 12:33:18 +02:00
f076d00ede
dead flag -> !isActive
2018-06-14 12:32:38 +02:00
b38dfe2e43
dead flag -> !isActive
2018-06-14 12:31:52 +02:00
da0aa85b05
dead flag -> !isActive
2018-06-14 12:31:15 +02:00
aa361f3a0d
dead flag -> !isActive
2018-06-14 12:30:41 +02:00
6901c53bd5
dead flag -> !isActive
2018-06-14 12:29:48 +02:00
897a818f4c
Switch to Units functions
2018-06-14 09:42:45 +02:00
39194e5e38
Merge remote-tracking branch 'suokko/cxx14_enabling' into develop (actually c++11)
2018-06-13 16:08:41 -04:00
cddb1b59e1
title-version: move to bottom of options screen
...
This avoids overlapping the window border when a world is loaded
2018-06-13 15:57:13 -04:00
de0521e618
title-version: add to options screen
2018-06-12 16:38:53 -04:00
40d0d946a4
autogems: avoid crash with non-workshop links, add some logging
...
Also update changelog, including revflood change
Fixes #1303
2018-06-12 12:17:04 -04:00
8f2cf3ad26
Fix printf format warnings
2018-06-11 19:57:06 +03:00
01abcb756e
Request c++14 support from compilers
...
All platforms seems to either have compiler supporting c++14. Windows
already requires msvc2015 that supports c++14 which should make it
minimal issue to require c++14 support from all compilers because gcc
is pretty easy to upgrade.
2018-06-10 23:15:33 +03:00
8717144f14
Fix revflood bug, was revealing some tiles from below inappropriately
...
When scanning floor tiles from below, don't just leave them hidden, but
skip checking neighbors as well
2018-06-09 14:19:52 -06:00
7e57450e78
Change buildingplan quality adjustment keys per #1284 comment, for consistency
2018-06-08 22:25:56 -04:00
c4692b1c8d
Merge remote-tracking branch 'TotallyGatsby/buildingplanmax' into develop
2018-06-08 22:07:54 -04:00
0ec3df6022
dead/killed flags
2018-06-08 11:09:11 +02:00
654f798b83
dead/killed flags
2018-06-08 11:08:35 +02:00
03968db344
Fix GCC warnings in 'tweak kitchen-prefs-all' and dev plugins
2018-06-01 10:02:38 -04:00
f57327e7c8
Fix periodic events in several plugins
...
Also stop running buildingplan/fortplan while loading a world, and stop running
autogems while paused
Fixes #1286
2018-05-29 23:24:02 -04:00
06b9dc0c1c
remove trailing spaces
2018-05-25 12:43:30 +12:00
a44f5b57cb
don't need this
2018-05-25 01:34:57 +12:00
0217916568
mousequery plugin with TWBT modifications
2018-05-25 01:07:12 +12:00
e206a6d88b
mousequery: leave menus safely, without looping
...
Fixes #1285
2018-05-22 16:37:44 -04:00
5f81cac3b7
dwarfmonitor.lua: use dmerror() consistently
2018-05-21 21:23:52 -04:00
3e54a136fd
Use two keys for min/max
2018-05-20 20:50:42 -07:00
385ac3f9f5
Add 'Max Quality' setting to buildingplan
2018-05-20 14:36:50 -07:00
50a863a48e
Fix Kitchen.h include (case-sensitive)
2018-05-17 20:11:46 -04:00
b551e70ffa
prospector: Avoid crashing due to invalid vein materials
...
Fixes #1276 , ref #1277
2018-05-17 19:56:48 -04:00
759ba5c420
New tweak: kitchen-prefs-all
...
Options to toggle brew/cook for all listed items
Also fixed kitchen lua docs and moved kitchen search option
2018-05-17 19:47:56 -04:00
17ba492992
Add some exclusion functions to Kitchen module, expose to Lua, fix build
2018-05-17 19:34:03 -04:00
fa8a2fa670
Merge branch 'develop' of gh:dfhack/dfhack into develop
2018-05-17 00:12:59 -04:00
79a0794658
Add kitchen preferences search
2018-05-17 00:11:52 -04:00
b6c6b4a8a0
Merge pull request #1252 from JapaMala/remote_reader
...
Bump RFR version number.
2018-05-17 07:48:18 +05:30
c85274eb01
tweak max-wheelbarrow: fix conflict with building renaming
...
Reported by xordae on bay12:
http://www.bay12forums.com/smf/index.php?topic=164123.msg7762438#msg7762438
2018-05-16 16:51:45 -04:00
0be16d4422
New tweak: stone-status-all
...
Adds an option to toggle the economic status of all stones
Also suggested by xq on IRC
2018-05-14 22:54:20 -04:00
914b376082
Add stone status search
...
Suggested by xq on IRC
2018-05-14 22:30:21 -04:00
ee85ed4011
Remove $(NOINHERIT) from Stonesense
2018-05-14 00:56:18 -05:00
f838b5695d
Remove $(NOINHERIT) which was inexplicably included in a bunch of plugins.
2018-05-14 00:12:22 -05:00
06031bdd0e
Merge branch 'develop' of gh:dfhack/dfhack into develop
2018-05-13 13:11:29 -04:00
e2cd1fca58
Reorder dfhack-md5 GCC flags, fix another embark-assistant warning
2018-05-13 13:09:51 -04:00
586051510c
Update stonesense.
2018-05-13 10:38:59 -05:00
016dab3990
Fix more warnings, including stonesense
2018-05-12 22:10:07 -04:00
e9ec08f419
Add Buildings::getRoomDescription(), moved from search plugin, +cleanup
2018-05-12 17:00:21 -04:00
7d0df117ee
dwarfmonitor: fix typo in function name
2018-05-12 14:59:26 -04:00
ad518faeec
cursecheck: Replace setUnitNickname (older) with Units::setNickname
2018-05-12 14:59:04 -04:00
c15571caa0
Move isRouteVehicle, isSquadEquipment from workflow to Items module
2018-05-12 14:49:30 -04:00
abb903d28f
command-prompt: support getSelectedPlant()
2018-05-12 13:02:52 -04:00
a34b34d3cb
Move a few item functions from autotrade/stocks into DFHack::Items
2018-05-12 12:04:46 -04:00
fbe652d7a0
Merge pull request #1265 from db48x/allow-calling-blueprint-from-lua
...
this allows the blueprint plugin to be called from lua
2018-05-11 23:52:16 -04:00
018deec912
Fix another occasional segfault in block-labors
...
Fixes #1057
2018-05-11 22:18:26 -04:00
9d353c1ea7
tweak block-labors: fix crash if unit is null
...
Fixes #1057
2018-05-11 10:21:05 -04:00
58636f5a27
Make 32-bit Linux builds also check for undefined symbols.
2018-05-10 11:20:19 -05:00
8e76c612f6
Add SDL to RFR libs on Linux
2018-05-09 21:48:27 -04:00
77ee74be50
Only require symbols to be defined in plugins
...
Core uses some unresolved symbols on Linux
2018-05-09 21:36:51 -04:00
a550c81628
update the CMakeList to link the blueprint plugin against the lua library
2018-05-09 18:25:26 -07:00
b127522992
Merge branch 'develop' into allow-calling-blueprint-from-lua
2018-05-09 12:55:17 -07:00
2ada907420
Move stockpiles option (load/save) below stocks/autodump/etc
...
Fixes #1161
2018-05-09 10:33:41 -04:00
ead0092765
Ignore added stockpile keys when renaming stockpiles
...
Fixes #1267
2018-05-09 10:25:55 -04:00
2a52582c1f
Add Gui::inRenameBuilding
2018-05-09 10:23:05 -04:00
d15f87715e
update comments
2018-05-08 13:04:14 -07:00
554814920b
this allows the blueprint plugin to be called from lua
2018-05-08 11:42:41 -07:00
9d7feaf39d
autogems: load blacklist from autogems.json
...
Closes #1027
2018-05-05 12:49:06 -04:00
60d1c270c2
Display autogems config option
2018-05-04 23:07:21 -04:00
bc32d15bea
[Release] cxxrandom v2.0
...
Major Revision
update v2.0
=-=-=-=-=
Native functions(exported to lua):
-GenerateEngine: returns engine id (args: seed)
-DestroyEngine: destroys corresponding engine (args: rngID)
-NewSeed re-seeds engine (args: rngID, seed)
-rollInt generates random integer (args: rngID, min, max)
-rollDouble generates random double (args: rngID, min, max)
-rollNormal generates random normal[gaus.] (args: rngID, avg, stddev)
-rollBool generates random boolean (args: rngID, chance)
-MakeNumSequence returns sequence id (args: start, end)
-AddToSequence adds a number to the sequence (args: seqID, num)
-ShuffleSequence shuffles the number sequence (args: rngID, seqID)
-NextInSequence returns the next number in seq.(args: seqID)
Lua plugin functions:
-MakeNewEngine returns engine id (args: seed)
Lua plugin classes:
-crng
methods:
-init(id, df, dist) :: constructor
id - Reference ID of engine to use in RNGenerations
df (optional) - bool indicating whether to destroy the Engine when the crng object is garbage collected
dist (optional) - lua number distribution to use
-__gc() :: destructor
-changeSeed(seed) :: alters engine's seed value
-setNumDistrib(distrib) :: set's the number distribution crng object should use
distrib - number distribution object to use in RNGenerations
-next() :: returns the next number in the distribution
-shuffle() :: effectively shuffles the number distribution
-normal_distribution
methods:
-init(avg, stddev) :: constructor
-next(id) :: returns next number in the distribution
id - engine ID to pass to native function
-real_distribution
methods:
-init(min, max) :: constructor
-next(id) :: returns next number in the distribution
id - engine ID to pass to native function
-int_distribution
methods:
-init(min, max) :: constructor
-next(id) :: returns next number in the distribution
id - engine ID to pass to native function
-bool_distribution
methods:
-init(min, max) :: constructor
-next(id) :: returns next boolean in the distribution
id - engine ID to pass to native function
-num_sequence
methods:
-init(a, b) :: constructor
-add(num) :: adds num to the end of the number sequence
-shuffle() :: shuffles the sequence of numbers
-next() :: returns next number in the sequence
Adds missing function exports.
Fixes numerous problems I won't go into
2018-04-29 21:08:44 -07:00
23b2d5eba5
Merge branch cxxrandom
...
Implements helper functions for random number generation.
Implemented using C++11 <random> library.
Exported Lua Functions:
- seedRNG(seed)
- rollInt(min, max)
- rollDouble(min, max)
- rollNormal(mean, std_deviation)
- rollBool(chance_for_true)
- resetIndexRolls(string, array_length) --String identifies the instance of SimpleNumDistribution to reset
- rollIndex(string, array_length) --String identifies the instance of SimpleNumDistribution to use
--(Shuffles a vector of indices, Next() increments through then reshuffles when end() is reached)
On branch cxxrandom-rel
Changes to be committed:
modified: plugins/CMakeLists.txt
new file: plugins/cxxrandom.cpp
new file: plugins/lua/cxxrandom.lua
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Squashed commit of the following:
commit 3a7ef70d45f3e0c2fe367141dd0349dddaaff60d
Merge: fd9f1982
2018-04-29 21:08:44 -07:00
5cd8aa0458
Update downloads to 0.44.09
2018-04-19 12:35:00 -04:00
0ea35a6e93
Merge remote-tracking branch 'lethsor/master' into remote_reader
2018-04-11 18:28:41 +05:30
f9ad71f682
Fix fencepost error in autolabor/autohauler/labormanager.
...
https://github.com/DFHack/dfhack/pull/1253#pullrequestreview-110903215
2018-04-10 13:29:00 -05:00
afc2c476bb
Fix remaining warnings on Windows.
2018-04-06 21:22:48 -05:00
67de61a1fe
Fix GCC warnings in stonesense.
2018-04-06 18:18:48 -05:00
1dd6625270
Fix remaining warnings in supported plugins
2018-04-06 14:17:34 -05:00
a7dfacd1c5
Fix warnings in supported plugins.
2018-04-06 01:25:21 -05:00
f3038fef09
Mark static functions in uicommon as "static inline" to remove the warning if they are not used.
2018-04-05 16:51:10 -05:00
7aee061258
Ignore warnings in plugin protobufs.
2018-04-05 16:50:28 -05:00
a37df92656
[labormanager] fix warning about non-virtual destructor in jlfunc
2018-04-05 16:04:14 -05:00
91930a618f
[dwarfvet] Fix infinite loop if an animal is not accepted at a hospital.
2018-04-05 15:01:50 -05:00
1badadf535
search: fix 4/6 keys in unit screen
2018-04-05 10:08:07 -04:00
868c032578
liquids: initialize range dimensions
2018-04-05 02:19:04 -04:00
e9457b9f65
liquids: use unique_ptr properly
2018-04-05 02:15:32 -04:00
996306560b
Merge remote-tracking branches 'ab9rf/digtype-1243' and 'ab9rf/labormanager-map-check-bug' into develop
2018-04-02 00:56:33 -04:00
d369f8be67
Bump version number.
2018-03-26 19:07:04 +05:30
b8de7d4cf8
check for tile material == MINERAL in digtype ( #1243 )
2018-03-20 01:44:10 -05:00
81c9c8cdfe
Avoid crashing labormanager if map square on lowest level is designated+hidden ( #1240 )
2018-03-20 00:55:17 -05:00
3a2fc6f65f
Update stonesense
2018-03-14 09:40:21 -04:00
9b6b73b1d2
Merge pull request #1232 from JapaMala/remote_reader
...
Remote reader
2018-03-14 09:31:56 -04:00
02569b1dac
Merge branch 'develop' of gh:dfhack/dfhack into develop
2018-03-14 09:29:35 -04:00
40d3b9b782
embark-assistant: fix copy-paste error, update docs ( #1231 )
2018-03-14 09:28:24 -04:00
1e7a38f0b1
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2018-03-14 09:24:47 -04:00
4d74f66b64
Merge remote-tracking branch 'DFHack/develop' into remote_reader
2018-03-14 16:18:03 +05:30
09bc1c3169
add ocean waves to RFR
2018-03-14 16:08:37 +05:30
40654954a1
Partial preparation for 0.44.07-alpha1.
...
Still need to write release notes and add tags.
2018-03-13 15:49:42 -05:00
ad57037711
Merge remote-tracking branch 'BenLubar/cmp0022-warning' into develop
2018-03-10 17:02:34 -05:00
db95796d4c
Many build fixes
2018-03-10 16:53:45 -05:00
a810960bde
Support spiderwebs and add a fake flow type for campfires.
2018-03-10 21:02:28 +05:30
acd4adc7cc
Fix CMake warning about CMP0022 policy being set as "OLD".
2018-03-08 02:28:28 -06:00
3e7da4d5f2
FIx wrong material being sent with item flows.
2018-03-06 22:37:26 +05:30
c3f931652d
Send item cloud info properly.
2018-03-06 09:44:21 +05:30
c765e12254
Store tool names in RFR
2018-03-05 19:00:18 +05:30
ebf9651896
Include Materials in flows.
2018-03-04 02:41:40 +05:30
894f6c232b
actually copy flows with the block this time.
2018-03-03 12:48:09 +05:30
3f26d4fe09
Add flows to RFR
2018-03-03 11:41:58 +05:30
ef24da0cd3
Key references on overlay as well
2018-02-27 21:06:07 +01:00
490fbd8b26
send instrument description using UTF8
2018-02-27 21:18:15 +05:30
65e549848d
fix some crashes in the new instrument reader code.
2018-02-27 21:01:38 +05:30
d758104f5e
update stonesense for RFR protos
2018-02-27 20:24:32 +05:30
265e229d61
Send all relavent generated instruement information over RFR
2018-02-27 19:58:07 +05:30
578d6666eb
Addressed request. Improved profile saving
2018-02-27 10:46:06 +01:00
7705eada5a
Added magma/candy search + profile save/load.
2018-02-26 18:31:33 +01:00
2277c4ee4e
Corrected reanimation detection
2018-02-25 10:28:38 +01:00
800dde360d
Merge pull request #1223 from JapaMala/remote_control
...
Remote control
2018-02-21 23:04:53 -05:00
9f9d90c2ef
Fix labormanager never assigning dwarves to fill ponds, making irrigation very difficult.
2018-02-21 18:46:21 -06:00
778a1667dc
...also do it for images.
2018-02-21 22:31:39 +05:30
8c20d178b5
Include plant type with plant items.
2018-02-21 22:27:04 +05:30
1c97f58340
Merge remote-tracking branch 'DFHack/develop' into remote_control
2018-02-21 21:29:58 +05:30
6e3b29930d
Avoid crash in dwarfvet due to negative width/height
...
Partial fix for #1227
2018-02-16 15:12:46 -05:00
7758fb6df5
dwarfvet: fix another log message, misc readability improvements
2018-02-16 02:32:53 -05:00
36f4954182
Update Stonesense and build docs (fixed Allegro download)
2018-02-16 02:16:06 -05:00
94b2ca68d8
dwarfvet: fix extra % in log message
...
Mentioned in #1227
2018-02-13 11:19:10 -05:00
60e9839f63
Merge remote-tracking branch 'DFHack/develop' into remote_control
2018-02-13 21:29:09 +05:30
18cf70a543
Update Stonesense.
2018-02-13 12:37:45 +05:30
7b19c9b8f0
Merge remote-tracking branch 'remotes/DFHack/develop' into RemoteServerUnsafe
...
# Conflicts:
# plugins/proto/RemoteFortressReader.proto
# plugins/remotefortressreader/remotefortressreader.cpp
# scripts
2018-02-12 20:19:40 +05:30
3a122d7391
Merge remote-tracking branch 'danamlund/better-fps-counter' into develop
2018-02-12 01:21:14 -05:00
6260062d05
Add basic embark-assistant docs ( closes #1226 )
2018-02-11 03:08:02 -05:00
ca29cb8e6f
embark-assistant: update field names, now compiles
2018-02-10 17:51:02 -05:00
ef3adbe816
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2018-02-10 17:27:13 -05:00
9a0befa4cb
Show number of trees skipped
2018-02-10 03:03:07 -05:00
342f193409
autochop: store skip settings in one field, fix double colon and initial load
...
language_name fields default to -1, so the new settings could have been enabled
on all worlds by default.
2018-02-10 02:07:36 -05:00
6a758c70a8
Merge remote-tracking branch 'dtimm/develop' into develop
2018-02-10 01:47:06 -05:00
55f5439ddf
dwarfmonitor: remove unused hook, use CoreSuspendClaimer
2018-02-09 02:07:08 -05:00
6d33069fe9
Fix more copy-paste errors
2018-02-05 10:41:36 -05:00
7f8ea9e82c
Merge remote-tracking branch 'DFHack/develop' into remote_control
2018-02-05 20:11:55 +05:30
9a032ac447
I'm a moron.
2018-02-05 20:11:47 +05:30
b2a19dedeb
load-art-image-chunk: safety check
2018-02-04 22:56:24 -05:00
78061085c6
Add art image properties to RFR
2018-02-04 16:02:02 +05:30
60c1bd3c66
Merge remote-tracking branch 'refs/remotes/DFHack/develop'
...
Conflicts:
library/xml
2018-02-04 10:26:39 +05:30
ed406e0e3d
fix naming and return statement.
2018-02-04 10:24:51 +05:30
c621a29fe3
Fix global name.
2018-02-04 10:21:28 +05:30
38140fb450
Copy engravings in RFR, and update the art image function.
2018-02-04 10:12:15 +05:30
bdba95f90c
memview: check for tags from sizecheck
2018-02-03 18:10:16 -05:00
6181b2bce3
Add tweak that replaces dwarf mode FPS counter with one that does not count when paused
2018-02-03 17:58:24 +01:00
8665600574
Send tiles for shape descriptors, and art image ids.
2018-02-03 10:38:17 +05:30
e63a871363
use the vmethod for getting improvement images.
2018-01-31 10:11:43 +05:30
9aaeecb4d6
Merge remote-tracking branch 'DFHack/develop' into remote_control
2018-01-28 13:41:52 +05:30
788a48144b
dig: fix issues with priority parameters and digvx/diglx
2018-01-28 02:16:57 -05:00
b78b2feed2
Remove extra whitespace.
2018-01-28 10:12:50 +05:30
ca3b2b30b3
fix compiling on gcc.
2018-01-27 19:26:30 +05:30
341c0dacf3
updated function definition for win64.
2018-01-27 12:44:51 +05:30
aff9c22875
update submodules.
2018-01-26 08:27:03 +05:30
e3d95daf45
Don't use globals
2018-01-26 08:19:41 +05:30
5e0e674580
Update submodules
2018-01-25 10:56:08 -05:00
ef451a2f2d
Got the image reader function working.
2018-01-25 20:24:12 +05:30
f1b8fa305b
try using the new function pointer.
2018-01-25 11:55:46 +05:30
68324dfe0b
Send statue images.
2018-01-25 07:53:19 +05:30
ee7ad348f0
add item images
2018-01-24 12:09:05 +05:30
42bbe124b7
Merge branch 'remote_control' of https://github.com/JapaMala/dfhack into remote_control
2018-01-24 10:24:23 +05:30
f75b116ae2
Added the rest of the relavent improvement headers.
2018-01-24 10:22:45 +05:30
f33c42a49e
Merge remote-tracking branch 'DFHack/develop' into remote_control
...
# Conflicts:
# scripts
2018-01-24 10:04:51 +05:30
1ba5477b63
Add designation priority support to MapCache and dig plugin
...
Fixes #481
2018-01-21 19:27:16 -05:00
7439f7fba7
Merge remote-tracking branch 'DFHack/develop' into remote_control
...
# Conflicts:
# scripts
2018-01-19 22:11:48 +05:30
58bef276de
send item imrpovements
2018-01-19 08:25:16 +05:30
1ed6c70663
dwarfmonitor: Add "view unit" option to prefs screen
2018-01-18 10:17:54 -05:00
74aefddd75
dwarfmonitor: Use a reasonable default for unhandled item types
2018-01-18 10:17:40 -05:00
b035d9e53a
ListColumn: only change items' foreground color in selected columns
2018-01-18 10:05:31 -05:00
7b16cf1619
dwarfmonitor: actually display creature names
2018-01-18 09:54:33 -05:00
9515a9e4f5
dwarfmonitor: use interface_key overload of OutputHotkeyString, grey out unit option
2018-01-18 01:14:30 -05:00
5f588b376a
dwarfmonitor: make handling of unrecognized preferences more obvious
2018-01-18 01:07:20 -05:00
4e2c6194ca
dwarfmonitor: support poetic/musical/dance forms
2018-01-18 01:06:55 -05:00
909776571e
dwarfmonitor: support getSelectedUnit
2018-01-18 01:06:03 -05:00
f2890620d1
Remove tweak kitchen-keys - DF bug 614 was fixed
2018-01-18 01:05:33 -05:00
a63347cf7a
Move item reader to a separate file.
2018-01-17 19:10:19 +05:30
ea6757377e
add item volume to RFR
2018-01-16 17:04:26 +05:30
9ba0b00580
Remove the stupid big warning comment.
2018-01-12 11:59:02 +05:30
8d6e30ef0e
Fix whitespace issues
2018-01-12 11:50:40 +05:30
56c76d5abc
Merge remote-tracking branch 'DFHack/develop' into remote_control
...
# Conflicts:
# scripts
2018-01-12 11:17:22 +05:30
2782008b42
Update tweak condition-material with new field names
...
dfhack/df-structures#236
2018-01-10 19:53:25 -05:00
724fb00b73
Use an inteligenter method of setting the gem shapes.
2018-01-08 09:58:37 +05:30
29426111f7
Send shapes for small gems too.
2018-01-07 01:14:15 +05:30
d80d16ddc3
Actually send gem shape.
2018-01-07 00:50:32 +05:30
d0a924a207
Send shape ids through RFR
2018-01-06 23:48:06 +05:30
bd8a6c31ba
Send vehicles over remoteFortressReader, and don't send every block like a retard.
2018-01-06 22:07:34 +05:30
d6df9cd257
tidying up
2017-12-31 13:57:37 +02:00
04465f59f5
Fix spaces and fix linux (again)
2017-12-31 13:57:37 +02:00
6a65ad2fcb
add more functions (not used yet) and fix linux
2017-12-31 13:57:37 +02:00
e48e2e6534
A twbt utils plugin for misc stuff used in twbt by mifki.
...
Currently only render map function.
2017-12-31 13:57:37 +02:00
546841d194
Merge remote-tracking branch 'DFHack/develop' into remote_control
...
# Conflicts:
# scripts
2017-12-31 14:33:03 +05:30
fa39220777
add projectiles, complete with velocity.
2017-12-31 14:31:58 +05:30
e72474613f
Add new PutItemOnDisplay job to labor management plugins
...
Also add building_type::DisplayFurniture to labormanager
Fixes #1208
2017-12-27 13:48:53 -05:00
cdfe1cf1c7
add a few more hotkeys to adventure control
2017-12-26 22:21:36 +05:30
e9e5113ff7
Add careful movement type to proto. Not used yet.
2017-12-26 12:34:46 +05:30
f5fc7fe1a1
Report the current adventure mode menu back to Armok Vision, currently including careful movement options.
2017-12-26 00:08:05 +05:30
e8ccfb4e4d
Merge branch 'remote_control' of https://github.com/JapaMala/dfhack into remote_control
2017-12-25 22:00:54 +05:30
5d32253b6e
added jumping ability to adventure control.
2017-12-25 22:00:45 +05:30
9b562aac73
Merge remote-tracking branch 'DFHack/develop' into remote_control
2017-12-25 10:45:37 +05:30
d6a6bf008e
Update xml, stonesense
...
Ref #1206
2017-12-24 23:17:39 -05:00
1408f7bfb3
Add a command to remotely send simple movement commands to an adventurer.
2017-12-24 18:33:25 +05:30
79467df263
Merge branch 'remote_reader' of https://github.com/JapaMala/dfhack.git
2017-12-20 17:21:46 +05:30
04b1a80654
Don't re-send all reports all the time.
2017-12-20 17:11:01 +05:30
e478c00ce5
Replace tab with space.
2017-12-19 11:20:12 +05:30
c4f9f6edb2
Add item stack size.
2017-12-17 18:42:03 +05:30
29282a238b
Bring in changes from the remoteServerUnsafe branch.
2017-12-17 18:05:38 +05:30
bbd823f5b0
Simplify logic in createitem, to avoid similar errors in the future
2017-12-16 15:40:39 -06:00
b1e77fa260
createitem: fix an issue with items teleporting to the location of another unit
...
This was due to moveToGround() being called twice, first with the location of
world.units.active[0], which caused the item to teleport to that location later.
Fixes #1198
2017-12-16 16:09:43 -05:00
23bb8c4f3d
Restore REQUIRE_GLOBAL(ui_menu_width) - used in tweak stable-cursor
2017-12-07 14:37:15 -05:00
88c7e493b8
Merge ui_area_map_width into ui_menu_width, now a 2-byte array
2017-12-03 20:34:59 -06:00
a0634f9ee0
Merge remote-tracking branch 'DFHack/develop' into RemoteServerUnsafe
2017-11-25 11:50:56 +05:30
7fd2586f62
Remove trailing whitespace
2017-11-25 11:39:15 +05:30
4a52f322c3
Remove tabs.
2017-11-25 11:37:54 +05:30
2c95ac411e
Update xml and all uses of job_handler
2017-11-25 00:59:59 -05:00
272f51ef4b
Merge remote-tracking branch 'remotes/DFHack/master' into RemoteServerUnsafe
2017-11-25 10:24:51 +05:30
c8cd2f40bc
Merge pull request #1188 from BenLubar/labormanager-culture-crash
...
Fix labormanager crash when a dwarf doesn't have a cultural identity
2017-11-23 16:22:44 -05:00
1d679e713e
Merge pull request #1156 from ViTuRaS/patch-1
...
max_barrels was serialized on max_bins position
2017-11-23 11:58:08 -05:00
9259cb22d2
Merge pull request #1184 from quietust/develop
...
update structures
2017-11-23 11:57:41 -05:00
e06644cdf4
Fix labormanager crash when a dwarf doesn't have a cultural identity
2017-11-23 10:55:37 -06:00
e3a41a323d
Update Units
2017-11-05 16:06:51 +05:30
53b5a5cc6f
Added a function to only get details for units within the area of interest.
2017-11-04 20:14:24 +05:30
33a43c5bfd
update structures
2017-11-04 07:50:47 -06:00
b449446526
Send announcements in Unicode.
2017-10-30 19:23:17 +05:30
117b6e0427
Send reports over RFR.
2017-10-30 19:00:03 +05:30
e51ae78a46
Always follow the current adventure in adventure mode.
2017-10-22 13:37:23 +05:30
b480cd6b38
Mark RFR functions as being safe for network use.
2017-10-20 19:07:47 +05:30
322964f0e6
Switch to explicit `interface_key` values instead of char.
2017-10-17 16:06:33 -06:00
3c564c64ba
Fix tabs.
2017-10-17 15:17:35 -06:00
d009022311
Add tree product exclusions to autochop
2017-10-17 13:43:20 -06:00
cc595d7a4e
Fix fencepost error in orders import. Fixes #1177 .
2017-10-16 14:01:23 -05:00
c080da3750
listcolumn - adjust add(ListEntry<T>) to take const ref, more compatible on Linux
2017-10-08 19:54:51 -06:00
c2b36f0979
Removed extra qualification to make Travis happy.
2017-09-01 17:29:55 +02:00
8a81f6b5f7
Removed extra qualification to make Travis happy.
2017-09-01 17:14:21 +02:00
596296358f
Moved all externally visible operation implementations out of name spaces to satisfy both Travis and Visual Studio.
2017-09-01 17:00:14 +02:00
84eaf04148
Removed function qualifications to make Travis happy and Visual Studio unhappy.
2017-09-01 16:22:10 +02:00
83061cffca
Replaced include of dfhack.h with <utility> and DataDefs.h
2017-09-01 15:37:40 +02:00
831fa07fb2
Removed path from dfhack.h include.
2017-09-01 15:10:53 +02:00
80fe49b339
Add embark-assistant plugin
2017-09-01 14:13:34 +02:00
ca481fc69f
max_barrels was serialized on max_bins position
...
When I save and load stockpile settings with stockpile management plugin, then saved barrels count will be loaded in bins and barrels are zero. So I think this change should correct it.
2017-08-28 22:33:24 +02:00
54b0d2fcb6
Merge pull request #1154 from JapaMala/master
...
RemoteFortressReader updates.
2017-08-22 10:48:47 -04:00
a7b837f2d0
Increment version number
2017-08-20 20:44:55 +05:30
8e71cf9def
Send Unit inventories with RFR
2017-08-19 17:48:18 +05:30
737aefefea
send over beard styles
2017-08-19 09:38:56 +05:30
5b5ac7088d
correct spelling
2017-08-12 19:12:14 +05:30
b7783ba8b9
Added unkept hair to style list
2017-08-12 19:10:35 +05:30
620cfcc8bd
Fix luasocket receive with byte count
...
Did not correctly detect when you typed in a number instead of pattern.
2017-08-12 15:42:56 +03:00
6c5e25db13
Add hair style to units in proto
2017-08-11 13:50:30 +05:30
55d22855a0
Add styling enums to RFR
2017-08-11 10:21:40 +05:30
95aa5bbb47
zoom: fix MSVC warning
2017-08-07 15:06:00 -04:00
1bf64ddfd8
Merge remote-tracking branch 'ab9rf/labormanager-1115' into develop
2017-08-07 14:04:05 -04:00
14867c36cc
Merge remote-tracking branch 'ab9rf/labormanager-1106' into develop
2017-08-07 14:00:37 -04:00
eb7e9dcf1f
Merge remote-tracking branch 'ab9rf/labormanager-1103' into develop
2017-08-07 14:00:15 -04:00
05b238c879
Fix another diggingInvaders compiler error
...
Windows-specific, for some strange reason
Ref #1145
2017-08-07 09:30:27 -04:00
a383cc9a30
Fix diggingInvaders compilation errors ( #1145 , GCC 4.8)
2017-08-06 21:01:36 -04:00
ab8fb9f44e
whitespace
2017-08-05 21:48:41 -05:00
b61859a55e
labormanager/#1103: fix NPE in meeting test
2017-08-04 11:29:48 -05:00
04733827a0
Favor/disfavor RECOVER_WOUNDED based on ALTRUISM ( fixes #1106 )
2017-07-29 19:54:51 -05:00
d98fd02048
Weight CUTWOOD jobs by KILL_PLANT ethic; fix #1115
2017-07-29 18:46:45 -05:00
682d4b3144
whitespace
2017-07-29 12:26:32 -05:00
fe9454ff1c
Fix #1103 : do not idle for a meeting if the other participant is dead, asleep, resting, or on military duty
2017-07-29 09:26:19 -05:00
c5c80d5dc0
Rename labormanager_joblabormapper to joblabormapper
2017-07-28 23:03:23 -05:00
d810faa4a3
whitespace
2017-07-28 02:43:32 -05:00
a7d21fd627
move labormanager into a subdirectory
2017-07-28 02:28:16 -05:00
8ae7a1235d
Add rider ID to creatures
2017-07-27 18:41:46 +05:30
92a962a9c0
Send grass levels over RemoteFortressReader
2017-07-25 08:31:02 +05:30
fd19935fe9
labormanager: remove stupid
2017-07-22 04:54:05 -05:00
15ae72edec
labormanager: Refactor source, separating the job labor mapper into a separate source file.
2017-07-22 04:31:30 -05:00
90dd9e932e
exclude on-duty military personnel from health labor check
2017-07-20 03:54:00 -05:00
1ee5debfba
Send the existence of all buildings on the map.
2017-07-17 15:29:23 +05:30
c5fad31a4c
Fix indentation
2017-07-12 16:55:50 -04:00
bdc746f3f1
Replace broken include guard
2017-07-12 16:53:09 -04:00
018f3be70a
Merge remote-tracking branch 'JapaMala/master' into develop
2017-07-12 16:52:30 -04:00
f963d89e12
Merge branch 'develop' into plugin-orders
2017-07-11 15:12:40 -05:00
070dfa1865
Merge branch 'develop' of dfhack/dfhack into develop
2017-07-05 23:57:35 -04:00
2d07e5edea
Add new "pathable" plugin
2017-07-05 23:54:55 -04:00
03772a6899
Don't support windmill direction on old DF
2017-07-04 21:10:59 +05:30
8a0777bb1e
Add stdint.h to the buildingreader header.
2017-07-04 20:51:25 +05:30
069cea675c
Split import and clear into two commands. Use for-each loops for clarity. Closes #965 .
2017-07-02 16:00:45 -05:00
7b3ce20167
Add orders plugin for managing manager orders.
2017-07-02 14:02:55 -05:00
fd68971ac5
Fix silly error in strangemood plugin - missing "break;" statements in deep material item searches
2017-07-02 07:31:31 -06:00
96dd5799f7
Add compatibility defines for 0.34.11
2017-06-30 01:00:31 +05:30
967ab4ab1e
autolabor: Fix an array bounds overrun when assigning haulers while traders are active.
2017-06-27 13:47:33 -05:00
fe8be90992
Add "tweak burrow-name-cancel" to fix bug 1518
...
http://www.bay12games.com/dwarves/mantisbt/view.php?id=1518
Closes #526
2017-06-25 16:42:30 -04:00
10e13c532a
Add "tweak cage-butcher" and some extra Building module functions
...
* Buildings::markedForRemoval()
* Buildings::getCageOccupants()
Closes #906
2017-06-25 15:27:21 -04:00
c9b5df8989
Merge develop
2017-06-24 11:00:14 +05:30
52b9a8f4ad
Added a function to get a subset of the plant raws.
2017-06-24 10:52:09 +05:30
bf8e65311b
Update submodules
2017-06-23 12:43:38 -04:00
31dbb792ca
Added a function to get a partial creature raw list.
2017-06-23 19:54:22 +05:30
a2f6c80298
Add compatibility defines to remotefortressreader.cpp
2017-06-23 16:02:30 +05:30
ae809afde7
Add Gui::refreshSidebar()
...
This handles feeding CURSOR_DOWN_Z and CURSOR_UP_Z properly, avoiding issues
when on the lowest z-level.
2017-06-23 00:02:21 -04:00
ac0134568e
Don't read empty rooms, and update version
2017-06-22 23:57:04 +05:30
34f55cec29
Merge remote-tracking branch 'origin/master'
2017-06-22 20:29:21 +05:30
0348de4880
Add a command to get the current RemoteFortressReader version
2017-06-22 20:29:10 +05:30
9ae50279a1
Moved the version define into a header file, and fixed removing designations that are alreaddy converted to jobs.
2017-06-20 15:46:03 +05:30
48f5fd7a39
Fix missing room info on sent buildings.
2017-06-20 11:06:37 +05:30
96f9faea28
Merge remote-tracking branch 'DFHack/develop'
2017-06-20 10:51:52 +05:30
3da9176c76
Update submodules
2017-06-20 10:51:41 +05:30
65382473f7
Ruby: stop cpp_new from truncating vtable pointers
...
This fixes a crash in levers.rb, for instance.
2017-06-10 17:22:52 -04:00
1321a64613
Remove lots of old/unused functions from the Units module
2017-06-10 17:21:34 -04:00
acf50b755f
tweak hotkey-clear: fix label position
2017-06-08 11:20:56 -04:00
a19e268923
Make re-invoking command-prompt hide the current prompt
2017-06-07 15:00:30 -04:00
c3d5663320
Ruby: use Gui module to get selected unit
...
This allows "exterminate it" to work from command-prompt, among other things.
Fixes #1100
2017-06-06 23:34:34 -04:00
b2f05834d9
buildingplan: fix an issue preventing some numbers from being used in names
2017-06-03 18:25:49 -04:00
9f18cb5bdc
resume: use map y dimension and fix off-by-one error
2017-06-03 11:24:23 -04:00
5278856b37
mousequery: Fix parameters to getDepthAt()
2017-06-02 15:39:23 -04:00
62c9f2695a
automaterial: use uicommon.h, draw to map
2017-06-02 15:00:51 -04:00
43c4a88068
Move some checks in paintTile/readTile after hooks are called
2017-06-02 00:40:14 -04:00
044b3a0789
resume: use uicommon and draw to map
2017-06-01 16:19:11 -04:00
2681392e27
siege-engine: use map tiles
2017-05-31 12:12:52 -04:00
9f2eaf35f1
Merge remote-tracking branch 'DFHack/develop'
2017-05-31 19:52:53 +05:30
2905376042
Fix multiple issues with the confirm plugin
...
- Only allow one confirmation to be open at once. This avoids situations where
pressing "s" would open another confirmation instead of the settings screen
(e.g. in the trade screen), and allows all confirmations to be implemented
without priorities specified.
- Fix #821 : close any active confirmations when they are disabled.
- Some misc. cleanup, C++11 features
- Fixed a memory leak
2017-05-27 00:26:14 -04:00
49ea61562f
uicommon: remove nullptr definition
...
This is available in GCC 4.8+ and MSVC 2015
2017-05-25 18:06:51 -04:00
addbb1a94f
(Hopefully) send active-state wil all applicable buildings.
2017-05-25 15:38:31 +05:30
2d6dab0f24
Add a special case for retraction bridge direction
2017-05-23 21:41:34 +05:30
3f98cd3da0
Add active state to some building types.
2017-05-22 22:03:12 +05:30
22de28c3ed
embark-tools sand: hide indicator when it overlaps with confirmation window
2017-05-19 11:49:25 -04:00
b92095190f
Update stonesense, scripts, xml
2017-05-18 20:52:41 -04:00
5831665231
Fix wrong units used between two bounding boxes.
2017-05-14 16:07:05 +05:30
4ec42f7994
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2017-05-14 11:17:09 +05:30
236561ff43
get the full building list in the requested area in one go, rather than several overlapping chunks.
2017-05-14 11:12:41 +05:30
d083b92e9c
probe: display tiletype enum names as well
2017-05-10 12:40:57 -04:00
d42bfd7a1d
Merge remote-tracking branch 'quietust/develop' into develop
2017-05-10 10:28:49 -04:00
5d9a3cdc99
Merge branch 'develop' of dfhack/dfhack into develop
2017-05-09 13:51:38 -04:00
88f9eaeebb
stonesense: Disable overlay in STANDARD-based modes
...
Closes dfhack/dfhack#1078
2017-05-09 13:50:08 -04:00
4dff218976
ruby: fix crash when unloading plugin on Windows
2017-05-09 13:49:07 -04:00
67e60fdaa1
Fix issue #874 (revflood doesn't always see past constructed downstairs)
2017-05-07 13:23:33 -06:00
de7ef79d76
Merge remote-tracking branch 'DFHack/develop' into develop
2017-05-07 19:24:39 +05:30
a1f692686a
Use forward slashes instead of underscored to separate building subtypes
2017-05-07 19:24:30 +05:30
d309839b74
Update stonesense - fix #1083
2017-05-06 15:15:32 -04:00
3dc2c2259b
Update getplants to use Designations module
...
Fixes #531
Fixes #1014
Fixes #1018
2017-05-06 00:11:07 -04:00
adaccceba7
autochop: fix display of unnamed burrows
2017-05-05 17:36:02 -04:00
5c784f4ba3
autochop: Avoid moving menu options around when toggling burrows
2017-05-05 17:31:54 -04:00
a527091172
autochop: Fix marking/unmarking trees (use Designations module)
...
Fixes #656
Fixes #1076
Closes #1030
2017-05-04 21:51:16 -04:00
690fec9d81
manipulator: show social activities in job column
2017-04-28 17:26:20 -04:00
3cfbd735dc
Update xml, stonesense, scripts
2017-04-23 17:14:22 -04:00
098481c60d
Merge branch 'develop' of dfhack/dfhack into develop
2017-04-19 13:45:45 -04:00
06737644cd
new tweak: hotkey-clear
2017-04-19 13:31:25 -04:00
e36e4fa1c1
Support archery target rotation in RemoteFortressReader
2017-04-05 15:35:48 +05:30
06225dd896
Send building items and items kept in buildings separately.
2017-03-30 16:23:14 +05:30
7c626ba3c2
Actually add the versionInfo function to the RPC list.
2017-03-29 22:05:49 +05:30
bbaf3210f1
Send DF version info over remoteFortressReader
2017-03-29 21:58:12 +05:30
c244901c16
Removed end of line space. (Sorry, travis)
2017-03-29 20:22:09 +05:30
19a253c132
Merge remote-tracking branch 'DFHack/develop' into develop
2017-03-29 19:46:55 +05:30
78cb4a31b9
New tweak: condition-material (fixes bug 9905)
...
http://www.bay12games.com/dwarves/mantisbt/view.php?id=9905
2017-03-28 09:50:38 -04:00
5ea964b9cf
Send building items with buildings.
2017-03-25 22:23:40 +05:30
aea76b7ef3
stockflow: make sure that manager order amounts are integers
...
Fixes #1044
2017-03-18 17:56:06 -04:00
815bdb2e57
Merge remote-tracking branch 'TC01/ruby-no-dl-flag' into develop
2017-03-18 00:51:37 -04:00
f7f05724aa
Merge branch 'develop' of gh:dfhack/dfhack into develop
2017-03-18 00:36:43 -04:00
85e0daf15e
stonesense: basic 64-bit OS X support
2017-03-18 00:34:07 -04:00
f17e9d3662
title-folder: fix SDL path on OS X
...
The Stonesense install script appears to do strange things which cause DF to
load SDL.framework/Versions/A/SDL instead of SDL.framework/SDL. Once the former
is loaded, loading the latter and calling SDL_WM_* functions from it will fail.
A better solution would be to remove parts of the Stonesense fix-libs-*.sh
script(s) that are causing this, since they don't appear to be needed, or
use dlsym() to find the already-opened library/symbols.
2017-03-18 00:31:25 -04:00
61c2fb0a11
Merged branch develop into develop
2017-03-18 00:26:01 +05:30
e60d8de5fe
Fix array out of bounds errors in remotefortressreader that were crashing linux.
2017-03-18 00:25:46 +05:30
19695b4ee7
EventManager/eventful: Pass building ID pointers to event handlers
...
Previously, there was some disagreement over whether event handlers such as
Buildings::updateBuildings() took building pointers or building IDs shoved
into pointers. It turned out to be the latter, which, unfortunately, did not
compile on x64. Passing building IDs isn't possible in all cases, because
building event handlers can be called for recently-deleted buildings too.
Pointers to building IDs do work reliably, though.
Fixes #1003
2017-02-17 22:53:48 -05:00
ae92ae7948
Merge remote-tracking branch 'JapaMala/creatureRenamer' into develop
2017-02-09 23:25:55 -05:00
0d8decd7ec
Remove trailing whitespaces.
2017-02-08 10:54:42 +05:30
2c19f6b237
remove rsize_t
2017-02-08 10:34:11 +05:30
873feaee2b
Added a function to the creature renamer to save a graphics pack file to set graphics for all the generated creatures.
2017-02-07 15:57:35 +05:30
10bbd3cb39
Added a function to spit out a generated graphics pack file. Not done yet.
2017-02-07 11:19:45 +05:30
b151ad7c75
always make sure the name prefix has an underscore at the end of it.
2017-02-07 11:09:39 +05:30
f9b296884c
Made the creature renamer work more than once on the same save, and changed the format of the resulting names.
2017-02-07 11:01:42 +05:30
68faca09ee
Added missing base types given by toady, and reorganized the list to look better.
2017-02-07 10:27:57 +05:30
64e217132e
Don't offset the raplacement by 1 since there's no space now.
2017-02-06 10:50:18 +05:30
5b83c6fe68
Add spaces to search string programmatically.
2017-02-06 10:49:22 +05:30
1aef1d1b98
use STD::Vector instead of a C array, and set version properly.
2017-02-06 10:42:10 +05:30
b18bd72c05
Replace tab with spaces.
2017-02-06 10:12:20 +05:30
7823d78cd9
Update xml and embark-tools field name
2017-02-04 14:49:21 -05:00
f65a981099
Fix indentation
2017-02-04 14:46:38 -05:00
c8e6845a7f
Send noble positions and professions along with Units.
2017-02-03 10:08:35 +05:30
d97b0497b3
Add prosession and noble position info to units.
2017-02-02 12:12:28 +05:30
c3c3f37b06
Added more descriptor types, and made it run on world load.
2017-01-26 15:58:43 +05:30
24a653f77b
added ants and apes to the list.
2017-01-26 12:50:37 +05:30
365624453e
Finish up the generated-creature-renamer plugin.
2017-01-26 12:45:40 +05:30
934d5b32bc
Fix creature listing and plugin name
2017-01-26 10:00:38 +05:30
c659b885b6
Start a plugin to rename generated creatures to have sensible IDs
2017-01-25 23:06:03 +05:30
f0d4a1f563
Add DOWNLOAD_RUBY option to Ruby plugin cmake, defaulting to ON
...
If DOWNLOAD_RUBY is set to OFF, the build will not attempt to download
a prebuilt libruby.so and not fire a warning that one is not present.
This may be desired if one wants to link dfhack against a newer system
libruby.so, now that dfhack supports ruby 2.x and also supports linking
against system libruby (at least, on Linux), as per the following commit:
df9b5bca73
2017-01-20 17:40:14 -05:00
affcd658dc
title-version: Hide when loading a game (e.g. arena)
2017-01-04 12:30:59 -05:00
cda4e7a300
title-version: add prerelease indicator
2016-12-30 18:03:28 -05:00
c99780aafd
Add support for shell crafts.
2016-12-27 23:40:53 -05:00
cd0d9fed18
stocks: Support getSelectedItem()
2016-12-27 17:41:32 -05:00
3c7d2626e2
df::dfhack_material_category has no constructor, must be manually initialized
...
see #1047
2016-12-18 17:58:24 -06:00
ba48afe908
stockflow: Simplify calculation
...
See #1046
Use math.floor() for now until we can get Lua 5.3 working on Travis
2016-12-16 14:22:00 -05:00
1419d58b9a
stockflow: Use "floor division"
...
Per suggestion by @dscorbett
2016-12-16 13:04:51 -06:00
5be77fa63d
stockflow: Fix "integer expected" problem in stockflow
2016-12-16 08:09:53 -06:00
a5eb5d2502
manipulator: Sort custom professions
...
Also use == instead of string::compare()
2016-12-15 19:18:07 -05:00
439e13643c
better hack to make ruby work on win64
2016-12-13 23:55:20 -06:00
c8b7dbd255
Fix manipulator crash when selecting profession from empty list
...
Also add ListColumn::hasSelection()
Fixes #1040
2016-12-11 21:16:21 -05:00
9e0221a44e
Merge remote-tracking branch 'dscorbett/bitfield-constructors' into develop
2016-12-11 17:52:00 -05:00
e8c8953cbb
Re-add and update misery plugin
...
Closes #1037
Ref #1011
2016-12-10 18:22:32 -05:00
acdb369aa8
Avoid non-trivial bitfield constructors
2016-12-09 13:41:14 -05:00
0c6c94b310
Merge branch 'develop' of gh:dfhack/dfhack into develop
2016-12-09 11:28:09 -05:00
d6fda58ca0
Remove treefarm (PR #1011 )
...
Merge remote-tracking branch 'PeridexisErrant/remove-broken-plugins'
advtools and misery are still partially broken, but parts of them still work, so
repairing them is possible.
2016-12-09 11:20:35 -05:00
1545a4106b
Merge pull request #1035 from ab9rf/labormanager-0.43.05-r1
...
labormanager: fix StoreItemInVehicle labor inference
2016-12-09 11:07:00 -05:00
1a9d8629c5
labormanager: fix StoreItemInVehicle labor inference ( #8 )
...
* labormanager: add deconstruct labor for constructed instruments
* labormanager: fix StoreItemInVehicle labor inference
StoreItemInVehicle requires the labor appropriate to the item being
stashed
2016-12-09 09:54:20 -06:00
8012c5686b
Merge pull request #1034 from ab9rf/labormanager-0.43.05-r1
...
labormanager: add deconstruct labor for constructed instruments
2016-12-08 17:15:04 -05:00
50ce9942f4
labormanager: add deconstruct labor for constructed instruments ( #7 )
2016-12-08 16:01:14 -06:00
8488b1a953
ruby: use correct raw string length with encodings
2016-12-05 10:29:16 +01:00
eaf9b75a18
Merge pull request #1026 from ab9rf/labormanager-0.43.05-r1
...
labormanager: fix deconstruction of buildings containing items
2016-12-01 18:41:10 -05:00
1eaa2033dc
Merge pull request #6 from ab9rf/labormanager-0.43.03-working
...
further tweak building construction labor identification
2016-12-01 14:38:21 -06:00
ad6d6fbaa6
further tweak building construction labor identification
...
It's always more complicated than you expect....
2016-12-01 14:36:46 -06:00
1fa997612f
Merge pull request #5 from ab9rf/labormanager-0.43.03-working
...
Mysteriously disappearing code reinserted
2016-12-01 11:12:39 -06:00
1d97638579
Mysteriously disappearing code reinserted
2016-12-01 11:10:52 -06:00
6856a7ebe0
Merge pull request #4 from ab9rf/labormanager-0.43.03-working
...
Fix deconstruction of buildings containing items
2016-12-01 11:07:36 -06:00
77a1264a94
Fix deconstruction of buildings containing items
2016-12-01 11:06:40 -06:00
ddf447d3de
Merge pull request #1022 from ab9rf/labormanager-0.43.05-r1
...
Use attributes in calculating assignment weight
2016-11-29 01:51:56 -05:00
0ab3005a89
Merge pull request #3 from ab9rf/labormanager-0.43.03-working
...
Incorporate more updates cherrypicked from nocico
2016-11-29 00:24:31 -06:00
d5d0775f1a
Remove redundant cast
2016-11-29 00:22:34 -06:00
5c16b5a2b7
labormanager: multimaterial constructions
2016-11-28 23:53:40 -06:00
d626990ac8
labormanager: trap components
2016-11-28 23:53:39 -06:00
7c0fecec14
Merge pull request #2 from ab9rf/labormanager-0.43.03-working
...
Pull working changes forward to 0.43.05
2016-11-27 22:53:29 -06:00
ae48612ebd
labormanager: support for jobs in bowyer's shop
2016-11-27 22:47:53 -06:00
5405c76746
labormanager: support for jobs in bowyer's shop
2016-11-28 05:40:03 +02:00
0acd1c9059
make labormanager know building instruments is furniture hauling
2016-11-26 21:09:31 -06:00
10384fe720
make labormanager know building instruments is furniture hauling
2016-11-26 21:07:02 -06:00
ad84217687
fix white space to make travis happy
2016-11-26 20:55:10 -06:00
47426e3e00
Use attributes in calculating assignment weight
2016-11-26 20:55:10 -06:00
cbcb148182
Better job assignment algorithm for labormanager.
2016-11-26 20:55:09 -06:00
491d53b76f
fix white space to make travis happy
2016-11-26 18:08:48 -06:00
8eb4f17b23
Use attributes in calculating assignment weight
2016-11-26 17:37:26 -06:00
f71d19578c
make labormanager know building instruments is furniture hauling
2016-11-26 13:39:20 +02:00
dd28079f30
Fix ruby.cpp compilation on win64
2016-11-22 22:43:48 -05:00
c7a35d7ece
fix remotefortressreader protobuf error in clean builds
2016-11-22 17:24:36 -05:00
647ef4d556
Fix labormanager whitespace
2016-11-22 17:17:56 -05:00
45d138191e
Merge remote-tracking branch 'ab9rf/labormanager-0.43.05-r1' into develop
2016-11-17 23:02:05 -05:00
df9b5bca73
Allow ruby plugin to try more than one library path, including libruby.so on Linux
2016-11-17 10:31:48 -05:00
dce00a5034
Partial compilation fixes for advtools, misery
2016-11-16 15:21:13 -05:00
8d9b888410
Revert "fixed MD5 hash of win64 ruby lib."
...
Unable to get anything other than 8a856 for the extracted library on my end
This reverts commit fbaf2697cb
2016-11-14 14:16:43 -05:00
80ff369059
Merge branch 'labormanager-0.43.03-r2' into labormanager-0.43.05-r1
2016-11-08 12:07:30 -06:00
8fec45696d
Better job assignment algorithm for labormanager.
2016-11-08 12:01:24 -06:00
6895f3fbed
remove tabs
2016-11-08 15:13:43 +05:30
5e204069ce
update stonesense
2016-11-08 15:13:06 +05:30
20b9aab8db
moved remotefortressreader.cpp to its own directory.
2016-11-08 15:11:27 +05:30
fbaf2697cb
fixed MD5 hash of win64 ruby lib.
2016-11-08 15:10:43 +05:30
2935032a1e
Add .proto files to plugin sources when used, to make it conventient to open it from the IDE.
2016-11-08 15:10:01 +05:30
ebc1a6d85e
Add functions to get and set the pause state in DF
2016-11-08 13:40:08 +05:30
99051f176b
Add a single bool dfproto message, to pausing and checking pause state
2016-11-06 10:08:28 +05:30
939b177673
Merge branch 'develop' of dfhack/dfhack into develop
2016-11-02 16:26:33 -04:00
04ad7a0a42
Replace some instances of "cmake -E copy_if_different" with a standalone script
...
@JapaMala reported that CMake < 3.5 doesn't support copy_if_different with
multiple source files.
https://cmake.org/cmake/help/v3.5/release/3.5.html#command-line
2016-11-02 16:23:32 -04:00
e769041983
Fix crash bug in remotefortressreader, that happened every time the user resumed.
2016-11-01 23:34:56 +05:30
a50af3e96c
Update stonesense
2016-10-31 22:52:45 +05:30
d8f3d7d8f9
Send dye color with items in remotefortressreader.cpp
2016-10-31 22:52:17 +05:30
8a66e22522
Merged branch develop into develop
2016-10-31 17:39:02 +05:30
335607d1f8
Update Stonesense.
2016-10-31 17:38:43 +05:30
2e6c7a90be
fix whitespace
2016-10-31 01:58:40 -04:00
30f4617abf
Merge remote-tracking branch 'ab9rf/labormanager-0.43.05-r1' into develop
2016-10-31 01:56:49 -04:00
9e97ccbb50
Use system libruby on osx64 (since ruby 1.8 and 2 are supported now)
2016-10-29 19:08:54 -04:00
8b7af8ba09
Merge branch 'develop' of dfhack/dfhack into develop
2016-10-29 19:00:58 -04:00
4e7f2b9579
win64 ruby 2
2016-10-29 19:00:28 -04:00
82f42addcb
Merged branch develop into develop
2016-10-29 13:32:38 +05:30
ea9992239b
Send building items, and send fake item types for boxes and bags.
2016-10-29 13:31:51 +05:30
a84958a390
Merge branch 'develop' of dfhack/dfhack into develop
2016-10-29 02:40:14 -04:00
ec222c0b24
Catch exceptions in stockpile (un)serialization
...
From #964 , protobuf exceptions in loadstock/savestock would either fail by only
logging an error to the console (when run from the Lua UI) or by crashing the
game entirely (when run from the console).
Figuring out what actually causes the exceptions in the first place (possibly a
misunderstood structure layout?) would be a better solution than this, but this
will at least stop crashes for now.
2016-10-29 02:35:27 -04:00
148202bcba
Use Binsearch for finding items.
2016-10-29 08:54:27 +05:30
0edce2b3ae
Merged branch develop into develop
2016-10-29 00:28:51 +05:30
30801697d9
Send items sitting on the floor through remoteFortressReader
2016-10-29 00:28:37 +05:30
c640006069
ruby: some more updates for x64, fix df_flagarray size
2016-10-28 16:40:14 +02:00
cdf24efe43
Remove plugins - all broken since 34.11
...
This changes nothing at all as far as any DFHack user is concerned, as
these plugins have not been possible to build since DF 34.11 - and would
have to be rewritten for compatiblity with new native-DF systems.
"treefarm" is additionally replaced by "autochop".
In the unlikely event that a developer wants the source code for
something... that's what version control is for!
2016-10-27 23:35:29 +11:00
d62d263793
ruby: Fix potential onupdate crash when cur_year is missing
2016-10-26 20:55:16 -04:00
cf329c7ceb
Ruby: fix Qnil and Qtrue constants with 64-bit Ruby 2.x
...
These have different values on x64 Ruby 2.x (see USE_FLONUM in ruby.h in the
ruby source). This was causing dump_rb_error to crash, since it was walking an
array until it got to Qnil (but thinking Qnil was 4 instead of 8) and trying to
print each element as a string. There were probably more subtle issues with
Qnil and Qtrue being wrong too.
2016-10-26 20:44:35 -04:00
defedb351e
Fix raw_vcall crash on Linux/OS X x64
2016-10-26 09:34:14 -04:00
4e933316ca
Merge branch 'labormanager-0.43.03-r2' into labormanager-0.43.05-r1
2016-10-25 17:06:01 -05:00
a04ed641b7
SPACES not TABS
2016-10-25 17:03:45 -05:00
9aa6b84e24
alphabetical order
2016-10-25 16:55:37 -05:00
18235da9d6
add a misisng labor rule for leather crafts
2016-10-25 16:45:25 -05:00
cffd3be591
Move labormanager out of dev
2016-10-25 16:34:20 -05:00
2c230f0d3e
Improve protobuf file regeneration (no longer uses a dummy status.txt file)
2016-10-24 22:51:27 -04:00
4fdbba0207
Only touch protobuf generated files if they actually changed
2016-10-24 22:28:51 -04:00
5c83c16a99
Fix memview x64 address display
2016-10-24 10:06:41 -04:00
25a64a2102
Merged branch develop into develop
2016-10-21 22:55:38 +05:30
a0b0c16a8b
Actually apply the designation changes in RemoteFortressReader
2016-10-21 22:55:28 +05:30
3df74de021
Fix rb_dfget_vtable_ptr on x64
...
This was causing rb_dfget_rtti_classname to receive a truncated pointer and
crash
2016-10-21 11:46:53 -04:00
97f29229cd
ruby: fix weird freeze when printing large strings to the console on linux64
2016-10-21 17:00:02 +02:00
f586692ed6
plugins/ruby: update for 64bits
2016-10-21 14:52:26 +02:00
e3ff89ba03
Fix compile error
2016-10-19 16:21:38 -04:00
701adc12b3
Add ability for remotefortressreader.cpp to accept dig designations.
2016-10-19 22:21:50 +05:30
919507d9a0
Send over dig designations from un-taken job postings in remotefortressreader.cpp.
2016-10-19 20:00:30 +05:30
16c77efb43
Fix whitespace issues
2016-10-15 16:05:33 -04:00
4c21bbd5ae
Add Lua::TableInsert() helper
2016-10-15 14:55:48 -04:00
8a138fcc4c
Avoid polluting global namespace in MapCache.h
2016-10-15 14:53:10 -04:00
8d84b0d968
Merged branch v0.43.03 into develop
2016-10-13 19:27:06 +05:30
1c20ebe62c
Make title-folder work without SDL_WM_GetCaption
2016-10-08 17:02:45 -04:00
2806fe73a9
ruby: Support for loading Ruby 2.x libruby
...
Check for rb_float_new and rb_float_new_in_heap, as documented in #271
2016-10-08 17:01:52 -04:00
58ed20b25b
Send world map snow coverage over remotefortressreader.
2016-10-06 22:16:40 +05:30
714ba1a030
Warn if ruby library is missing instead of breaking installation
2016-09-26 18:28:59 -04:00
caa6a81669
Add ruby library for linux x64
...
Built by @dseguin: https://github.com/DFHack/dfhack/pull/989
Closes dfhack/dfhack#989
2016-09-26 17:46:50 -04:00
7abb82b6d1
Switch to downloading 32-bit libruby on Linux and Windows
2016-09-26 17:36:57 -04:00
888a09bed5
Switch to downloading OS X libruby
2016-09-26 17:24:35 -04:00
8f2cc5bc4d
Fix and reorganize remotefortressreader includes
2016-09-04 16:06:26 -04:00
e205dc82a5
Merge pull request #991 from JapaMala/v0.43.03
...
Removed the other foreach.
2016-08-29 22:30:43 +05:30
1862106fd1
Removed the other foreach.
2016-08-29 22:29:40 +05:30
b09ee3407c
Merge branch 'v0.43.03' of https://github.com/JapaMala/dfhack into develop
...
Conflicts:
library/xml
plugins/remotefortressreader.cpp
2016-08-29 22:06:37 +05:30
af5d4ec5a8
removed foreach.
2016-08-29 21:43:20 +05:30
bbaf129adf
Fix ruby codegen for bitfields/enums with long base-type
2016-08-27 15:24:53 -04:00
7d145de4a7
Translate histfig mats into creature mats, rather than sending the entire histfig population.
2016-08-26 23:48:32 +05:30
91cb734a25
Send histfig materials over remotefortressreader.cpp, using unique ids.
2016-08-26 12:23:50 +05:30
5c3260c382
Actually check spatter amounts properly
2016-08-26 08:49:54 +05:30
db7be082ef
Only copy spatters if they actually have any amount.
2016-08-25 23:56:30 +05:30
a3ab757642
Add spatters to remotefortressreader.cpp
2016-08-25 21:14:23 +05:30
6ce470ad57
Add basic lua expression support to memview
...
Currently just supports basic field accesses (world.x, screen.y.z).
No support for world.x - 4, etc.
Closes #976
2016-08-24 16:26:34 -04:00
Su
myk002
bseiller
Myk Taylor
lethosor
Susan
abstern
Timur Kelman
PatrikLundell
Tachytaenius
Nilsolm
Quietust
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
codefactor-io
Vitaly Pronkin
Vitaly Pronkin
Phillip Spiess
Daniel Brooks
Dan Amlund
David Timm
ViTuRaS
Ben Lubar
Ben Rosser
David Corbett
jj
nocico
PeridexisErrant