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

Fix tabs.

develop
David Timm 2017-10-17 15:17:35 -06:00
parent d009022311
commit 3c564c64ba
1 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
plugins/autochop.cpp
Unescape Escape View File

@ -195,9 +195,9 @@ static void initialize()
min_logs = 80; min_logs = 80;
max_logs = 100; max_logs = 100;
wait_for_threshold = false; wait_for_threshold = false;
skip_fruit_trees = false; skip_fruit_trees = false;
skip_food_trees = false; skip_food_trees = false;
skip_cook_trees = false; skip_cook_trees = false;
config_autochop = World::GetPersistentData("autochop/config"); config_autochop = World::GetPersistentData("autochop/config");
if (config_autochop.isValid()) if (config_autochop.isValid())
@ -221,47 +221,47 @@ static void initialize()
static bool skip_plant(const df::plant * plant) static bool skip_plant(const df::plant * plant)
{ {
// Skip all non-trees immediately. // Skip all non-trees immediately.
if (plant->flags.bits.is_shrub) if (plant->flags.bits.is_shrub)
return true; return true;
// Skip plants with invalid tile. // Skip plants with invalid tile.
df::map_block *cur = Maps::getTileBlock(plant->pos); df::map_block *cur = Maps::getTileBlock(plant->pos);
if (!cur) if (!cur)
return true; return true;
int x = plant->pos.x % 16; int x = plant->pos.x % 16;
int y = plant->pos.y % 16; int y = plant->pos.y % 16;
// Skip all unrevealed plants. // Skip all unrevealed plants.
if (cur->designation[x][y].bits.hidden) if (cur->designation[x][y].bits.hidden)
return true; return true;
const df::plant_raw *plant_raw = df::plant_raw::find(plant->material); const df::plant_raw *plant_raw = df::plant_raw::find(plant->material);
// Skip fruit trees if set. // Skip fruit trees if set.
if (skip_fruit_trees && plant_raw->material_defs.type_drink != -1) if (skip_fruit_trees && plant_raw->material_defs.type_drink != -1)
return true; return true;
if (skip_food_trees || skip_cook_trees) if (skip_food_trees || skip_cook_trees)
{ {
df::material * mat; df::material * mat;
for (int idx = 0; idx < plant_raw->material.size(); idx++) for (int idx = 0; idx < plant_raw->material.size(); idx++)
{ {
mat = plant_raw->material[idx]; mat = plant_raw->material[idx];
if (skip_food_trees && mat->flags.is_set(material_flags::EDIBLE_RAW)) if (skip_food_trees && mat->flags.is_set(material_flags::EDIBLE_RAW))
return true; return true;
if (skip_cook_trees && mat->flags.is_set(material_flags::EDIBLE_COOKED)) if (skip_cook_trees && mat->flags.is_set(material_flags::EDIBLE_COOKED))
return true; return true;
} }
} }
df::tiletype_material material = tileMaterial(cur->tiletype[x][y]); df::tiletype_material material = tileMaterial(cur->tiletype[x][y]);
if (material != tiletype_material::TREE) if (material != tiletype_material::TREE)
return true; return true;
return false; return false;
} }
static int do_chop_designation(bool chop, bool count_only) static int do_chop_designation(bool chop, bool count_only)
@ -271,11 +271,11 @@ static int do_chop_designation(bool chop, bool count_only)
{ {
const df::plant *plant = world->plants.all[i]; const df::plant *plant = world->plants.all[i];
if (skip_plant(plant)) if (skip_plant(plant))
continue; continue;
if (!count_only && !watchedBurrows.isValidPos(plant->pos)) if (!count_only && !watchedBurrows.isValidPos(plant->pos))
continue; continue;
if (chop && !Designations::isPlantMarked(plant)) if (chop && !Designations::isPlantMarked(plant))
{ {
@ -603,15 +603,15 @@ public:
} }
else if (input->count(interface_key::CUSTOM_F)) else if (input->count(interface_key::CUSTOM_F))
{ {
skip_fruit_trees = !skip_fruit_trees; skip_fruit_trees = !skip_fruit_trees;
} }
else if (input->count(interface_key::CUSTOM_E)) else if (input->count(interface_key::CUSTOM_E))
{ {
skip_food_trees = !skip_food_trees; skip_food_trees = !skip_food_trees;
} }
else if (input->count(interface_key::CUSTOM_C)) else if (input->count(interface_key::CUSTOM_C))
{ {
skip_cook_trees = !skip_cook_trees; skip_cook_trees = !skip_cook_trees;
} }
else if (enabler->tracking_on && enabler->mouse_lbut) else if (enabler->tracking_on && enabler->mouse_lbut)
{ {
@ -661,44 +661,44 @@ public:
OutputHotkeyString(x, y, "Designate Now", "d", true, left_margin); OutputHotkeyString(x, y, "Designate Now", "d", true, left_margin);
OutputHotkeyString(x, y, "Undesignate Now", "u", true, left_margin); OutputHotkeyString(x, y, "Undesignate Now", "u", true, left_margin);
OutputHotkeyString(x, y, "Toggle Burrow", "Enter", true, left_margin); OutputHotkeyString(x, y, "Toggle Burrow", "Enter", true, left_margin);
if (autochop_enabled) if (autochop_enabled)
{ {
using namespace df::enums::interface_key; using namespace df::enums::interface_key;
const struct { const struct {
const char *caption; const char *caption;
int count; int count;
bool in_edit; bool in_edit;
df::interface_key key; df::interface_key key;
df::interface_key skeys[4]; df::interface_key skeys[4];
} rows[] = { } rows[] = {
{"Min Logs: ", min_logs, edit_mode == EDIT_MIN, CUSTOM_N, {CUSTOM_H, CUSTOM_J, CUSTOM_SHIFT_H, CUSTOM_SHIFT_J}}, {"Min Logs: ", min_logs, edit_mode == EDIT_MIN, CUSTOM_N, {CUSTOM_H, CUSTOM_J, CUSTOM_SHIFT_H, CUSTOM_SHIFT_J}},
{"Max Logs: ", max_logs, edit_mode == EDIT_MAX, CUSTOM_M, {CUSTOM_K, CUSTOM_L, CUSTOM_SHIFT_K, CUSTOM_SHIFT_L}} {"Max Logs: ", max_logs, edit_mode == EDIT_MAX, CUSTOM_M, {CUSTOM_K, CUSTOM_L, CUSTOM_SHIFT_K, CUSTOM_SHIFT_L}}
}; };
for (size_t i = 0; i < sizeof(rows) / sizeof(rows[0]); ++i) for (size_t i = 0; i < sizeof(rows) / sizeof(rows[0]); ++i)
{ {
auto row = rows[i]; auto row = rows[i];
OutputHotkeyString(x, y, row.caption, row.key); OutputHotkeyString(x, y, row.caption, row.key);
auto prev_x = x; auto prev_x = x;
if (row.in_edit) if (row.in_edit)
OutputString(COLOR_LIGHTCYAN, x, y, int_to_string(row.count) + "_"); OutputString(COLOR_LIGHTCYAN, x, y, int_to_string(row.count) + "_");
else if (row.count <= LOG_CAP_MAX) else if (row.count <= LOG_CAP_MAX)
OutputString(COLOR_LIGHTGREEN, x, y, int_to_string(row.count)); OutputString(COLOR_LIGHTGREEN, x, y, int_to_string(row.count));
else else
OutputString(COLOR_LIGHTBLUE, x, y, "Unlimited"); OutputString(COLOR_LIGHTBLUE, x, y, "Unlimited");
if (edit_mode == EDIT_NONE) if (edit_mode == EDIT_NONE)
{ {
x = std::max(x, prev_x + 10); x = std::max(x, prev_x + 10);
for (size_t j = 0; j < sizeof(row.skeys) / sizeof(row.skeys[0]); ++j) for (size_t j = 0; j < sizeof(row.skeys) / sizeof(row.skeys[0]); ++j)
OutputString(COLOR_LIGHTGREEN, x, y, DFHack::Screen::getKeyDisplay(row.skeys[j])); OutputString(COLOR_LIGHTGREEN, x, y, DFHack::Screen::getKeyDisplay(row.skeys[j]));
OutputString(COLOR_WHITE, x, y, ": Step"); OutputString(COLOR_WHITE, x, y, ": Step");
} }
OutputString(COLOR_WHITE, x, y, "", true, left_margin); OutputString(COLOR_WHITE, x, y, "", true, left_margin);
} }
OutputHotkeyString(x, y, "No limit", CUSTOM_SHIFT_N, true, left_margin); OutputHotkeyString(x, y, "No limit", CUSTOM_SHIFT_N, true, left_margin);
OutputToggleString(x, y, "Skip Fruit Trees: ", "f", skip_fruit_trees, true, left_margin); OutputToggleString(x, y, "Skip Fruit Trees: ", "f", skip_fruit_trees, true, left_margin);
OutputToggleString(x, y, "Skip Edible Product Trees: ", "e", skip_food_trees, true, left_margin); OutputToggleString(x, y, "Skip Edible Product Trees: ", "e", skip_food_trees, true, left_margin);
OutputToggleString(x, y, "Skip Cookable Product Trees: ", "c", skip_cook_trees, true, left_margin); OutputToggleString(x, y, "Skip Cookable Product Trees: ", "c", skip_cook_trees, true, left_margin);
} }
++y; ++y;
OutputString(COLOR_BROWN, x, y, "Current Counts", true, left_margin); OutputString(COLOR_BROWN, x, y, "Current Counts", true, left_margin);