Merge pull request #3565 from myk002/myk_exotic

[stockpiles] include exotic pets as tameable
develop
Myk 2023-07-16 12:01:22 -07:00 committed by GitHub
commit e1ad92295c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

@ -40,6 +40,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
- Fix extra keys appearing in DFHack text boxes when shift (or any other modifier) is released before the other key you were pressing
## Misc Improvements
- `stockpiles`: include exotic pets in the "tameable" filter
- `autonick`: add more variety to nicknames based on famous literary dwarves
- ``widgets.EditField``: DFHack edit fields now support cut/copy/paste with the system clipboard with Ctrl-X/Ctrl-C/Ctrl-V
- Suppress DF keyboard events when a DFHack keybinding is matched. This prevents, for example, a backtick from appearing in a textbox as text when you launch `gui/launcher` from the backtick keybinding.

@ -615,7 +615,9 @@ static bool serialize_list_creature(color_ostream& out, FuncWriteExport add_valu
}
static string get_filter_string(df::creature_raw *r) {
if (!r->caste.size() || !r->caste[0]->flags.is_set(df::enums::caste_raw_flags::PET))
if (!r->caste.size() ||
(!r->caste[0]->flags.is_set(df::enums::caste_raw_flags::PET) &&
!r->caste[0]->flags.is_set(df::enums::caste_raw_flags::PET_EXOTIC)))
return r->name[0];
return r->name[0] + "/tameable";
}