3ba984c22c
only reset extents if they are unusable
...
this allows callers of Buildings::setSize() to "pre-initialize" the
extents to declare non-rectangular structures. this allows quickfort to
create non-rectangular stockpiles, farm plots, zones, etc. the extents
are still reset as before if the size of the building doesn't match the
caller's expectations.
this commit also fixes a memory leak when setSize() allocates memory for
extents, but the memory is not deallocated if the building is ultimately
invalid for some reason.
2020-12-16 11:10:47 -08:00
159695775e
Merge branch 'develop' into lua-runcommand
2020-12-05 19:49:55 -05:00
855ce84eca
Update submodules
2020-12-04 23:55:43 -05:00
af2255956a
Update submodules
2020-12-03 23:00:21 -05:00
fe0cd9a939
Make lineedit() fail sooner when another lineedit() call is active
...
Before, calling `dfhack.run_command('tiletypes')` from a `dfhack.timeout` callback would leave the console in a broken state, since raw mode was enabled but never disabled.
Only tested on Linux with a supported terminal.
2020-12-03 22:04:00 -05:00
a9bb11c145
Optimize Lua's internal.runCommand() when printing directly to the console
...
This also makes commands run with `run_command()` detect the console properly (notably used by `df2console()`)
2020-11-20 17:57:54 -05:00
fb44b26b47
Make utils.addressof() work for raw userdata
2020-11-19 21:32:42 -05:00
8cb38ecf5b
Merge remote-tracking branch 'myk002/myk_metalhead_mario' into develop
2020-11-13 14:04:30 -05:00
76e8c495fe
revert skip_vector=true for now
2020-11-13 10:45:53 -08:00
fa126af1fd
undo unnecessary edits
2020-11-12 22:49:06 -08:00
10616a387f
cleaner mask-based implementation
2020-11-12 22:44:38 -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
913d860ae4
Use initial working directory as process path on Linux, and expose to Lua
2020-11-12 19:07:51 -05:00
23b230495e
Merge branch 'develop' into cwd-handling
2020-11-12 18:44:05 -05:00
421844dcb8
Update xml
2020-11-11 16:05:24 -05:00
eee33822e7
Update submodules
2020-11-09 23:41:53 -05:00
3aa902bd25
Update submodules
2020-11-03 19:52:24 -05:00
1d0e2dc6bc
Update extents handling to use building_extents_type
2020-11-03 14:56:16 -05:00
3b4d6de454
Merge remote-tracking branch 'myk002/quickfort_building_types' into develop
2020-10-27 23:14:38 -04:00
186f28a94b
filters for altars, display cases, and bookcases
2020-10-23 09:11:07 -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
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
ce7772a1c2
Add Filesystem::restorecwd()
...
This allows restoring the working directory to its original value, which may not actually be the DF root. See #1671 , dfhack/scripts#152
2020-10-14 21:22:53 -04:00
b343d00800
Update to 0.47.04-r3 (authors, changelog, and submodules)
2020-10-10 17:31:30 -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
d1eec9d338
Update xml
2020-10-09 21:44:16 -04:00
c9609ad590
Make `createitem inspect` consistent for PLANT_GROWTH items
2020-10-09 12:45:49 -04:00
c2280356cb
Set language of some code blocks to enable syntax highlighting
2020-10-09 01:15:42 -04:00
9ba677a38b
Update xml
...
dfhack/df-structures#410
2020-10-06 22:03:13 -04:00
17bc4cd365
Merge remote-tracking branch 'myk002/buildingplan_item_match' into develop
2020-09-29 20:04:02 -04:00
c73b1f03af
buckets can be lye- and milk-free
...
otherwise the bucket for wells can never be matched
2020-09-29 00:23:44 -07:00
3c51bb51ab
remove references to non-existent vector ids
2020-09-28 23:14:13 -07:00
6cc1428199
Merge remote-tracking branch 'upstream/develop' into buildings_vectors
2020-09-28 23:13:13 -07:00
74a3e0eddf
Use a string and .reserve for normalizing instead of stringbuf
2020-09-24 15:22:58 -07:00
f5c3712778
Nicer formatting for the normalized character mapping table
2020-09-24 14:32:58 -07:00
38c9c28250
Fix wrong variable usage in to_search_normalized
2020-09-24 10:52:03 -07:00
a3c565b243
Add to_search_normalized to search for characters with accents
2020-09-24 07:31:10 -07:00
dfac5bc143
Update gui.Painter docs, add sections to dfhack.screen, add more links, etc
2020-09-23 22:00:39 -04:00
65b8071941
Use typedefs from xlsxio in PluginStatics.h
...
The typedefs in the header foward-declared new structs of the same names in the DFHack namespace, e.g. DFHack::xlsxio_read_struct. Apparently the constructors that used these typedefs are not inlined on Windows, so libdfhack was compiled with a constructor taking a "DFHack::xlsxio_read_sheet_struct", and xlsxreader was looking for a constructor taking just a "xlsxio_read_sheet_struct", which didn't exist.
2020-09-18 15:05:17 -04:00
f837532b42
use more precise item vectors for bld item filters
2020-09-13 17:12:29 -07:00
5aca88ef03
Update submodules
2020-08-29 20:02:33 -04:00
3b5a82cc05
Change color of ListBox.select2_hint to grey to indicate enabled
...
Ref dfhack/scripts#185
2020-08-27 00:08:28 -04:00
c034276af5
Merge remote-tracking branch 'myk002/quickfort_filter' into develop
2020-08-21 00:34:34 -04:00
8779ca0659
Merge remote-tracking branch 'myk002/quickfort_civzones' into develop
2020-08-21 00:34:26 -04:00
9a3e9d5b12
listbox filter can match strings after punctuation
2020-08-17 21:15:33 -07:00
8a438c2a55
allow row_height to be set from the ListBox class
2020-08-17 21:14:05 -07:00
e546d3eec3
rename is_civzone to the more general allow_wall
2020-08-15 20:13:48 -07:00
ae872e812f
properly detect valid tiles for civzones
2020-08-15 17:24:12 -07:00
bda678bcd4
add some explanatory text to the top of the header
2020-08-11 19:47:04 -07:00
39ae2d95fc
2nd attempt to solve compilation errors on windows
2020-08-11 17:06:28 -07:00
4f88bb4c3d
attempt to solve compilation error on windows
2020-08-11 16:54:53 -07:00
0bda289b17
move xlsxreader identity statics to dfhack lib
2020-08-11 14:51:17 -07:00
a41f7c0998
convert XlsxReader module to xlsxreader plugin
2020-08-09 08:54:42 -07:00
b0cb40c5ea
pass the cmake environment to deps
2020-08-08 22:42:50 -07:00
8d157012d0
build dfhack with verbosity on too
2020-08-08 22:04:49 -07:00
cffac8ed93
fix line endings in XlsxReader.cpp
2020-08-08 20:07:54 -07:00
8c7fb808e1
get xlsxio Lua API working
2020-08-08 17:55:49 -07:00
18f4786458
Merge remote-tracking branch 'upstream/develop' into quickfort_xlsxio
2020-08-08 17:17:45 -07:00
89a6309788
build xlsxio and link it into dfhack, add lua api
2020-08-08 15:24:12 -07:00
f2b0f012c9
Bump to 0.47.04-r2
2020-08-08 14:53:24 -04:00
8c5b21b7ee
Fix a couple warnings in the Units module ( #1615 )
2020-08-08 14:35:12 -04:00
8f047530c4
Make Units::getRaceNameById and other ID-related functions available to Lua
2020-08-08 14:28:17 -04:00
3b3b0be8c5
Update submodules, tweak changelog order
2020-08-08 02:00:12 -04:00
cb1b751988
Update submodules
2020-08-08 00:31:28 -04:00
f7fda8e7f5
Update changelog, authors, xml ( #1615 )
2020-08-08 00:06:59 -04:00
c76f71cd46
Update xml library submodule
2020-08-07 22:20:11 +01: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
498fd9a1a6
Flush plugin warning messages
2020-08-06 22:45:46 -04:00
7c2af344a1
Update changelog ( #1564 ) and xml ( dfhack/df-structures#400 )
2020-08-06 02:04:23 -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
dba7df7ab8
Add "delete word" support to Console-posix
2020-08-02 23:10:35 -04:00
bb66ef32a7
Tone down a couple warnings
...
There have been a few cases of people thinking these are more important than they actually are
2020-08-02 12:55:36 -04:00
d504e476c5
Update xml
2020-07-28 23:42:37 -04:00
f546816eb9
Update submodules
2020-07-28 00:39:59 -04:00
289e0df828
Roll back to actions/checkout v1
...
v2 uses the wrong commit sometimes: actions/checkout#299
2020-07-27 01:12:14 -04:00
569370489a
Update submodules ( fixes #1576 )
2020-07-26 23:16:13 -04:00
f0ad730a37
Lua: Fix off-by-one preventing accessing last df-other-vectors item by ID, add tests
2020-07-26 02:11:27 -04:00
4e218c7de3
Update xml
2020-07-26 02:00:13 -04:00
4891b4fd5e
Fix indexing primitive refs with integers (broken in #1543 ), add tests
...
Apparently lua_tostring has the side effect of *converting* numbers to strings
2020-07-25 20:22:52 -04:00
8137b43e57
Merge remote-tracking branch 'myk002/internal_scripts' into develop
2020-07-25 13:46:12 -04:00
7c921d8c91
Lua listdir_recursive: allow nil to be used for default arguments
...
https://github.com/DFHack/dfhack/pull/1609#issuecomment-663803777
2020-07-25 13:02:35 -04:00
48d4013bcb
don't list subdirectories named 'internal'
...
instead of just specifically for lua files with a '-internal.lua' suffix
2020-07-24 22:07:16 -07:00
da11932d6b
Merge remote-tracking branch 'upstream/develop' into internal_scripts
2020-07-24 20:47:24 -07:00
fcb14623a7
Update authors, submodules
...
Ref dfhack/scripts#162
2020-07-24 22:18:00 -04:00
cafdc1620b
Improve Lua listdir_recursive error handling
...
Ref #519 , #1609
2020-07-24 22:15:35 -04:00
86e9f69d42
Merge branch 'quickfort_skeleton' into internal_scripts
2020-07-24 08:24:45 -07:00
e17d492203
address PR review comments on api docs
2020-07-23 21:55:05 -07:00
b200219967
support for splitting lua scripts into parts
...
without polluting the output of #DFHack ls
2020-07-20 23:04:23 -07:00
d0f8ba06a2
expose new include_prefix param to Lua
2020-07-19 01:52:57 -07:00
16cfd34678
recurs-ify default config copying logic
...
I refactored Filesystem::listdir_recursive to support removing the path
prefix from the returned files list. There are no current calls that
make use of the prefix parameter, so I converted it into a boolean.
Current usages will use the new default parameter and will not see any
changed behavior.
2020-07-18 22:22:37 -07:00
a0c514b117
Update xml
2020-07-17 17:35:33 -04:00
35d659091d
Merge remote-tracking branch 'myk002/blueprint_in_blueprints' into develop
2020-07-17 17:32:59 -04:00
56e43a0dde
Linux: make Process::getPath (and dfhack.getDFPath()) not depend on cwd, for consistency with other platforms
2020-07-16 23:21:56 -04:00
bb91fdcf8c
Merge remote-tracking branch 'upstream/develop' into blueprint_in_blueprints
2020-07-16 09:24:52 -07:00
0afbe9d931
include algorithm on windows for std::replace
2020-07-16 08:42:39 -07:00
bb1fcff410
use FILENAME_MAX instead of PATH_MAX for compat
2020-07-16 08:33:23 -07:00
c0d10b9e44
Update submodules
2020-07-16 01:49:16 -04:00
1ae341b637
Check that we created a dir before we return true
2020-07-15 22:02:12 -07:00
c19fc1f349
gcc-4.8 compatibility
2020-07-15 21:35:21 -07:00
df6f3a0455
Mark ref_target as a metafield so meta_primitive_newindex fails properly
...
unit:_field('hist_figure_id').ref_target = 4 now fails with "Cannot write field int32_t.ref_target: builtin property or method" instead of "not found"
2020-07-14 02:31:18 -04:00
a44a2e2298
Merge branch 'develop' into lua-ref-target
2020-07-14 01:31:23 -04:00
07a2b4a9d7
Use language_name_type enum item names
2020-07-11 02:05:38 -04:00
24d64175fb
Remove top-level links from TOCs
2020-07-08 02:13:37 -04:00
25f1b14a88
update structures
2020-07-01 23:12:45 -05:00
72ce52e004
update structures
2020-07-01 23:10:34 -05:00
ae0f57f0e0
Update submodules
2020-07-01 23:54:31 -04: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
ee56d8157f
Update xml
2020-06-27 00:15:48 -04:00
5570a5743b
Merge branch 'develop' of https://github.com/DFHack/dfhack into Units
2020-06-26 09:53:41 +02:00
8a7e8f4fac
Update xml
2020-06-25 01:12:18 -04:00
e2301ecae7
Update structures, fix reaction_productst::produce() parms
2020-06-23 13:31:27 -06:00
85855a2d88
update structures
2020-06-21 16:16:16 -05:00
7b4ae9b6a3
update structures
2020-06-20 23:08:55 -05:00
5073bd31c4
update structures
2020-06-19 19:37:54 -05:00
bd216dbc11
update structures
2020-06-15 23:47:35 -05:00
d5b5b81450
changes
2020-06-02 15:03:59 +02:00
5d05cfc7cc
Fix several functions in the Units module ignoring unit caste.
...
Fixes #1583 .
2020-06-02 01:18:57 -05:00
2fc7fa7ac2
Update xml, scripts
...
See #1576
2020-05-28 23:11:08 -04:00
4e97269312
Merge branch 'develop' of https://github.com/DFHack/dfhack into Units
2020-05-23 10:25:08 +02:00
f20446534b
fix DfOtherVectors computed size
2020-05-14 14:01:12 -05:00
7dd4b6d968
update structures
2020-05-14 13:07:11 -05:00
6c20fe4c80
implement df-other-vectors-type for lua
2020-05-09 18:28:40 -05:00
7cf9624de9
add assert to make sure other_id array index is in bounds
2020-05-09 18:28:40 -05:00
fc10ed3df6
Implementation for df-other-vectors-type in C++. Still needs Lua and Ruby support.
2020-05-09 18:28:40 -05:00
0ffafbde29
update structures
2020-05-09 18:28:19 -05:00
d0c030c3da
Update xml (changelog only)
2020-05-04 19:27:17 -04:00
ec7f97bb7a
adapted to enum value name change
2020-05-02 17:37:10 +02:00
1c57aa7bb4
update structures
2020-05-02 02:01:32 -05:00
947d0db182
update structures
2020-05-02 01:54:38 -05:00
217535decb
Update xml
2020-05-01 22:52:35 -04:00
24cebbda58
Fix segfault when setting DFHACK_HEADLESS but not PRINT_MODE:TEXT
...
endwin() is unhappy if initscr() wasn't called
2020-04-28 21:38:47 -04:00
2108c2363d
Use strcmp
2020-04-28 01:21:11 -04:00
9e085b66ac
Merge branch 'develop' into lua-ref-target
2020-04-27 23:24:29 -04:00
6bdbf5b0dd
Update to 0.47.04-r1, update xml, scripts, changelog version
2020-04-25 21:33: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
405af5a20b
Update structures
2020-04-25 02:01:21 -04:00
55a82e43c6
Update xml, fix stockpiles build
2020-04-24 23:50:35 -04:00
c6ed0a2458
Update xml, scripts, authors
2020-04-24 21:15:04 -04:00
27e42ed25d
Update xml
2020-04-23 23:12:43 -04:00
84f13b643b
update structures
2020-04-23 15:34:26 -05:00
c5513c3ca1
Update xml
2020-04-23 01:11:29 -04:00
0272fd57f8
Update submodules
2020-04-22 22:16:24 -04:00
21be5cf061
adapted to structures
2020-04-22 15:32:49 +02:00
f371ae6da8
adapted to histfig_nemesis_id->union
2020-04-22 12:38:37 +02:00
07571e9eb4
updated and resolved conflict
2020-04-22 11:43:37 +02:00
9a10ea9fe5
Update submodules
2020-04-22 02:13:24 -04:00
66314806b1
update structures
2020-04-19 22:03:13 -05:00
54d4b68f3c
don't crash if the path to an instance-vector contains a null pointer
2020-04-18 20:40:17 -05:00
c8ff8d0d8e
update scripts and structures
2020-04-17 11:52:16 -05:00
8427f518c9
match capitalization changes I made to df-structures in specific_ref
2020-04-15 20:05:15 -05:00
253b15aeb9
update structures
2020-04-15 19:03:40 -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
57d565c735
Merge remote-tracking branch 'PatrikLundell/TranslateName' into develop
2020-04-15 01:07:34 -04:00
67c1321a06
update structures
2020-04-11 13:03:38 -05:00
9a2549bad6
Update xml
2020-04-09 23:56:01 -04:00
125f4b129b
Add ref_target attribute to primitive field references
2020-04-09 00:02:07 -04: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
509755d726
update structures
2020-04-07 16:08:19 -05:00
6b810b97a0
DataDefs.h can have little a documentation
2020-04-07 13:46:44 -05:00
c8e63cf7a6
update structures
2020-04-07 10:17:01 -05:00
f83fee86de
Make pairs(df.type) return class methods
2020-04-06 19:12:53 -04:00
cc2a5acdd3
Update xml, authors
2020-04-05 23:29:53 -04:00
a0e2abe20a
Units update need coordination with structure identity
2020-04-04 14:00:26 +02:00
c8a0ac146c
Update submodules, changelog, CMakeLists, Authors
2020-04-04 01:36:52 -04:00
eb4cfcec90
Update xml
2020-04-04 00:36:02 -04:00
1024f39a26
Update submodules
2020-04-02 01:47:53 -04:00
63a26b987d
Fix issue #1528
2020-04-01 11:16:24 +02:00
4844ff5071
Update submodules
2020-04-01 00:25:12 -04:00
ffe73028f9
update structures
2020-03-30 10:36:45 -05:00
6c00ace68b
Merge branch 'develop' of gh:DFHack/dfhack into develop
2020-03-30 03:03:00 -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
52cf892383
update structures and scripts
2020-03-29 14:08:30 -05:00
6eb73d9046
Fall back to stdout if tty fails to open
...
May help with #1477
2020-03-28 13:14:03 -04:00
b6e0d3f73d
Update xml
2020-03-28 01:36:41 -04:00
67908e0f53
Console-posix: Reset color on shutdown
...
Ensures that dfhack-run doesn't leave behind a colorful prompt
2020-03-25 00:30:12 -04:00
65a7db44be
Update xml, scripts
2020-03-24 01:28:02 -04:00
24ceff8f7d
Update xml, scripts
2020-03-23 00:49:57 -04:00
49fcb29097
Update xml, scripts
2020-03-22 17:24:39 -04:00
b67de60a9b
update structures
2020-03-22 12:36:19 -05:00
0b69f98561
update structures
2020-03-22 12:22:43 -05: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
5b8952baf8
ghidra: handle destructor ABI differences
2020-03-21 08:53:11 -05:00
b2940b69f8
update structures
2020-03-21 07:49:22 -05:00
77e40a52c0
Update scripts, xml, authors
2020-03-21 02:02:00 -04:00
37e7bed779
add df.global:_field method. add test case to check for overlapping globals.
2020-03-20 09:41:58 -05:00
d28b35b6eb
update structures
2020-03-15 15:29:02 -05:00
2f4bd32d28
update structures and scripts
2020-03-15 15:19:51 -05:00
60722d778f
update structures and scripts
2020-03-15 02:17:19 -05:00
39486083f5
handle overlapping structures in check-structures-sanity better
...
update structures
2020-03-12 22:16:30 -05:00
1a4c4a5f33
update structures
2020-03-12 14:03:23 -05:00
f204f14e52
update scripts and structures
2020-03-12 12:53:24 -05:00
myk002
lethosor
Myk Taylor
George Murray
Ryan Bennitt
Ben Lubar
PatrikLundell
Quietust