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

Merge branch 'develop' of gh:dfhack/dfhack into develop

develop
lethosor 2018-06-20 12:10:52 -04:00
parent 7036cc376b 2c106fa7a5
commit cdca28ddfa
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

@ -52,6 +52,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
- `ban-cooking`: fixed errors introduced by kitchen structure changes in 0.44.10-r1 - `ban-cooking`: fixed errors introduced by kitchen structure changes in 0.44.10-r1
- `remove-stress`: fixed an error when running on soul-less units (e.g. with ``-all``) - `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 - `revflood`: stopped revealing tiles adjacent to tiles above open space inappropriately
- `stockpiles`: ``loadstock`` sets usable and unusable weapon and armor settings
## Misc Improvements ## Misc Improvements
- Added script name to messages produced by ``qerror()`` in Lua scripts - 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(); bool usable = weapons.usable();
debug() << "unusable " << unusable << endl; debug() << "unusable " << unusable << endl;
debug() << "usable " << usable << endl; debug() << "usable " << usable << endl;
mPile->settings.weapons.unusable = unusable;
mPile->settings.weapons.usable = usable;
// weapon type // weapon type
unserialize_list_itemdef ( [=] ( const size_t & idx ) -> const std::string& unserialize_list_itemdef ( [=] ( const size_t & idx ) -> const std::string&
@ -2127,6 +2129,8 @@ void StockpileSerializer::read_armor()
bool usable = armor.usable(); bool usable = armor.usable();
debug() << "unusable " << unusable << endl; debug() << "unusable " << unusable << endl;
debug() << "usable " << usable << endl; debug() << "usable " << usable << endl;
mPile->settings.armor.unusable = unusable;
mPile->settings.armor.usable = usable;
// body type // body type
unserialize_list_itemdef ( [=] ( const size_t & idx ) -> const std::string& unserialize_list_itemdef ( [=] ( const size_t & idx ) -> const std::string&