From e99c8faa24b948fb56365a868d2791568c6c644c Mon Sep 17 00:00:00 2001 From: bseiller Date: Tue, 19 Jan 2021 00:01:54 +0100 Subject: [PATCH] switching to mid_level_tile_incursion_base to store incursion data of world tile edges - defs.h: using mid_level_tile_incursion_base in region_tile_datum to store incursion data of world tile edges - survey.cpp: commented out "not used" blocks of assignment in survey_mid_level_tile that no longer make sense now --- plugins/embark-assistant/defs.h | 8 +-- plugins/embark-assistant/survey.cpp | 80 ++++++++++++++--------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/plugins/embark-assistant/defs.h b/plugins/embark-assistant/defs.h index 99db1f7a7..a67660545 100644 --- a/plugins/embark-assistant/defs.h +++ b/plugins/embark-assistant/defs.h @@ -146,10 +146,10 @@ namespace embark_assist { std::vector minerals; std::vector neighbors; // entity_raw indices uint8_t necro_neighbors; - mid_level_tile north_row[16]; - mid_level_tile south_row[16]; - mid_level_tile west_column[16]; - mid_level_tile east_column[16]; + mid_level_tile_incursion_base north_row[16]; + mid_level_tile_incursion_base south_row[16]; + mid_level_tile_incursion_base west_column[16]; + mid_level_tile_incursion_base east_column[16]; uint8_t north_corner_selection[16]; // 0 - 3. For some reason DF stores everything needed for incursion uint8_t west_corner_selection[16]; // detection in 17:th row/colum data in the region details except // this info, so we have to go to neighboring world tiles to fetch it. diff --git a/plugins/embark-assistant/survey.cpp b/plugins/embark-assistant/survey.cpp index 300750a29..fac5af267 100644 --- a/plugins/embark-assistant/survey.cpp +++ b/plugins/embark-assistant/survey.cpp @@ -1381,50 +1381,50 @@ void embark_assist::survey::survey_mid_level_tile(embark_assist::defs::geo_data tile->west_column[i].sand = mlt->at(0).at(i).sand; tile->east_column[i].sand = mlt->at(15).at(i).sand; - tile->north_row[i].flux = mlt->at(i).at(0).flux; // Not used - tile->south_row[i].flux = mlt->at(i).at(15).flux; - tile->west_column[i].flux = mlt->at(0).at(i).flux; - tile->east_column[i].flux = mlt->at(15).at(i).flux; + // tile->north_row[i].flux = mlt->at(i).at(0).flux; // Not used + // tile->south_row[i].flux = mlt->at(i).at(15).flux; + // tile->west_column[i].flux = mlt->at(0).at(i).flux; + // tile->east_column[i].flux = mlt->at(15).at(i).flux; - tile->north_row[i].coal = mlt->at(i).at(0).coal; // Not used - tile->south_row[i].coal = mlt->at(i).at(15).coal; - tile->west_column[i].coal = mlt->at(0).at(i).coal; - tile->east_column[i].coal = mlt->at(15).at(i).coal; + // tile->north_row[i].coal = mlt->at(i).at(0).coal; // Not used + // tile->south_row[i].coal = mlt->at(i).at(15).coal; + // tile->west_column[i].coal = mlt->at(0).at(i).coal; + // tile->east_column[i].coal = mlt->at(15).at(i).coal; tile->north_row[i].soil_depth = mlt->at(i).at(0).soil_depth; tile->south_row[i].soil_depth = mlt->at(i).at(15).soil_depth; tile->west_column[i].soil_depth = mlt->at(0).at(i).soil_depth; tile->east_column[i].soil_depth = mlt->at(15).at(i).soil_depth; - tile->north_row[i].offset = mlt->at(i).at(0).offset; // Not used - tile->south_row[i].offset = mlt->at(i).at(15).offset; - tile->west_column[i].offset = mlt->at(0).at(i).offset; - tile->east_column[i].offset = mlt->at(15).at(i).offset; + // tile->north_row[i].offset = mlt->at(i).at(0).offset; // Not used + // tile->south_row[i].offset = mlt->at(i).at(15).offset; + // tile->west_column[i].offset = mlt->at(0).at(i).offset; + // tile->east_column[i].offset = mlt->at(15).at(i).offset; tile->north_row[i].elevation = mlt->at(i).at(0).elevation; tile->south_row[i].elevation = mlt->at(i).at(15).elevation; tile->west_column[i].elevation = mlt->at(0).at(i).elevation; tile->east_column[i].elevation = mlt->at(15).at(i).elevation; - tile->north_row[i].river_size = mlt->at(i).at(0).river_size; // Not used - tile->south_row[i].river_size = mlt->at(i).at(15).river_size; - tile->west_column[i].river_size = mlt->at(0).at(i).river_size; - tile->east_column[i].river_size = mlt->at(15).at(i).river_size; + // tile->north_row[i].river_size = mlt->at(i).at(0).river_size; // Not used + // tile->south_row[i].river_size = mlt->at(i).at(15).river_size; + // tile->west_column[i].river_size = mlt->at(0).at(i).river_size; + // tile->east_column[i].river_size = mlt->at(15).at(i).river_size; - tile->north_row[i].river_elevation = mlt->at(i).at(0).river_elevation; // Not used - tile->south_row[i].river_elevation = mlt->at(i).at(15).river_elevation; - tile->west_column[i].river_elevation = mlt->at(0).at(i).river_elevation; - tile->east_column[i].river_elevation = mlt->at(15).at(i).river_elevation; + // tile->north_row[i].river_elevation = mlt->at(i).at(0).river_elevation; // Not used + // tile->south_row[i].river_elevation = mlt->at(i).at(15).river_elevation; + // tile->west_column[i].river_elevation = mlt->at(0).at(i).river_elevation; + // tile->east_column[i].river_elevation = mlt->at(15).at(i).river_elevation; - tile->north_row[i].adamantine_level = mlt->at(i).at(0).adamantine_level; // Not used - tile->south_row[i].adamantine_level = mlt->at(i).at(15).adamantine_level; - tile->west_column[i].adamantine_level = mlt->at(0).at(i).adamantine_level; - tile->east_column[i].adamantine_level = mlt->at(15).at(i).adamantine_level; + // tile->north_row[i].adamantine_level = mlt->at(i).at(0).adamantine_level; // Not used + // tile->south_row[i].adamantine_level = mlt->at(i).at(15).adamantine_level; + // tile->west_column[i].adamantine_level = mlt->at(0).at(i).adamantine_level; + // tile->east_column[i].adamantine_level = mlt->at(15).at(i).adamantine_level; - tile->north_row[i].magma_level = mlt->at(i).at(0).magma_level; // Not used - tile->south_row[i].magma_level = mlt->at(i).at(15).magma_level; - tile->west_column[i].magma_level = mlt->at(0).at(i).magma_level; - tile->east_column[i].magma_level = mlt->at(15).at(i).magma_level; + // tile->north_row[i].magma_level = mlt->at(i).at(0).magma_level; // Not used + // tile->south_row[i].magma_level = mlt->at(i).at(15).magma_level; + // tile->west_column[i].magma_level = mlt->at(0).at(i).magma_level; + // tile->east_column[i].magma_level = mlt->at(15).at(i).magma_level; tile->north_row[i].biome_offset = mlt->at(i).at(0).biome_offset; tile->south_row[i].biome_offset = mlt->at(i).at(15).biome_offset; @@ -1446,20 +1446,20 @@ void embark_assist::survey::survey_mid_level_tile(embark_assist::defs::geo_data tile->west_column[i].evilness_level = mlt->at(0).at(i).evilness_level; tile->east_column[i].evilness_level = mlt->at(15).at(i).evilness_level; - tile->north_row[i].metals.resize(0); // Not used - tile->south_row[i].metals.resize(0); - tile->west_column[i].metals.resize(0); - tile->east_column[i].metals.resize(0); + // tile->north_row[i].metals.resize(0); // Not used + // tile->south_row[i].metals.resize(0); + // tile->west_column[i].metals.resize(0); + // tile->east_column[i].metals.resize(0); - tile->north_row[i].economics.resize(0); // Not used - tile->south_row[i].economics.resize(0); - tile->west_column[i].economics.resize(0); - tile->east_column[i].economics.resize(0); + // tile->north_row[i].economics.resize(0); // Not used + // tile->south_row[i].economics.resize(0); + // tile->west_column[i].economics.resize(0); + // tile->east_column[i].economics.resize(0); - tile->north_row[i].minerals.resize(0); // Not used - tile->south_row[i].minerals.resize(0); - tile->west_column[i].minerals.resize(0); - tile->east_column[i].minerals.resize(0); + // tile->north_row[i].minerals.resize(0); // Not used + // tile->south_row[i].minerals.resize(0); + // tile->west_column[i].minerals.resize(0); + // tile->east_column[i].minerals.resize(0); tile->north_corner_selection[i] = world_data->region_details[0]->edges.biome_corner[i][0]; tile->west_corner_selection[i] = world_data->region_details[0]->edges.biome_corner[0][i];