diff --git a/plugins/embark-assistant/finder_ui.cpp b/plugins/embark-assistant/finder_ui.cpp index 3f972635f..4ef93c91b 100644 --- a/plugins/embark-assistant/finder_ui.cpp +++ b/plugins/embark-assistant/finder_ui.cpp @@ -46,9 +46,11 @@ namespace embark_assist { soil_min, soil_min_everywhere, soil_max, - evil_weather, + blood_rain, + syndrome_rain, +//### evil_weather, reanimation, - thralling, +//### thralling, spire_count_min, spire_count_max, magma_min, @@ -451,9 +453,7 @@ namespace embark_assist { case fields::waterfall: case fields::flat: - case fields::evil_weather: - case fields::reanimation: - case fields::thralling: + case fields::blood_rain: { embark_assist::defs::yes_no_ranges k = embark_assist::defs::yes_no_ranges::NA; while (true) { @@ -576,6 +576,91 @@ namespace embark_assist { break; + case fields::syndrome_rain: + { + embark_assist::defs::syndrome_rain_ranges k = embark_assist::defs::syndrome_rain_ranges::NA; + while (true) { + switch (k) { + case embark_assist::defs::syndrome_rain_ranges::NA: + element->list.push_back({ "N/A", static_cast(k) }); + break; + + case embark_assist::defs::syndrome_rain_ranges::Any: + element->list.push_back({ "Any Syndrome", static_cast(k) }); + break; + + case embark_assist::defs::syndrome_rain_ranges::Permanent: + element->list.push_back({ "Permanent Syndrome", static_cast(k) }); + break; + + case embark_assist::defs::syndrome_rain_ranges::Temporary: + element->list.push_back({ "Temporary Syndrome", static_cast(k) }); + break; + + case embark_assist::defs::syndrome_rain_ranges::Not_Permanent: + element->list.push_back({ "Not Permanent Syndrome", static_cast(k) }); + break; + + case embark_assist::defs::syndrome_rain_ranges::None: + element->list.push_back({ "No Syndrome", static_cast(k) }); + break; + + } + + if (k == embark_assist::defs::syndrome_rain_ranges::None) { + break; + } + + k = static_cast (static_cast(k) + 1); + } + } + + break; + + case fields::reanimation: + { + embark_assist::defs::reanimation_ranges k = embark_assist::defs::reanimation_ranges::NA; + while (true) { + switch (k) { + case embark_assist::defs::reanimation_ranges::NA: + element->list.push_back({ "N/A", static_cast(k) }); + break; + + case embark_assist::defs::reanimation_ranges::Both: + element->list.push_back({ "Reanimation & Thralling", static_cast(k) }); + break; + + case embark_assist::defs::reanimation_ranges::Any: + element->list.push_back({ "Reanimation or Thralling", static_cast(k) }); + break; + + case embark_assist::defs::reanimation_ranges::Thralling: + element->list.push_back({ "Thralling", static_cast(k) }); + break; + + case embark_assist::defs::reanimation_ranges::Reanimation: + element->list.push_back({ "Reanimation", static_cast(k) }); + break; + + case embark_assist::defs::reanimation_ranges::Not_Thralling: + element->list.push_back({ "Not Thralling", static_cast(k) }); + break; + + case embark_assist::defs::reanimation_ranges::None: + element->list.push_back({ "None", static_cast(k) }); + break; + } + + if (k == embark_assist::defs::reanimation_ranges::None) { + break; + } + + k = static_cast (static_cast(k) + 1); + } + } + + break; + case fields::spire_count_min: case fields::spire_count_max: for (int16_t k = -1; k <= 9; k++) { @@ -834,16 +919,16 @@ namespace embark_assist { state->finder_list.push_back({ "Min Soil Everywhere", static_cast(i) }); break; - case fields::evil_weather: - state->finder_list.push_back({ "Evil Weather", static_cast(i) }); + case fields::blood_rain: + state->finder_list.push_back({ "Blood Rain", static_cast(i) }); break; - case fields::reanimation: - state->finder_list.push_back({ "Reanimation", static_cast(i) }); + case fields::syndrome_rain: + state->finder_list.push_back({ "Syndrome Rain", static_cast(i) }); break; - case fields::thralling: - state->finder_list.push_back({ "Thralling", static_cast(i) }); + case fields::reanimation: + state->finder_list.push_back({ "Reanimation", static_cast(i) }); break; case fields::clay: @@ -1058,19 +1143,19 @@ namespace embark_assist { static_cast(state->ui[static_cast(i)]->current_value); break; - case fields::evil_weather: - finder.evil_weather = + case fields::blood_rain: + finder.blood_rain = static_cast(state->ui[static_cast(i)]->current_value); break; - case fields::reanimation: - finder.reanimation = - static_cast(state->ui[static_cast(i)]->current_value); + case fields::syndrome_rain: + finder.syndrome_rain = + static_cast(state->ui[static_cast(i)]->current_value); break; - case fields::thralling: - finder.thralling = - static_cast(state->ui[static_cast(i)]->current_value); + case fields::reanimation: + finder.reanimation = + static_cast(state->ui[static_cast(i)]->current_value); break; case fields::clay: