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

Merge pull request #3921 from myk002/myk_prospect 

[prospect] reinstate embark screen estimates
develop
Myk 2023-10-27 18:38:21 -07:00 committed by GitHub
parent 5dc33e6707 435f859000
commit c09919ff8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.txt
Unescape Escape View File

@ -54,6 +54,7 @@ Template for new versions:
## New Tools ## New Tools
## New Features ## New Features
- `prospect`: can now give you an estimate of resources from the embark screen. hover the mouse over a potential embark area and run `prospect`.
## Fixes ## Fixes
- `stockpiles`: hide configure and help buttons when the overlay panel is minimized - `stockpiles`: hide configure and help buttons when the overlay panel is minimized

4
docs/plugins/prospector.rst
Unescape Escape View File

@ -11,8 +11,8 @@ prospector
.. dfhack-command:: prospect .. dfhack-command:: prospect
:summary: Shows a summary of resources that exist on the map. :summary: Shows a summary of resources that exist on the map.
It can also calculate an estimate of resources available in the selected embark It can also calculate an estimate of resources available in the currently
area. highlighted embark area.
Usage Usage
----- -----

34
plugins/prospector.cpp
Unescape Escape View File

@ -567,26 +567,11 @@ static command_result embark_prospector(color_ostream &out,
df::viewscreen_choose_start_sitest *screen, df::viewscreen_choose_start_sitest *screen,
const prospect_options &options) const prospect_options &options)
{ {
out.printerr("prospector at embark is not currently available.\n"); if (!world->world_data) {
return CR_FAILURE;
/*
if (!world || !world->world_data)
{
out.printerr("World data is not available.\n"); out.printerr("World data is not available.\n");
return CR_FAILURE; return CR_FAILURE;
} }
df::world_data *data = world->world_data;
coord2d cur_region = screen->location.region_pos;
auto cur_details = get_details(data, cur_region);
if (!cur_details)
{
out.printerr("Current region details are not available.\n");
return CR_FAILURE;
}
// Compute material maps // Compute material maps
MatMap layerMats; MatMap layerMats;
MatMap veinMats; MatMap veinMats;
@ -595,12 +580,18 @@ static command_result embark_prospector(color_ostream &out,
// Compute biomes // Compute biomes
std::map<coord2d, int> biomes; std::map<coord2d, int> biomes;
for (int x = screen->location.embark_pos_min.x; x <= 15 && x <= screen->location.embark_pos_max.x; x++) int32_t max_x = (world->worldgen.worldgen_parms.dim_x * 16) - 1;
{ int32_t max_y = (world->worldgen.worldgen_parms.dim_y * 16) - 1;
for (int y = screen->location.embark_pos_min.y; y <= 15 && y <= screen->location.embark_pos_max.y; y++)
{ for (int x = screen->location.embark_pos_min.x; x <= max_x && x <= screen->location.embark_pos_max.x; ++x) {
for (int y = screen->location.embark_pos_min.y; y <= max_y && y <= screen->location.embark_pos_max.y; ++y) {
auto cur_details = get_details(world->world_data, coord2d(x / 16, y / 16));
if (!cur_details)
continue;
EmbarkTileLayout tile; EmbarkTileLayout tile;
if (!estimate_underground(out, tile, cur_details, x, y) || if (!estimate_underground(out, tile, cur_details, x % 16, y % 16) ||
!estimate_materials(out, tile, layerMats, veinMats)) !estimate_materials(out, tile, layerMats, veinMats))
return CR_FAILURE; return CR_FAILURE;
@ -627,7 +618,6 @@ static command_result embark_prospector(color_ostream &out,
out << std::endl << "Warning: the above data is only a very rough estimate." << std::endl; out << std::endl << "Warning: the above data is only a very rough estimate." << std::endl;
return CR_OK; return CR_OK;
*/
} }
static command_result map_prospector(color_ostream &con, static command_result map_prospector(color_ostream &con,