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

Merge branch 'master' of git://github.com/ab9rf/dfhack

develop
Robert Heinrich 2012-04-15 16:07:43 +02:00
parent 98df7d99d4 005658a9cd
commit be580592ce
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/zone.cpp
Unescape Escape View File

@ -119,6 +119,7 @@ const string zone_help_filters =
" male - obvious\n" " male - obvious\n"
" female - obvious\n" " female - obvious\n"
" egglayer - race lays eggs (use together with 'female')\n" " egglayer - race lays eggs (use together with 'female')\n"
" noegglayer - race does not lay eggs\n"
" grazer - is a grazer\n" " grazer - is a grazer\n"
" nograzer - not a grazer\n" " nograzer - not a grazer\n"
" milkable - race is milkable (use together with 'female')\n" " milkable - race is milkable (use together with 'female')\n"
@ -1466,6 +1467,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
bool find_male = false; bool find_male = false;
bool find_female = false; bool find_female = false;
bool find_egglayer = false; bool find_egglayer = false;
bool find_noegglayer = false;
bool find_grazer = false; bool find_grazer = false;
bool find_nograzer = false; bool find_nograzer = false;
bool find_milkable = false; bool find_milkable = false;
@ -1699,6 +1701,10 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
{ {
find_egglayer = true; find_egglayer = true;
} }
else if(p == "noegglayer")
{
find_noegglayer = true;
}
else if(p == "grazer") else if(p == "grazer")
{ {
find_grazer = true; find_grazer = true;
@ -1885,6 +1891,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
|| (find_grazer && !isGrazer(unit)) || (find_grazer && !isGrazer(unit))
|| (find_nograzer && isGrazer(unit)) || (find_nograzer && isGrazer(unit))
|| (find_egglayer && !isEggLayer(unit)) || (find_egglayer && !isEggLayer(unit))
|| (find_noegglayer && isEggLayer(unit))
|| (find_milkable && !isMilkable(unit)) || (find_milkable && !isMilkable(unit))
|| (find_male && !isMale(unit)) || (find_male && !isMale(unit))
|| (find_female && !isFemale(unit)) || (find_female && !isFemale(unit))