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

Merge branch 'develop' into check_jobs_on_mapcache_commit_1229

develop
Lethosor 2018-06-18 21:50:14 -04:00 committed by GitHub
parent bcf9387ce9 2c106fa7a5
commit f9de49283c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.txt
Unescape Escape View File

@ -49,6 +49,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
- `remove-stress`: fixed an error when running on soul-less units (e.g. with ``-all``)
- `revflood`: stopped revealing tiles adjacent to tiles above open space inappropriately
- `dig`: Fix "Inappropriate dig square" announcements if digging job has been posted
- `stockpiles`: ``loadstock`` sets usable and unusable weapon and armor settings
## Misc Improvements
- Added script name to messages produced by ``qerror()`` in Lua scripts

4
plugins/stockpiles/StockpileSerializer.cpp
Unescape Escape View File

@ -1964,6 +1964,8 @@ void StockpileSerializer::read_weapons()
bool usable = weapons.usable();
debug() << "unusable " << unusable << endl;
debug() << "usable " << usable << endl;
mPile->settings.weapons.unusable = unusable;
mPile->settings.weapons.usable = usable;
// weapon type
unserialize_list_itemdef ( [=] ( const size_t & idx ) -> const std::string&
@ -2127,6 +2129,8 @@ void StockpileSerializer::read_armor()
bool usable = armor.usable();
debug() << "unusable " << unusable << endl;
debug() << "usable " << usable << endl;
mPile->settings.armor.unusable = unusable;
mPile->settings.armor.usable = usable;
// body type
unserialize_list_itemdef ( [=] ( const size_t & idx ) -> const std::string&