Removes derive-getters, as it was incredibly annoying in IDEs, and couldn't figure out borrow lifetimes.
This commit is contained in:
@@ -43,9 +43,9 @@ impl BattleStatCalculator {
|
||||
|
||||
fn calculate_health_stat(&self, pokemon: &Pokemon) -> u32 {
|
||||
let base = pokemon.form().get_base_stat(Statistic::HP) as u32;
|
||||
let iv = *pokemon.individual_values().hp() as u32;
|
||||
let ev = *pokemon.effort_values().hp() as u32;
|
||||
let level = *pokemon.level() as u32;
|
||||
let iv = pokemon.individual_values().hp() as u32;
|
||||
let ev = pokemon.effort_values().hp() as u32;
|
||||
let level = pokemon.level() as u32;
|
||||
(((2 * base + iv + (ev / 4)) * level) / 100) + level + 10
|
||||
}
|
||||
|
||||
@@ -53,7 +53,7 @@ impl BattleStatCalculator {
|
||||
let base = pokemon.form().get_base_stat(stat) as u32;
|
||||
let iv = pokemon.individual_values().get_stat(stat) as u32;
|
||||
let ev = pokemon.effort_values().get_stat(stat) as u32;
|
||||
let level = *pokemon.level() as u32;
|
||||
let level = pokemon.level() as u32;
|
||||
let unmodified = (((2 * base + iv + (ev / 4)) * level) / 100) + 5;
|
||||
return (unmodified as f32 * pokemon.nature().get_stat_modifier(stat)) as u32;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user