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

zone: stop enumnick from taking priority over assign/unassign/slaughter 

Fixes #1709
Ref #1652
develop
lethosor 2020-11-15 22:18:54 -05:00
parent 8319d71dff
commit 0b886399fe
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.txt
Unescape Escape View File

@ -39,6 +39,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
- `buildingplan`: no longer erroneously matches items to buildings while the game is paused - `buildingplan`: no longer erroneously matches items to buildings while the game is paused
- `dwarfmonitor`: fixed a crash when opening the ``prefs`` screen if units have vague preferences - `dwarfmonitor`: fixed a crash when opening the ``prefs`` screen if units have vague preferences
- `embark-assistant`: fixed an issue causing incursion resource matching (e.g. sand/clay) to skip some tiles if those resources were provided only through incursions - `embark-assistant`: fixed an issue causing incursion resource matching (e.g. sand/clay) to skip some tiles if those resources were provided only through incursions
- `zone`: fixed an issue causing the ``enumnick`` subcommand to run when attempting to run ``assign``, ``unassign``, or ``slaughter``
## Misc Improvements ## Misc Improvements
- `buildingplan`: all buildings, furniture, and constructions are now supported (except for instruments) - `buildingplan`: all buildings, furniture, and constructions are now supported (except for instruments)

9
plugins/zone.cpp
Unescape Escape View File

@ -449,7 +449,7 @@ void unitInfo(color_ostream & out, df::unit* unit, bool verbose = false)
out << ", milkable"; out << ", milkable";
if(unit->flags2.bits.slaughter) if(unit->flags2.bits.slaughter)
out << ", slaughter"; out << ", slaughter";
if(verbose) if(verbose)
{ {
out << ". Pos: ("<<unit->pos.x << "/"<< unit->pos.y << "/" << unit->pos.z << ") " << endl; out << ". Pos: ("<<unit->pos.x << "/"<< unit->pos.y << "/" << unit->pos.z << ") " << endl;
@ -1493,7 +1493,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
bool cagezone_assign = false; bool cagezone_assign = false;
bool nick_set = false; bool nick_set = false;
string target_nick; string target_nick;
bool enum_nick = true; bool enum_nick = false;
string enum_prefix; string enum_prefix;
bool verbose = false; bool verbose = false;
@ -1552,8 +1552,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
return CR_OK; return CR_OK;
} else { } else {
out.color(COLOR_BLUE); out.color(COLOR_BLUE);
out << "Current building unset (no building under" out << "Current building unset (no building under cursor)." << endl;
"cursor)." << endl;
out.reset_color(); out.reset_color();
return CR_OK; return CR_OK;
@ -2127,7 +2126,7 @@ command_result df_zone (color_ostream &out, vector <string> & parameters)
} }
continue; continue;
} }
matchedCount++; matchedCount++;
if(unit_info) if(unit_info)