Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[prospect] reinstate embark screen estimates #3921

Merged
merged 1 commit into from
Oct 28, 2023
Merged

[prospect] reinstate embark screen estimates #3921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ Template for new versions:
## New Tools

## 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
- `stockpiles`: hide configure and help buttons when the overlay panel is minimized
Expand Down
4 changes: 2 additions & 2 deletions docs/plugins/prospector.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ prospector
.. dfhack-command:: prospect
:summary: Shows a summary of resources that exist on the map.

It can also calculate an estimate of resources available in the selected embark
area.
It can also calculate an estimate of resources available in the currently
highlighted embark area.

Usage
-----
Expand Down
34 changes: 12 additions & 22 deletions plugins/prospector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,26 +567,11 @@ static command_result embark_prospector(color_ostream &out,
df::viewscreen_choose_start_sitest *screen,
const prospect_options &options)
{
out.printerr("prospector at embark is not currently available.\n");
return CR_FAILURE;

/*
if (!world || !world->world_data)
{
if (!world->world_data) {
out.printerr("World data is not available.\n");
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
MatMap layerMats;
MatMap veinMats;
Expand All @@ -595,12 +580,18 @@ static command_result embark_prospector(color_ostream &out,
// Compute 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++)
{
for (int y = screen->location.embark_pos_min.y; y <= 15 && y <= screen->location.embark_pos_max.y; y++)
{
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 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;
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))
return CR_FAILURE;

Expand All @@ -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;

return CR_OK;
*/
}

static command_result map_prospector(color_ostream &con,
Expand Down