MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop

develop
lethosor 2021-07-04 21:20:09 -04:00
parent 1a98595227 ba5915b866
commit ed03df7dfb
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.txt
Unescape Escape View File

@ -41,6 +41,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
- `orders`: don't crash when importing orders with malformed IDs - `orders`: don't crash when importing orders with malformed IDs
- ``quickfortress.csv`` blueprint: fixed refuse stockpile config and prevented stockpiles from covering stairways - ``quickfortress.csv`` blueprint: fixed refuse stockpile config and prevented stockpiles from covering stairways
- `stonesense`: fixed a crash that could occur when ctrl+scrolling or closing the Stonesense window - `stonesense`: fixed a crash that could occur when ctrl+scrolling or closing the Stonesense window
- `embark-assistant`: faulty early exit when searching for waterfalls in first search attempt removed
## Misc Improvements ## Misc Improvements
- `blueprint`: make ``depth`` and ``name`` parameters optional. ``depth`` now defaults to ``1`` (current level only) and ``name`` defaults to "blueprint" - `blueprint`: make ``depth`` and ``name`` parameters optional. ``depth`` now defaults to ``1`` (current level only) and ``name`` defaults to "blueprint"

2
plugins/embark-assistant/help_ui.cpp
Unescape Escape View File

@ -340,7 +340,7 @@ namespace embark_assist{
help_text.push_back(" the N, followed by the one to the W, and lastly the one acting as the"); help_text.push_back(" the N, followed by the one to the W, and lastly the one acting as the");
help_text.push_back(" reference. This means there's a risk embarks with such 'trouble' corners"); help_text.push_back(" reference. This means there's a risk embarks with such 'trouble' corners");
help_text.push_back(" may get affected corner(s) evaluated incorrectly."); help_text.push_back(" may get affected corner(s) evaluated incorrectly.");
help_text.push_back("Version 0.13 2020-12-03"); help_text.push_back("Version 0.14 2021-06-13");
break; break;
} }

9
plugins/embark-assistant/matcher.cpp
Unescape Escape View File

@ -1642,7 +1642,7 @@ namespace embark_assist {
// Waterfall // Waterfall
if (finder->min_waterfall > tile->max_waterfall) { // N/A = -1 is always smaller if (finder->min_waterfall > tile->max_waterfall) { // N/A = -1 is always smaller
if (trace) out.print("matcher::world_tile_match: Waterfall (%i, %i)\n", x, y); if (trace) out.print("matcher::world_tile_match: Waterfall (%i, %i), finder: %i, tile: %i\n", x, y, finder->min_waterfall, tile->max_waterfall);
return false; return false;
} }
if (finder->min_waterfall == 0 && // Absent if (finder->min_waterfall == 0 && // Absent
@ -2280,12 +2280,7 @@ namespace embark_assist {
// River size // Requires survey // River size // Requires survey
// Waterfall // Waterfall // Requires survey
if (finder->min_waterfall > 0 &&
tile->min_river_size == embark_assist::defs::river_sizes::None) {
if (trace) out.print("matcher::world_tile_match: NS Waterfall (%i, %i)\n", x, y);
return false;
}
// Flat. No world tile checks. Need to look at the details // Flat. No world tile checks. Need to look at the details