From 3e97643b37821ca6bc9d218106c1ba0467cb8720 Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Sun, 23 Jun 2019 18:35:28 +0200
Subject: [PATCH] Modified Flat detection options

---
 plugins/embark-assistant/finder_ui.cpp | 47 +++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/plugins/embark-assistant/finder_ui.cpp b/plugins/embark-assistant/finder_ui.cpp
index 5c7cc9046..59aa0783a 100644
--- a/plugins/embark-assistant/finder_ui.cpp
+++ b/plugins/embark-assistant/finder_ui.cpp
@@ -40,7 +40,7 @@ namespace embark_assist {
             min_river,
             max_river,
             waterfall,
-            flat,
+            flatness,
             clay,
             sand,
             flux,
@@ -246,7 +246,7 @@ namespace embark_assist {
 
             fclose(infile);
 
-            //  Checking done. No do the work.
+            //  Checking done. Now do the work.
 
             infile = fopen(profile_file_name, "r");
             i = first_fields;
@@ -453,7 +453,6 @@ namespace embark_assist {
                 break;
 
                 case fields::waterfall:
-                case fields::flat:
                 case fields::blood_rain:
                 {
                     embark_assist::defs::yes_no_ranges k = embark_assist::defs::yes_no_ranges::NA;
@@ -482,6 +481,38 @@ namespace embark_assist {
 
                 break;
 
+                case fields::flatness:
+                {
+                    embark_assist::defs::flatness_ranges k = embark_assist::defs::flatness_ranges::NA;
+                    while (true) {
+                        switch (k) {
+                        case embark_assist::defs::flatness_ranges::NA:
+                            element->list.push_back({ "N/A", static_cast<int8_t>(k) });
+                            break;
+
+                        case embark_assist::defs::flatness_ranges::Flat_Verified:
+                            element->list.push_back({ "Flat Verified", static_cast<int8_t>(k) });
+                            break;
+
+                        case embark_assist::defs::flatness_ranges::Mostly_Flat:
+                            element->list.push_back({ "Mostly Flat", static_cast<int8_t>(k) });
+                            break;
+
+                        case embark_assist::defs::flatness_ranges::Uneven:
+                            element->list.push_back({ "Uneven", static_cast<int8_t>(k) });
+                            break;
+                        }
+
+                        if (k == embark_assist::defs::flatness_ranges::Uneven) {
+                            break;
+                        }
+
+                        k = static_cast <embark_assist::defs::flatness_ranges>(static_cast<int8_t>(k) + 1);
+                    }
+                }
+
+                break;
+
                 case fields::soil_min_everywhere:
                 {
                     embark_assist::defs::all_present_ranges k = embark_assist::defs::all_present_ranges::All;
@@ -959,8 +990,8 @@ namespace embark_assist {
                     state->finder_list.push_back({ "Waterfall", static_cast<int8_t>(i) });
                     break;
 
-                case fields::flat:
-                    state->finder_list.push_back({ "Flat", static_cast<int8_t>(i) });
+                case fields::flatness:
+                    state->finder_list.push_back({ "Flatness", static_cast<int8_t>(i) });
                     break;
 
                 case fields::soil_min_everywhere:
@@ -1189,9 +1220,9 @@ namespace embark_assist {
                         static_cast<embark_assist::defs::yes_no_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
                     break;
 
-                case fields::flat:
-                    finder.flat =
-                        static_cast<embark_assist::defs::yes_no_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
+                case fields::flatness:
+                    finder.flatness =
+                        static_cast<embark_assist::defs::flatness_ranges>(state->ui[static_cast<uint8_t>(i)]->current_value);
                     break;
 
                 case fields::soil_min_everywhere: