show everything

This commit is contained in:
Wiktor Mazur
2019-12-15 17:34:34 +01:00
parent 47f64a9834
commit e4963a5a35
11 changed files with 134 additions and 44 deletions
+1 -1
View File
@@ -137,7 +137,7 @@ pub fn stats(py: Python, stat_type: StatType) -> PyResult<PyList> {
if let Ok(ref mut meter) = m.lock() {
return Ok(core::stats(&meter, stat_type)
.into_iter()
// .filter(|s| s.damage != 0.0 || s.fame != 0.0)
.filter(|s| !s.idle || s.fame != 0.0)
.collect::<Vec<meter::PlayerStatistics>>()
.into_py_object(py))
}
+27 -3
View File
@@ -57,7 +57,8 @@ impl Session {
fame: player.fame(),
fame_per_minute: player.fame_per_minute(),
fame_per_hour: player.fame_per_hour(),
items: player.items()
items: player.items(),
idle: player.idle(),
})
.collect(),
)
@@ -100,6 +101,7 @@ pub struct Meter {
last_fight_session: Session,
main_player_id: Option<usize>,
party: Option<types::Party>,
unconsumed_items: HashMap<usize, game_protocol::Items>,
config: MeterConfig,
}
@@ -111,6 +113,7 @@ impl Meter {
last_fight_session: Session::new(),
main_player_id: None,
party: None,
unconsumed_items: HashMap::new(),
config: Default::default(),
}
}
@@ -211,6 +214,21 @@ impl PlayerEvents for Meter {
Some(vec![zone_player, las_fight_session_player])
}
fn register_item_update(&mut self, player_id: usize, items: &game_protocol::Items) -> Option<()> {
let mut consumed = false;
for player in self.get_item_carriers_in_zone(player_id).unwrap_or(vec![]) {
player.items_update(items);
consumed = true;
}
if !consumed {
info!("Storing not consumed items for player id: {}", player_id);
self.unconsumed_items.insert(player_id, items.clone());
}
Some(())
}
fn register_main_player(&mut self, name: &str, id: usize) {
info!("Main player {} registered with id {}", name, id);
self.main_player_id = Some(id);
@@ -219,6 +237,11 @@ impl PlayerEvents for Meter {
self.new_session();
}
self.add_player(name, id);
if let Some(items) = self.unconsumed_items.get(&id) {
let i = items.clone();
self.register_item_update(id, &i);
self.unconsumed_items.remove(&id);
}
}
fn register_leave(&mut self, id: usize) -> Option<()> {
@@ -261,6 +284,7 @@ impl LastFightStats for Meter {
fn reset_last_fight_stats(&mut self) -> Option<()> {
self.last_fight_session = Session::from(&self.last_fight_session);
info!("Reset: last fight");
Some(())
}
}
@@ -274,7 +298,7 @@ impl ZoneStats for Meter {
fn reset_zone_stats(&mut self) -> Option<()> {
let last_session = self.zone_session_mut()?;
self.zone_session = Some(Session::from(&last_session));
info!("Reset: zone");
Some(())
}
}
@@ -298,7 +322,7 @@ impl GameStats for Meter {
let last_session = self.zone_session_mut()?;
self.zone_session = Some(Session::from(&last_session));
self.last_fight_session = Session::from(&self.last_fight_session);
info!("Reset: overall");
Some(())
}
+11 -2
View File
@@ -36,7 +36,8 @@ pub struct Player {
combat_state: CombatState,
time_started: Instant,
fame: f32,
items: Items
items: Items,
idle: bool,
}
@@ -50,8 +51,13 @@ impl Player {
time_started: Instant::now(),
fame: 0.0,
items: Default::default(),
idle: true
}
}
pub fn idle(&self) -> bool {
self.idle
}
}
impl DamageDealer for Player {
@@ -59,11 +65,12 @@ impl DamageDealer for Player {
if self.combat_state == CombatState::OutOfCombat {
return
}
self.idle = false;
self.damage_dealt += damage_dealt
}
fn enter_combat(&mut self) {
self.idle = false;
self.combat_time.entered_combat = Some(Instant::now());
self.combat_state = CombatState::InCombat;
}
@@ -103,12 +110,14 @@ impl DamageStats for Player {
impl FameGatherer for Player {
fn register_fame_gain(&mut self, fame: f32) {
self.fame += fame;
self.idle = false;
}
}
impl ItemCarrier for Player {
fn items_update(&mut self, items: &Items) {
self.items = items.clone();
self.idle = false;
}
fn items(&self) -> Items {
+2 -8
View File
@@ -74,6 +74,8 @@ pub trait PlayerEvents {
fn register_player(&mut self, name: &str, id: usize);
fn register_item_update(&mut self, player_id: usize, items: &Items) -> Option<()>;
fn register_fame_gain(&mut self, player_id: usize, fame: f32) -> Option<()> {
for player in self.get_fame_gatherers_in_zone(player_id)? {
player.register_fame_gain(fame);
@@ -82,14 +84,6 @@ 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 {
+2 -1
View File
@@ -44,7 +44,8 @@ pub struct PlayerStatistics {
pub fame: f32,
pub fame_per_minute: u32,
pub fame_per_hour: u32,
pub items: Items
pub items: Items,
pub idle: bool
}
#[derive(Debug, PartialEq, Clone)]