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

impl grinders, fix mag pbs, fix bank thing, etc #128

Merged
jake merged 12 commits from use_grinders into master 2023-02-02 11:37:58 -05:00
Conversation 0 Commits 12 Files Changed 18 +3 -3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 45996e9d01 - Show all commits

2
src/ship/items/apply_item.rs
View File

@ -12,7 +12,7 @@ use crate::entity::item::tech::TechniqueDisk;
use crate::entity::item::{ItemDetail, ItemEntityId}; use crate::entity::item::{ItemDetail, ItemEntityId};
use crate::entity::item::weapon::WeaponModifier; use crate::entity::item::weapon::WeaponModifier;
use crate::ship::items::state::ItemStateProxy; use crate::ship::items::state::ItemStateProxy;
use crate::ship::items::inventory::{InventoryItem, InventoryItemDetail}; use crate::ship::items::inventory::InventoryItemDetail;
#[derive(Error, Debug)] #[derive(Error, Debug)]

2
src/ship/items/bank.rs
View File

@ -134,7 +134,7 @@ impl BankState {
item.item_id = ClientItemId(*bitem_id + i as u32); item.item_id = ClientItemId(*bitem_id + i as u32);
} }
*bitem_id = *bitem_id + self.bank.0.len() as u32; *bitem_id += self.bank.0.len() as u32;
} }
pub fn add_meseta(&mut self, amount: u32) -> Result<(), anyhow::Error> { pub fn add_meseta(&mut self, amount: u32) -> Result<(), anyhow::Error> {

2
src/ship/items/inventory.rs
View File

@ -214,7 +214,7 @@ impl InventoryState {
item.item_id = ClientItemId(*bitem_id + i as u32); item.item_id = ClientItemId(*bitem_id + i as u32);
} }
*bitem_id = *bitem_id + self.inventory.0.len() as u32; *bitem_id += self.inventory.0.len() as u32;
} }
pub async fn new_item_id(&mut self) -> ClientItemId { pub async fn new_item_id(&mut self) -> ClientItemId {