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

Merge pull request #1133 from ab9rf/labormanager-1101 

exclude on-duty military personnel from health labor check
develop
Lethosor 2017-07-20 11:13:44 -04:00 committed by GitHub
parent 15ed1bfd67 90dd9e932e
commit 4e55c4c916
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/labormanager.cpp
Unescape Escape View File

@ -2224,8 +2224,12 @@ private:
out.print("Dwarf \"%s\": state %s %d\n", dwarf->dwarf->name.first_name.c_str(), state_names[dwarf->state], dwarf->clear_all);
// determine if dwarf has medical needs
// babies cannot currently receive health care even if they need it
if (dwarf->dwarf->profession != profession::BABY && dwarf->dwarf->health)
if (dwarf->dwarf->health && !(
// on-duty military will not necessarily break to get minor injuries attended
ENUM_ATTR(profession, military, dwarf->dwarf->profession) ||
// babies cannot currently receive health care even if they need it
dwarf->dwarf->profession == profession::BABY)
)
{
if (dwarf->dwarf->health->flags.bits.needs_recovery)
cnt_recover_wounded++;