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

switch autolabor & autohauler to debugging api 

might need to change some of the message levels, time will tell
develop
Kelly Kinkade 2022-11-29 02:58:43 -06:00
parent 8d95d20852
commit cea9e144c6
2 changed files with 27 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/autolabor/autohauler.cpp
Unescape Escape View File

@ -1,5 +1,6 @@
#include "Core.h" #include "Core.h"
#include <Console.h> #include <Console.h>
#include <Debug.h>
#include <Export.h> #include <Export.h>
#include <PluginManager.h> #include <PluginManager.h>
@ -79,7 +80,9 @@ REQUIRE_GLOBAL(world);
DFHACK_PLUGIN_IS_ENABLED(enable_autohauler); DFHACK_PLUGIN_IS_ENABLED(enable_autohauler);
static bool print_debug = false; namespace DFHack {
DBG_DECLARE(autohauler, cycle, DebugCategory::LINFO);
}
static std::vector<int> state_count(NUM_STATE); static std::vector<int> state_count(NUM_STATE);
@ -461,24 +464,17 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
dwarf_info[dwarf].state = dwarf_states[job]; dwarf_info[dwarf].state = dwarf_states[job];
else else
{ {
out.print("Dwarf %i \"%s\" has unknown job %i\n", dwarf, dwarfs[dwarf]->name.first_name.c_str(), job); WARN(cycle, out).print("Dwarf %i \"%s\" has unknown job %i\n", dwarf, dwarfs[dwarf]->name.first_name.c_str(), job);
dwarf_info[dwarf].state = BUSY; dwarf_info[dwarf].state = OTHER;
} }
} }
// Debug: Output dwarf job and state data
if(print_debug)
out.print("Dwarf %i %s State: %i\n", dwarf, dwarfs[dwarf]->name.first_name.c_str(),
dwarf_info[dwarf].state);
// Increment corresponding labor in default_labor_infos struct
state_count[dwarf_info[dwarf].state]++; state_count[dwarf_info[dwarf].state]++;
INFO(cycle, out).print("Dwarf %i \"%s\": state %s\n",
dwarf, dwarfs[dwarf]->name.first_name.c_str(), state_names[dwarf_info[dwarf].state]);
} }
// At this point the debug if present has been completed
print_debug = false;
// This is a vector of all the labors // This is a vector of all the labors
std::vector<df::unit_labor> labors; std::vector<df::unit_labor> labors;
@ -720,18 +716,6 @@ command_result autohauler (color_ostream &out, std::vector <std::string> & param
return CR_OK; return CR_OK;
} }
else if (parameters.size() == 1 && parameters[0] == "debug")
{
if (!enable_autohauler)
{
out << "Error: The plugin is not enabled." << std::endl;
return CR_FAILURE;
}
print_debug = true;
return CR_OK;
}
else else
{ {
out.print("Automatically assigns hauling labors to dwarves.\n" out.print("Automatically assigns hauling labors to dwarves.\n"

50
plugins/autolabor/autolabor.cpp
Unescape Escape View File

@ -1,5 +1,6 @@
#include "Core.h" #include "Core.h"
#include <Console.h> #include <Console.h>
#include <Debug.h>
#include <Export.h> #include <Export.h>
#include <PluginManager.h> #include <PluginManager.h>
@ -78,7 +79,9 @@ REQUIRE_GLOBAL(world);
DFHACK_PLUGIN_IS_ENABLED(enable_autolabor); DFHACK_PLUGIN_IS_ENABLED(enable_autolabor);
static bool print_debug = false; namespace DFHack {
DBG_DECLARE(autolabor, cycle, DebugCategory::LINFO);
}
static std::vector<int> state_count(NUM_STATE); static std::vector<int> state_count(NUM_STATE);
@ -675,8 +678,10 @@ static void assign_labor(unit_labor::unit_labor labor,
dwarfs[dwarf]->military.pickup_flags.bits.update = 1; dwarfs[dwarf]->military.pickup_flags.bits.update = 1;
} }
if (print_debug) TRACE(cycle, out).print("Dwarf % i \"%s\" assigned %s: value %i %s %s\n",
out.print("Dwarf %i \"%s\" assigned %s: value %i %s %s\n", dwarf, dwarfs[dwarf]->name.first_name.c_str(), ENUM_KEY_STR(unit_labor, labor).c_str(), values[dwarf], dwarf_info[dwarf].trader ? "(trader)" : "", dwarf_info[dwarf].diplomacy ? "(diplomacy)" : ""); dwarf, dwarfs[dwarf]->name.first_name.c_str(), ENUM_KEY_STR(unit_labor, labor).c_str(), values[dwarf],
dwarf_info[dwarf].trader ? "(trader)" : "",
dwarf_info[dwarf].diplomacy ? "(diplomacy)" : "");
if (dwarf_info[dwarf].state == IDLE || dwarf_info[dwarf].state == BUSY || dwarf_info[dwarf].state == EXCLUSIVE) if (dwarf_info[dwarf].state == IDLE || dwarf_info[dwarf].state == BUSY || dwarf_info[dwarf].state == EXCLUSIVE)
labor_infos[labor].active_dwarfs++; labor_infos[labor].active_dwarfs++;
@ -737,13 +742,10 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
{ {
df::building_tradedepotst* depot = (df::building_tradedepotst*) build; df::building_tradedepotst* depot = (df::building_tradedepotst*) build;
trader_requested = trader_requested || depot->trade_flags.bits.trader_requested; trader_requested = trader_requested || depot->trade_flags.bits.trader_requested;
if (print_debug) INFO(cycle,out).print(trader_requested
{ ? "Trade depot found and trader requested, trader will be excluded from all labors.\n"
if (trader_requested) : "Trade depot found but trader is not requested.\n"
out.print("Trade depot found and trader requested, trader will be excluded from all labors.\n"); );
else
out.print("Trade depot found but trader is not requested.\n");
}
} }
} }
@ -820,8 +822,8 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
if (p1 || p2) if (p1 || p2)
{ {
dwarf_info[dwarf].diplomacy = true; dwarf_info[dwarf].diplomacy = true;
if (print_debug) INFO(cycle, out).print("Dwarf %i \"%s\" has a meeting, will be cleared of all labors\n",
out.print("Dwarf %i \"%s\" has a meeting, will be cleared of all labors\n", dwarf, dwarfs[dwarf]->name.first_name.c_str()); dwarf, dwarfs[dwarf]->name.first_name.c_str());
break; break;
} }
} }
@ -893,15 +895,15 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
dwarf_info[dwarf].state = dwarf_states[job]; dwarf_info[dwarf].state = dwarf_states[job];
else else
{ {
out.print("Dwarf %i \"%s\" has unknown job %i\n", dwarf, dwarfs[dwarf]->name.first_name.c_str(), job); WARN(cycle, out).print("Dwarf %i \"%s\" has unknown job %i\n", dwarf, dwarfs[dwarf]->name.first_name.c_str(), job);
dwarf_info[dwarf].state = OTHER; dwarf_info[dwarf].state = OTHER;
} }
} }
state_count[dwarf_info[dwarf].state]++; state_count[dwarf_info[dwarf].state]++;
if (print_debug) INFO(cycle, out).print("Dwarf %i \"%s\": penalty %i, state %s\n",
out.print("Dwarf %i \"%s\": penalty %i, state %s\n", dwarf, dwarfs[dwarf]->name.first_name.c_str(), dwarf_info[dwarf].mastery_penalty, state_names[dwarf_info[dwarf].state]); dwarf, dwarfs[dwarf]->name.first_name.c_str(), dwarf_info[dwarf].mastery_penalty, state_names[dwarf_info[dwarf].state]);
} }
std::vector<df::unit_labor> labors; std::vector<df::unit_labor> labors;
@ -1008,8 +1010,8 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
if (dwarf_info[dwarf].state == IDLE || dwarf_info[dwarf].state == BUSY || dwarf_info[dwarf].state == EXCLUSIVE) if (dwarf_info[dwarf].state == IDLE || dwarf_info[dwarf].state == BUSY || dwarf_info[dwarf].state == EXCLUSIVE)
labor_infos[labor].active_dwarfs++; labor_infos[labor].active_dwarfs++;
if (print_debug) TRACE(cycle, out).print("Dwarf %i \"%s\" assigned %s: hauler\n",
out.print("Dwarf %i \"%s\" assigned %s: hauler\n", dwarf, dwarfs[dwarf]->name.first_name.c_str(), ENUM_KEY_STR(unit_labor, labor).c_str()); dwarf, dwarfs[dwarf]->name.first_name.c_str(), ENUM_KEY_STR(unit_labor, labor).c_str());
} }
for (size_t i = num_haulers; i < hauler_ids.size(); i++) for (size_t i = num_haulers; i < hauler_ids.size(); i++)
@ -1025,8 +1027,6 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
} }
} }
print_debug = false;
return CR_OK; return CR_OK;
} }
@ -1212,18 +1212,6 @@ command_result autolabor (color_ostream &out, std::vector <std::string> & parame
return CR_OK; return CR_OK;
} }
else if (parameters.size() == 1 && parameters[0] == "debug")
{
if (!enable_autolabor)
{
out << "Error: The plugin is not enabled." << std::endl;
return CR_FAILURE;
}
print_debug = 1;
return CR_OK;
}
else else
{ {
out.print("Automatically assigns labors to dwarves.\n" out.print("Automatically assigns labors to dwarves.\n"