From cec31c6689f36a72dec738e6fe04fa749cfa55b2 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Tue, 28 Jul 2026 17:54:21 +0200 Subject: [PATCH 1/2] Made shield a category --- .../weaponry/src/weaponry_structs/equipement_advanced_repr.rs | 2 +- crates/weaponry/src/weaponry_structs/equipement_fields.rs | 3 +-- crates/weaponry/src/weaponry_structs/equipement_impl_basics.rs | 2 +- crates/weaponry/src/weaponry_structs/equipement_impl_io.rs | 2 +- ravenous_databases | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/crates/weaponry/src/weaponry_structs/equipement_advanced_repr.rs b/crates/weaponry/src/weaponry_structs/equipement_advanced_repr.rs index fae9911..5bfb17b 100644 --- a/crates/weaponry/src/weaponry_structs/equipement_advanced_repr.rs +++ b/crates/weaponry/src/weaponry_structs/equipement_advanced_repr.rs @@ -105,7 +105,7 @@ impl From<&RefinedEquipement> for ExportableEquipement { (&Some(WeaponBaseShape::Ranged), Some(WeaponBaseSize::SuperHeavy)) => parmure += 1, _ => (), } - special.push(format!(r"\Gls{{parmure}} {parmure}")); + special.push(format!(r"\glssymbol{{parmure}} {parmure}")); } if value.inner.range != 0 { let mut range = value.inner.range; diff --git a/crates/weaponry/src/weaponry_structs/equipement_fields.rs b/crates/weaponry/src/weaponry_structs/equipement_fields.rs index 46d497d..7284809 100644 --- a/crates/weaponry/src/weaponry_structs/equipement_fields.rs +++ b/crates/weaponry/src/weaponry_structs/equipement_fields.rs @@ -318,8 +318,7 @@ impl EquipementTargets { (EquipementTargets::Weapons, WeaponBaseShape::Slash) => true, (EquipementTargets::Weapons, WeaponBaseShape::Ranged) => true, (EquipementTargets::Weapons, WeaponBaseShape::Exotic) => true, - // You can apply weapon modifiers to shields, not the best behaviour but well - (EquipementTargets::Weapons, WeaponBaseShape::Shields) => true, + // (EquipementTargets::Weapons, WeaponBaseShape::Shields) => true, (EquipementTargets::Armors, WeaponBaseShape::Armors) => true, (EquipementTargets::Shields, WeaponBaseShape::Shields) => true, (EquipementTargets::Ranged, WeaponBaseShape::Ranged) => true, diff --git a/crates/weaponry/src/weaponry_structs/equipement_impl_basics.rs b/crates/weaponry/src/weaponry_structs/equipement_impl_basics.rs index 962e367..8943bc6 100644 --- a/crates/weaponry/src/weaponry_structs/equipement_impl_basics.rs +++ b/crates/weaponry/src/weaponry_structs/equipement_impl_basics.rs @@ -241,7 +241,7 @@ fn stupid_adjective_fix(name_base: &str, adj: String) -> String { "Hast" => masc(), "Marteau" => masc(), "Arc" => masc(), - "Bouclier" => masc(), + // "Bouclier" => masc(), _ => adj, } } diff --git a/crates/weaponry/src/weaponry_structs/equipement_impl_io.rs b/crates/weaponry/src/weaponry_structs/equipement_impl_io.rs index 23ea936..a86dc7b 100644 --- a/crates/weaponry/src/weaponry_structs/equipement_impl_io.rs +++ b/crates/weaponry/src/weaponry_structs/equipement_impl_io.rs @@ -34,7 +34,7 @@ impl ToTex for RefinedEquipementList { for i in 0..data.len() - 1 { if data[i].category != data[i + 1].category - && data[i + 1].category == Some(super::WeaponBaseShape::Shields) + // && data[i + 1].category == Some(super::WeaponBaseShape::Shields) { data[i].needs_break = true; } diff --git a/ravenous_databases b/ravenous_databases index 8e6a318..8997559 160000 --- a/ravenous_databases +++ b/ravenous_databases @@ -1 +1 @@ -Subproject commit 8e6a31899f87f3cfe6de856238457161ebb811c2 +Subproject commit 89975594031f98f8e23632d1474733d1497c0aef -- 2.45.1 From daf65e8a27150a61f498ca4dd4a3280ce1455a2e Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Tue, 28 Jul 2026 19:18:44 +0200 Subject: [PATCH 2/2] Typos & Actions --- helper_config.toml | 4 ++-- ravenous_databases | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/helper_config.toml b/helper_config.toml index 7129f16..1735318 100644 --- a/helper_config.toml +++ b/helper_config.toml @@ -244,10 +244,10 @@ master_part = ''' \rb{Initiative} & \rb{Valeur} & \rb{Actions} & \rb{Valeur} & \rb{Actions} & & \rb{Force} & \rb{Perception} & \rb{Volonté} & \rb{Res Alt} & \rb{Torque} & \rb{Vigilance} & \rb{Fatigue} & & \rb{Marche} & \rb{Trot} & \rb{Course} & \rb{Vol} & & \rb{Bon. Phy} {{#if stats.elemental_bonus_dmg}}& \rb{Bon. Élém} {{/if}}\\ {{#each init_full}} {{#if @index}} -\SetCell{font=\footnotesize} $i_{{(plus @index 1)}} $ & ${{{p1_value}}} $ & {{{pt1_actions}}} & ${{{p2_value}}} $ & {{{p2_actions}}} \\ +\SetCell{font=\footnotesize} $i_{{(plus @index 1)}} $ & ${{{p1_value}}} $ & {{{p1_actions}}} & ${{{p2_value}}} $ & {{{p2_actions}}} \\ {{else}} {{#with ../stats~}} -\SetCell{font=\footnotesize} $i_1 $ & ${{{p1_init}}} $ & $4 $A & ${{{p2_init}}} $ & $4 $A & & ${{{strength}}} $ & ${{{perception}}} $ & ${{{willpower}}} $ & ${{{alteration_resistance}}} $ & ${{{torque}}} $ & ${{{awareness}}} $ & ${{{fatigue}}} $ & & ${{{mvt_walk}}} $ & ${{{mvt_trot}}} $ & ${{{mvt_run}}} $ & ${{{mvt_flight}}} $ & & ${{{physical_bonus_dmg}}} $ {{#if elemental_bonus_dmg}} & ${{elemental_bonus_dmg}} $ {{/if}} \\ +\SetCell{font=\footnotesize} $i_1 $ & ${{{p1_init}}} $ & ${{{p1_actions}}} $A & ${{{p2_init}}} $ & ${{{p1_actions}}} $A & & ${{{strength}}} $ & ${{{perception}}} $ & ${{{willpower}}} $ & ${{{alteration_resistance}}} $ & ${{{torque}}} $ & ${{{awareness}}} $ & ${{{fatigue}}} $ & & ${{{mvt_walk}}} $ & ${{{mvt_trot}}} $ & ${{{mvt_run}}} $ & ${{{mvt_flight}}} $ & & ${{{physical_bonus_dmg}}} $ {{#if elemental_bonus_dmg}} & ${{elemental_bonus_dmg}} $ {{/if}} \\ {{/with}} {{/if}} {{/each}} diff --git a/ravenous_databases b/ravenous_databases index 8997559..99d2b53 160000 --- a/ravenous_databases +++ b/ravenous_databases @@ -1 +1 @@ -Subproject commit 89975594031f98f8e23632d1474733d1497c0aef +Subproject commit 99d2b53d89d54ca4a2043f4f86122fc3dcf0b281 -- 2.45.1