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

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
develop
lethosor 2015-07-24 11:13:13 -04:00
parent 6c55164be4
commit f1a6e5fbe9
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
Unescape Escape View File

@ -64,7 +64,9 @@ DFHack Future
- Supports fortress mode loo[k] menu - Supports fortress mode loo[k] menu
- Recognizes ? and ; keys - Recognizes ? and ; keys
teleport: Fixed cursor recognition 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 workflow: Improved handling of plant reactions
Removed Removed

32
plugins/tweak/tweaks/farm-plot-select.h
Unescape Escape View File

@ -23,26 +23,22 @@ struct farm_select_hook : df::viewscreen_dwarfmodest {
{ {
// Adapted from autofarm // Adapted from autofarm
using namespace df::enums::plant_raw_flags; using namespace df::enums::plant_raw_flags;
// Discovered? // Possible to plant?
if (ui->tasks.discovered_plants[crop_id]) 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? // Right depth?
df::plant_raw* raws = world->raws.plants.all[crop_id]; DFCoord cursor (farm_plot->centerx, farm_plot->centery, farm_plot->z);
if (raws->flags.is_set(SEED) && raws->flags.is_set((df::plant_raw_flags)season)) 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? return true;
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 false; return false;