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

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
develop
bseiller 2021-01-19 00:01:54 +01:00
parent bdfd50cc65
commit e99c8faa24
2 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/embark-assistant/defs.h
Unescape Escape View File

@ -146,10 +146,10 @@ namespace embark_assist {
std::vector<bool> minerals; std::vector<bool> minerals;
std::vector<int16_t> neighbors; // entity_raw indices std::vector<int16_t> neighbors; // entity_raw indices
uint8_t necro_neighbors; uint8_t necro_neighbors;
mid_level_tile north_row[16]; mid_level_tile_incursion_base north_row[16];
mid_level_tile south_row[16]; mid_level_tile_incursion_base south_row[16];
mid_level_tile west_column[16]; mid_level_tile_incursion_base west_column[16];
mid_level_tile east_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 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 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. // this info, so we have to go to neighboring world tiles to fetch it.

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

@ -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->west_column[i].sand = mlt->at(0).at(i).sand;
tile->east_column[i].sand = mlt->at(15).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->north_row[i].flux = mlt->at(i).at(0).flux; // Not used
tile->south_row[i].flux = mlt->at(i).at(15).flux; // tile->south_row[i].flux = mlt->at(i).at(15).flux;
tile->west_column[i].flux = mlt->at(0).at(i).flux; // tile->west_column[i].flux = mlt->at(0).at(i).flux;
tile->east_column[i].flux = mlt->at(15).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->north_row[i].coal = mlt->at(i).at(0).coal; // Not used
tile->south_row[i].coal = mlt->at(i).at(15).coal; // tile->south_row[i].coal = mlt->at(i).at(15).coal;
tile->west_column[i].coal = mlt->at(0).at(i).coal; // tile->west_column[i].coal = mlt->at(0).at(i).coal;
tile->east_column[i].coal = mlt->at(15).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->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->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->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->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->north_row[i].offset = mlt->at(i).at(0).offset; // Not used
tile->south_row[i].offset = mlt->at(i).at(15).offset; // tile->south_row[i].offset = mlt->at(i).at(15).offset;
tile->west_column[i].offset = mlt->at(0).at(i).offset; // tile->west_column[i].offset = mlt->at(0).at(i).offset;
tile->east_column[i].offset = mlt->at(15).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->north_row[i].elevation = mlt->at(i).at(0).elevation;
tile->south_row[i].elevation = mlt->at(i).at(15).elevation; tile->south_row[i].elevation = mlt->at(i).at(15).elevation;
tile->west_column[i].elevation = mlt->at(0).at(i).elevation; tile->west_column[i].elevation = mlt->at(0).at(i).elevation;
tile->east_column[i].elevation = mlt->at(15).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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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->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; 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->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->east_column[i].evilness_level = mlt->at(15).at(i).evilness_level;
tile->north_row[i].metals.resize(0); // Not used // tile->north_row[i].metals.resize(0); // Not used
tile->south_row[i].metals.resize(0); // tile->south_row[i].metals.resize(0);
tile->west_column[i].metals.resize(0); // tile->west_column[i].metals.resize(0);
tile->east_column[i].metals.resize(0); // tile->east_column[i].metals.resize(0);
tile->north_row[i].economics.resize(0); // Not used // tile->north_row[i].economics.resize(0); // Not used
tile->south_row[i].economics.resize(0); // tile->south_row[i].economics.resize(0);
tile->west_column[i].economics.resize(0); // tile->west_column[i].economics.resize(0);
tile->east_column[i].economics.resize(0); // tile->east_column[i].economics.resize(0);
tile->north_row[i].minerals.resize(0); // Not used // tile->north_row[i].minerals.resize(0); // Not used
tile->south_row[i].minerals.resize(0); // tile->south_row[i].minerals.resize(0);
tile->west_column[i].minerals.resize(0); // tile->west_column[i].minerals.resize(0);
tile->east_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->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]; tile->west_corner_selection[i] = world_data->region_details[0]->edges.biome_corner[0][i];