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

Leave merchant stuff alone, even if they're certainly dwarfs.

develop
Kelly Martin 2012-04-08 01:07:29 -05:00
parent de960e65f5
commit ad657c68a3
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/zone.cpp
Unescape Escape View File

@ -310,6 +310,7 @@ bool isWar(df::unit* creature);
bool isHunter(df::unit* creature); bool isHunter(df::unit* creature);
bool isOwnCiv(df::unit* creature); bool isOwnCiv(df::unit* creature);
bool isMerchant(df::unit* creature); bool isMerchant(df::unit* creature);
bool isForest(df::unit* creature);
bool isActivityZone(df::building * building); bool isActivityZone(df::building * building);
bool isPenPasture(df::building * building); bool isPenPasture(df::building * building);
@ -350,6 +351,11 @@ bool isMerchant(df::unit* unit)
return unit->flags1.bits.merchant; return unit->flags1.bits.merchant;
} }
bool isForest(df::unit* unit)
{
return unit->flags1.bits.forest;
}
bool isMarkedForSlaughter(df::unit* unit) bool isMarkedForSlaughter(df::unit* unit)
{ {
return unit->flags2.bits.slaughter; return unit->flags2.bits.slaughter;
@ -590,8 +596,8 @@ void unitInfo(color_ostream & out, df::unit* unit, bool verbose = false)
} }
out << ")"; out << ")";
out << ", age: " << getUnitAge(unit); out << ", age: " << getUnitAge(unit);
if(isTame(unit)) if(isTame(unit))
out << ", tame"; out << ", tame";
if(isOwnCiv(unit)) if(isOwnCiv(unit))
out << ", owned"; out << ", owned";
@ -599,6 +605,10 @@ void unitInfo(color_ostream & out, df::unit* unit, bool verbose = false)
out << ", war"; out << ", war";
if(isHunter(unit)) if(isHunter(unit))
out << ", hunter"; out << ", hunter";
if(isMerchant(unit))
out << ", merchant";
if(isForest(unit))
out << ", forest";
if(verbose) if(verbose)
{ {
@ -970,6 +980,8 @@ bool isFreeEgglayer(df::unit * unit)
&& isEggLayer(unit) && isEggLayer(unit)
&& !isAssigned(unit) && !isAssigned(unit)
&& !isGrazer(unit) // exclude grazing birds because they're messy && !isGrazer(unit) // exclude grazing birds because they're messy
&& !isMerchant(unit) // don't steal merchant mounts
&& !isForest(unit) // don't steal birds from traders, they hate that
) )
return true; return true;
else else
@ -1621,8 +1633,9 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
continue; continue;
// ignore merchant units // ignore merchant units
if (isMerchant(unit)) if (isMerchant(unit) || isForest(unit))
continue; continue;
if(find_race && getRaceName(unit) != target_race) if(find_race && getRaceName(unit) != target_race)
continue; continue;
// ignore own dwarves by default // ignore own dwarves by default