Merge remote-tracking branch 'kristjanmoore/develop' into develop

develop
lethosor 2020-08-29 17:43:46 -04:00
commit 23dc7727b5
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
4 changed files with 15 additions and 11 deletions

@ -76,6 +76,7 @@ kane-t kane-t
Kelly Kinkade ab9rf
KlonZK KlonZK
Kris Parker kaypy
Kristjan Moore kristjanmoore
Kromtec Kromtec
Kurik Amudnil
Lethosor lethosor

@ -37,6 +37,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
- `search`: fixed an issue causing item counts on the trade screen to display inconsistently when searching
- `stockpiles`: fixed a crash when loading food stockpiles
## Misc Improvements
- `embark-assistant`: added support for searching for taller waterfalls (up to 50 z-levels tall)
# 0.47.04-r2
## New Tweaks

@ -318,7 +318,7 @@ namespace embark_assist {
aquifer_ranges aquifer;
river_ranges min_river;
river_ranges max_river;
int8_t min_waterfall; // N/A(-1), Absent, 1-9
int8_t min_waterfall; // N/A(-1), Absent, 1-50
yes_no_ranges flat;
present_absent_ranges clay;
present_absent_ranges sand;

@ -535,16 +535,16 @@ namespace embark_assist {
break;
case fields::min_waterfall:
for (int16_t k = -1; k <= 9; k++) {
if (k == -1) {
element->list.push_back({ "N/A", k });
}
else if (k == 0) {
element->list.push_back({ "Absent", k });
}
else {
element->list.push_back({ "N/A", -1 });
element->list.push_back({ "Absent", 0 });
for (int16_t k = 1; k <= 9; k++) {
element->list.push_back({ std::to_string(k), k });
}
for (int16_t k = 10; k <= 50; k+=5) {
element->list.push_back({ std::to_string(k), k });
}
break;