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

allow semi-wild units to be butchered

develop
Myk Taylor 2023-09-16 19:08:38 -07:00
parent dc270abd0c
commit 48c48baab4
No known key found for this signature in database
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.txt
Unescape Escape View File

@ -57,6 +57,7 @@ Template for new versions:
## Fixes ## Fixes
- Linux launcher: preserve LD_PRELOAD set by Steam, so Steam Overlay and game streaming works - Linux launcher: preserve LD_PRELOAD set by Steam, so Steam Overlay and game streaming works
- `autobutcher`: allow semi-wild units to be butchered again
## Misc Improvements ## Misc Improvements

3
plugins/autobutcher.cpp
Unescape Escape View File

@ -746,7 +746,8 @@ static bool isInappropriateUnit(df::unit *unit) {
static bool isProtectedUnit(df::unit *unit) { static bool isProtectedUnit(df::unit *unit) {
return Units::isWar(unit) // ignore war dogs etc return Units::isWar(unit) // ignore war dogs etc
|| Units::isHunter(unit) // ignore hunting dogs etc || Units::isHunter(unit) // ignore hunting dogs etc
|| Units::isMarkedForTraining(unit) // ignore units marked for any kind of training || Units::isMarkedForWarTraining(unit) // ignore units marked for any kind of training
|| Units::isMarkedForHuntTraining(unit)
// ignore creatures in built cages which are defined as rooms to leave zoos alone // ignore creatures in built cages which are defined as rooms to leave zoos alone
// (TODO: better solution would be to allow some kind of slaughter cages which you can place near the butcher) // (TODO: better solution would be to allow some kind of slaughter cages which you can place near the butcher)
|| (isContainedInItem(unit) && isInBuiltCageRoom(unit)) // !!! see comments in isBuiltCageRoom() || (isContainedInItem(unit) && isInBuiltCageRoom(unit)) // !!! see comments in isBuiltCageRoom()