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

Merge remote-tracking branch 'falconne/plugin_automelt' into update-falconne-plugins 

Conflicts:
	NEWS
	plugins/CMakeLists.txt
	plugins/automelt.cpp
develop
lethosor 2014-11-15 16:31:51 -05:00
parent f7fcb342ed 5f611ec48b
commit 61fa2fbda0
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
Unescape Escape View File

@ -246,7 +246,7 @@ DFHack v0.34.11-r5
New plugins: New plugins:
- rendermax: replace the renderer with something else. Most interesting is "rendermax light"- a lighting engine for df. - rendermax: replace the renderer with something else. Most interesting is "rendermax light"- a lighting engine for df.
- stockflow (by eswald): queues manager jobs of the configured type based on the state of a stockpile. - automelt: allows marking stockpiles for automelt (i.e. any items placed in stocpile will be designated for melting)
- embark-tools: implementations of Embark Anywhere, Nano Embark, and a few other embark-related utilities - embark-tools: implementations of Embark Anywhere, Nano Embark, and a few other embark-related utilities
- building-hacks: Allows to add custom functionality and/or animations to buildings. - building-hacks: Allows to add custom functionality and/or animations to buildings.
- petcapRemover: triggers pregnancies in creatures so that you can effectively raise the default pet population cap from the default 50 - petcapRemover: triggers pregnancies in creatures so that you can effectively raise the default pet population cap from the default 50

9
Readme.rst
Unescape Escape View File

@ -2880,6 +2880,15 @@ Enable the autodump plugin in your dfhack.init with
When querying a stockpile an option will appear to toggle autodump for this stockpile. When querying a stockpile an option will appear to toggle autodump for this stockpile.
Any items placed in this stockpile will be designated to be dumped. Any items placed in this stockpile will be designated to be dumped.
Stockpile Automation
====================
Enable the automelt plugin in your dfhack.init with
``enable automelt``
When querying a stockpile an option will appear to toggle automelt for this stockpile.
Any items placed in this stockpile will be designated to be melted.
gui/liquids gui/liquids
=========== ===========

2
plugins/automelt.cpp
Unescape Escape View File

@ -233,7 +233,7 @@ struct melt_hook : public df::viewscreen_dwarfmodest
links += sp->links.give_to_workshop.size(); links += sp->links.give_to_workshop.size();
links += sp->links.take_from_workshop.size(); links += sp->links.take_from_workshop.size();
bool state = monitor.isMonitored(sp); bool state = monitor.isMonitored(sp);
if (links + 12 >= y) { if (links + 12 >= y) {
y = dims.y2; y = dims.y2;
OutputString(COLOR_WHITE, x, y, "Auto: "); OutputString(COLOR_WHITE, x, y, "Auto: ");