lethosor
e2d56b9b8f
Merge remote-tracking branch 'lethosor/tweak-hide-priority-improvements' into develop
2021-04-08 23:43:14 -04:00
lethosor
761cf19e99
tweak hide-priority: make toggle state persist across designation menu uses
...
To reproduce:
1. Enter the `d`esignation menu
2. Press `-+` to change priorities
3. Create a designation
4. Press `Alt-p` to hide priorities
5. Exit and re-enter the designation menu (`Esc`, `d`)
Previously, priorities would be visible again after step 5. With this change, they are not visible until you press `Alt-p` again.
Fixes #1068 . Note that this is a relatively unobtrusive fix: selecting a priority with `+-` will still result in priorities being shown again. This is native DF behavior that I am reluctant to override because users of designation priorities likely want to see them.
2021-04-05 21:58:51 -04:00
myk002
81bfdf4182
update changelog
2021-04-04 17:40:59 -07:00
lethosor
ea1bc9e01b
Add GitHub issues/discussions to troubleshooting section
2021-04-03 00:24:58 -04:00
lethosor
8b38bf0e28
Move contribution-related information from Compile.rst to Contributing.rst
2021-04-03 00:20:15 -04:00
lethosor
cb2d8e0903
Compile.rst: remove old git note and rearrange
...
Very unlikely that this affects anyone now
2021-04-02 23:52:32 -04:00
lethosor
dfb52a2aba
Merge remote-tracking branch 'lethosor/command-prompt-fix-gui-scripts' into develop
...
Conflicts:
docs/changelog.txt
2021-04-02 21:53:14 -04:00
lethosor
257f8dbe00
buildingplan: fix size calculation for constructions
...
Planning a 4x2 construction with DF's `umkh` keys (i.e. not automaterial's box-select) would previously produce a 5x3 construction instead, for example.
2021-04-01 00:16:54 -04:00
lethosor
2332009825
Merge remote-tracking branch 'myk002/myk_enable_luacov' into develop
2021-03-28 00:38:36 -04:00
lethosor
5e09fd882d
Fix Painter:viewport()
...
This works because Painter inherits from ViewRect. Unsure how this went unnoticed.
2021-03-27 16:55:48 -04:00
lethosor
d61c4aa234
Merge remote-tracking branch 'myk002/myk_xlsxreader_classes' into develop
2021-03-27 00:10:03 -04:00
lethosor
ceae4723cd
Update scripts, authors ( dfhack/scripts#264 )
2021-03-26 00:37:28 -04:00
myk002
222feff342
expand docs for open and close functions
2021-03-22 10:44:32 -07:00
myk002
4ef0ff2a24
fix formatting errors
2021-03-22 10:40:29 -07:00
myk002
5f00183177
move test harness out of test dir
...
and install to test.lua in top-level scripts directory instead of test/main.lua
2021-03-22 10:15:32 -07:00
myk002
aac958aa50
add open() wrapper fn and document class methods
2021-03-22 09:38:20 -07:00
lethosor
59b023c71d
Ensure that command-prompt is dismissed after a command creates a new screen
...
Fixes #1803
Running a command that created a new screen would previously result in a screen
order that looked like this, due to how `Screen::Hide` works:
- DF screen
- `command-prompt` screen (dismissed)
- New screen
The `command-prompt` screen remained on the stack until the new screen was
dismissed, so it would intercept viewscreen vmethod calls intended for the
DF screen.
This change adds a new behavior to `Screen::Hide` that results in this screen
order after running a command:
- DF screen
- New screen
- `command-prompt` screen (dismissed) - DF removes this screen immediately
2021-03-21 20:42:50 -04:00
lethosor
fcb17da223
Update authors ( #1801 ), xml
2021-03-20 19:21:39 -04:00
lethosor
3926482047
Merge remote-tracking branch 'gaberau/patch-1' into develop
2021-03-20 19:15:25 -04:00
Gabe Rau
81b6d93701
Minor grammer fixes.
2021-03-20 15:51:35 -06:00
Gabe Rau
cc376eeb55
Fixed a number of spelling and grammatical errors. Should be set now. Added better examples and removed redundant words.
2021-03-20 15:49:53 -06:00
Gabe Rau
374fc763eb
Fixed whitespace issues that cause a failed build on lint.
2021-03-20 01:55:45 -06:00
Gabe Rau
e6639180db
Fixed merge conflicts, expanded upon provided examples, added more detail.
2021-03-20 01:47:36 -06:00
Gabe Rau
5aa3c6bfc6
Revised Lua API.rst to better explain command. Added proper examples and explantion of difference between run_command and run_script.
2021-03-19 21:58:24 -06:00
Gabe Rau
a77353b2e6
Update Lua API.rst
...
Corrected the dfhack.run_script documentation and added an example.
2021-03-17 23:17:01 -06:00
lethosor
ab2c51d19c
Remove changelog entry from #1792
...
Only applied to files in scripts/test, which didn't exist in previous versions
2021-03-10 00:45:58 -05:00
myk002
f3bef8c34e
update changelog
2021-03-08 15:06:27 -08:00
myk002
69a2f44020
Lua class wrappers for the xlsxreader plugin API
2021-03-08 15:04:50 -08:00
myk002
81e62b8cfc
update changelog
2021-03-07 08:53:42 -08:00
myk002
ed21ed8593
update changelog
2021-03-07 08:51:33 -08:00
myk002
49b34b52f5
update docs
2021-03-07 08:16:25 -08:00
myk002
dc58d39c36
document DFHACK_ENABLE_LUACOV env var
2021-03-07 08:16:24 -08:00
lethosor
6d1bd62af9
Add a Java client lib and update the name of the Python one
2021-03-06 17:31:27 -05:00
lethosor
032cd64c10
Bump to r1, update submodules and changelog
2021-03-06 13:30:16 -05:00
lethosor
2bb4dbccc6
Replace installed hack/changelog.txt with stub
...
This was incomplete, but people were still referencing it.
Closes #1775
2021-03-06 12:43:31 -05:00
lethosor
9df06564a0
Merge remote-tracking branch 'PatrikLundell/Prospector' into develop
...
Conflicts:
docs/changelog.txt
2021-03-03 23:56:06 -05:00
lethosor
1b2eed7c5e
confirm convict: use visible name to avoid exposing alternate identities
...
Ref #1593
See also:
https://www.reddit.com/r/dwarffortress/comments/ltzu82/if_i_wasnt_sure_i_found_the_vampire_before/
http://www.bay12forums.com/smf/index.php?topic=164123.msg8253738#msg8253738
2021-02-28 01:01:47 -05:00
lethosor
6acece1536
Merge remote-tracking branch 'myk002/myk_dreamfort' into develop
2021-02-25 22:25:42 -05:00
myk002
5a6263f72c
fix indentation
2021-02-24 21:56:40 -08:00
lethosor
4a7fcc6118
Fix plugin name in error, add link in docs
...
Ref #1769
2021-02-25 00:41:13 -05:00
lethosor
cb9ed4ff0c
Merge remote-tracking branch 'myk002/myk_manipulator' into develop
...
Conflicts:
docs/changelog.txt
2021-02-25 00:39:01 -05:00
myk002
23461e17c2
separate sand bags into their own stockpile
...
since quantum stockpiling them dumps out their contents
2021-02-24 19:50:29 -08:00
lethosor
96e91fa5e2
Merge remote-tracking branch 'myk002/myk_aliases_docs' into develop
2021-02-24 13:53:22 -05:00
lethosor
af34b5d614
Merge remote-tracking branch 'bseiller/ea_improve_survey_performance_keep_mlts_on_heap' into develop
2021-02-23 00:22:22 -05:00
lethosor
bf56ac1af9
Merge remote-tracking branch 'myk002/myk_deprecate_fortplan' into develop
...
Conflicts:
docs/changelog.txt
2021-02-20 00:54:18 -05:00
lethosor
1be75f269b
Merge remote-tracking branch 'myk002/myk_dreamfort' into develop
...
+typo fix in quickfort-alias-guide.rst
2021-02-20 00:47:59 -05:00
lethosor
cc51835660
Merge remote-tracking branch 'myk002/myk_stockpile_containers_docs' into develop
2021-02-20 00:38:34 -05:00
myk002
3278519c98
document how to specify containers for stockpiles
...
that are not specified with expansion syntax
2021-02-19 11:43:10 -08:00
myk002
b3666da0a6
fix wheelbarrow UI change attribution
2021-02-18 23:11:09 -08:00
myk002
cf0506e650
add documentation for #aliases blueprints
2021-02-17 23:10:47 -08:00
myk002
9e17bc938c
only set labor validity for the player civ
2021-02-17 09:16:49 -08:00
lethosor
e9afbd328e
Add some more client libraries to docs
2021-02-15 21:44:35 -05:00
myk002
09f0607db2
add deprecation warnings to fortplan
2021-02-13 11:07:14 -08:00
myk002
4790e23a5c
add more docs for quickfort orders
2021-02-13 07:46:45 -08:00
myk002
e87f27e1fd
Merge remote-tracking branch 'upstream/develop' into myk_stockpile_containers_docs
2021-02-13 07:17:15 -08:00
myk002
55743fc43f
Merge remote-tracking branch 'upstream/develop' into myk_manipulator
2021-02-13 07:16:58 -08:00
myk002
81d0a276b2
Merge branch 'develop' into myk_dreamfort
2021-02-13 07:15:11 -08:00
lethosor
49b6e814db
Bump to beta1, update submodules
2021-02-10 21:08:45 -05:00
lethosor
ebbbfc0f8e
Merge remote-tracking branch 'myk002/myk_orders_crash' into develop
...
Conflicts:
docs/changelog.txt
2021-02-10 00:10:53 -05:00
bseiller
efe62b412c
Update changelog
2021-02-09 08:48:43 +01:00
PatrikLundell
4660f52b36
improved pre embark mineral estimates
2021-02-08 14:45:49 +01:00
myk002
09d91dcae1
move alchemist-enabling logic to autohauler
2021-02-06 14:14:08 -08:00
myk002
13fae4628b
add docs for #place-generated manager orders
2021-02-05 17:05:34 -08:00
myk002
6819ee9928
make alchemist flag valid for controllable civs
2021-02-05 16:45:39 -08:00
myk002
4d57d27d4d
Revert "allow alchemist skill to be toggled in manipulator"
...
This reverts commit fa662cafbc
.
2021-02-05 16:10:36 -08:00
myk002
330bde7660
add heavy feeder piles
...
and other minor fixes found during playtesting
refine the embark profile suggestions
2021-02-04 23:01:12 -08:00
myk002
6c6a9968ff
hauling aliases can take from multile stockpiles
2021-02-03 13:51:02 -08:00
myk002
1063497828
don't crash on malformed orders json
2021-02-02 10:50:21 -08:00
myk002
fa662cafbc
allow alchemist skill to be toggled in manipulator
...
since autohauler uses it as a flag
2021-02-02 08:28:48 -08:00
bseiller
76c9d7a678
Update changelog
...
- changelog.txt: changed description of fix to be more concise
Co-Authored-By: PatrikLundell <22739822+PatrikLundell@users.noreply.github.com>
2021-02-02 00:32:30 +01:00
bseiller
84151ccbf9
Update changelog
...
- changelog.txt: added entry for bug fix
2021-02-01 23:52:51 +01:00
myk002
824beb0253
documentation for bin/barrel/wb feature
2021-02-01 02:22:04 -08:00
myk002
4c7e25739f
more dreamfort refinements (details on forum)
2021-01-31 19:36:05 -08:00
myk002
94a46a66c6
update changelog
2021-01-31 08:38:50 -08:00
myk002
fb143516cd
refresh the dreamfort case study
2021-01-30 19:32:41 -08:00
myk002
0c165e020c
fix formatting error
2021-01-30 18:47:34 -08:00
myk002
32d4eb001a
update dreamfort case study according to changes
2021-01-30 18:43:39 -08:00
lethosor
d2f3ec6076
Bump to 0.47.04-r5, adjust changelog
2021-01-30 21:23:44 -05:00
lethosor
9c65c1f7c7
Merge remote-tracking branch 'myk002/myk_stockpiles_stockflow_conflict' into develop
...
Conflicts:
docs/changelog.txt
2021-01-30 21:11:58 -05:00
lethosor
472f19e82a
Merge remote-tracking branch 'myk002/myk_alias_fix' into develop
...
Conflicts:
docs/changelog.txt
2021-01-30 20:58:36 -05:00
lethosor
7e12f3fd3d
Fix off-by-one, adjust changelog, move scroll keys to consistent place
...
Ref #1748
2021-01-30 19:40:15 -05:00
lethosor
8967e98a33
Merge remote-tracking branch 'myk002/myk_scrollable_labels' into develop
2021-01-30 19:33:04 -05:00
lethosor
6c379752fe
Update changelog, authors
...
Ref #1752 , #1753
2021-01-30 18:11:39 -05:00
lethosor
62870e9aee
Remove extra log statement, reorder changelog
...
ref #1753
2021-01-30 18:08:17 -05:00
lethosor
9d0eacadbf
Merge remote-tracking branch 'Moth-Tolias/seedwatch' into develop
2021-01-30 17:56:16 -05:00
myk002
8e53fb450c
use normal title replacement for search-plugin
2021-01-30 00:56:36 -08:00
lethosor
c6da99e5ce
Merge remote-tracking branch 'myk002/myk_stockflow_steals_input' into develop
...
Conflicts:
docs/changelog.txt
2021-01-30 01:59:44 -05:00
lethosor
6db851a2ad
Update changelog ( #1717 )
2021-01-29 20:32:33 -05:00
lethosor
4126585573
Merge remote-tracking branch 'lethosor/lua-runcommand' into develop
2021-01-29 20:27:38 -05:00
lethosor
845993ba59
Merge remote-tracking branch 'lethosor/fix-k-search-crash' into develop
2021-01-29 20:08:08 -05:00
myk002
4bad609e33
use the search plugin for tallow aliases
...
and document the dependency
2021-01-29 12:20:25 -08:00
Su
545fcf6745
Merge branch 'develop' into seedwatch
2021-01-29 11:34:57 +00:00
lethosor
5c14f619c8
Merge remote-tracking branch 'myk002/myk_buildingplan_enable_all' into develop
2021-01-29 00:59:33 -05:00
myk002
7f62c12a83
document all_enabled setting
2021-01-28 21:50:43 -08:00
lethosor
865484f678
Merge branch 'develop' into fix-k-search-crash
...
Conflicts:
docs/changelog.txt
2021-01-29 00:16:13 -05:00
lethosor
de6f9183fd
Fix changelog, replace a couple qerror calls with error
...
Ref #1746
2021-01-29 00:04:10 -05:00
lethosor
d4aef78b26
Merge remote-tracking branch 'myk002/myk_getopt' into develop
2021-01-28 23:58:45 -05:00
myk002
8a728c5170
fix tallow alias
2021-01-28 12:17:26 -08:00
myk002
aeb911878b
document new aliases
2021-01-27 14:57:03 -08:00
myk002
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
myk002
ff69665815
keep stockflow from stealing input during rename
2021-01-27 08:25:21 -08:00
myk002
b7c598bb07
update changelog
2021-01-27 08:21:34 -08:00
lethosor
a2ee5e027b
Merge remote-tracking branch 'myk002/myk_help_i_am_my_own_grandpa' into develop
2021-01-26 23:53:39 -05:00
lethosor
07c9cab969
Add comma
2021-01-26 00:45:30 -05:00
lethosor
58244ee574
Merge remote-tracking branch 'myk002/myk_dreamfort' into develop
2021-01-26 00:45:05 -05:00
myk002
3372099f96
add aliases for bronze armor too
2021-01-24 17:11:17 -08:00
myk002
99fa1916f8
update changelog
2021-01-24 17:03:13 -08:00
myk002
96dfea70c3
update changelog
2021-01-24 09:12:49 -08:00
myk002
cd476a943c
fix quickfort library aliases for weapons
2021-01-24 09:00:38 -08:00
myk002
03719f58df
avoid infinite parentage when linking rooms
2021-01-24 08:52:34 -08:00
lethosor
d01e61c658
Fix some error message formatting and add some cross-links to docs
...
Followup to #1747
2021-01-22 21:05:20 -05:00
lethosor
5ef7a81fd1
Merge remote-tracking branch 'myk002/myk_buildingplan_set_settings' into develop
2021-01-22 20:57:30 -05:00
myk002
ad39bb3c33
address review comments
2021-01-22 12:48:36 -08:00
lethosor
ed3c48e64b
Update changelog and authors ( #1755 )
2021-01-21 23:55:01 -05:00
lethosor
0089edde1e
Merge remote-tracking branch 'myk002/myk_docs_ignore' into develop
2021-01-21 00:14:15 -05:00
Susan
b57286c59c
update changelog
2021-01-17 17:32:31 +00:00
Myk
4300c185d7
Update docs/changelog.txt
...
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2021-01-12 22:46:18 -08:00
myk002
b5b7319a23
add documentation for #ignore blueprints
2021-01-11 15:58:16 -08:00
myk002
39059f2b12
update changelog
2021-01-11 15:14:24 -08:00
myk002
b49768a7cf
use and document new {Empty} quickfort keycode
2021-01-11 15:04:41 -08:00
myk002
97309e45f5
update changelog
2021-01-11 15:02:58 -08:00
myk002
96b117d369
update plugin docs and changelog
2021-01-11 14:37:57 -08:00
myk002
4e1c70bc06
update changelog
2021-01-10 17:10:44 -08:00
lethosor
614ea739d0
Merge branch 'develop' into lua-runcommand
2021-01-08 20:45:23 -05:00
Timur Kelman
a69c4b9b6d
fix example in Lua API.rst
...
Whitespace in the wrong place.
2021-01-04 17:05:55 +01:00
lethosor
936a13181a
Update changelog
2020-12-30 15:08:20 -05:00
PatrikLundell
58a4dbe15d
corrected temperature calculation factor order
2020-12-27 11:25:04 +01:00
lethosor
debeac14c1
Stop reversing changelog entries
...
This makes entries show up in the same order in the generated docs as in changelog.txt
The only other significant difference this causes is that when notes from multiple prereleases are combined into one stable release, changes from the newer version will show up first now (i.e. in the same order as reading the changelog from the top down), but this has minimal impact.
2020-12-24 13:29:56 -05:00
lethosor
c6aac0d9d5
Bump changelog version and improve consistency
2020-12-24 13:29:50 -05:00
lethosor
8cace1eb06
probe: print more designation and occupancy-related flags
...
This was useful for testing #1729
2020-12-23 15:36:39 -05:00
lethosor
251511fcb5
Merge remote-tracking branch 'myk002/myk_extents' into develop
2020-12-23 11:57:33 -05:00
lethosor
3c8ee35f98
Documentation.rst: explain GitHub Actions
...
Ref dfhack/scripts#235
2020-12-21 17:01:21 -05:00
lethosor
4ffb3ffbb8
Documentation.rst: move dependencies up to top-level section + misc tweaks
...
Makes it easier to jump to "Building the documentation"
2020-12-21 16:47:03 -05:00
myk002
17f8048ab1
update changelog
2020-12-17 10:08:01 -08:00
myk002
16a8f31b93
high level docs for quickfort blueprint library
2020-12-17 09:59:37 -08:00
myk002
dfbad3ec54
update changelog
2020-12-16 11:15:53 -08:00
myk002
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
lethosor
cdfdfb0eb1
Update changelog
2020-12-14 00:16:28 -05:00
lethosor
9a6dcc3d36
Merge remote-tracking branch 'myk002/myk_alias_docs' into develop
2020-12-11 22:26:20 -05:00
myk002
45a9106e9f
address review comments
...
- use :: shorthand where we can
- clarify sub-alias docs
- remove note about multiple modifier keys not being supported
2020-12-11 11:22:38 -08:00
myk002
ab815de38f
update changelog
2020-12-09 09:39:41 -08:00
lethosor
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
myk002
4ac6716abc
add default values for optional sub-aliases
2020-12-06 10:37:09 -08:00
myk002
96126418ab
remove a tab that snuck in at the end of a line
2020-12-05 18:58:15 -08:00
myk002
593d746dd0
add link to blueprint library sources back in
2020-12-05 18:52:13 -08:00
myk002
025c9ff758
overhaul quickfort alias documentation
...
- move the alias syntax and usage docs from dfhack-config/quickfort/aliases.txt to a proper guide written in RST. Add examples and more details.
- move the alias library docs from data/quickfort/aliases-common.txt to the new guide
- reorder aliases in aliases-common to match the order in the docs
- factor out the character used to enter the stockpile config screen so we can use the same aliases for stockpiles and hauling routes (use 's' for stockpiles and '{Enter}' for hauling routes)
- reference the new guide in the quickfort user guide
- do an editorial pass of the quickfort user guide
- change name to "Quickfort Blueprint Guide", but only in the text, not the filename, so we don't change the URL
- add `quickfort-blueprint-guide` as a label, in addition to the existing `quickfort-user-guide`
- changed table-like lists to actual tables
- changed "grid" tables into "simple" tables where possible
- used ':kbd:' markers whenever we refer to a single character
- turned Meta blueprints and Notes blueprints sections into subsections of a new "Other blueprint modes" section, in preparation for a few new modes coming in -r5.
- updated out-of date caveat about bookcases, display furniture, and offering places not being supported
2020-12-05 18:36:15 -08:00
lethosor
159695775e
Merge branch 'develop' into lua-runcommand
2020-12-05 19:49:55 -05:00
lethosor
a3d8c5a2ec
revflood docs: clarify that constructed walls are ignored
...
Closes #1719
2020-12-05 19:41:32 -05:00
lethosor
db03f943c9
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2020-12-04 23:54:50 -05:00
lethosor
38e0f1c485
Update authors ( dfhack/scripts#217 )
2020-12-03 22:59:55 -05:00
lethosor
6ceaf77b38
Update authors ( dfhack/scripts#217 )
2020-12-03 21:08:06 -05:00
PatrikLundell
9b53222932
river size determination change log
2020-12-03 15:48:28 +01:00
lethosor
b4c040291f
Document dfhack.run_command() and related functions/constants
2020-11-20 22:23:29 -05:00
lethosor
fb44b26b47
Make utils.addressof() work for raw userdata
2020-11-19 21:32:42 -05:00
lethosor
8548295fe5
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2020-11-18 11:12:17 -05:00
lethosor
e68d2f9e3d
Update changelog (#1712/#1711)
2020-11-17 23:42:59 -05:00
Nilsolm
1c5fcae5b1
update changelog
2020-11-18 02:48:19 +01:00
PatrikLundell
edc84f8de9
2 spaces killed
2020-11-17 22:01:54 +01:00
lethosor
0b886399fe
zone: stop enumnick from taking priority over assign/unassign/slaughter
...
Fixes #1709
Ref #1652
2020-11-15 22:21:46 -05:00
lethosor
8319d71dff
Improve documentation of reqscript, dfhack_flags, etc.
2020-11-15 18:42:14 -05:00
lethosor
14eeeeedc0
Remove extra paragraph from generated changelogs, restore paragraph margins
...
The CSS (changed in bca76b8f
) was removing space between actual paragraphs in
lists. This was intended to address excess padding in changelogs, but that is
resolved here by removing blank lines surrounding nested lists. This still
displays properly on GitHub/Reddit and presumably other Markdown implementations
as well.
2020-11-15 17:39:34 -05:00
lethosor
85dfb67004
Move #1704's changelog entry to the correct release
2020-11-14 15:16:25 -05:00
lethosor
4921cb4ac7
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2020-11-14 15:08:22 -05:00
PatrikLundell
d51b56c780
removed a blank
2020-11-13 20:28:22 +01:00
lethosor
bd278bbe68
Merge remote-tracking branch 'myk002/myk_quickfort_guide' into develop
2020-11-13 14:13:57 -05:00
lethosor
2e4f23d49f
Merge remote-tracking branch 'myk002/myk_isplannedbuilding' into develop
2020-11-13 14:09:36 -05:00
lethosor
8cb38ecf5b
Merge remote-tracking branch 'myk002/myk_metalhead_mario' into develop
2020-11-13 14:04:30 -05:00
myk002
efdba8b596
add buildingplan.isPlannedBuilding
2020-11-13 10:18:54 -08:00
myk002
01741ce6c6
update quickfort guide and aliases
...
- move bit of alias documentation from aliases-common to aliases.txt
- document new behavior for 'c'ustom stockpiles
2020-11-12 23:23:03 -08:00
Myk Taylor
76759184d3
reinforce that meta blueprints can't cross files
...
they must refer to labels that are within the same .xlsx or .csv file
2020-11-12 23:23:03 -08:00
Myk Taylor
93c8de9b23
use numbered lists in meta blueprints section
2020-11-12 23:23:03 -08:00
Myk Taylor
647093f5c8
quickfort guide: 'c' stockpiles don't make sense
...
explain why "custom" stockpiles aren't meaningful to create in a
blueprint and what the user should do instead
2020-11-12 23:23:03 -08:00
myk002
54eec5d47f
there is no job-module -- it's just an html anchor
2020-11-12 23:11:55 -08:00
myk002
93d9ac76be
update docs
2020-11-12 23:08:22 -08:00
lethosor
a5e58b766b
Update scripts, changelog
2020-11-12 21:07:14 -05:00
lethosor
913d860ae4
Use initial working directory as process path on Linux, and expose to Lua
2020-11-12 19:07:51 -05:00
lethosor
23b230495e
Merge branch 'develop' into cwd-handling
2020-11-12 18:44:05 -05:00
lethosor
9c13b497bf
Merge remote-tracking branch 'myk002/myk_automaterial_buildingplan_fix' into develop
2020-11-11 23:36:42 -05:00
lethosor
0958fdbf4b
Document script paths
...
Ref #1690
2020-11-10 00:48:27 -05:00
lethosor
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
lethosor
7f68229d10
Merge remote-tracking branch 'myk002/quickfort_library' into develop
...
Conflicts:
docs/changelog.txt
2020-11-02 13:21:11 -05:00
Myk Taylor
f053ccf14b
update changelog
2020-10-31 03:05:55 -07:00
Myk Taylor
8d1ba5a83a
remove changelog line -- this is new functionality
2020-10-31 02:34:06 -07:00
Myk Taylor
5ac1df96db
update changelog
2020-10-31 02:30:26 -07:00
lethosor
27e054c9a7
Merge remote-tracking branch 'myk002/quickfort_dreamfort_walkthrough' into develop
...
Conflicts:
docs/changelog.txt
2020-10-30 23:53:25 -04:00
Myk Taylor
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
lethosor
d508ad3c4b
Merge remote-tracking branch 'myk002/buildingplan_building_material_filters' into develop
...
Conflicts:
docs/changelog.txt
2020-10-28 23:57:55 -04:00
Myk Taylor
5244ca106b
attribute dreamfort updates to the quickfort script
2020-10-27 22:03:14 -07:00
Myk Taylor
556c935e2b
update changelog
2020-10-27 22:01:27 -07:00
lethosor
ccfc1f8a53
Use keyboard formatting
2020-10-28 00:19:26 -04:00
lethosor
e61839b571
Fix ordered list
2020-10-28 00:01:51 -04:00
lethosor
64114551dd
Merge remote-tracking branch 'myk002/quickfort_docs' into develop
2020-10-27 23:45:39 -04:00
lethosor
3ab9157a2d
Merge remote-tracking branch 'myk002/buildingplan_refactor5_allbuildings_squashed2' into develop
2020-10-26 21:37:41 -04:00
Myk Taylor
371f68f0a3
update changelog
2020-10-26 16:22:15 -07:00
Myk Taylor
a0c86b8a9b
rewrite quickfort user guide into
...
spend more space highlighting how users can use the blueprint plugin to
avoid learning how to write blueprints themselves
2020-10-24 21:14:09 -07:00
Myk Taylor
3e0b0f8078
update changelog
2020-10-24 09:21:18 -07:00
lethosor
4301252ddf
Merge remote-tracking branch 'myk002/buildingplan_refactor2_squashed' into develop
2020-10-23 13:51:54 -04:00
Myk Taylor
233ce26ab5
update changelog
2020-10-23 09:45:41 -07:00
Myk Taylor
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
lethosor
26505acb70
Add some cross-references and clean up
2020-10-20 01:18:25 -04:00