From 8bb6d09b15ecc72477827e9a7339c1a2a1290296 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Tue, 18 Feb 2025 23:50:22 +0100 Subject: [PATCH] Lay the groundwork for the database intermediate object representation --- weaponry/databases/weapons.db | Bin 28672 -> 28672 bytes weaponry/examples/serde_loading.rs | 27 ++++++++++ .../equipement_impl_database.rs | 1 + .../weaponry_structs/equipement_structs.rs | 49 +++++++++++++++--- 4 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 weaponry/examples/serde_loading.rs diff --git a/weaponry/databases/weapons.db b/weaponry/databases/weapons.db index f361221defc013df358aa2cb237d2de131edd91b..9ddfd1985b8da960e01c8e1208ff646d29976378 100644 GIT binary patch literal 28672 zcmeI)O>f&a7zc34Z;IV!E|6_TkPcvcsf}bsi*_r9qG+9l&4fB~YRl__9Rx;VTw%84 z$n?@;r*s{#eT03Mop;!WSU*KiJB@m=WqU}M0=;@+D!4w9Pd z5Zy589&K-XY`}?0zcsf57P#WYw8HjBV!GqF$H%Tc?$6WrY$8*RsTmVKS0o;0tbx z*~__};Jvx=2|qX)b4#51)-&cgJS9nLe2*{IIKDGGN)`mE*J#LR&M^|4^~JMkjJ6EA z=ga01wO~Pyi?}TN+2LrS3Km6e&DjUM?=vSpmfR?BCJNSb`|`e7N4_^6O|M4|+WLN@ zeMlbD!`e01xkegYv!xp{ANHwX*6WvVWNvPJzPWPtqX^tyj|UF#bHS~V2*$RsTu1jj z9&`i~qe%|6^*xy}WU(PB5xF!TnX+z|HmOXvmO;|)r5(Db8&RXA`cb>JPjtZtx5}{jnT4KaEc} z3o%y{S)3`WT4jA*J^L=2MTT@{ZYz<`94Y1Rwwb2tWV=5P$##AOHafER{ehj8?w?FaKSBvs8g2 zSO`D>0uX=z1Rwwb2tWV=5P$##E+CN4s_M$hA1mut8Uk4=utA{Gch z00Izz00bZa0SG_<0uX=z1eR8ykXJC^dkv-Cbrk+`c-=sL<=MhaIXxfkpbk2o?iD zZ5A@_Yqi3|M;d^I$AwiF6z~6o2g=^o-LNm2hb0vZyPD#=2}>Rav>3r!X}i`98VD|_ zE&KamzNF5;R3sM%4Qk0lZtY>8P@)<9u-vErv4oSqxkSm311y9-_AsD*mxhvJSMF&> zwuFgwL55P$zYv36LbvY(hd62;VUwcV+*kP_(3#-okM)>QWna!#t1UUfE z2YOM<_Kf1yk(("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]