diff --git a/weaponry/databases/weapons.db b/weaponry/databases/weapons.db index f361221..9ddfd19 100644 Binary files a/weaponry/databases/weapons.db and b/weaponry/databases/weapons.db differ diff --git a/weaponry/examples/serde_loading.rs b/weaponry/examples/serde_loading.rs new file mode 100644 index 0000000..4397a3a --- /dev/null +++ b/weaponry/examples/serde_loading.rs @@ -0,0 +1,27 @@ +// Workspace: weaponry +// File: examples/typical_wl_recipe.rs +//! Example of a typical workload +//! + +use serde_rusqlite::to_params; +use weaponry::interfaces::RecipeDatabase; +use weaponry::weaponry_structs::equipement_impl_database::EquipementDatabase; +use weaponry::weaponry_structs::equipement_structs::InnerEquipementStats; + +fn main() { + let db = EquipementDatabase::new("./databases/weapons.db").unwrap(); + db.initialize_empty_table::("Eq_test") + .unwrap(); + let v = db.serialize_vec_from_table::("InnerStats", None); + db.conn + .execute( + "INSERT INTO example (id, name) VALUES (?,?)", + to_params(InnerEquipementStats::random_new()).unwrap(), + ) + .unwrap(); + // let mut r = db.conn.prepare("SELECT * FROM InnerStats").unwrap(); + // let mut v = r.query([]).unwrap(); + // println!("{:?}:\n {:#?}", db, r); + + println!("{:?}", v); +} diff --git a/weaponry/src/weaponry_structs/equipement_impl_database.rs b/weaponry/src/weaponry_structs/equipement_impl_database.rs index 563d3fe..7b4aa33 100644 --- a/weaponry/src/weaponry_structs/equipement_impl_database.rs +++ b/weaponry/src/weaponry_structs/equipement_impl_database.rs @@ -13,6 +13,7 @@ use rusqlite::Connection; use serde::de::DeserializeOwned; /// Struct for database connection. +#[derive(Debug)] pub struct EquipementDatabase { /// Connection parameter for rusqlite pub conn: rusqlite::Connection, diff --git a/weaponry/src/weaponry_structs/equipement_structs.rs b/weaponry/src/weaponry_structs/equipement_structs.rs index 781991e..5fc278a 100644 --- a/weaponry/src/weaponry_structs/equipement_structs.rs +++ b/weaponry/src/weaponry_structs/equipement_structs.rs @@ -52,15 +52,50 @@ impl FilterFunction { Self(Box::new(Rc::new(filter))) } } - /// The inner statistics of the equipement, used across all parts and final weapon #[allow(clippy::missing_docs_in_private_items, missing_docs)] #[derive(Clone, Default, FieldsAsSlice, Debug, Deserialize, Serialize)] #[cfg_attr(test, derive(PartialEq))] pub struct InnerEquipementStats { - #[INTEGER] pub id: Vec, pub name: Vec, + pub(super) rarity: u8, + pub(super) cost: u8, + pub(super) difficulty: u8, + pub(super) tier: u8, + pub(super) damage: u8, + pub(super) p_damage: u8, + pub(super) precision: i8, + pub(super) rmax: u8, + pub(super) armor_break: u8, + pub(super) armor_pierce: u8, + pub(super) antimaterial: u8, + pub(super) damage_type: Option, + pub(super) protection: u8, + pub(super) integrity: u8, + pub(super) torque_two_handed: u8, + pub(super) torque_one_handed: u8, + pub(super) dodge: u8, + pub(super) parry: u8, + pub(super) speed: u8, + pub(super) stealth: u8, + pub(super) category: Option, + pub(super) target: Option, + pub(super) special: SpecialCategory, + pub(super) action_cost: u8, + pub(super) reload_cost: Option, + pub(super) range: u8, + pub(super) agility_bonus: u8, +} + +#[allow(clippy::missing_docs_in_private_items, missing_docs)] +#[derive(Clone, Default, FieldsAsSlice, Debug, Deserialize, Serialize)] +#[cfg_attr(test, derive(PartialEq))] +pub struct DatabaseEquipementStats { + #[INTEGER] + pub id: u8, + pub meta_category: String, + pub name: String, #[INTEGER] pub(super) rarity: u8, #[INTEGER] @@ -83,7 +118,7 @@ pub struct InnerEquipementStats { pub(super) armor_pierce: u8, #[INTEGER] pub(super) antimaterial: u8, - pub(super) damage_type: Option, + pub(super) damage_type: String, #[INTEGER] pub(super) protection: u8, #[INTEGER] @@ -100,12 +135,12 @@ pub struct InnerEquipementStats { pub(super) speed: u8, #[INTEGER] pub(super) stealth: u8, - pub(super) category: Option, - pub(super) target: Option, - pub(super) special: SpecialCategory, + pub(super) category: String, + pub(super) target: String, + pub(super) special: String, #[INTEGER] pub(super) action_cost: u8, - pub(super) reload_cost: Option, + pub(super) reload_cost: String, #[INTEGER] pub(super) range: u8, #[INTEGER]