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

Replace drybuckets plugin with a script 

Also closes #248, by checking job and building flags.
develop
PeridexisErrant 2015-11-17 13:55:43 +09:30
parent 928bcb6d95
commit 2ba9ef04e3
5 changed files with 26 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS.rst
Unescape Escape View File

@ -36,6 +36,10 @@ Fixes
-----
- confirm haul-delete: Fixed issue preventing deletion of stop conditions or using "x" in route names
New Scripts
-----------
- `fix/dry-buckets`: replaces the ``drybuckets`` plugin
DFHack 0.40.24-r4
=================

4
docs/Plugins.rst
Unescape Escape View File

@ -182,10 +182,6 @@ Shows all items needed for the currently active strange mood.
Bugfixes
========
drybuckets
==========
Removes water from all buckets in your fortress, allowing them to be used for making lye.
fixdiplomats
============
Adds a Diplomat position to all Elven civilizations, allowing them to negotiate

1
plugins/CMakeLists.txt
Unescape Escape View File

@ -115,7 +115,6 @@ if (BUILD_SUPPORTED)
DFHACK_PLUGIN(dig dig.cpp)
DFHACK_PLUGIN(digFlood digFlood.cpp)
add_subdirectory(diggingInvaders)
DFHACK_PLUGIN(drybuckets drybuckets.cpp)
DFHACK_PLUGIN(dwarfmonitor dwarfmonitor.cpp LINK_LIBRARIES lua)
DFHACK_PLUGIN(embark-tools embark-tools.cpp)
DFHACK_PLUGIN(eventful eventful.cpp LINK_LIBRARIES lua)

52
plugins/drybuckets.cpp
Unescape Escape View File

@ -1,52 +0,0 @@
// Dry Buckets : Remove all "water" objects from buckets scattered around the fortress
#include "Core.h"
#include "Console.h"
#include "Export.h"
#include "PluginManager.h"
#include "DataDefs.h"
#include "df/world.h"
#include "df/item.h"
#include "df/builtin_mats.h"
using std::string;
using std::vector;
using namespace DFHack;
using namespace df::enums;
DFHACK_PLUGIN("drybuckets");
REQUIRE_GLOBAL(world);
command_result df_drybuckets (color_ostream &out, vector <string> & parameters)
{
if (!parameters.empty())
return CR_WRONG_USAGE;
CoreSuspender suspend;
int dried_total = 0;
for (size_t i = 0; i < world->items.all.size(); i++)
{
df::item *item = world->items.all[i];
if ((item->getType() == item_type::LIQUID_MISC) && (item->getMaterial() == builtin_mats::WATER))
{
item->flags.bits.garbage_collect = 1;
dried_total++;
}
}
if (dried_total)
out.print("Done. %d buckets of water marked for emptying.\n", dried_total);
return CR_OK;
}
DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
{
commands.push_back(PluginCommand("drybuckets", "Removes water from buckets.", df_drybuckets));
return CR_OK;
}
DFhackCExport command_result plugin_shutdown ( color_ostream &out )
{
return CR_OK;
}

22
scripts/fix/dry-buckets.lua
Unescape Escape View File

@ -0,0 +1,22 @@
-- Removes water from buckets (for lye-making).
--[[=begin
fix/dry-buckets
===============
Removes water from all buckets in your fortress, allowing them
to be used for making lye. Skips buckets in buildings (eg a well),
being carried, or currently used by a job.
=end]]
local emptied = 0
local water_type = dfhack.matinfo.find('WATER').type
for _,item in ipairs(df.global.world.items.all) do
if item:getMaterial() == water_type and not (item.flags.in_job or item.flags.in_building) then
dfhack.items.remove(item)
emptied = emptied + 1
end
end
print('Emptied '..emptied..' buckets.')