summaryrefslogtreecommitdiff
path: root/plugins/zone.cpp
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/zone.cpp
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/zone.cpp')
-rw-r--r--plugins/zone.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/zone.cpp b/plugins/zone.cpp
index ce610128..52ea5c07 100644
--- a/plugins/zone.cpp
+++ b/plugins/zone.cpp
@@ -420,6 +420,7 @@ bool isTame(df::unit* creature)
{
switch (creature->training_level)
{
+ case df::animal_training_level::SemiWild: //??
case df::animal_training_level::Trained:
case df::animal_training_level::WellTrained:
case df::animal_training_level::SkilfullyTrained:
@@ -429,7 +430,6 @@ bool isTame(df::unit* creature)
case df::animal_training_level::Domesticated:
tame=true;
break;
- case df::animal_training_level::SemiWild: //??
case df::animal_training_level::Unk8: //??
case df::animal_training_level::WildUntamed:
default:
@@ -1232,7 +1232,7 @@ bool isFreeEgglayer(df::unit * unit)
{
if( !isDead(unit) && !isUndead(unit)
&& isFemale(unit)
- && isDomesticated(unit) // better strict than sorry (medium trained wild animals can revert into wild state)
+ && isTame(unit)
&& isOwnCiv(unit)
&& isEggLayer(unit)
&& !isAssigned(unit)