From 5738f0fd74ff34d3916cfc37b67526c9cbfad51f Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Thu, 20 Feb 2025 02:20:05 +0100 Subject: [PATCH] Wip on the firt import fn --- more_fields/Cargo.toml | 2 + weaponry/Cargo.toml | 3 +- weaponry/databases/weapons.db | Bin 28672 -> 28672 bytes weaponry/examples/.rustfmt.toml | 1 + weaponry/examples/serde_loading.rs | 175 ++++++++++++++++++++++------- 5 files changed, 141 insertions(+), 40 deletions(-) create mode 100644 weaponry/examples/.rustfmt.toml diff --git a/more_fields/Cargo.toml b/more_fields/Cargo.toml index ba443ad..1c83567 100644 --- a/more_fields/Cargo.toml +++ b/more_fields/Cargo.toml @@ -5,6 +5,8 @@ version.workspace = true [dependencies] more_fields_macro = {path ="../more_fields_macro"} + +[dev-dependencies] pretty_assertions = "1.4.1" [features] diff --git a/weaponry/Cargo.toml b/weaponry/Cargo.toml index 915b59d..56c961e 100644 --- a/weaponry/Cargo.toml +++ b/weaponry/Cargo.toml @@ -8,7 +8,6 @@ more_fields = {path ="../more_fields"} comfy-table = "7.1.4" csv = "1.3.1" fastrand = "2.3.0" -pretty_assertions = "1.4.1" probability = "0.20.3" rusqlite = { version = "0.33.0" } # , features = ["bundled"] serde = { version = "1.0.217", features = ["derive"] } @@ -19,6 +18,8 @@ thiserror = "2.0.11" [dev-dependencies] criterion = { version = "0.5" } +regex = "1.11.1" +pretty_assertions = "^1.4" [[bench]] name = "iter_creation" diff --git a/weaponry/databases/weapons.db b/weaponry/databases/weapons.db index f0862ffbb83007ef0f13f8c1e7db1b49184fdc40..5fea0f35eea85fe0ae67cd0919efb5579bfde3e7 100644 GIT binary patch delta 671 zcmZXRKTpCy7>9d*fIGA;Xb2&gpd^kYKwKS4qq3N|8xt!Yk))_;X>==&ZaOpRq;WEi zj(iCw!#D6N_+DE=@osq28{VhS?|0)l8qd*F70sTvY&82ke=#eXrg43uncwEUxo7+u zAI7DztN-Yeubsk!9$LJnm8&c{h_NDqAy2hbWF^K9Z@i(fykX!8pEO!HU$AkzjTTwkP$(S&luBg6Wv18!L{?0ukGIozK?rHmbyHzj z7#Q%3QK?IlMVdkKz+J~5Q7k?3s)vo1X&}#{5yV$Kj=Vv?FMLefm}H3}^16NU2Xaw} AWdHyG delta 483 zcmZp8z}WDBae_3X!9*EnMuUwB3;9L))-tg21u^j7=eOhE!C%K01cI9d6>RwGBO2@E z8F+a)fPj$^L~@ujfhi6SSy^=sK}HVlyy$ABfTGOY#G*8V9ZFgjW(FF#*NM=1$N#u^%_GB7YqgqjR7(i~y|+~jPA7xh@pHi8)mqtT3x1R8w< z)o7Tbd4a;bj2zw!AF-Hhrzp=L4e={Py=XnmNur{H9HLAdu7$xFi3O>83_tQpb8_N9 z1PDjRf=Gsw=8ep-&|-q<1nPkRumOx53|BqDO7Ej;Wm46LYlP?kIuZyBff(v!hKmeu ZjqT+bVCo>oa)6x+VuO`&a4b>?000xhVN?JB diff --git a/weaponry/examples/.rustfmt.toml b/weaponry/examples/.rustfmt.toml new file mode 100644 index 0000000..98b9e7f --- /dev/null +++ b/weaponry/examples/.rustfmt.toml @@ -0,0 +1 @@ +max_width = 278 diff --git a/weaponry/examples/serde_loading.rs b/weaponry/examples/serde_loading.rs index d9dde9f..c5de52f 100644 --- a/weaponry/examples/serde_loading.rs +++ b/weaponry/examples/serde_loading.rs @@ -4,31 +4,92 @@ //! use more_fields::FieldsAsSlice; +use serde::Serialize; use serde_rusqlite::to_params_named; use weaponry::interfaces::RecipeDatabase; +use weaponry::weaponry_structs::WeaponCategory; use weaponry::weaponry_structs::equipement_impl_database::EquipementDatabase; -use weaponry::weaponry_structs::equipement_structs::{ - DatabaseEquipementStats, InnerEquipementStats, -}; +use weaponry::weaponry_structs::equipement_structs::{DatabaseEquipementStats, InnerEquipementStats}; +// const BASE_DATA: &[[&str; 17]] = &[ +// // {Forme} & {Maniement} & {\damagew} & + & {R.Max} & \arbreakw & \protection & \integrite & $\mathbb{T}$2 & $\mathbb{T}$1 & {Modes} & {Esq.} & {Par.} & {Vit.} & {Disc.} & {Spécial} & {Diff.} \\ +// // % Nom & Type & Dé & + & RM & AB & Pr & In & T2 & T1 & Md & Esq. & Par. & Vit. & Disc. & Spc. & Diff +// ["Griffes", "Tranchantes", "2", "1", "4", "1", "1", "2", "3", "6", "slash", "2", "0", "3", "1", "-", "1"], +// ["Hast", "Hast", "4", "1", "2", "1", "4", "3", "10", "18", "pierce, [slash]", "-1", "-3", "1", "0", "-", "1"], +// ["Épée", "Tranchantes", "3", "1", "3", "1", "3", "4", "12", "15", "slash, [pierce]", "0", "1", "0", "0", "-", "1"], +// ["Marteau", "Contondantes", "5", "1", "1", "1", "4", "3", "11", "18", "blunt", "-1", "-1", "0", "-2", "-", "1"], +// ["Hache", "Tranchantes", "4", "2", "1", "3", "4", "3", "9", "14", "slash", "0", "-1", "1", "0", "-", "1"], +// ["Arbalète", "Distance", "4", "1", "3", "0", "3", "1", "8", "16", "pierce", "-1", "-1", "0", "-1", "2reload, Gls{parmure} 2, 80m", "1"], +// ["Arc", "Distance", "3", "1", "4", "0", "2", "1", "-", "7", "pierce", "0", "0", "0", "0", "1reload, Gls{parmure} 2, 120m", "1"], +// ["Biers", " -", "1", "1", "2", "0", "3", "2", "6", "8", "blunt", "-2", "0", "-1", "-2", "-", "1"], +// ["Armures", " -", " ", " ", " ", " ", "3", "2", "10", "-", "blunt", "-1", "0", "0", "-1", "-", "1"], +// // % "Explosive" , "Exotiques", "3", "1" , "3", "1", "2", "2", "20" , "10" , "slash", "0", "0", "0", "0" , "-" , "ddlvl{5}" +// // % "Flexible", "Exotiques", "3", "1" , "3", "1", "2", "2", "20" , "10" , "slash", "0", "0", "0", "0" , "-" , "ddlvl{2}" +// // % "Exotique", "Exotiques", "3", "1" , "3", "1", "2", "2", "20" , "10" , "slash", "0", "0", "0", "0" , - , "ddlvl{3}" +// ]; +// +const BASE_FORME: &[&str] = &[ + // "% Nom & Type & Dé & + & RM & AB & Pr & In & T2 & T1 & Md & Esq. & Par. & Vit. & Disc. & Spc. & Diff ", + "Griffes & Tranchantes & 2 & 1 & 4 & 1 & 1 & 2 & 3 & 6 & slash & 2 & 0 & 3 & 1 & - & ddlvl{1} ", + "Hast & Hast & 4 & 1 & 2 & 1 & 4 & 3 & 10 & 18 & pierce, [slash] & -1 & -3 & 1 & 0 & - & ddlvl{1} ", + "Épée & Tranchantes & 3 & 1 & 3 & 1 & 3 & 4 & 12 & 15 & slash, [pierce] & 0 & 1 & 0 & 0 & - & ddlvl{1} ", + "Marteau & Contondantes & 5 & 1 & 1 & 1 & 4 & 3 & 11 & 18 & blunt & -1 & -1 & 0 & -2 & - & ddlvl{1} ", + "Hache & Tranchantes & 4 & 2 & 1 & 3 & 4 & 3 & 9 & 14 & slash & 0 & -1 & 1 & 0 & - & ddlvl{1} ", + "Arbalète & Distance & 4 & 1 & 3 & 0 & 3 & 1 & 8 & 16 & pierce & -1 & -1 & 0 & -1 & 2reload, Gls{parmure} 2, 80m & ddlvl{1} ", + "Arc & Distance & 3 & 1 & 4 & 0 & 2 & 1 & - & 7 & pierce & 0 & 0 & 0 & 0 & 1reload, Gls{parmure} 2, 120m & ddlvl{1} ", + "Boucliers & - & 1 & 1 & 2 & 0 & 3 & 2 & 6 & 8 & blunt & -2 & 0 & -1 & -2 & - & ddlvl{1} ", + "Armures & - & & & & & 3 & 2 & 10 & - & blunt & -1 & 0 & 0 & -1 & - & ddlvl{1} ", + // "% Explosive & Exotiques & 3 & 1 & 3 & 1 & 2 & 2 & 20 & 10 & slash & 0 & 0 & 0 & 0 & - & ddlvl{5} ", + // "% Flexible & Exotiques & 3 & 1 & 3 & 1 & 2 & 2 & 20 & 10 & slash & 0 & 0 & 0 & 0 & - & ddlvl{2} ", + // "% Exotique & Exotiques & 3 & 1 & 3 & 1 & 2 & 2 & 20 & 10 & slash & 0 & 0 & 0 & 0 & - & ddlvl{3} ", +]; fn main() { - let db = EquipementDatabase::new("./databases/weapons.db").unwrap(); - let mut data_eg = DatabaseEquipementStats::random_new(); - // data_eg.id = fastrand::u8(1..u8::MAX); - // data_eg.damage_type = serde_json::to_string(&Some(DamageType(vec![DamageMod::Primary( - // PhysicalDamageType::Blunt, - // )]))) - // .unwrap(); - // data_eg.category = serde_json::to_string(&Some(WeaponCategory::Dagger)).unwrap(); - // data_eg.target = serde_json::to_string(&Some(WeaponCategory::Dagger)).unwrap(); - // data_eg.special = - // serde_json::to_string(&SpecialCategory(vec!["noo".to_string(), "boo".to_string()])) - // .unwrap(); - // data_eg.reload_cost = serde_json::to_string(&Some(12)).unwrap(); - data_eg.id = fastrand::u8(1..u8::MAX); + let mut global_index = 0; + let b = load_base(&mut global_index); + // println!("{b:?}"); // Equipements - db.initialize_empty_table::("Equipements") - .unwrap(); + let db = EquipementDatabase::new("./databases/weapons.db").unwrap(); + db.initialize_empty_table::("Equipements").unwrap(); + db.conn.execute("DELETE FROM Equipements", []).unwrap(); + println!("Processed {global_index} ids"); + b.iter().for_each(|v| database_shnn(&db, v)); + let v = db.serialize_vec_from_table::("Equipements", None); + println!("{:#?}", v); + + // Final deserialisation + let final_s = v.unwrap().into_iter().map(InnerEquipementStats::try_from).collect::>(); + let v = final_s + .iter() + .scan(0, |status, eq| { + if eq.is_ok() { + *status += 1; + } + Some(*status) + }) + .sum::(); + println!("{:#?}, {:#?}", final_s, v); +} + +#[allow(dead_code)] +#[derive(Default)] +struct FoundFields { + reload: Option, + range: Option, + parmor: Option, +} +fn parse_special_field(fields: &str) -> FoundFields { + // "Arbalète & Distance & 4 & 1 & 3 0 & 3 & 1 & 8 & 16 & pierce & -1 & -1 & 0 & -1 & 2reload, Gls{parmure} 2, 80m & ddlvl{1} ", + let re = regex::Regex::new(r"((?\d)reload)?(, )?(Gls\{parmure\} (?\d))?(, )?(?(\d+)m)?").unwrap(); + re.captures(fields).map_or(FoundFields::default(), |f| FoundFields { + reload: f.name("reload").map(|n| n.as_str().parse().unwrap()), + range: f.name("range").map(|v| v.as_str().parse().unwrap()), + parmor: f.name("parmor").map(|v| v.as_str().parse().unwrap()), + }) +} + +#[allow(dead_code)] +fn database_shnn(db: &EquipementDatabase, row: T) { + // let mut row = DatabaseEquipementStats::random_new(); let sql = &format!( "INSERT INTO Equipements ({}) VALUES ({})", @@ -45,24 +106,60 @@ fn main() { .collect::>() .join(", ") ); - println!("{}", sql); - let r = db.conn.execute( - sql, - to_params_named(&data_eg).unwrap().to_slice().as_slice(), - ); - println!("{:?}", r); - - let v = db.serialize_vec_from_table::("Equipements", None); - // println!("{:#?}", v); - - println!( - "{:#?}", - v.unwrap() - .into_iter() - .map(InnerEquipementStats::try_from) - .collect::>() - ); - // let mut r = db.conn.prepare("SELECT * FROM InnerStats").unwrap(); - // let mut v = r.query([]).unwrap(); - // println!("{:?}:\n {:#?}", db, r); + // println!("{}", sql); + let r = db.conn.execute(sql, to_params_named(&row).unwrap().to_slice().as_slice()); + println!("Loaded {:?} entries into the database", r); +} + +fn load_base(index: &mut u8) -> Vec { + // data_eg.id = fastrand::u8(1..u8::MAX); + // data_eg.damage_type = serde_json::to_string(&Some(DamageType(vec![DamageMod::Primary( + // PhysicalDamageType::Blunt, + // )]))) + // .unwrap(); + // data_eg.category = serde_json::to_string(&Some(WeaponCategory::Dagger)).unwrap(); + // data_eg.target = serde_json::to_string(&Some(WeaponCategory::Dagger)).unwrap(); + // data_eg.special = + // serde_json::to_string(&SpecialCategory(vec!["noo".to_string(), "boo".to_string()])) + // .unwrap(); + // data_eg.reload_cost = serde_json::to_string(&Some(12)).unwrap(); + BASE_FORME + .iter() + .map(|row| { + let fields = row.split("&").map(|field| field.trim()).collect::>(); + let FoundFields { reload, range, parmor } = parse_special_field(fields[16]); + *index += 1; + DatabaseEquipementStats { + id: *index, + meta_category: "Forme".into(), + name: fields[0].to_string(), + category: format!("\"{}\"", fields[1]), + rarity: 0, + cost: 0, + difficulty: fields[16].parse().unwrap_or_default(), + tier: 0, + damage: fields[2].parse().unwrap_or_default(), + p_damage: fields[3].parse().unwrap_or_default(), + precision: fields[4].parse().unwrap_or_default(), + rmax: fields[5].parse().unwrap_or_default(), + armor_break: fields[6].parse().unwrap_or_default(), + protection: fields[7].parse().unwrap_or_default(), + integrity: fields[8].parse().unwrap_or_default(), + + torque_two_handed: fields[10].parse().unwrap_or_default(), + torque_one_handed: fields[9].parse().unwrap_or_default(), // The or default is a problem + damage_type: fields[11].parse().unwrap(), + + dodge: fields[12].parse().unwrap_or_default(), + parry: fields[13].parse().unwrap_or_default(), + speed: fields[14].parse().unwrap_or_default(), + stealth: fields[15].parse().unwrap_or_default(), + reload_cost: serde_json::to_string(&reload).unwrap(), + range: range.unwrap_or_default(), + + // target: fields[5].parse().unwrap(), // Armors ? + ..Default::default() + } + }) + .collect::>() }