guezoloic/BakersAdventure
1
0
Fork 0
mirror of https://github.com/guezoloic/BakersAdventure.git synced 2026-01-25 03:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(character.rs): replace use_item with two separate functions

Browse Source
This commit is contained in:
Loïc GUEZO
2026-01-14 09:54:02 +01:00
parent 42bff2595f
commit 92f19f853a
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/character.rs
View File

@@ -1,5 +1,3 @@
use std::f64::consts::E;
use crate::items::Item; use crate::items::Item;
/// # Character /// # Character
@@ -47,12 +45,20 @@ impl Character {
} }
} }
pub fn use_item(&mut self, other: Option<&mut Character>) -> () { pub fn use_item_on(&mut self, other: &mut Character) -> &mut Self {
let mut item: Option<Box<dyn Item>> = self.item.take(); // pop item and replace to None if let Some(mut i) = self.item.take() {
if let Some(i) = &mut item { i.apply(self);
i.apply(other.unwrap_or(self)); self.item = Some(i);
} }
self.item = item; self
}
pub fn use_item_on_self(&mut self) -> &mut Self {
if let Some(mut item) = self.item.take() {
item.apply(self);
self.item = Some(item);
}
self
} }
/// Returns the character's name. /// Returns the character's name.
@@ -86,11 +92,11 @@ mod tests {
let p = Box::new(Potion::new("testp", 50)); let p = Box::new(Potion::new("testp", 50));
let mut c: Character = Character::new_no_weapon("testc", 100); let mut c: Character = Character::new_no_weapon("testc", 100);
c.set_item(Some(p)).use_item(None); c.set_item(Some(p)).use_item_on_self();
assert_eq!(c.life, 150); assert_eq!(c.life, 150);
c.set_item(Some(w)).use_item(None); c.set_item(Some(w)).use_item_on_self();
assert_eq!(c.life, 140); assert_eq!(c.life, 140);
} }