From f1a6e5fbe9890de7b5a2cb2b4a8b64575e61d107 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Fri, 24 Jul 2015 11:13:13 -0400
Subject: [PATCH] tweak farm-plot-select: Don't require crops to be discovered

Crops whose seeds haven't been discovered are still listed in
menus as of 0.40.10
---
 NEWS                                    |  4 +++-
 plugins/tweak/tweaks/farm-plot-select.h | 32 +++++++++++--------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/NEWS b/NEWS
index fdcf9fb51..358e6b19a 100644
--- a/NEWS
+++ b/NEWS
@@ -64,7 +64,9 @@ DFHack Future
           - Supports fortress mode loo[k] menu
           - Recognizes ? and ; keys
         teleport: Fixed cursor recognition
-        tweak: debug output now logged to stderr.log instead of console
+        tweak:
+          - debug output now logged to stderr.log instead of console - makes DFHack start faster
+          - farm-plot-select: Fixed issues with selecting undiscovered crops
         workflow: Improved handling of plant reactions
     Removed
 
diff --git a/plugins/tweak/tweaks/farm-plot-select.h b/plugins/tweak/tweaks/farm-plot-select.h
index 11d772450..38b0596bd 100644
--- a/plugins/tweak/tweaks/farm-plot-select.h
+++ b/plugins/tweak/tweaks/farm-plot-select.h
@@ -23,26 +23,22 @@ struct farm_select_hook : df::viewscreen_dwarfmodest {
     {
         // Adapted from autofarm
         using namespace df::enums::plant_raw_flags;
-        // Discovered?
-        if (ui->tasks.discovered_plants[crop_id])
+        // Possible to plant?
+        df::plant_raw* raws = world->raws.plants.all[crop_id];
+        if (raws->flags.is_set(SEED) && raws->flags.is_set((df::plant_raw_flags)season))
         {
-            // Possible to plant?
-            df::plant_raw* raws = world->raws.plants.all[crop_id];
-            if (raws->flags.is_set(SEED) && raws->flags.is_set((df::plant_raw_flags)season))
+            // Right depth?
+            DFCoord cursor (farm_plot->centerx, farm_plot->centery, farm_plot->z);
+            MapExtras::MapCache mc;
+            MapExtras::Block * b = mc.BlockAt(cursor / 16);
+            if (!b || !b->is_valid())
+                return false;
+            auto &block = *b->getRaw();
+            df::tile_designation &des =
+                block.designation[farm_plot->centerx % 16][farm_plot->centery % 16];
+            if ((raws->underground_depth_min == 0 || raws->underground_depth_max == 0) != des.bits.subterranean)
             {
-                // Right depth?
-                DFCoord cursor (farm_plot->centerx, farm_plot->centery, farm_plot->z);
-                MapExtras::MapCache mc;
-                MapExtras::Block * b = mc.BlockAt(cursor / 16);
-                if (!b || !b->is_valid())
-                    return false;
-                auto &block = *b->getRaw();
-                df::tile_designation &des =
-                    block.designation[farm_plot->centerx % 16][farm_plot->centery % 16];
-                if ((raws->underground_depth_min == 0 || raws->underground_depth_max == 0) != des.bits.subterranean)
-                {
-                    return true;
-                }
+                return true;
             }
         }
         return false;