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

use actual item and unit positions

develop
Myk Taylor 2023-02-01 04:24:42 -08:00
parent be40d55e64
commit febb2bf030
No known key found for this signature in database
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/autochop.cpp
Unescape Escape View File

@ -7,6 +7,7 @@
#include "modules/Burrows.h" #include "modules/Burrows.h"
#include "modules/Designations.h" #include "modules/Designations.h"
#include "modules/Items.h"
#include "modules/Maps.h" #include "modules/Maps.h"
#include "modules/Persistence.h" #include "modules/Persistence.h"
#include "modules/Units.h" #include "modules/Units.h"
@ -253,9 +254,10 @@ static command_result do_command(color_ostream &out, vector<string> &parameters)
// cycle logic // cycle logic
// //
static bool is_accessible_item(const df::coord &pos, const vector<df::unit *> &citizens) { static bool is_accessible_item(df::item *item, const vector<df::unit *> &citizens) {
const df::coord pos = Items::getPosition(item);
for (auto &unit : citizens) { for (auto &unit : citizens) {
if (Maps::canWalkBetween(unit->pos, pos)) if (Maps::canWalkBetween(Units::getPosition(unit), pos))
return true; return true;
} }
return false; return false;
@ -518,7 +520,7 @@ static void scan_logs(int32_t *usable_logs, const vector<df::unit *> &citizens,
if (!is_valid_item(item)) if (!is_valid_item(item))
continue; continue;
if (!is_accessible_item(item->pos, citizens)) { if (!is_accessible_item(item, citizens)) {
if (inaccessible_logs) if (inaccessible_logs)
++*inaccessible_logs; ++*inaccessible_logs;
} else if (usable_logs) { } else if (usable_logs) {

11
plugins/seedwatch.cpp
Unescape Escape View File

@ -9,6 +9,7 @@
#include "PluginManager.h" #include "PluginManager.h"
#include "TileTypes.h" #include "TileTypes.h"
#include "modules/Items.h"
#include "modules/Kitchen.h" #include "modules/Kitchen.h"
#include "modules/Maps.h" #include "modules/Maps.h"
#include "modules/Persistence.h" #include "modules/Persistence.h"
@ -269,9 +270,6 @@ static command_result do_command(color_ostream &out, vector<string> &parameters)
struct BadFlags { struct BadFlags {
uint32_t whole; uint32_t whole;
// TODO: maybe don't filter out seeds that are in_building. that would
// allow us to count seeds that are in workshops. are there any negative
// consequences?
BadFlags() { BadFlags() {
df::item_flags flags; df::item_flags flags;
#define F(x) flags.bits.x = true; #define F(x) flags.bits.x = true;
@ -285,9 +283,10 @@ struct BadFlags {
} }
}; };
static bool is_accessible_item(const df::coord &pos, const vector<df::unit *> &citizens) { static bool is_accessible_item(df::item *item, const vector<df::unit *> &citizens) {
const df::coord pos = Items::getPosition(item);
for (auto &unit : citizens) { for (auto &unit : citizens) {
if (Maps::canWalkBetween(unit->pos, pos)) if (Maps::canWalkBetween(Units::getPosition(unit), pos))
return true; return true;
} }
return false; return false;
@ -304,7 +303,7 @@ static void scan_seeds(color_ostream &out, unordered_map<int32_t, int32_t> *acce
MaterialInfo mat(item); MaterialInfo mat(item);
if (!mat.isPlant()) if (!mat.isPlant())
continue; continue;
if ((bad_flags.whole & item->flags.whole) || !is_accessible_item(item->pos, citizens)) { if ((bad_flags.whole & item->flags.whole) || !is_accessible_item(item, citizens)) {
if (inaccessible_counts) if (inaccessible_counts)
++(*inaccessible_counts)[mat.plant->index]; ++(*inaccessible_counts)[mat.plant->index];
} else { } else {