From 3c564c64ba85f1dab9e13eb4b2bc2d9ebe7e3c04 Mon Sep 17 00:00:00 2001 From: David Timm Date: Tue, 17 Oct 2017 15:17:35 -0600 Subject: [PATCH] Fix tabs. --- plugins/autochop.cpp | 178 +++++++++++++++++++++---------------------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/plugins/autochop.cpp b/plugins/autochop.cpp index 48f0a7626..312f5ba42 100644 --- a/plugins/autochop.cpp +++ b/plugins/autochop.cpp @@ -195,9 +195,9 @@ static void initialize() min_logs = 80; max_logs = 100; wait_for_threshold = false; - skip_fruit_trees = false; - skip_food_trees = false; - skip_cook_trees = false; + skip_fruit_trees = false; + skip_food_trees = false; + skip_cook_trees = false; config_autochop = World::GetPersistentData("autochop/config"); if (config_autochop.isValid()) @@ -221,47 +221,47 @@ static void initialize() static bool skip_plant(const df::plant * plant) { - // Skip all non-trees immediately. - if (plant->flags.bits.is_shrub) - return true; - - // Skip plants with invalid tile. - df::map_block *cur = Maps::getTileBlock(plant->pos); - if (!cur) - return true; - - int x = plant->pos.x % 16; - int y = plant->pos.y % 16; - - // Skip all unrevealed plants. - if (cur->designation[x][y].bits.hidden) - return true; - - const df::plant_raw *plant_raw = df::plant_raw::find(plant->material); - - // Skip fruit trees if set. - if (skip_fruit_trees && plant_raw->material_defs.type_drink != -1) - return true; - - if (skip_food_trees || skip_cook_trees) - { - df::material * mat; - for (int idx = 0; idx < plant_raw->material.size(); idx++) - { - mat = plant_raw->material[idx]; - if (skip_food_trees && mat->flags.is_set(material_flags::EDIBLE_RAW)) - return true; - - if (skip_cook_trees && mat->flags.is_set(material_flags::EDIBLE_COOKED)) - return true; - } - } - - df::tiletype_material material = tileMaterial(cur->tiletype[x][y]); - if (material != tiletype_material::TREE) - return true; - - return false; + // Skip all non-trees immediately. + if (plant->flags.bits.is_shrub) + return true; + + // Skip plants with invalid tile. + df::map_block *cur = Maps::getTileBlock(plant->pos); + if (!cur) + return true; + + int x = plant->pos.x % 16; + int y = plant->pos.y % 16; + + // Skip all unrevealed plants. + if (cur->designation[x][y].bits.hidden) + return true; + + const df::plant_raw *plant_raw = df::plant_raw::find(plant->material); + + // Skip fruit trees if set. + if (skip_fruit_trees && plant_raw->material_defs.type_drink != -1) + return true; + + if (skip_food_trees || skip_cook_trees) + { + df::material * mat; + for (int idx = 0; idx < plant_raw->material.size(); idx++) + { + mat = plant_raw->material[idx]; + if (skip_food_trees && mat->flags.is_set(material_flags::EDIBLE_RAW)) + return true; + + if (skip_cook_trees && mat->flags.is_set(material_flags::EDIBLE_COOKED)) + return true; + } + } + + df::tiletype_material material = tileMaterial(cur->tiletype[x][y]); + if (material != tiletype_material::TREE) + return true; + + return false; } 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]; - if (skip_plant(plant)) - continue; + if (skip_plant(plant)) + continue; - if (!count_only && !watchedBurrows.isValidPos(plant->pos)) - continue; + if (!count_only && !watchedBurrows.isValidPos(plant->pos)) + continue; if (chop && !Designations::isPlantMarked(plant)) { @@ -603,15 +603,15 @@ public: } 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)) { - skip_food_trees = !skip_food_trees; + skip_food_trees = !skip_food_trees; } 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) { @@ -661,44 +661,44 @@ public: OutputHotkeyString(x, y, "Designate Now", "d", true, left_margin); OutputHotkeyString(x, y, "Undesignate Now", "u", true, left_margin); OutputHotkeyString(x, y, "Toggle Burrow", "Enter", true, left_margin); - if (autochop_enabled) - { - using namespace df::enums::interface_key; - const struct { - const char *caption; - int count; - bool in_edit; - df::interface_key key; - df::interface_key skeys[4]; - } rows[] = { - {"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}} - }; - for (size_t i = 0; i < sizeof(rows) / sizeof(rows[0]); ++i) - { - auto row = rows[i]; - OutputHotkeyString(x, y, row.caption, row.key); - auto prev_x = x; - if (row.in_edit) - OutputString(COLOR_LIGHTCYAN, x, y, int_to_string(row.count) + "_"); - else if (row.count <= LOG_CAP_MAX) - OutputString(COLOR_LIGHTGREEN, x, y, int_to_string(row.count)); - else - OutputString(COLOR_LIGHTBLUE, x, y, "Unlimited"); - if (edit_mode == EDIT_NONE) - { - x = std::max(x, prev_x + 10); - 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_WHITE, x, y, ": Step"); - } - OutputString(COLOR_WHITE, x, y, "", 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 Edible Product Trees: ", "e", skip_food_trees, true, left_margin); - OutputToggleString(x, y, "Skip Cookable Product Trees: ", "c", skip_cook_trees, true, left_margin); - } + if (autochop_enabled) + { + using namespace df::enums::interface_key; + const struct { + const char *caption; + int count; + bool in_edit; + df::interface_key key; + df::interface_key skeys[4]; + } rows[] = { + {"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}} + }; + for (size_t i = 0; i < sizeof(rows) / sizeof(rows[0]); ++i) + { + auto row = rows[i]; + OutputHotkeyString(x, y, row.caption, row.key); + auto prev_x = x; + if (row.in_edit) + OutputString(COLOR_LIGHTCYAN, x, y, int_to_string(row.count) + "_"); + else if (row.count <= LOG_CAP_MAX) + OutputString(COLOR_LIGHTGREEN, x, y, int_to_string(row.count)); + else + OutputString(COLOR_LIGHTBLUE, x, y, "Unlimited"); + if (edit_mode == EDIT_NONE) + { + x = std::max(x, prev_x + 10); + 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_WHITE, x, y, ": Step"); + } + OutputString(COLOR_WHITE, x, y, "", 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 Edible Product Trees: ", "e", skip_food_trees, true, left_margin); + OutputToggleString(x, y, "Skip Cookable Product Trees: ", "c", skip_cook_trees, true, left_margin); + } ++y; OutputString(COLOR_BROWN, x, y, "Current Counts", true, left_margin);