From 78088cecfe17070d823fc39f50c17f9ee22713a5 Mon Sep 17 00:00:00 2001 From: hodasemi Date: Mon, 7 Apr 2025 11:09:23 +0200 Subject: [PATCH] Return applied damage --- rpg_components/src/components/ability_slots.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rpg_components/src/components/ability_slots.rs b/rpg_components/src/components/ability_slots.rs index 1aad288..7348413 100644 --- a/rpg_components/src/components/ability_slots.rs +++ b/rpg_components/src/components/ability_slots.rs @@ -12,7 +12,7 @@ use crate::{components::inventory::Storable, items::ItemSystem}; use crate::{config::save_game::SaveGame, items::ability_book::Ability}; use crate::{ 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}; @@ -145,13 +145,17 @@ impl AbilitySlots { damage_type: DamageType, enemy_statistics: &Statistics, enemy_status: &mut CharacterStatus, - ) { + ) -> Option { let resistance = enemy_statistics.calculate_resistance(damage_type); if resistance < base_damage { let damage = base_damage - resistance; enemy_status.apply_damage(damage as f32); + + Some(damage) + } else { + None } } }