Player flags structured

This commit is contained in:
Wiktor Mazur
2019-12-25 14:24:32 +01:00
parent 75238241e6
commit f58307b902
+15 -10
View File
@@ -28,6 +28,13 @@ impl CombatTime {
} }
} }
#[derive(Debug)]
struct Flags
{
idle: bool,
main: bool
}
#[derive(Debug)] #[derive(Debug)]
pub struct Player { pub struct Player {
id: usize, id: usize,
@@ -37,8 +44,7 @@ pub struct Player {
time_started: Instant, time_started: Instant,
fame: f32, fame: f32,
items: Items, items: Items,
idle: bool, flags: Flags
main: bool
} }
@@ -52,13 +58,12 @@ impl Player {
time_started: Instant::now(), time_started: Instant::now(),
fame: 0.0, fame: 0.0,
items: Default::default(), items: Default::default(),
idle: true, flags: Flags{idle: true, main},
main
} }
} }
pub fn idle(&self) -> bool { pub fn idle(&self) -> bool {
self.idle self.flags.idle
} }
pub fn id(&self) -> usize { pub fn id(&self) -> usize {
@@ -66,7 +71,7 @@ impl Player {
} }
pub fn main(&self) -> bool { pub fn main(&self) -> bool {
self.main self.flags.main
} }
} }
@@ -75,12 +80,12 @@ impl DamageDealer for Player {
if self.combat_state == CombatState::OutOfCombat { if self.combat_state == CombatState::OutOfCombat {
return return
} }
self.idle = false; self.flags.idle = false;
self.damage_dealt += damage_dealt self.damage_dealt += damage_dealt
} }
fn enter_combat(&mut self) { fn enter_combat(&mut self) {
self.idle = false; self.flags.idle = false;
self.combat_time.entered_combat = Some(Instant::now()); self.combat_time.entered_combat = Some(Instant::now());
self.combat_state = CombatState::InCombat; self.combat_state = CombatState::InCombat;
} }
@@ -120,14 +125,14 @@ impl DamageStats for Player {
impl FameGatherer for Player { impl FameGatherer for Player {
fn register_fame_gain(&mut self, fame: f32) { fn register_fame_gain(&mut self, fame: f32) {
self.fame += fame; self.fame += fame;
self.idle = false; self.flags.idle = false;
} }
} }
impl ItemCarrier for Player { impl ItemCarrier for Player {
fn items_update(&mut self, items: &Items) { fn items_update(&mut self, items: &Items) {
self.items = items.clone(); self.items = items.clone();
self.idle = false; self.flags.idle = false;
} }
fn items(&self) -> Items { fn items(&self) -> Items {