Adds some weaapon balancing cleanup and \half support
This commit is contained in:
parent
54688cb74f
commit
3d211b711a
|
|
@ -6,7 +6,7 @@ resolver = "3"
|
|||
# edition = "2024"
|
||||
# license = "MIT OR Apache-2.0"
|
||||
[workspace.package]
|
||||
version = "0.3.11"
|
||||
version = "0.3.12"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
|
|
|
|||
|
|
@ -58,6 +58,12 @@ pub enum FatalEquipementError {
|
|||
pub enum WeaponGenerationError {
|
||||
#[error("An unexpected error occured")]
|
||||
Unexpected,
|
||||
|
||||
#[error("An error was encountered while generating equipement")]
|
||||
FatalEquipementError(#[from] FatalEquipementError),
|
||||
|
||||
#[error("An error occured while writing the file")]
|
||||
IOError(#[from] std::io::Error),
|
||||
}
|
||||
|
||||
// #[derive(Error, Debug)]
|
||||
|
|
|
|||
|
|
@ -37,18 +37,17 @@ pub fn export_weapons(args: &WeaponConfig, config: &Config) -> Result<(), Weapon
|
|||
materials: None,
|
||||
nature: Some(()), //(!args.no_natures).then_some(()),
|
||||
finishing: None, //args.finishing.then_some(()),
|
||||
})
|
||||
.unwrap();
|
||||
})?;
|
||||
|
||||
// let filter = Box::new(|_: &RefinedEquipement| true);
|
||||
let refined_list = scenarios.generate_refined_recipes().unwrap();
|
||||
let refined_list = scenarios.generate_refined_recipes()?;
|
||||
// .inner_filter(filter);
|
||||
|
||||
let tex = refined_list.to_tex(config).unwrap();
|
||||
let tex = refined_list.to_tex(config)?;
|
||||
|
||||
let name = format!("{}/gen-forge-table.tex", args.export);
|
||||
println!("Writing to file {name}");
|
||||
let mut f = fs::File::create(name).unwrap();
|
||||
writeln!(f, "{}", tex).unwrap();
|
||||
let mut f = fs::File::create(name)?;
|
||||
writeln!(f, "{}", tex)?;
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,6 +75,20 @@ pub struct ExportableEquipement {
|
|||
pub needs_break: bool,
|
||||
}
|
||||
|
||||
/// Put half numbers
|
||||
fn halves(f: f32) -> String {
|
||||
let base = f.floor();
|
||||
let extra = f - base;
|
||||
if !(-0.1..=0.1).contains(&extra) {
|
||||
if base == 0. {
|
||||
"\\half{}".to_string()
|
||||
} else {
|
||||
format!("{base:0}\\half{{}}")
|
||||
}
|
||||
} else {
|
||||
format!("{base}")
|
||||
}
|
||||
}
|
||||
impl From<&RefinedEquipement> for ExportableEquipement {
|
||||
fn from(value: &RefinedEquipement) -> Self {
|
||||
let mut special = Vec::new();
|
||||
|
|
@ -108,6 +122,9 @@ impl From<&RefinedEquipement> for ExportableEquipement {
|
|||
value.inner.precision
|
||||
));
|
||||
}
|
||||
if value.inner.agility_bonus != 0. {
|
||||
special.push(format!(r"Ag {}", halves(value.inner.agility_bonus)));
|
||||
}
|
||||
Self {
|
||||
name: value.advanced.display_name.clone(),
|
||||
maniement: value.inner.get_maniement(),
|
||||
|
|
@ -120,7 +137,7 @@ impl From<&RefinedEquipement> for ExportableEquipement {
|
|||
torque_one_handed: value.inner.torque_one_handed,
|
||||
torque_two_handed: value.inner.torque_two_handed,
|
||||
modes: value.inner.get_modes(),
|
||||
esquive: value.inner.dodge.to_string(),
|
||||
esquive: halves(value.inner.dodge),
|
||||
parrade: value.inner.parry.to_string(),
|
||||
vitesse: value.inner.speed.to_string(),
|
||||
discretion: value.inner.stealth.to_string(),
|
||||
|
|
|
|||
|
|
@ -87,7 +87,6 @@ impl Display for InnerEquipementStats {
|
|||
self.difficulty,
|
||||
self.tier,
|
||||
self.category_base
|
||||
.clone()
|
||||
.map_or_else(|| "ø".to_string(), |v| v.to_string()),
|
||||
self.category_size
|
||||
.clone()
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 14934910a40cd5fdee09f9ef7df75e1e4d0f2288
|
||||
Subproject commit f52776f917aeaf0e29944351d05f76efb0ecb2f6
|
||||
Loading…
Reference in New Issue