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

Make can_trade() return true if at least one caravan can trade 

Fixes #900
develop
lethosor 2016-04-16 17:13:00 -04:00
parent 0d37209063
commit 8226134f67
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS.rst
Unescape Escape View File

@ -84,6 +84,7 @@ Fixes
- More plugins should recognize non-dwarf citizens - More plugins should recognize non-dwarf citizens
- Fixed a possible crash from cloning jobs - Fixed a possible crash from cloning jobs
- moveToBuilding() now sets flags for items that aren't a structural part of the building properly - moveToBuilding() now sets flags for items that aren't a structural part of the building properly
- `autotrade`, `stocks`: Made trading work when multiple caravans are present but only some can trade
- `confirm` note-delete: No longer interferes with name entry - `confirm` note-delete: No longer interferes with name entry
- `exportlegends`: Handles entities without specific races, and a few other fixes for things new to v0.42 - `exportlegends`: Handles entities without specific races, and a few other fixes for things new to v0.42
- `fastdwarf`: Fixed a bug involving teleporting mothers but not the babies they're holding. - `fastdwarf`: Fixed a bug involving teleporting mothers but not the babies they're holding.

6
plugins/uicommon.h
Unescape Escape View File

@ -263,11 +263,11 @@ static bool can_trade()
auto caravan = *it; auto caravan = *it;
auto trade_state = caravan->trade_state; auto trade_state = caravan->trade_state;
auto time_remaining = caravan->time_remaining; auto time_remaining = caravan->time_remaining;
if ((trade_state != state::Approaching && trade_state != state::AtDepot) || time_remaining == 0) if ((trade_state == state::Approaching || trade_state == state::AtDepot) && time_remaining != 0)
return false; return true;
} }
return true; return false;
} }
static bool is_metal_item(df::item *item) static bool is_metal_item(df::item *item)