summaryrefslogtreecommitdiff
path: root/plugins/devel
diff options
context:
space:
mode:
authorKelly Martin2012-07-11 14:30:47 -0500
committerKelly Martin2012-07-11 14:30:47 -0500
commit4c7c38df93a6600517157be50f1c964d4ba8805f (patch)
treea995a9319c5eb46d9aa7845cd06ed3e0cf0a434c /plugins/devel
parent6f4f3039e1bf0ac52be4da2b5c214eaf76f49ace (diff)
downloaddfhack-4c7c38df93a6600517157be50f1c964d4ba8805f.tar.gz
dfhack-4c7c38df93a6600517157be50f1c964d4ba8805f.tar.bz2
dfhack-4c7c38df93a6600517157be50f1c964d4ba8805f.tar.xz
* Autolabor: really exclude the broker from all labors when trader requested
* Autolabor: add 'haulpct' config option to control percentage of non-idle dwarfs assigned to hauling labors (default is 33) * Zones: allow nontamed birds to be nestboxes. warning: does not check for 'hostile to civilization' birds, so if you try to tame a hostile elk bird, !!fun!! will happen * Stripcaged: changed default behavior to keep armor, reduced noisiness
Diffstat (limited to 'plugins/devel')
-rw-r--r--plugins/devel/stripcaged.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/plugins/devel/stripcaged.cpp b/plugins/devel/stripcaged.cpp
index 922f220b..e3d2a82f 100644
--- a/plugins/devel/stripcaged.cpp
+++ b/plugins/devel/stripcaged.cpp
@@ -77,12 +77,12 @@ DFhackCExport command_result plugin_shutdown ( color_ostream &out )
command_result df_stripcaged(color_ostream &out, vector <string> & parameters)
{
CoreSuspender suspend;
- bool keeparmor = false;
+ bool keeparmor = true;
- if (parameters.size() == 1 && parameters[0] == "keeparmor")
+ if (parameters.size() == 1 && parameters[0] == "dumparmor")
{
- out << "Not dumping armor" << endl;
- keeparmor = true;
+ out << "Dumping armor too" << endl;
+ keeparmor = false;
}
size_t count = 0;
@@ -97,12 +97,10 @@ command_result df_stripcaged(color_ostream &out, vector <string> & parameters)
if (uii->item)
{
if (keeparmor && (uii->item->isArmorNotClothing() || uii->item->isClothing()))
- {
- std::string desc;
- uii->item->getItemDescription(&desc,0);
- out << "Armor item " << desc << " not dumped" << endl;
continue;
- }
+ std::string desc;
+ uii->item->getItemDescription(&desc,0);
+ out << "Item " << desc << " dumped." << endl;
uii->item->flags.bits.forbid = 0;
uii->item->flags.bits.dump = 1;
count++;