From 06b8fa7979dd983f7c5dc68b1ed045660ab1059d Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Fri, 21 Feb 2025 05:42:43 +0100 Subject: [PATCH] Sucessfully imports data on napkin example --- .ignore | 1 + weaponry/databases/weapons.db | Bin 28672 -> 28672 bytes weaponry/examples/test_serialisation_wl.rs | 3 +- weaponry/src/error.rs | 6 ++- .../src/weaponry_structs/equipement_fields.rs | 35 +++++++++--------- .../equipement_impl_basics.rs | 7 +++- .../equipement_impl_database.rs | 6 ++- .../weaponry_structs/equipement_impl_logic.rs | 12 +++--- .../weaponry_structs/equipement_impl_math.rs | 6 +-- .../weaponry_structs/equipement_structs.rs | 25 +++++++------ weaponry/src/weaponry_structs/mod.rs | 2 +- 11 files changed, 58 insertions(+), 45 deletions(-) create mode 100644 .ignore diff --git a/.ignore b/.ignore new file mode 100644 index 0000000..8e062ad --- /dev/null +++ b/.ignore @@ -0,0 +1 @@ +*.drawio diff --git a/weaponry/databases/weapons.db b/weaponry/databases/weapons.db index d0343f193cd15f2ecd4c903207456e5b6c37d814..7e68296556a73157c15701a56fda77c29bc0a713 100644 GIT binary patch literal 28672 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 delta 675 zcmY*WOH30{6n$^rOy|>fhEk^Obc$073k)Wrq$P@Cgb+T8!RV$zA{~4rBSUL{64MZI zhdan!xP*l<)|E{cYFM+qTs@}Ig+ZXX}3cW&B`N{7o zH;#to(&%@e-AtKr_3t1M1?_*t@egOtUr#0$k?0dyx zWj)^4KXAMc9*1){59bXNry*@jhT8SSLbmL>%YnuQ8EWBP$VW$E%)A6g(HYru4vko0 zEJ<)x55gNm4P19Jd`Utyn*(uP|Is_|F16oRa=52PIM#^E#{d$SsQ&;7erUAA+aGj_e&pmze{& ztyCE=IE=$#Y8wjRS@ep`K5@qCmgII5xTXT1^#E*|Q;?3$!h3Vl=OQ%jWpqL5uWxWM zW^%4uub!AEbw2*pO2mU48Nd_yvU7*7(rl@CGfUTGKche$2x|)?p2zB4wk;b8pde7VkZF?*68<#P% A3;+NC diff --git a/weaponry/examples/test_serialisation_wl.rs b/weaponry/examples/test_serialisation_wl.rs index abd1d3f..d5d9ad0 100644 --- a/weaponry/examples/test_serialisation_wl.rs +++ b/weaponry/examples/test_serialisation_wl.rs @@ -26,6 +26,7 @@ fn main() { // }) // .sum::(); let f = intermediate_deserialisation.iter().fold((0, 0), |val, res| (val.0 + res.is_ok() as usize, val.1 + 1_usize)); - println!("Final data {:#?}", intermediate_deserialisation); + // println!("Final data {:#?}", intermediate_deserialisation); + println!("Failed to parse: {:#?}", intermediate_deserialisation.into_iter().filter_map(|v| v.err()).collect::>()); println!("Succeded in parsing {}/{}", f.0, f.1); } diff --git a/weaponry/src/error.rs b/weaponry/src/error.rs index dff152a..808b9d8 100644 --- a/weaponry/src/error.rs +++ b/weaponry/src/error.rs @@ -20,10 +20,14 @@ pub enum FatalEquipementError { #[error("Deserialisation from json failed : {0}")] SerdeJSON(#[from] serde_json::Error), - #[error("Deserialisation from json failed at line {line} : {error}]")] + #[error( + "Deserialisation from json failed at line {line} on file {file} while trying to parse the value: {parsed_value}: {error}]" + )] SerdeJSONAt { line: String, + file: String, error: serde_json::Error, + parsed_value: String, }, #[error("Couldn't convert into type {origin_type} with data {data}")] diff --git a/weaponry/src/weaponry_structs/equipement_fields.rs b/weaponry/src/weaponry_structs/equipement_fields.rs index dd6efeb..cd52da0 100644 --- a/weaponry/src/weaponry_structs/equipement_fields.rs +++ b/weaponry/src/weaponry_structs/equipement_fields.rs @@ -7,8 +7,6 @@ use std::fmt::Display; use std::ops::Add; use strum::Display; -use crate::error::FatalEquipementError; - #[derive(Clone, Default, Debug, Deserialize, Serialize)] #[cfg_attr(test, derive(PartialEq))] /// The special category, a vec of string, for display purposes only @@ -36,21 +34,21 @@ pub enum PhysicalDamageType { Pierce, } -impl TryFrom<&str> for PhysicalDamageType { - type Error = FatalEquipementError; +// impl TryFrom<&str> for PhysicalDamageType { +// type Error = FatalEquipementError; - fn try_from(value: &str) -> Result { - match value.to_ascii_lowercase().as_str() { - "blunt" => Ok(Self::Blunt), - "slash" => Ok(Self::Slash), - "pierce" => Ok(Self::Pierce), - _ => Err(FatalEquipementError::Conversion { - origin_type: std::any::type_name::().to_owned(), - data: value.to_string(), - }), - } - } -} +// fn try_from(value: &str) -> Result { +// match value.to_ascii_lowercase().as_str() { +// "blunt" => Ok(Self::Blunt), +// "slash" => Ok(Self::Slash), +// "pierce" => Ok(Self::Pierce), +// _ => Err(FatalEquipementError::Conversion { +// origin_type: std::any::type_name::().to_owned(), +// data: value.to_string(), +// }), +// } +// } +// } /// Weapon damage, combining the base weapon damage type and it's level /// @@ -149,7 +147,7 @@ pub enum WeaponCategory { /// The list of initial weapon meta categories #[allow(clippy::missing_docs_in_private_items, missing_docs)] #[derive(Clone, Debug, PartialEq, Display, Deserialize, Serialize, strum::EnumString)] -pub enum WeaponMetaCategory { +pub enum WeaponMacroCategory { Staves, Blunt, Slash, @@ -157,6 +155,9 @@ pub enum WeaponMetaCategory { Armor, Shields, Exotic, + /// A custom none category, used to forbid a part to be cast upon of from + // TODO: Check the soundness of this implementation + None, } #[cfg(test)] diff --git a/weaponry/src/weaponry_structs/equipement_impl_basics.rs b/weaponry/src/weaponry_structs/equipement_impl_basics.rs index 3d27023..509ea8e 100644 --- a/weaponry/src/weaponry_structs/equipement_impl_basics.rs +++ b/weaponry/src/weaponry_structs/equipement_impl_basics.rs @@ -42,7 +42,10 @@ impl From for Equipement { // TODO : Checks that this is exactly desired behavious // :Also check for Cross Weapon/Armor contamination // Checks that the nature is compatible with the previous iteration - filter_function: FilterFunction::new(&|sel, lhs| match (&sel.target, &lhs.category) { + filter_function: FilterFunction::new(&|sel, lhs| match ( + &sel.target, + &lhs.macro_category, + ) { (Some(a), Some(b)) => a == b, (None, None) => true, _ => false, @@ -83,7 +86,7 @@ impl Display for InnerEquipementStats { self.cost, self.difficulty, self.tier, - self.category + self.macro_category .clone() .map_or_else(|| "ΓΈ".to_string(), |v| v.to_string()) )]); diff --git a/weaponry/src/weaponry_structs/equipement_impl_database.rs b/weaponry/src/weaponry_structs/equipement_impl_database.rs index 9541279..58611ac 100644 --- a/weaponry/src/weaponry_structs/equipement_impl_database.rs +++ b/weaponry/src/weaponry_structs/equipement_impl_database.rs @@ -77,7 +77,9 @@ impl FixedRecipe for EquipementFixedRecipe { macro_rules! from_serde { ($value: expr) => { serde_json::from_str(&$value).map_err(|error| FatalEquipementError::SerdeJSONAt { - line: format!("{} line {}", file!(), line!()), + line: line!().to_string(), + file: file!().to_string(), + parsed_value: $value.to_string(), error, }) }; @@ -112,7 +114,7 @@ impl TryFrom for InnerEquipementStats { parry: value.parry, speed: value.speed, stealth: value.stealth, - category: from_serde!(&value.category)?, + macro_category: from_serde!(&value.category)?, target: from_serde!(&value.target)?, special: from_serde!(&value.special)?, action_cost: value.action_cost, diff --git a/weaponry/src/weaponry_structs/equipement_impl_logic.rs b/weaponry/src/weaponry_structs/equipement_impl_logic.rs index a7f5d6a..ae5370c 100644 --- a/weaponry/src/weaponry_structs/equipement_impl_logic.rs +++ b/weaponry/src/weaponry_structs/equipement_impl_logic.rs @@ -53,7 +53,7 @@ mod test { interfaces::RecipeCollection, weaponry_structs::{ DamageMod, DamageType, Equipement, InitialEquipementList, SpecialCategory, - equipement_fields::{PhysicalDamageType, WeaponMetaCategory}, + equipement_fields::{PhysicalDamageType, WeaponMacroCategory}, equipement_structs::InnerEquipementStats, }, }; @@ -93,8 +93,8 @@ mod test { rarity: 1, integrity: 2, range: 3, - agility_bonus: 4, - category: Some(WeaponMetaCategory::Staves), + agility_bonus: 4., + macro_category: Some(WeaponMacroCategory::Staves), special: SpecialCategory(vec!["zero".into()]), damage_type: Some(DamageType(vec![DamageMod::Secondary( PhysicalDamageType::Slash, @@ -103,7 +103,7 @@ mod test { }; let i2 = InnerEquipementStats { integrity: 3, - agility_bonus: 5, + agility_bonus: 5., damage: 10, damage_type: Some(DamageType(vec![DamageMod::Primary( PhysicalDamageType::Blunt, @@ -116,10 +116,10 @@ mod test { InnerEquipementStats { rarity: 1, integrity: 5, - agility_bonus: 9, + agility_bonus: 9., damage: 10, range: 3, - category: Some(WeaponMetaCategory::Staves), + macro_category: Some(WeaponMacroCategory::Staves), special: SpecialCategory(vec!["zero".into(), "one".into(), "two".into()]), damage_type: Some(DamageType(vec![ DamageMod::Secondary(PhysicalDamageType::Slash,), diff --git a/weaponry/src/weaponry_structs/equipement_impl_math.rs b/weaponry/src/weaponry_structs/equipement_impl_math.rs index 8a677e8..e6e376d 100644 --- a/weaponry/src/weaponry_structs/equipement_impl_math.rs +++ b/weaponry/src/weaponry_structs/equipement_impl_math.rs @@ -55,9 +55,9 @@ impl std::ops::Add for &InnerEquipementStats { parry: self.parry + rhs.parry, speed: self.speed + rhs.speed, stealth: self.stealth + rhs.stealth, - category: self.category.clone().or(rhs.category.clone()), // Can be further optimized - target: self.target.clone().or(rhs.target.clone()), // Can be further optimized - special: self.special.clone() + rhs.special.clone(), // Can be further optimized + macro_category: self.macro_category.clone().or(rhs.macro_category.clone()), // Can be further optimized + target: self.target.clone().or(rhs.target.clone()), // Can be further optimized + special: self.special.clone() + rhs.special.clone(), // Can be further optimized action_cost: self.action_cost + rhs.action_cost, reload_cost: self.reload_cost.or(rhs.reload_cost), range: self.range + rhs.range, diff --git a/weaponry/src/weaponry_structs/equipement_structs.rs b/weaponry/src/weaponry_structs/equipement_structs.rs index d74ddfd..e0899ef 100644 --- a/weaponry/src/weaponry_structs/equipement_structs.rs +++ b/weaponry/src/weaponry_structs/equipement_structs.rs @@ -8,7 +8,7 @@ use crate::interfaces::{FilterFunction, FilterFunctionType}; use more_fields::FieldsAsSlice; use serde::{Deserialize, Serialize}; -use super::{DamageType, SpecialCategory, WeaponCategory, equipement_fields::WeaponMetaCategory}; +use super::{DamageType, SpecialCategory, WeaponCategory, equipement_fields::WeaponMacroCategory}; /// The final equipement list /// @@ -75,17 +75,18 @@ pub struct InnerEquipementStats { pub(super) integrity: i8, pub(super) torque_two_handed: Option, // Might be option (single claw) pub(super) torque_one_handed: Option, // Should be option (bows) - pub(super) dodge: i8, + pub(super) dodge: f32, // I could also use a custom HalfValue pub(super) parry: i8, pub(super) speed: i8, pub(super) stealth: i8, - pub(super) category: Option, - pub(super) target: Option, // TODO: This might be incorrect, to check + /// The initial macro category, in turn combined with other stats it will describe a final category + pub(super) macro_category: Option, // TODO : This initial macro category fill as a final stat feed the final category + pub(super) target: Option, // TODO: This might be incorrect, to check pub(super) special: SpecialCategory, pub(super) action_cost: i8, pub(super) reload_cost: Option, // Shouldn't it be Option ? pub(super) range: i8, // Shoudln't it be Option ? - pub(super) agility_bonus: i8, + pub(super) agility_bonus: f32, // Also convert this one to HalfValue } // TODO: This implementation of default is painfull @@ -129,8 +130,8 @@ pub struct DatabaseEquipementStats { pub integrity: i8, pub torque_two_handed: String, pub torque_one_handed: String, - #[INTEGER] - pub dodge: i8, + #[REAL] + pub dodge: f32, #[INTEGER] pub parry: i8, #[INTEGER] @@ -145,8 +146,8 @@ pub struct DatabaseEquipementStats { pub reload_cost: String, #[INTEGER] pub range: i8, - #[INTEGER] - pub agility_bonus: i8, + #[REAL] + pub agility_bonus: f32, } impl Default for DatabaseEquipementStats { @@ -156,7 +157,7 @@ impl Default for DatabaseEquipementStats { meta_category: "EqShape".to_string(), name: String::new(), damage_type: serde_json::to_string(&None::).unwrap(), - category: serde_json::to_string(&None::).unwrap(), + category: serde_json::to_string(&None::).unwrap(), target: serde_json::to_string(&None::).unwrap(), special: serde_json::to_string(&SpecialCategory::default()).unwrap(), reload_cost: serde_json::to_string(&None::).unwrap(), @@ -175,12 +176,12 @@ impl Default for DatabaseEquipementStats { integrity: 0, torque_two_handed: serde_json::to_string(&0).unwrap(), torque_one_handed: serde_json::to_string(&None::).unwrap(), - dodge: 0, + dodge: 0., parry: 0, speed: 0, stealth: 0, range: 0, - agility_bonus: 0, + agility_bonus: 0., action_cost: 0, } } diff --git a/weaponry/src/weaponry_structs/mod.rs b/weaponry/src/weaponry_structs/mod.rs index cf3aab5..e4ab206 100644 --- a/weaponry/src/weaponry_structs/mod.rs +++ b/weaponry/src/weaponry_structs/mod.rs @@ -35,5 +35,5 @@ pub use equipement_structs::{Equipement, InitialEquipementList}; // #[allow(unused_imports)] pub use equipement_fields::PhysicalDamageType; pub use equipement_fields::{ - DamageMod, DamageType, NatureTarget, SpecialCategory, WeaponCategory, WeaponMetaCategory, + DamageMod, DamageType, NatureTarget, SpecialCategory, WeaponCategory, WeaponMacroCategory, };