Return applied damage
This commit is contained in:
parent
65d1658a08
commit
78088cecfe
1 changed files with 6 additions and 2 deletions
|
@ -12,7 +12,7 @@ use crate::{components::inventory::Storable, items::ItemSystem};
|
||||||
use crate::{config::save_game::SaveGame, items::ability_book::Ability};
|
use crate::{config::save_game::SaveGame, items::ability_book::Ability};
|
||||||
use crate::{
|
use crate::{
|
||||||
damage_type::DamageType,
|
damage_type::DamageType,
|
||||||
items::{ability_addon::AbilityAddonTypes, ability_book::AbilityBook, Rarities},
|
items::{Rarities, ability_addon::AbilityAddonTypes, ability_book::AbilityBook},
|
||||||
};
|
};
|
||||||
|
|
||||||
use super::{character_status::CharacterStatus, statistics::Statistics};
|
use super::{character_status::CharacterStatus, statistics::Statistics};
|
||||||
|
@ -145,13 +145,17 @@ impl<A: Ability> AbilitySlots<A> {
|
||||||
damage_type: DamageType,
|
damage_type: DamageType,
|
||||||
enemy_statistics: &Statistics,
|
enemy_statistics: &Statistics,
|
||||||
enemy_status: &mut CharacterStatus,
|
enemy_status: &mut CharacterStatus,
|
||||||
) {
|
) -> Option<u32> {
|
||||||
let resistance = enemy_statistics.calculate_resistance(damage_type);
|
let resistance = enemy_statistics.calculate_resistance(damage_type);
|
||||||
|
|
||||||
if resistance < base_damage {
|
if resistance < base_damage {
|
||||||
let damage = base_damage - resistance;
|
let damage = base_damage - resistance;
|
||||||
|
|
||||||
enemy_status.apply_damage(damage as f32);
|
enemy_status.apply_damage(damage as f32);
|
||||||
|
|
||||||
|
Some(damage)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue