Made shield a category
This commit is contained in:
parent
9408152f98
commit
cec31c6689
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 8e6a31899f87f3cfe6de856238457161ebb811c2
|
||||
Subproject commit 89975594031f98f8e23632d1474733d1497c0aef
|
||||
Loading…
Reference in New Issue