jake/elseware
1
0
Fork 0
Code Issues 63 Pull Requests 1 Projects Releases Wiki Activity

I am dumb

Browse Source
This commit is contained in:
jake 2022-05-15 00:55:09 -06:00 committed by andy
parent cf09433df2
commit b473af7680
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ship/items/actions.rs
View File

@ -494,6 +494,7 @@ fn equip_inventory_item(character_id: CharacterEntityId, item_id: ClientItemId,
let mut inventory = item_state.inventory(&character_id)?; let mut inventory = item_state.inventory(&character_id)?;
inventory.equip(&item_id, equip_slot); inventory.equip(&item_id, equip_slot);
transaction.gateway().set_character_equips(&character_id, &inventory.as_equipped_entity()).await?; transaction.gateway().set_character_equips(&character_id, &inventory.as_equipped_entity()).await?;
item_state.set_inventory(inventory);
Ok(((item_state, transaction), ())) Ok(((item_state, transaction), ()))
}) })
@ -522,7 +523,6 @@ where
} }
fn unequip_inventory_item(character_id: CharacterEntityId, item_id: ClientItemId) fn unequip_inventory_item(character_id: CharacterEntityId, item_id: ClientItemId)
-> impl for<'a> Fn((ItemStateProxy<'a>, Box<dyn EntityGatewayTransaction + 'a>), ()) -> impl for<'a> Fn((ItemStateProxy<'a>, Box<dyn EntityGatewayTransaction + 'a>), ())
-> Pin<Box<dyn Future<Output=Result<((ItemStateProxy<'a>, Box<dyn EntityGatewayTransaction + 'a>), ()), ItemStateError>> + Send + 'a>> -> Pin<Box<dyn Future<Output=Result<((ItemStateProxy<'a>, Box<dyn EntityGatewayTransaction + 'a>), ()), ItemStateError>> + Send + 'a>>
@ -532,6 +532,7 @@ fn unequip_inventory_item(character_id: CharacterEntityId, item_id: ClientItemId
let mut inventory = item_state.inventory(&character_id)?; let mut inventory = item_state.inventory(&character_id)?;
inventory.unequip(&item_id); inventory.unequip(&item_id);
transaction.gateway().set_character_equips(&character_id, &inventory.as_equipped_entity()).await?; transaction.gateway().set_character_equips(&character_id, &inventory.as_equipped_entity()).await?;
item_state.set_inventory(inventory);
Ok(((item_state, transaction), ())) Ok(((item_state, transaction), ()))
}) })

4
tests/test_item_actions.rs
View File

@ -47,8 +47,8 @@ async fn test_equip_unit_from_equip_menu() {
}).await.unwrap()); }).await.unwrap());
let equipped = item::EquippedEntity { let equipped = item::EquippedEntity {
weapon: Some(p1_inv[0].id), weapon: None,
armor: None, armor: Some(p1_inv[0].id),
shield: None, shield: None,
unit: [None; 4], unit: [None; 4],
mag: None, mag: None,