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

make inv item stuff serializable

Browse Source
This commit is contained in:
jake 2020-11-09 18:54:44 -07:00
parent 9de04ad87b
commit 2d5f83fab6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/entity/item/mod.rs
View File

@ -17,10 +17,10 @@ use crate::ship::drops::ItemDropType;
pub struct ItemEntityId(pub u32); pub struct ItemEntityId(pub u32);
#[derive(Hash, PartialEq, Eq, Debug, Clone)] #[derive(Hash, PartialEq, Eq, Debug, Clone)]
pub struct ItemId(u32); pub struct ItemId(u32);
#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)] #[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
pub struct BankName(pub String); pub struct BankName(pub String);
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub enum ItemLocation { pub enum ItemLocation {
Inventory { Inventory {
character_id: CharacterEntityId, character_id: CharacterEntityId,
@ -167,7 +167,7 @@ pub struct NewItemEntity {
pub item: ItemDetail, pub item: ItemDetail,
} }
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
pub struct ItemEntity { pub struct ItemEntity {
pub id: ItemEntityId, pub id: ItemEntityId,
pub location: ItemLocation, pub location: ItemLocation,
@ -175,7 +175,7 @@ pub struct ItemEntity {
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug, Serialize, Deserialize)]
pub enum InventoryItemEntity { pub enum InventoryItemEntity {
Individual(ItemEntity), Individual(ItemEntity),
Stacked(Vec<ItemEntity>), Stacked(Vec<ItemEntity>),

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

@ -3,8 +3,9 @@ mod floor;
mod inventory; mod inventory;
mod manager; mod manager;
pub mod use_tool; pub mod use_tool;
use serde::{Serialize, Deserialize};
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq, Serialize, Deserialize)]
pub struct ClientItemId(pub u32); pub struct ClientItemId(pub u32);
// TODO: remove these and fix use statements in the rest of the codebase // TODO: remove these and fix use statements in the rest of the codebase