From 90dd9e932e03e18cb29196a4f5a2941649662099 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Thu, 20 Jul 2017 03:53:45 -0500 Subject: [PATCH] exclude on-duty military personnel from health labor check --- plugins/labormanager.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/labormanager.cpp b/plugins/labormanager.cpp index 699e04605..cec70ab1e 100644 --- a/plugins/labormanager.cpp +++ b/plugins/labormanager.cpp @@ -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++;