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

add debug logging

develop
Myk Taylor 2023-04-11 00:58:40 -07:00
parent c5ff1622cd
commit 956918ff21
No known key found for this signature in database
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/getplants.cpp
Unescape Escape View File

@ -1,3 +1,4 @@
#include "Debug.h"
#include "PluginManager.h" #include "PluginManager.h"
#include "TileTypes.h" #include "TileTypes.h"
@ -24,6 +25,11 @@ using std::set;
using namespace DFHack; using namespace DFHack;
using namespace df::enums; using namespace df::enums;
namespace DFHack
{
DBG_DECLARE(getplants, log, DebugCategory::LINFO);
}
DFHACK_PLUGIN("getplants"); DFHACK_PLUGIN("getplants");
REQUIRE_GLOBAL(plotinfo); REQUIRE_GLOBAL(plotinfo);
REQUIRE_GLOBAL(world); REQUIRE_GLOBAL(world);
@ -67,14 +73,13 @@ enum class selectability {
// is one of the issues in bug 6940 on the bug tracker (the others cases are detected and // is one of the issues in bug 6940 on the bug tracker (the others cases are detected and
// result in the plants not being usable for farming or even collectable at all). // result in the plants not being usable for farming or even collectable at all).
//selectability selectablePlant(color_ostream &out, const df::plant_raw *plant, bool farming) selectability selectablePlant(color_ostream& out, const df::plant_raw* plant, bool farming) {
selectability selectablePlant(const df::plant_raw* plant, bool farming) {
const DFHack::MaterialInfo basic_mat = DFHack::MaterialInfo(plant->material_defs.type[plant_material_def::basic_mat], plant->material_defs.idx[plant_material_def::basic_mat]); const DFHack::MaterialInfo basic_mat = DFHack::MaterialInfo(plant->material_defs.type[plant_material_def::basic_mat], plant->material_defs.idx[plant_material_def::basic_mat]);
bool outOfSeason = false; bool outOfSeason = false;
selectability result = selectability::Nonselectable; selectability result = selectability::Nonselectable;
if (plant->flags.is_set(plant_raw_flags::TREE)) { if (plant->flags.is_set(plant_raw_flags::TREE)) {
// out.print("%s is a selectable tree\n", plant->id.c_str()); DEBUG(log, out).print("%s is a selectable tree\n", plant->id.c_str());
if (farming) { if (farming) {
return selectability::Nonselectable; return selectability::Nonselectable;
} }
@ -83,7 +88,7 @@ selectability selectablePlant(const df::plant_raw* plant, bool farming) {
} }
} }
else if (plant->flags.is_set(plant_raw_flags::GRASS)) { else if (plant->flags.is_set(plant_raw_flags::GRASS)) {
// out.print("%s is a non selectable Grass\n", plant->id.c_str()); DEBUG(log, out).print("%s is a non selectable Grass\n", plant->id.c_str());
return selectability::Grass; return selectability::Grass;
} }
@ -93,7 +98,7 @@ selectability selectablePlant(const df::plant_raw* plant, bool farming) {
if (basic_mat.material->flags.is_set(material_flags::EDIBLE_RAW) || if (basic_mat.material->flags.is_set(material_flags::EDIBLE_RAW) ||
basic_mat.material->flags.is_set(material_flags::EDIBLE_COOKED)) { basic_mat.material->flags.is_set(material_flags::EDIBLE_COOKED)) {
// out.print("%s is edible\n", plant->id.c_str()); DEBUG(log, out).print("%s is edible\n", plant->id.c_str());
if (farming) { if (farming) {
if (basic_mat.material->flags.is_set(material_flags::EDIBLE_RAW)) { if (basic_mat.material->flags.is_set(material_flags::EDIBLE_RAW)) {
result = selectability::Selectable; result = selectability::Selectable;
@ -109,7 +114,7 @@ selectability selectablePlant(const df::plant_raw* plant, bool farming) {
plant->flags.is_set(plant_raw_flags::EXTRACT_VIAL) || plant->flags.is_set(plant_raw_flags::EXTRACT_VIAL) ||
plant->flags.is_set(plant_raw_flags::EXTRACT_BARREL) || plant->flags.is_set(plant_raw_flags::EXTRACT_BARREL) ||
plant->flags.is_set(plant_raw_flags::EXTRACT_STILL_VIAL)) { plant->flags.is_set(plant_raw_flags::EXTRACT_STILL_VIAL)) {
// out.print("%s is thread/mill/extract\n", plant->id.c_str()); DEBUG(log, out).print("%s is thread/mill/extract\n", plant->id.c_str());
if (farming) { if (farming) {
result = selectability::Selectable; result = selectability::Selectable;
} }
@ -120,7 +125,7 @@ selectability selectablePlant(const df::plant_raw* plant, bool farming) {
if (basic_mat.material->reaction_product.id.size() > 0 || if (basic_mat.material->reaction_product.id.size() > 0 ||
basic_mat.material->reaction_class.size() > 0) { basic_mat.material->reaction_class.size() > 0) {
// out.print("%s has a reaction\n", plant->id.c_str()); DEBUG(log, out).print("%s has a reaction\n", plant->id.c_str());
if (farming) { if (farming) {
result = selectability::Selectable; result = selectability::Selectable;
} }
@ -154,7 +159,7 @@ selectability selectablePlant(const df::plant_raw* plant, bool farming) {
if (*cur_year_tick >= plant->growths[i]->timing_1 && if (*cur_year_tick >= plant->growths[i]->timing_1 &&
(plant->growths[i]->timing_2 == -1 || (plant->growths[i]->timing_2 == -1 ||
*cur_year_tick <= plant->growths[i]->timing_2)) { *cur_year_tick <= plant->growths[i]->timing_2)) {
// out.print("%s has an edible seed or a stockpile growth\n", plant->id.c_str()); DEBUG(log, out).print("%s has an edible seed or a stockpile growth\n", plant->id.c_str());
if (!farming || seedSource) { if (!farming || seedSource) {
return selectability::Selectable; return selectability::Selectable;
} }
@ -188,11 +193,11 @@ selectability selectablePlant(const df::plant_raw* plant, bool farming) {
} }
if (outOfSeason) { if (outOfSeason) {
// out.print("%s has an out of season growth\n", plant->id.c_str()); DEBUG(log, out).print("%s has an out of season growth\n", plant->id.c_str());
return selectability::OutOfSeason; return selectability::OutOfSeason;
} }
else { else {
// out.printerr("%s cannot be gathered\n", plant->id.c_str()); DEBUG(log, out).print("%s cannot be gathered\n", plant->id.c_str());
return result; return result;
} }
} }
@ -368,13 +373,11 @@ command_result df_getplants(color_ostream& out, vector <string>& parameters) {
for (size_t i = 0; i < world->raws.plants.all.size(); i++) { for (size_t i = 0; i < world->raws.plants.all.size(); i++) {
df::plant_raw* plant = world->raws.plants.all[i]; df::plant_raw* plant = world->raws.plants.all[i];
if (all) { if (all) {
// plantSelections[i] = selectablePlant(out, plant, farming); plantSelections[i] = selectablePlant(out, plant, farming);
plantSelections[i] = selectablePlant(plant, farming);
} }
else if (plantNames.find(plant->id) != plantNames.end()) { else if (plantNames.find(plant->id) != plantNames.end()) {
plantNames.erase(plant->id); plantNames.erase(plant->id);
// plantSelections[i] = selectablePlant(out, plant, farming); plantSelections[i] = selectablePlant(out, plant, farming);
plantSelections[i] = selectablePlant(plant, farming);
switch (plantSelections[i]) { switch (plantSelections[i]) {
case selectability::Grass: case selectability::Grass:
out.printerr("%s is a grass and cannot be gathered\n", plant->id.c_str()); out.printerr("%s is a grass and cannot be gathered\n", plant->id.c_str());
@ -421,8 +424,7 @@ command_result df_getplants(color_ostream& out, vector <string>& parameters) {
out.print("Valid plant IDs:\n"); out.print("Valid plant IDs:\n");
for (size_t i = 0; i < world->raws.plants.all.size(); i++) { for (size_t i = 0; i < world->raws.plants.all.size(); i++) {
df::plant_raw* plant = world->raws.plants.all[i]; df::plant_raw* plant = world->raws.plants.all[i];
// switch (selectablePlant(out, plant, farming)) switch (selectablePlant(out, plant, farming)) {
switch (selectablePlant(plant, farming)) {
case selectability::Grass: case selectability::Grass:
case selectability::Nonselectable: case selectability::Nonselectable:
continue; continue;
@ -486,7 +488,7 @@ command_result df_getplants(color_ostream& out, vector <string>& parameters) {
++count; ++count;
} }
if (!deselect && designate(plant, farming)) { if (!deselect && designate(plant, farming)) {
// out.print("Designated %s at (%i, %i, %i), %d\n", world->raws.plants.all[plant->material]->id.c_str(), plant->pos.x, plant->pos.y, plant->pos.z, (int)i); DEBUG(log, out).print("Designated %s at (%i, %i, %i), %d\n", world->raws.plants.all[plant->material]->id.c_str(), plant->pos.x, plant->pos.y, plant->pos.z, (int)i);
collectionCount[plant->material]++; collectionCount[plant->material]++;
++count; ++count;
} }