Fixed: colors in different modes

This commit is contained in:
Wiktor Mazur
2020-01-02 16:23:25 +01:00
parent b3bdf49d73
commit 71d0dd1004
5 changed files with 168 additions and 117 deletions
+29 -9
View File
@@ -11,9 +11,9 @@ mod types;
use player::Player;
pub use super::game_protocol;
pub use traits::*;
pub use types::*;
pub use super::game_protocol;
#[derive(Debug)]
pub struct Session {
@@ -30,7 +30,7 @@ impl Session {
fn from(session: &Self) -> Self {
let mut players = HashMap::new();
for (player_name, player) in &session.players {
let mut new_player = Player::new(player.id(), player.main());
let mut new_player = Player::from(player);
if let CombatState::InCombat = player.combat_state() {
new_player.enter_combat();
}
@@ -179,7 +179,10 @@ impl Meter {
}
impl PlayerEvents for Meter {
fn get_damage_dealers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn DamageDealer>> {
fn get_damage_dealers_in_zone(
&mut self,
player_id: usize,
) -> Option<Vec<&mut dyn DamageDealer>> {
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)?;
@@ -193,7 +196,10 @@ impl PlayerEvents for Meter {
Some(vec![zone_player, las_fight_session_player])
}
fn get_fame_gatherers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn FameGatherer>> {
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()?;
if player_id != main_player_id {
@@ -205,7 +211,11 @@ 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<()> {
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);
@@ -238,7 +248,10 @@ impl PlayerEvents for Meter {
fn register_leave(&mut self, id: usize) -> Option<()> {
let main_player_id = self.main_player_id?;
if id == main_player_id {
info!("Main player ({}) left the zone, Creating new zone session.", id);
info!(
"Main player ({}) left the zone, Creating new zone session.",
id
);
self.zone_session_mut()?.cleanup_players();
self.new_session();
}
@@ -248,11 +261,18 @@ impl PlayerEvents for Meter {
fn register_player(&mut self, name: &str, id: usize) {
if self.zone_session.is_none() {
info!("New player ({}) registered without session, creating new session", name);
info!(
"New player ({}) registered without session, creating new session",
name
);
self.new_session();
}
if self.get_damage_dealers_in_zone(id).unwrap_or(vec![]).is_empty() {
if self
.get_damage_dealers_in_zone(id)
.unwrap_or(vec![])
.is_empty()
{
self.add_player(name, id, false);
}
}
+27 -15
View File
@@ -8,31 +8,29 @@ 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::FameStats;
use super::traits::ItemCarrier;
#[derive(Debug)]
struct CombatTime
{
struct CombatTime {
entered_combat: Option<Instant>,
time_in_combat: std::time::Duration
time_in_combat: std::time::Duration,
}
impl CombatTime {
fn new() -> Self {
Self {
entered_combat: None,
time_in_combat: std::time::Duration::from_millis(0)
time_in_combat: std::time::Duration::from_millis(0),
}
}
}
#[derive(Debug)]
struct Flags
{
struct Flags {
idle: bool,
main: bool
main: bool,
}
#[derive(Debug)]
@@ -44,10 +42,9 @@ pub struct Player {
time_started: Instant,
fame: f32,
items: Items,
flags: Flags
flags: Flags,
}
impl Player {
pub fn new(id: usize, main: bool) -> Self {
Self {
@@ -58,7 +55,23 @@ impl Player {
time_started: Instant::now(),
fame: 0.0,
items: Default::default(),
flags: Flags{idle: true, main},
flags: Flags { idle: true, main },
}
}
pub fn from(other: &Self) -> Self {
Self {
id: other.id,
damage_dealt: 0.0,
combat_time: CombatTime::new(),
combat_state: other.combat_state(),
time_started: Instant::now(),
fame: 0.0,
items: other.items.clone(),
flags: Flags {
idle: true,
main: other.main(),
},
}
}
@@ -78,7 +91,7 @@ impl Player {
impl DamageDealer for Player {
fn register_damage_dealt(&mut self, damage_dealt: f32) {
if self.combat_state == CombatState::OutOfCombat {
return
return;
}
self.flags.idle = false;
self.damage_dealt += damage_dealt
@@ -112,7 +125,8 @@ impl DamageStats for Player {
fn time_in_combat(&self) -> f32 {
if self.combat_state == CombatState::InCombat {
if let Some(entered_combat) = self.combat_time.entered_combat {
let time_in_combat = self.combat_time.time_in_combat + (Instant::now() - entered_combat);
let time_in_combat =
self.combat_time.time_in_combat + (Instant::now() - entered_combat);
return time_in_combat.as_millis() as f32;
}
} else {
@@ -140,7 +154,6 @@ impl ItemCarrier for Player {
}
}
impl FameStats for Player {
fn fame(&self) -> f32 {
self.fame
@@ -174,4 +187,3 @@ mod test {
assert_eq!(player.fame_per_hour(), 100);
}
}
+6 -8
View File
@@ -26,7 +26,7 @@ pub struct PlayerStatistics {
#[derive(Debug, PartialEq, Clone)]
pub struct PlayerStatisticsVec {
_vec: Vec<PlayerStatistics>
_vec: Vec<PlayerStatistics>,
}
#[derive(Debug, PartialEq, Copy, Clone)]
@@ -34,19 +34,17 @@ pub enum StatType {
LastFight,
Zone,
Overall,
Unknown
Unknown,
}
impl PlayerStatisticsVec {
pub fn new() -> Self {
Self {
_vec: vec![]
}
Self { _vec: vec![] }
}
pub fn from(player_statistics_vec: Vec<PlayerStatistics>) -> Self {
Self {
_vec: player_statistics_vec
_vec: player_statistics_vec,
}
}
@@ -68,6 +66,7 @@ impl PlayerStatisticsVec {
s.fame_per_minute = s.fame_per_minute();
s.fame_per_hour = s.fame_per_hour();
s.main_player_stats = stat.main_player_stats;
s.items = stat.items.clone();
})
.or_insert(stat.clone());
acc
@@ -75,7 +74,7 @@ impl PlayerStatisticsVec {
);
Self {
_vec: merged.iter().map(|(_, v)| v.clone()).collect()
_vec: merged.iter().map(|(_, v)| v.clone()).collect(),
}
}
}
@@ -102,4 +101,3 @@ impl FameStats for PlayerStatistics {
std::time::Duration::from_secs(self.seconds_in_game as u64)
}
}