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

Updated evil weather

develop
PatrikLundell 2018-06-21 20:51:05 +02:00
parent 91aa16216b
commit f02f4b8bcc
1 changed files with 126 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,9 @@ namespace embark_assist {
bool flux_found = false; bool flux_found = false;
uint8_t max_soil = 0; uint8_t max_soil = 0;
bool uneven = false; bool uneven = false;
bool evil_weather_found = false; bool blood_rain_found = false;
bool permanent_syndrome_rain_found = false;
bool temporary_syndrome_rain_found = false;
bool reanimation_found = false; bool reanimation_found = false;
bool thralling_found = false; bool thralling_found = false;
uint8_t spire_count = 0; uint8_t spire_count = 0;
@ -183,21 +185,39 @@ namespace embark_assist {
if (finder->soil_max != embark_assist::defs::soil_ranges::NA && if (finder->soil_max != embark_assist::defs::soil_ranges::NA &&
mlt->at(i).at(k).soil_depth > static_cast<uint16_t>(finder->soil_max)) return false; mlt->at(i).at(k).soil_depth > static_cast<uint16_t>(finder->soil_max)) return false;
// Evil Weather // Blood Rain
if (survey_results->at(x).at(y).evil_weather[mlt->at(i).at(k).biome_offset]) { if (survey_results->at(x).at(y).blood_rain[mlt->at(i).at(k).biome_offset]) {
if (finder->evil_weather == embark_assist::defs::yes_no_ranges::No) return false; if (finder->blood_rain == embark_assist::defs::yes_no_ranges::No) return false;
evil_weather_found = true; blood_rain_found = true;
}
// Syndrome Rain, Permanent
if (survey_results->at(x).at(y).permanent_syndrome_rain[mlt->at(i).at(k).biome_offset]) {
if (finder->syndrome_rain == embark_assist::defs::syndrome_rain_ranges::Temporary ||
finder->syndrome_rain == embark_assist::defs::syndrome_rain_ranges::Not_Permanent ||
finder->syndrome_rain == embark_assist::defs::syndrome_rain_ranges::None) return false;
permanent_syndrome_rain_found = true;
}
// Syndrome Rain, Temporary
if (survey_results->at(x).at(y).temporary_syndrome_rain[mlt->at(i).at(k).biome_offset]) {
if (finder->syndrome_rain == embark_assist::defs::syndrome_rain_ranges::Permanent ||
finder->syndrome_rain == embark_assist::defs::syndrome_rain_ranges::None) return false;
temporary_syndrome_rain_found = true;
} }
// Reanmation // Reanmation
if (survey_results->at(x).at(y).reanimating[mlt->at(i).at(k).biome_offset]) { if (survey_results->at(x).at(y).reanimating[mlt->at(i).at(k).biome_offset]) {
if (finder->reanimation == embark_assist::defs::yes_no_ranges::No) return false; if (finder->reanimation == embark_assist::defs::reanimation_ranges::Thralling ||
finder->reanimation == embark_assist::defs::reanimation_ranges::None) return false;
reanimation_found = true; reanimation_found = true;
} }
// Thralling // Thralling
if (survey_results->at(x).at(y).thralling[mlt->at(i).at(k).biome_offset]) { if (survey_results->at(x).at(y).thralling[mlt->at(i).at(k).biome_offset]) {
if (finder->thralling == embark_assist::defs::yes_no_ranges::No) return false; if (finder->reanimation == embark_assist::defs::reanimation_ranges::Reanimation ||
finder->reanimation == embark_assist::defs::reanimation_ranges::Not_Thralling ||
finder->reanimation == embark_assist::defs::reanimation_ranges::None) return false;
thralling_found = true; thralling_found = true;
} }
@ -303,14 +323,19 @@ namespace embark_assist {
finder->soil_min_everywhere == embark_assist::defs::all_present_ranges::Present && finder->soil_min_everywhere == embark_assist::defs::all_present_ranges::Present &&
max_soil < static_cast<uint8_t>(finder->soil_min)) return false; max_soil < static_cast<uint8_t>(finder->soil_min)) return false;
// Evil Weather // Blood Rain
if (finder->evil_weather == embark_assist::defs::yes_no_ranges::Yes && !evil_weather_found) return false; if (finder->blood_rain == embark_assist::defs::yes_no_ranges::Yes && !blood_rain_found) return false;
// Reanimation // Syndrome Rain
if (finder->reanimation == embark_assist::defs::yes_no_ranges::Yes && !reanimation_found) return false; if (finder->syndrome_rain == embark_assist::defs::syndrome_rain_ranges::Any && !permanent_syndrome_rain_found && !temporary_syndrome_rain_found) return false;
if (finder->syndrome_rain == embark_assist::defs::syndrome_rain_ranges::Permanent && !permanent_syndrome_rain_found) return false;
if (finder->syndrome_rain == embark_assist::defs::syndrome_rain_ranges::Temporary && !temporary_syndrome_rain_found) return false;
// Thralling // Reanimation
if (finder->thralling == embark_assist::defs::yes_no_ranges::Yes && !thralling_found) return false; if (finder->reanimation == embark_assist::defs::reanimation_ranges::Both && !(reanimation_found && thralling_found)) return false;
if (finder->reanimation == embark_assist::defs::reanimation_ranges::Any && !reanimation_found && !thralling_found) return false;
if (finder->reanimation == embark_assist::defs::reanimation_ranges::Thralling && !thralling_found) return false;
if (finder->reanimation == embark_assist::defs::reanimation_ranges::Reanimation && !reanimation_found) return false;
// Spires // Spires
if (finder->spire_count_min != -1 && finder->spire_count_min > spire_count) return false; if (finder->spire_count_min != -1 && finder->spire_count_min > spire_count) return false;
@ -597,46 +622,74 @@ namespace embark_assist {
break; break;
} }
// Evil Weather // Blood Rain
switch (finder->evil_weather) { switch (finder->blood_rain) {
case embark_assist::defs::yes_no_ranges::NA: case embark_assist::defs::yes_no_ranges::NA:
break; // No restriction break; // No restriction
case embark_assist::defs::yes_no_ranges::Yes: case embark_assist::defs::yes_no_ranges::Yes:
if (!tile->evil_weather_possible) return false; if (!tile->blood_rain_possible) return false;
break; break;
case embark_assist::defs::yes_no_ranges::No: case embark_assist::defs::yes_no_ranges::No:
if (tile->evil_weather_full) return false; if (tile->blood_rain_full) return false;
break; break;
} }
// Reanimating // Syndrome Rain
switch (finder->reanimation) { switch (finder->syndrome_rain) {
case embark_assist::defs::yes_no_ranges::NA: case embark_assist::defs::syndrome_rain_ranges::NA:
break; // No restriction break; // No restriction
case embark_assist::defs::yes_no_ranges::Yes: case embark_assist::defs::syndrome_rain_ranges::Any:
if (!tile->reanimating_possible) return false; if (!tile->permanent_syndrome_rain_possible && !tile->temporary_syndrome_rain_possible) return false;
break; break;
case embark_assist::defs::yes_no_ranges::No: case embark_assist::defs::syndrome_rain_ranges::Permanent:
if (tile->reanimating_full) return false; if (!tile->permanent_syndrome_rain_possible) return false;
break;
case embark_assist::defs::syndrome_rain_ranges::Temporary:
if (!tile->temporary_syndrome_rain_possible) return false;
break;
case embark_assist::defs::syndrome_rain_ranges::Not_Permanent:
if (tile->permanent_syndrome_rain_full) return false;
break;
case embark_assist::defs::syndrome_rain_ranges::None:
if (tile->permanent_syndrome_rain_full || tile->temporary_syndrome_rain_full) return false;
break; break;
} }
// Thralling // Reanimating
switch (finder->thralling) { switch (finder->reanimation) {
case embark_assist::defs::yes_no_ranges::NA: case embark_assist::defs::reanimation_ranges::NA:
break; // No restriction break; // No restriction
case embark_assist::defs::yes_no_ranges::Yes: case embark_assist::defs::reanimation_ranges::Both:
if (!tile->reanimating_possible || !tile->thralling_possible) return false;
break;
case embark_assist::defs::reanimation_ranges::Any:
if (!tile->reanimating_possible && !tile->thralling_possible) return false;
break;
case embark_assist::defs::reanimation_ranges::Thralling:
if (!tile->thralling_possible) return false; if (!tile->thralling_possible) return false;
break; break;
case embark_assist::defs::yes_no_ranges::No: case embark_assist::defs::reanimation_ranges::Reanimation:
if (!tile->reanimating_possible) return false;
break;
case embark_assist::defs::reanimation_ranges::Not_Thralling:
if (tile->thralling_full) return false; if (tile->thralling_full) return false;
break; break;
case embark_assist::defs::reanimation_ranges::None:
if (tile->reanimating_full || tile->thralling_full) return false;
break;
} }
// Spire Count Min/Max // Spire Count Min/Max
@ -950,46 +1003,74 @@ namespace embark_assist {
// Soil Max // Soil Max
// Can't say anything as the preliminary data isn't reliable // Can't say anything as the preliminary data isn't reliable
// Evil Weather // Blood Rain
switch (finder->evil_weather) { switch (finder->blood_rain) {
case embark_assist::defs::yes_no_ranges::NA: case embark_assist::defs::yes_no_ranges::NA:
break; // No restriction break; // No restriction
case embark_assist::defs::yes_no_ranges::Yes: case embark_assist::defs::yes_no_ranges::Yes:
if (!tile->evil_weather_possible) return false; if (!tile->blood_rain_possible) return false;
break; break;
case embark_assist::defs::yes_no_ranges::No: case embark_assist::defs::yes_no_ranges::No:
if (tile->evil_weather_full) return false; if (tile->blood_rain_full) return false;
break; break;
} }
// Reanimating // Syndrome Rain
switch (finder->reanimation) { switch (finder->syndrome_rain) {
case embark_assist::defs::yes_no_ranges::NA: case embark_assist::defs::syndrome_rain_ranges::NA:
break; // No restriction break; // No restriction
case embark_assist::defs::yes_no_ranges::Yes: case embark_assist::defs::syndrome_rain_ranges::Any:
if (!tile->reanimating_possible) return false; if (!tile->permanent_syndrome_rain_possible && !tile->temporary_syndrome_rain_possible) return false;
break; break;
case embark_assist::defs::yes_no_ranges::No: case embark_assist::defs::syndrome_rain_ranges::Permanent:
if (tile->reanimating_full) return false; if (!tile->permanent_syndrome_rain_possible) return false;
break;
case embark_assist::defs::syndrome_rain_ranges::Temporary:
if (!tile->temporary_syndrome_rain_possible) return false;
break;
case embark_assist::defs::syndrome_rain_ranges::Not_Permanent:
if (tile->permanent_syndrome_rain_full) return false;
break;
case embark_assist::defs::syndrome_rain_ranges::None:
if (tile->permanent_syndrome_rain_full || tile->temporary_syndrome_rain_full) return false;
break; break;
} }
// Thralling // Reanimating
switch (finder->thralling) { switch (finder->reanimation) {
case embark_assist::defs::yes_no_ranges::NA: case embark_assist::defs::reanimation_ranges::NA:
break; // No restriction break; // No restriction
case embark_assist::defs::yes_no_ranges::Yes: case embark_assist::defs::reanimation_ranges::Both:
if (!tile->reanimating_possible || !tile->thralling_possible) return false;
break;
case embark_assist::defs::reanimation_ranges::Any:
if (!tile->reanimating_possible && !tile->thralling_possible) return false;
break;
case embark_assist::defs::reanimation_ranges::Thralling:
if (!tile->thralling_possible) return false; if (!tile->thralling_possible) return false;
break; break;
case embark_assist::defs::yes_no_ranges::No: case embark_assist::defs::reanimation_ranges::Reanimation:
if (!tile->reanimating_possible) return false;
break;
case embark_assist::defs::reanimation_ranges::Not_Thralling:
if (tile->thralling_full) return false; if (tile->thralling_full) return false;
break; break;
case embark_assist::defs::reanimation_ranges::None:
if (tile->reanimating_full || tile->thralling_full) return false;
break;
} }
// Spire Count Min/Max // Spire Count Min/Max