damage on stdin

This commit is contained in:
Wiktor Mazur
2019-08-08 21:40:45 +02:00
parent 66fad1f389
commit 6000a83838
4 changed files with 89 additions and 32 deletions
+16
View File
@@ -10,6 +10,7 @@ macro_rules! deserialize_number {
match p { match p {
Value::Short(v) => Some(*v as usize), Value::Short(v) => Some(*v as usize),
Value::Integer(v) => Some(*v as usize), Value::Integer(v) => Some(*v as usize),
Value::Byte(v) => Some(*v as usize),
_ => { _ => {
error!("Failed to deserialize {}", $name); error!("Failed to deserialize {}", $name);
None None
@@ -191,8 +192,22 @@ impl CharacterStats {
} }
} }
#[derive(Debug)]
pub struct Leave {
pub source: usize
}
impl Leave {
fn encode(val: Parameters) -> Option<Message> {
let source = deserialize_number!(val, 0, "Leave::source")?;
Some(Message::Leave(Leave{source}))
}
}
#[derive(Debug)] #[derive(Debug)]
pub enum Message { pub enum Message {
Leave(Leave),
ChatSay(ChatSay), ChatSay(ChatSay),
NewCharacter(NewCharacter), NewCharacter(NewCharacter),
HealthUpdate(HealthUpdate), HealthUpdate(HealthUpdate),
@@ -203,6 +218,7 @@ pub enum Message {
impl Packet { impl Packet {
pub fn decode(self) -> Option<Message> { pub fn decode(self) -> Option<Message> {
match self.code { match self.code {
1 => Leave::encode(self.parameters),
6 => HealthUpdate::encode(self.parameters), 6 => HealthUpdate::encode(self.parameters),
24 => NewCharacter::encode(self.parameters), 24 => NewCharacter::encode(self.parameters),
63 => ChatSay::encode(self.parameters), 63 => ChatSay::encode(self.parameters),
+10 -4
View File
@@ -8,7 +8,7 @@ use std::sync::mpsc;
use simplelog::*; use simplelog::*;
use log::*; use log::*;
use std::time::Instant;
use packet_sniffer::UdpPacket; use packet_sniffer::UdpPacket;
@@ -31,7 +31,7 @@ fn main() {
packet_sniffer::receive(tx); packet_sniffer::receive(tx);
let mut meter = meter::Meter::new(); let mut meter = meter::Meter::new();
let now = Instant::now();
loop { loop {
if let Ok(packet) = rx.recv() { if let Ok(packet) = rx.recv() {
if packet.destination_port != 5056 && packet.source_port != 5056 { if packet.destination_port != 5056 && packet.source_port != 5056 {
@@ -43,18 +43,24 @@ fn main() {
debug!("Found message {:?}", msg); debug!("Found message {:?}", msg);
match msg { match msg {
game_protocol::Message::Leave(msg) => meter.register_leave(msg.source),
game_protocol::Message::NewCharacter(msg) => meter.register_player(&msg.character_name, msg.source), game_protocol::Message::NewCharacter(msg) => meter.register_player(&msg.character_name, msg.source),
game_protocol::Message::CharacterStats(msg) => meter.register_player(&msg.character_name, msg.source), game_protocol::Message::CharacterStats(msg) => meter.register_main_player(&msg.character_name, msg.source),
game_protocol::Message::HealthUpdate(msg) => meter.register_damage_dealt(msg.source, msg.value), game_protocol::Message::HealthUpdate(msg) => meter.register_damage_dealt(msg.source, msg.value),
game_protocol::Message::RegenerationHealthChanged(msg) => { game_protocol::Message::RegenerationHealthChanged(msg) => {
match msg.regeneration_rate { match msg.regeneration_rate {
Some(_) => meter.register_combat_leave(msg.source), Some(_) => meter.register_combat_leave(msg.source),
None => meter.register_combat_enter(msg.source) None => meter.register_combat_enter(msg.source) // TODO: handle death
} }
} }
_ => {} _ => {}
} }
} }
if now.elapsed().as_millis() % 10 == 0 {
print!("{}[2J", 27 as char);
println!("{:?}", meter.get_instance_session());
}
} }
+56 -25
View File
@@ -1,5 +1,5 @@
extern crate timer;
extern crate chrono; extern crate chrono;
extern crate timer;
use std::collections::HashMap; use std::collections::HashMap;
use std::collections::VecDeque; use std::collections::VecDeque;
@@ -10,29 +10,38 @@ mod player;
use player::Player; use player::Player;
#[derive(Hash, Eq, PartialEq)] #[derive(Hash, Eq, PartialEq)]
struct PlayerName(String); struct PlayerName(String);
pub struct Session { pub struct Session {
players: HashMap<PlayerName, Player> players: HashMap<PlayerName, Player>,
}
#[derive(Debug)]
pub struct PlayerStatistics {
player: String,
damage: f32,
time_in_combat: f32,
dps: f32
} }
impl Session { impl Session {
fn new() -> Self { fn new() -> Self {
Self { Self {
players: HashMap::new() players: HashMap::new(),
} }
} }
pub fn get_dps(&self) -> String { pub fn stats(&self) -> Vec<PlayerStatistics> {
let mut f = String::new(); self.players
f.push_str("\n"); .iter()
for player in self.players.values() { .map(|(name, player)| PlayerStatistics {
f.push_str(&format!("Name {} \t\t Damage {} \t\t DPS {}\n", player.get_name(), player.get_damage_dealt(), player.get_dps())) player: name.0.to_owned(),
} damage: player.get_damage_dealt(),
f.push_str("\n"); time_in_combat: player.get_time_elapsed(),
f dps: player.get_damage_dealt() / player.get_time_elapsed() * 1000.0
})
.collect()
} }
fn get_player_by_name(&self, player_name: &str) -> Option<&Player> { fn get_player_by_name(&self, player_name: &str) -> Option<&Player> {
@@ -44,31 +53,52 @@ impl Session {
} }
fn add_player(&mut self, player_name: &str, player_id: usize) { fn add_player(&mut self, player_name: &str, player_id: usize) {
self.players.insert(PlayerName(player_name.to_owned()), Player::new(player_id, player_name)); self.players.insert(
PlayerName(player_name.to_owned()),
Player::new(player_id, player_name),
);
} }
} }
pub struct Meter pub struct Meter {
{ instance_sessions: VecDeque<Session>,
instance_sessions: VecDeque<Session> main_player_id: Option<usize>,
} }
impl Meter { impl Meter {
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
instance_sessions: VecDeque::new() instance_sessions: VecDeque::new(),
main_player_id: None,
}
}
pub fn register_main_player(&mut self, name: &str, id: usize) {
error!("Main player {} registerd with id {}", name, id);
self.main_player_id = Some(id);
match self.instance_sessions.back_mut() {
Some(session) => session.add_player(name, id),
None => {
let mut session = Session::new();
session.add_player(name, id);
self.instance_sessions.push_back(session);
}
}
}
pub fn register_leave(&mut self, id: usize) {
if let Some(main_player_id) = self.main_player_id {
if id == main_player_id {
error!("New session, main player left the instance");
self.instance_sessions.push_back(Session::new());
}
} }
} }
pub fn register_player(&mut self, name: &str, id: usize) { pub fn register_player(&mut self, name: &str, id: usize) {
if self.instance_sessions.is_empty() { if self.instance_sessions.is_empty() {
debug!("New session {} is_empty", name); error!("New session");
self.instance_sessions.push_back(Session::new()); self.instance_sessions.push_back(Session::new());
} else if let Some(player) = self.instance_sessions.back().unwrap().get_player_by_name(name) {
if player.id != id {
debug!("New session {} already defined", name);
self.instance_sessions.push_back(Session::new());
}
} }
let session = self.instance_sessions.back_mut().unwrap(); let session = self.instance_sessions.back_mut().unwrap();
@@ -101,7 +131,8 @@ impl Meter {
} }
} }
pub fn get_instance_session(&self) -> Option<&Session> { pub fn get_instance_session(&self) -> Option<Vec<PlayerStatistics>> {
self.instance_sessions.back() let last_session = self.instance_sessions.back()?;
Some(last_session.stats())
} }
} }
+4
View File
@@ -76,6 +76,10 @@ impl Player
pub fn get_damage_dealt(&self) -> f32 { self.damage_dealt } pub fn get_damage_dealt(&self) -> f32 { self.damage_dealt }
pub fn get_time_elapsed(&self) -> f32 {
*self.time_elapsed.lock().unwrap()
}
pub fn get_dps(&self) -> f32 { pub fn get_dps(&self) -> f32 {
let elapsed = *self.time_elapsed.lock().unwrap(); let elapsed = *self.time_elapsed.lock().unwrap();
if elapsed == 0.0 { if elapsed == 0.0 {