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

Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop

develop
lethosor 2020-12-20 01:15:40 -05:00
parent de21e0cdb8 0b7ab90d3d
commit eff360b49d
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/embark-assistant/survey.cpp
Unescape Escape View File

@ -1663,8 +1663,8 @@ uint8_t embark_assist::survey::translate_corner(embark_assist::defs::world_tile
return embark_assist::defs::directions::Center; return embark_assist::defs::directions::Center;
} }
nw_region_type = embark_assist::survey::region_type_of(survey_results, x, y, effective_i - 1, effective_k - 1); nw_region_type = embark_assist::survey::region_type_of(survey_results, effective_x, effective_y, effective_i - 1, effective_k - 1);
w_region_type = embark_assist::survey::region_type_of(survey_results, x, y, effective_i - 1, effective_k); w_region_type = embark_assist::survey::region_type_of(survey_results, effective_x, effective_y, effective_i - 1, effective_k);
if (nw_region_type == df::world_region_type::Lake || if (nw_region_type == df::world_region_type::Lake ||
nw_region_type == df::world_region_type::Ocean) { nw_region_type == df::world_region_type::Ocean) {
@ -1705,8 +1705,8 @@ uint8_t embark_assist::survey::translate_corner(embark_assist::defs::world_tile
} }
} }
else if (effective_y == world_data->world_height) { else if (effective_y == world_data->world_height) {
nw_region_type = embark_assist::survey::region_type_of(survey_results, x, y, effective_i - 1, effective_k - 1); nw_region_type = embark_assist::survey::region_type_of(survey_results, effective_x, effective_y, effective_i - 1, effective_k - 1);
n_region_type = embark_assist::survey::region_type_of(survey_results, x, y, effective_i, effective_k - 1); n_region_type = embark_assist::survey::region_type_of(survey_results, effective_x, effective_y, effective_i, effective_k - 1);
if (nw_region_type == df::world_region_type::Lake || if (nw_region_type == df::world_region_type::Lake ||
nw_region_type == df::world_region_type::Ocean) { nw_region_type == df::world_region_type::Ocean) {
@ -1756,10 +1756,10 @@ uint8_t embark_assist::survey::translate_corner(embark_assist::defs::world_tile
effective_corner = survey_results->at(effective_x).at(effective_y).west_corner_selection[effective_k]; effective_corner = survey_results->at(effective_x).at(effective_y).west_corner_selection[effective_k];
} }
nw_region_type = embark_assist::survey::region_type_of(survey_results, x, y, effective_i - 1, effective_k - 1); nw_region_type = embark_assist::survey::region_type_of(survey_results, effective_x, effective_y, effective_i - 1, effective_k - 1);
n_region_type = embark_assist::survey::region_type_of(survey_results, x, y, effective_i, effective_k - 1); n_region_type = embark_assist::survey::region_type_of(survey_results, effective_x, effective_y, effective_i, effective_k - 1);
w_region_type = embark_assist::survey::region_type_of(survey_results, x, y, effective_i - 1, effective_k); w_region_type = embark_assist::survey::region_type_of(survey_results, effective_x, effective_y, effective_i - 1, effective_k);
home_region_type = embark_assist::survey::region_type_of(survey_results, x, y, effective_i, effective_k); home_region_type = embark_assist::survey::region_type_of(survey_results, effective_x, effective_y, effective_i, effective_k);
if (nw_region_type == df::world_region_type::Lake || if (nw_region_type == df::world_region_type::Lake ||
nw_region_type == df::world_region_type::Ocean) { nw_region_type == df::world_region_type::Ocean) {