From 9408152f987c679727a4623ac3e831c4ddf22d64 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Tue, 28 Jul 2026 05:26:39 +0200 Subject: [PATCH] Typos, change arbreakk --- Cargo.toml | 2 +- crates/monsters/src/monster_analysis/defense_analysis.rs | 8 +++++--- crates/monsters/src/monster_render.rs | 2 +- crates/monsters/src/monster_structs.rs | 2 +- helper_config.toml | 2 +- ravenous_databases | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8ba947d..819644c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ resolver = "3" # edition = "2024" # license = "MIT OR Apache-2.0" [workspace.package] -version = "0.3.24" +version = "0.3.25" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/monsters/src/monster_analysis/defense_analysis.rs b/crates/monsters/src/monster_analysis/defense_analysis.rs index f393953..94ec054 100644 --- a/crates/monsters/src/monster_analysis/defense_analysis.rs +++ b/crates/monsters/src/monster_analysis/defense_analysis.rs @@ -98,7 +98,7 @@ fn damage_report_on_part( display: Showcase, ) -> DefenseReport { // Every round need to eliminate X dices from the pool - let mut dice_left_to_parry = creature.balancing.average_defensive_dices; + let mut dice_left_to_parry = creature.balancing.average_defensive_successes; let players = ChunkIter::new(creature.balancing.player_groupsize); let mut total_damage_done_p1 = DamageDealtByPlayer::default(); let mut total_damage_done_p2 = DamageDealtByPlayer::default(); @@ -137,8 +137,10 @@ fn damage_report_on_part( let time_to_p2 = ratio * body_part.life_points_p1.unwrap() as f64 / damage_done_p1.hp_t; let time_to_kill = ratio - * (body_part.life_points_p1.unwrap() as f64 / damage_done_p1.hp_t - + body_part.life_points_p2.unwrap_or(0) as f64 / damage_done_p2.hp_t); + * ( + //body_part.life_points_p1.unwrap() as f64 / damage_done_p1.hp_t + + body_part.life_points_p2.unwrap_or(0) as f64 / damage_done_p2.hp_t + ); let time_to_armorbreak = ratio * (body_part.integrity_p1.unwrap() as f64 / damage_done_p1.ab_t); let time_to_kill_through = ratio * (body_part.life_points_p1.unwrap() as f64 diff --git a/crates/monsters/src/monster_render.rs b/crates/monsters/src/monster_render.rs index db13d02..a84f5b0 100644 --- a/crates/monsters/src/monster_render.rs +++ b/crates/monsters/src/monster_render.rs @@ -100,7 +100,7 @@ impl ToRow for DamageReport { fn to_row(&self) -> Row { vec![ match self.showcase { - Showcase::Balancing => shorten_string(&self.name, 22).to_cell().fg(Color::Green), + Showcase::Balancing => shorten_string(&self.name, 20).to_cell().fg(Color::Green), Showcase::Display => self.stance.to_string().to_cell().fg(Color::DarkGrey), }, dim_if_not!( diff --git a/crates/monsters/src/monster_structs.rs b/crates/monsters/src/monster_structs.rs index a506003..37f5f91 100644 --- a/crates/monsters/src/monster_structs.rs +++ b/crates/monsters/src/monster_structs.rs @@ -440,7 +440,7 @@ pub struct CreatureBalancing { pub player_groupsize: f64, #[INTEGER] /// (FIXED) The average number of defence dice the creature will be using - pub average_defensive_dices: i64, + pub average_defensive_successes: i64, } /// Balancing info on all the player depending on their level diff --git a/helper_config.toml b/helper_config.toml index 7a0eef9..7129f16 100644 --- a/helper_config.toml +++ b/helper_config.toml @@ -348,7 +348,7 @@ template=''' rowhead = 1, } \hline -{Forme} & {Maniement} & {\damagew} & + & {R.Max} & \arbreakw & \protection & \integrite & $\mathbb{T}$2 & $\mathbb{T}$1 & {Modes} & {Esq.} & {Par.} & {Vit.} & {Disc.} & {Spécial} & {Diff.} \\ +{Forme} & {Maniement} & {\damagew} & + & {R.Max} & \arbreakk & \protection & \integrite & $\mathbb{T}$2 & $\mathbb{T}$1 & {Modes} & {Esq.} & {Par.} & {Vit.} & {Disc.} & {Spécial} & {Diff.} \\ \hline {{#each this}} {{name}} & {{maniement}} & {{damage_base}} & {{damage_per}} & {{rmax}} & {{arbreak}} & {{protection}} & {{integrity}} & {{torque_two_handed}} & {{torque_one_handed}} & $\mathbf{ {{{~modes~}}} }$ & {{esquive}} & {{parrade}} & {{vitesse}} & {{discretion}} & {{{special}}} & \ddlvl{ {{~difficulty~}} } \\ diff --git a/ravenous_databases b/ravenous_databases index e13cb01..8e6a318 160000 --- a/ravenous_databases +++ b/ravenous_databases @@ -1 +1 @@ -Subproject commit e13cb0197f108b40c51b5ab5a16cc5702d5db8c5 +Subproject commit 8e6a31899f87f3cfe6de856238457161ebb811c2 -- 2.45.1