Probe now displays biome savagery and evilness.

Devel plugin bprobe (also in this commit) goes digging around in region data at embark screen, not really useful for public consumption.

plugins/devel/CMakeLists.txt

@@ -15,4 +15,5 @@ DFHACK_PLUGIN(dumpmats dumpmats.cpp)
 DFHACK_PLUGIN(counters counters.cpp)
 DFHACK_PLUGIN(stockcheck stockcheck.cpp)
 DFHACK_PLUGIN(stripcaged stripcaged.cpp)
+DFHACK_PLUGIN(rprobe rprobe.cpp)
 

plugins/devel/rprobe.cpp

@@ -0,0 +1,107 @@
+// Produces a list of materials available on the map.
+// Options:
+//  -a : show unrevealed tiles
+//  -p : don't show plants
+//  -s : don't show slade
+//  -t : don't show demon temple
+
+//#include <cstdlib>
+#include <iostream>
+#include <iomanip>
+#include <map>
+#include <algorithm>
+#include <vector>
+
+using namespace std;
+#include "Core.h"
+#include "Console.h"
+#include "Export.h"
+#include "PluginManager.h"
+#include "modules/MapCache.h"
+
+#include "MiscUtils.h"
+
+#include "DataDefs.h"
+#include "df/world.h"
+#include "df/world_data.h"
+#include "df/world_region_details.h"
+#include "df/world_geo_biome.h"
+#include "df/world_geo_layer.h"
+#include "df/inclusion_type.h"
+#include "df/viewscreen_choose_start_sitest.h"
+
+using namespace DFHack;
+using namespace df::enums;
+using df::global::world;
+using df::coord2d;
+
+
+
+command_result rprobe (color_ostream &out, vector <string> & parameters);
+
+DFHACK_PLUGIN("rprobe");
+
+DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
+{
+    commands.push_back(PluginCommand(
+        "rprobe", "Display assorted region information from embark screen",
+        rprobe, false,
+        "Display assorted region information from embark screen\n"
+    ));
+    return CR_OK;
+}
+
+DFhackCExport command_result plugin_shutdown ( color_ostream &out )
+{
+    return CR_OK;
+}
+
+
+command_result rprobe (color_ostream &out, vector <string> & parameters)
+{
+    CoreSuspender suspend;
+
+    // Embark screen active: estimate using world geology data
+    VIRTUAL_CAST_VAR(screen, df::viewscreen_choose_start_sitest, Core::getTopViewscreen());
+	
+	if (!screen) 
+		return CR_WRONG_USAGE;
+	
+    if (!world || !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->region_pos;
+
+    // Compute biomes
+    for (int i = 0; i < screen->biome_rgn.size(); i++) 
+    {
+        coord2d rg = screen->biome_rgn[i];
+        out << i << ": x = " << rg.x << ", y = " << rg.y;
+
+        df::world_data::T_region_map* rd = &data->region_map[rg.x][rg.y];
+
+        out <<
+            " region_id: " << rd->region_id <<
+            " geo_index: " << rd->geo_index <<
+            " landmass_id: " << rd->landmass_id <<
+            " flags: " << hex << rd->flags.as_int() << dec <<
+            " sav: " << rd->savagery <<
+            " evil: " << rd->evilness;
+
+        int32_t *p = (int32_t *)rd;
+        int c = sizeof(*rd) / sizeof(int32_t);
+        for (int j = 0; j < c; j++) {
+            if (j % 8 == 0) 
+            out << endl << setfill('0') << setw(8) << hex << (int)(rd+j) << ": ";
+            out << " " << setfill('0') << setw(8) << hex << p[j];
+        }
+        out << dec << endl;
+
+    }
+    
+    return CR_OK;
+}

plugins/probe.cpp

@@ -210,8 +210,17 @@ command_result df_probe (color_ostream &out, vector <string> & parameters)
     out.print("temperature1: %d U\n",mc.temperature1At(cursor));
     out.print("temperature2: %d U\n",mc.temperature2At(cursor));
 
+    int offset = block.region_offset[des.bits.biome];
+    df::coord2d region_pos = block.region_pos + df::coord2d ((offset % 3) - 1, (offset / 3) -1);
+
+    df::world_data::T_region_map* biome = 
+        &world->world_data->region_map[region_pos.x][region_pos.y];
+
     // biome, geolayer
-    out << "biome: " << des.bits.biome << std::endl;
+    out << "biome: " << des.bits.biome << " (" << 
+        "region id=" << biome->region_id << ", " <<
+        "savagery " << biome->savagery << ", " <<
+        "evilness " << biome->evilness << ")" << std::endl;
     out << "geolayer: " << des.bits.geolayer_index
         << std::endl;
     int16_t base_rock = mc.baseMaterialAt(cursor);