+ Player items
This commit is contained in:
@@ -13,6 +13,7 @@ use player::Player;
|
||||
|
||||
pub use traits::*;
|
||||
pub use types::*;
|
||||
pub use super::game_protocol;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct Session {
|
||||
@@ -56,6 +57,7 @@ impl Session {
|
||||
fame: player.fame(),
|
||||
fame_per_minute: player.fame_per_minute(),
|
||||
fame_per_hour: player.fame_per_hour(),
|
||||
items: player.items()
|
||||
})
|
||||
.collect(),
|
||||
)
|
||||
@@ -190,6 +192,13 @@ impl PlayerEvents for Meter {
|
||||
Some(vec![zone_player, las_fight_session_player])
|
||||
}
|
||||
|
||||
fn get_item_carriers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn ItemCarrier>> {
|
||||
let (zone, last_fight) = self.sessions_mut()?;
|
||||
let las_fight_session_player = last_fight.get_player_by_id(player_id)?;
|
||||
let zone_player = zone.get_player_by_id(player_id)?;
|
||||
Some(vec![zone_player, las_fight_session_player])
|
||||
}
|
||||
|
||||
fn get_fame_gatherers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn FameGatherer>> {
|
||||
let main_player_id = self.main_player_id?;
|
||||
let (zone, last_fight) = self.sessions_mut()?;
|
||||
|
||||
@@ -3,11 +3,14 @@ use fake_clock::FakeClock as Instant;
|
||||
#[cfg(not(test))]
|
||||
use std::time::Instant;
|
||||
|
||||
use super::game_protocol::Items;
|
||||
|
||||
use super::traits::CombatState;
|
||||
use super::traits::DamageDealer;
|
||||
use super::traits::DamageStats;
|
||||
use super::traits::FameStats;
|
||||
use super::traits::FameGatherer;
|
||||
use super::traits::ItemCarrier;
|
||||
|
||||
#[derive(Debug)]
|
||||
struct CombatTime
|
||||
@@ -32,7 +35,8 @@ pub struct Player {
|
||||
combat_time: CombatTime,
|
||||
combat_state: CombatState,
|
||||
time_started: Instant,
|
||||
fame: f32
|
||||
fame: f32,
|
||||
items: Items
|
||||
}
|
||||
|
||||
|
||||
@@ -44,7 +48,8 @@ impl Player {
|
||||
combat_time: CombatTime::new(),
|
||||
combat_state: CombatState::OutOfCombat,
|
||||
time_started: Instant::now(),
|
||||
fame: 0.0
|
||||
fame: 0.0,
|
||||
items: Default::default(),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -101,6 +106,17 @@ impl FameGatherer for Player {
|
||||
}
|
||||
}
|
||||
|
||||
impl ItemCarrier for Player {
|
||||
fn items_update(&mut self, items: &Items) {
|
||||
self.items = items.clone();
|
||||
}
|
||||
|
||||
fn items(&self) -> Items {
|
||||
self.items.clone()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
impl FameStats for Player {
|
||||
fn fame(&self) -> f32 {
|
||||
self.fame
|
||||
|
||||
@@ -4,6 +4,7 @@ use fake_clock::FakeClock as Instant;
|
||||
use std::time::Instant;
|
||||
|
||||
use super::types::PlayerStatisticsVec;
|
||||
use super::game_protocol::Items;
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub enum CombatState {
|
||||
@@ -55,11 +56,18 @@ pub trait DamageDealer {
|
||||
fn combat_state(&self) -> CombatState;
|
||||
}
|
||||
|
||||
pub trait ItemCarrier {
|
||||
fn items_update(&mut self, items: &Items);
|
||||
fn items(&self) -> Items;
|
||||
}
|
||||
|
||||
pub trait PlayerEvents {
|
||||
fn get_damage_dealers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn DamageDealer>>;
|
||||
|
||||
fn get_fame_gatherers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn FameGatherer>>;
|
||||
|
||||
fn get_item_carriers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn ItemCarrier>>;
|
||||
|
||||
fn register_main_player(&mut self, name: &str, id: usize);
|
||||
|
||||
fn register_leave(&mut self, id: usize) -> Option<()>;
|
||||
@@ -74,6 +82,14 @@ pub trait PlayerEvents {
|
||||
Some(())
|
||||
}
|
||||
|
||||
fn register_item_update(&mut self, player_id: usize, items: &Items) -> Option<()> {
|
||||
for player in self.get_item_carriers_in_zone(player_id)? {
|
||||
player.items_update(items);
|
||||
}
|
||||
|
||||
Some(())
|
||||
}
|
||||
|
||||
fn register_damage_dealt(&mut self, player_id: usize, damage: f32) -> Option<()> {
|
||||
for player in self.get_damage_dealers_in_zone(player_id)? {
|
||||
if damage < 0.0 {
|
||||
|
||||
@@ -7,6 +7,7 @@ use fake_clock::FakeClock as Instant;
|
||||
#[cfg(not(test))]
|
||||
use std::time::Instant;
|
||||
|
||||
use super::game_protocol::Items;
|
||||
use super::traits::DamageStats;
|
||||
use super::traits::FameStats;
|
||||
|
||||
@@ -42,7 +43,8 @@ pub struct PlayerStatistics {
|
||||
pub seconds_in_game: f32,
|
||||
pub fame: f32,
|
||||
pub fame_per_minute: u32,
|
||||
pub fame_per_hour: u32
|
||||
pub fame_per_hour: u32,
|
||||
pub items: Items
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Clone)]
|
||||
|
||||
Reference in New Issue
Block a user