From 3ebb812cd5ac272a4b851567ba74dac9de4ca7ed Mon Sep 17 00:00:00 2001 From: kristjanmoore Date: Sun, 23 Aug 2020 13:20:45 +0000 Subject: [PATCH 1/4] Allow searches for higher waterfalls --- plugins/embark-assistant/defs.h | 2 +- plugins/embark-assistant/finder_ui.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/embark-assistant/defs.h b/plugins/embark-assistant/defs.h index 13494b91e..d22b7436d 100644 --- a/plugins/embark-assistant/defs.h +++ b/plugins/embark-assistant/defs.h @@ -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; diff --git a/plugins/embark-assistant/finder_ui.cpp b/plugins/embark-assistant/finder_ui.cpp index bcd82a3e4..a553144b8 100644 --- a/plugins/embark-assistant/finder_ui.cpp +++ b/plugins/embark-assistant/finder_ui.cpp @@ -546,6 +546,9 @@ namespace embark_assist { 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; From 293b0253c496dd6d27932c06265b9616ba7bc902 Mon Sep 17 00:00:00 2001 From: kristjanmoore Date: Sun, 23 Aug 2020 17:35:45 +0000 Subject: [PATCH 2/4] Set min_waterfall special cases outside loop --- plugins/embark-assistant/finder_ui.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/plugins/embark-assistant/finder_ui.cpp b/plugins/embark-assistant/finder_ui.cpp index a553144b8..aaaf8945e 100644 --- a/plugins/embark-assistant/finder_ui.cpp +++ b/plugins/embark-assistant/finder_ui.cpp @@ -535,19 +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({ std::to_string(k), k }); - } + + 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 }); + element->list.push_back({ std::to_string(k), k }); } break; From cb8a90324091716ec3b95d5502dec85e7c470dc8 Mon Sep 17 00:00:00 2001 From: kristjanmoore Date: Sun, 23 Aug 2020 17:38:27 +0000 Subject: [PATCH 3/4] Update changelog --- docs/changelog.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/changelog.txt b/docs/changelog.txt index 7247b665d..fb099dc9a 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -36,6 +36,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## Fixes - `stockpiles`: fixed a crash when loading food stockpiles +## Misc Improvements +- `embark-assistant`: changed UI to allow users to search for taller waterfalls + # 0.47.04-r2 ## New Tweaks From 0fa4987edb515d409e4f0997799ed45e40326636 Mon Sep 17 00:00:00 2001 From: kristjanmoore Date: Sun, 23 Aug 2020 18:01:16 +0000 Subject: [PATCH 4/4] Update authors --- docs/Authors.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Authors.rst b/docs/Authors.rst index 42fda0985..a1cef86a8 100644 --- a/docs/Authors.rst +++ b/docs/Authors.rst @@ -75,6 +75,7 @@ kane-t kane-t Kelly Kinkade ab9rf KlonZK KlonZK Kris Parker kaypy +Kristjan Moore kristjanmoore Kromtec Kromtec Kurik Amudnil Lethosor lethosor