Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'aweinstock/tradefixes-20210314' into 'master'

Browse Source 
Client-side trade fixes: update recipe cache and always put client on the same...

See merge request veloren/veloren!1904
This commit is contained in:
Forest Anderson 2021-03-15 04:52:09 +00:00
commit 0049976da9
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/lib.rs
View File

@ -1641,6 +1641,7 @@ impl Client {
},
ServerGeneral::FinishedTrade(result) => {
if let Some((_, trade)) = self.pending_trade.take() {
self.update_available_recipes();
frontend_events.push(Event::TradeComplete { result, trade })
}
},

23
voxygen/src/hud/trade.rs
View File

@ -156,21 +156,28 @@ impl<'a> Trade<'a> {
state: &mut ConrodState<'_, State>,
ui: &mut UiCell<'_>,
trade: &'a PendingTrade,
who: usize,
ours: bool,
) -> <Self as Widget>::Event {
let inventories = self.client.inventories();
let uid = trade.parties[who];
let entity = self.client.state().ecs().entity_from_uid(uid.0)?;
let ours = entity == self.client.entity();
let check_if_us = |who: usize| -> Option<_> {
let uid = trade.parties[who];
let entity = self.client.state().ecs().entity_from_uid(uid.0)?;
let is_ours = entity == self.client.entity();
Some(((who, uid, entity), is_ours))
};
let (who, uid, entity) = match check_if_us(0)? {
(x, is_ours) if ours == is_ours => x,
_ => check_if_us(1)?.0,
};
// TODO: update in accordence with https://gitlab.com/veloren/veloren/-/issues/960
let inventory = inventories.get(entity)?;
// Alignment for Grid
let mut alignment = Rectangle::fill_with([200.0, 340.0], color::TRANSPARENT);
if who % 2 == 0 {
if !ours {
alignment = alignment.top_left_with_margins_on(state.ids.bg, 180.0, 46.5);
} else {
alignment = alignment.right_from(state.ids.inv_alignment[0], 0.0);
alignment = alignment.right_from(state.ids.inv_alignment[1 - who], 0.0);
}
alignment
.scroll_kids_vertically()
@ -516,8 +523,8 @@ impl<'a> Widget for Trade<'a> {
self.title(&mut state, ui);
self.phase_indicator(&mut state, ui, &trade);
event = self.item_pane(&mut state, ui, &trade, 0).or(event);
event = self.item_pane(&mut state, ui, &trade, 1).or(event);
event = self.item_pane(&mut state, ui, &trade, false).or(event);
event = self.item_pane(&mut state, ui, &trade, true).or(event);
event = self
.accept_decline_buttons(&mut state, ui, &trade)
.or(event);