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

Implements plugin: channel-safely v0.6.1

develop
Josh Cooper 2022-11-08 11:38:30 -08:00
parent 92537bc459
commit a9f0021927
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/channel-safely/channel-safely-plugin.cpp
Unescape Escape View File

@ -243,8 +243,13 @@ namespace CSP {
ChannelManager::Get().manage_group(below); ChannelManager::Get().manage_group(below);
ChannelManager::Get().debug(); ChannelManager::Get().debug();
} else { } else {
ERR(jobs).print(" -> (" COORD ") is not done but the job \"completed\".\n", COORDARGS(job->pos)); // the tile is unchanged
ERR(jobs).print(" -> (" COORD ") stopped working but (" COORD ") doesn't appear done.\n",COORDARGS(worker->pos), COORDARGS(job->pos));
df::unit* worker = active_workers[job->id];
endangered_workers.emplace(active_workers[job->id]); endangered_workers.emplace(active_workers[job->id]);
if (config.insta_dig) {
dignow_queue.emplace(job->pos);
}
} }
// clean up // clean up
if (!config.resurrect) { if (!config.resurrect) {
@ -266,12 +271,18 @@ namespace CSP {
idx = df::report::binsearch_index(reports, report_id); idx = df::report::binsearch_index(reports, report_id);
df::report* report = reports.at(idx); df::report* report = reports.at(idx);
switch (report->type) { switch (report->type) {
case announcement_type::CANCEL_JOB:
out.print("%d, pos: " COORD ", pos2: " COORD "\n%s\n", report_id, COORDARGS(report->pos), COORDARGS(report->pos2), report->text.c_str());
if (report->text.find("Dangerous") != std::string::npos) {
dignow_queue.emplace(report->pos);
break;
} else if (!report->flags.bits.unconscious) {
break;
}
case announcement_type::CAVE_COLLAPSE: case announcement_type::CAVE_COLLAPSE:
for (auto p : active_workers) { for (auto p : active_workers) {
endangered_workers.emplace(p.second); endangered_workers.emplace(p.second);
} }
case announcement_type::CANCEL_JOB:
out.print("%d, pos: " COORD "\n%s\n", report_id, COORDARGS(report->pos), report->text.c_str());
default: default:
break; break;
} }
@ -294,14 +305,17 @@ namespace CSP {
if (config.insta_dig) { if (config.insta_dig) {
TRACE(monitor).print(" -> evaluate dignow queue\n"); TRACE(monitor).print(" -> evaluate dignow queue\n");
for (const df::coord &pos: dignow_queue) { for (auto iter = dignow_queue.begin(); iter != dignow_queue.end();) {
if (!has_unit(Maps::getTileOccupancy(pos))) { if (!has_unit(Maps::getTileOccupancy(*iter))) {
out.print("channel-safely: insta-dig: Digging now!\n"); dig_now(out, *iter);
dig_now(out, pos); iter = dignow_queue.erase(iter);
WARN(plugin).print(">INSTA-DIGGING<\n");
continue;
} else { } else {
// todo: teleport? // todo: teleport?
//Units::teleport() //Units::teleport()
} }
++iter;
} }
TRACE(monitor).print("OnUpdate() refresh done\n"); TRACE(monitor).print("OnUpdate() refresh done\n");
} }
@ -389,6 +403,7 @@ namespace CSP {
TRACE(monitor).print("OnUpdate() monitoring done\n"); TRACE(monitor).print("OnUpdate() monitoring done\n");
} }
// Resurrect Dead Workers
if (config.resurrect && tick - last_resurrect_tick >= 1) { if (config.resurrect && tick - last_resurrect_tick >= 1) {
last_resurrect_tick = tick; last_resurrect_tick = tick;
static std::unordered_map<df::unit*, int32_t> age; static std::unordered_map<df::unit*, int32_t> age;