625380a30b
Update submodules
2021-02-09 00:11:59 -05:00
c5a5812377
embiggen feeder stockpiles on the industry level
2021-02-08 18:47:59 -08:00
4660f52b36
improved pre embark mineral estimates
2021-02-08 14:45:49 +01:00
c963da351a
doc updates, move booze further away from kitchen
2021-02-07 13:52:33 -08:00
09d91dcae1
move alchemist-enabling logic to autohauler
2021-02-06 14:14:08 -08:00
13fae4628b
add docs for #place-generated manager orders
2021-02-05 17:05:34 -08:00
6819ee9928
make alchemist flag valid for controllable civs
2021-02-05 16:45:39 -08:00
4d57d27d4d
Revert "allow alchemist skill to be toggled in manipulator"
...
This reverts commit fa662cafbc
2021-02-05 16:10:36 -08:00
64d797b4cf
fix a final few bugs found in playtesting
...
and doc updates
2021-02-05 12:28:29 -08:00
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
efc92750fa
Fix crash
...
embark-assistant.cpp: Move call to survey::initiate() after call to survey::setup(), otherwise state won't exist
2021-02-04 01:10:10 +01:00
6c6a9968ff
hauling aliases can take from multile stockpiles
2021-02-03 13:51:02 -08:00
52bf998224
Adapt to review comments by @PatrikLundell
...
- survey.cpp: rename loop variable for more clarity; replace use of parmeter with use of vector.size(), replace nested vector.at calls with direct index access/subscript as it is faster and easier to read
2021-02-03 14:32:03 +01:00
2eea9fd692
change central ramp to central stairs
2021-02-02 22:11:19 -08:00
0c304cf85f
Improve performance of surveying => faster search
...
replace the local/automatic mid_level_tiles variable in matcher::match_world_tile with one that is created once during the setup phase (heap).
The dynamic part of the contained (16*16*3 = 768) vectors is being allocated on the heap in both cases - which made the repeated instatiations of the automatic variable so slow/expensive.
Also replace calls to vector<bool>.resize in nested loops with direct assignments to those vectors, which curiously even after a lot of profiling is the fastest way to reset the inorganic vectors - at least on Windows.
- embark-assistant.cpp: Replace 2 local/automatic mid_level_tiles variables with a single dynamic variable created during setup as well; add calls to matcher::setup() and matcher::shutdown()
- matcher.cpp/.h: add state with mid_level_tiles member; add setup and shutdown functions
- survey.cpp: add function reset_mlt_inorganics as replacement for the looped calls to vector::resize as all inorganic vectors are now expected to have the proper size when entering survey::survey_mid_level_tile
2021-02-03 00:08:59 +01:00
45a3c903a0
Merge remote-tracking branch 'upstream/develop' into myk_dreamfort
2021-02-02 10:53:38 -08:00
1063497828
don't crash on malformed orders json
2021-02-02 10:50:21 -08:00
fa662cafbc
allow alchemist skill to be toggled in manipulator
...
since autohauler uses it as a flag
2021-02-02 08:28:48 -08:00
06cd0c8437
Make libz.dylib optional on macOS
...
Thurin reports that the path specified does not exist on macOS 11.2, and DFHack links successfully without it.
CMake output from the find_package(ZLib) call in /CMakeLists.txt:
Found ZLIB: /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk/usr/lib/libz.tbd (found suitable version "1.2.11", minimum required is "1.1.2")
2021-02-01 23:23:19 -05:00
5e135d2bb7
update help text and walkthroughs
...
make hospital and dining room more useful in the first build blueprint
separate out construction of the surface roof into a new stage so
dwarves aren't building too much at once
2021-02-01 19:47:48 -08:00
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
84151ccbf9
Update changelog
...
- changelog.txt: added entry for bug fix
2021-02-01 23:52:51 +01:00
56335977ab
Merge branch 'develop' into ea_refactoring
2021-02-01 23:36:04 +01:00
fede136008
refactoring embark-assistant survey, 12.iteration
...
- survey.cpp: replace repeated (nested) vector access with an const int / auto pointer in survey_mid_level_tile
2021-02-01 22:57:30 +01:00
aff64956fb
refactoring embark-assistant survey, 11.iteration
...
- survey.cpp: replace repeated (nested) vector access with a auto pointers in survey_mid_level_tile
2021-02-01 22:53:45 +01:00
4fdcec5893
refactoring embark-assistant survey, 10.iteration
...
- survey.cpp: replacing repeated vector access with auto value in survey_mid_level_tile
2021-02-01 22:36:16 +01:00
1ed783284e
refactoring embark-assistant survey, 9.iteration
...
- survey.cpp: replacing repeated vector access with a const world_geo_biome pointer in survey_mid_level_tile
2021-02-01 22:31:58 +01:00
9d64c9a549
refactoring embark-assistant survey, 8.iteration
...
survey.cpp: remove unused includes
2021-02-01 22:25:57 +01:00
db423cc11e
refactoring embark-assistant survey, 7.iteration
...
- survey.cpp: replacing repeated nested vector access with a const df::inorganic_raw pointer in survey_mid_level_tile
2021-02-01 22:22:10 +01:00
aa520dfcce
refactoring embark-assistant survey, 6.iteration
...
- survey.cpp: add function to copy all incursion values from one mid_level_tile_incursion_base instance to another; replace repeated assignments with calls to new function in survey_mid_level_tile
2021-02-01 16:00:01 +01:00
824beb0253
documentation for bin/barrel/wb feature
2021-02-01 02:22:04 -08:00
4c7e25739f
more dreamfort refinements (details on forum)
2021-01-31 19:36:05 -08:00
3181532bf2
refactoring embark-assistant survey, 5.iteration
...
- survey.cpp: replacing repeated nested vector access with a const mid_level_tile reference in survey_mid_level_tile
2021-02-01 00:24:56 +01:00
353b8b71f5
Update xml
2021-01-31 13:24:21 -05:00
233925ec75
Bump to 0.47.05-alpha0, update xml
2021-01-31 12:10:00 -05:00
94a46a66c6
update changelog
2021-01-31 08:38:50 -08:00
16438c59c8
Remove trailing whitespace as per lint rules
2021-01-31 14:03:49 +01:00
115b8a439f
fixing use of wrong indices, discovered during refactoring in survey::survey_mid_level_tile
...
- survey.cpp: replacing faulty repeated nested vector access (due to wrong indices) with the existing region_map_entry reference
2021-01-31 13:58:17 +01:00
fb143516cd
refresh the dreamfort case study
2021-01-30 19:32:41 -08:00
0c165e020c
fix formatting error
2021-01-30 18:47:34 -08:00
c8397ddaa8
significantly revamp the dreamfort blueprint set
...
as per the several pages of posts following http://www.bay12forums.com/smf/index.php?topic=176889.msg8239017#msg8239017
2021-01-30 18:45:44 -08:00
32d4eb001a
update dreamfort case study according to changes
2021-01-30 18:43:39 -08:00
d2f3ec6076
Bump to 0.47.04-r5, adjust changelog
2021-01-30 21:23:44 -05:00
fd7c3fc4aa
Prevent stockpiles hotkey label from overlapping with autodump
...
stockflow moved to last slot because it isn't enabled in dfhack.init-example
Ref #1764
2021-01-30 21:14:45 -05:00
9c65c1f7c7
Merge remote-tracking branch 'myk002/myk_stockpiles_stockflow_conflict' into develop
...
Conflicts:
docs/changelog.txt
2021-01-30 21:11:58 -05:00
eed1f2db6a
Update scripts
2021-01-30 21:03:05 -05:00
d80867d6eb
Update scripts
2021-01-30 20:58:44 -05:00
472f19e82a
Merge remote-tracking branch 'myk002/myk_alias_fix' into develop
...
Conflicts:
docs/changelog.txt
2021-01-30 20:58:36 -05:00
7e12f3fd3d
Fix off-by-one, adjust changelog, move scroll keys to consistent place
...
Ref #1748
2021-01-30 19:40:15 -05:00
8967e98a33
Merge remote-tracking branch 'myk002/myk_scrollable_labels' into develop
2021-01-30 19:33:04 -05:00
lethosor
myk002
PatrikLundell
bseiller