Funcionality from python POC
This commit is contained in:
Generated
+43
@@ -93,6 +93,15 @@ name = "cfg-if"
|
|||||||
version = "0.1.9"
|
version = "0.1.9"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "chrono"
|
||||||
|
version = "0.2.25"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "chrono"
|
name = "chrono"
|
||||||
version = "0.4.7"
|
version = "0.4.7"
|
||||||
@@ -122,10 +131,12 @@ name = "damage-meter"
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
|
"bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"packet_sniffer 0.1.0",
|
"packet_sniffer 0.1.0",
|
||||||
"protocol16 0.1.0",
|
"protocol16 0.1.0",
|
||||||
"simplelog 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"simplelog 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"timer 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -230,6 +241,16 @@ name = "nodrop"
|
|||||||
version = "0.1.13"
|
version = "0.1.13"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "num"
|
||||||
|
version = "0.1.42"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-integer"
|
name = "num-integer"
|
||||||
version = "0.1.41"
|
version = "0.1.41"
|
||||||
@@ -239,6 +260,16 @@ dependencies = [
|
|||||||
"num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
"num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "num-iter"
|
||||||
|
version = "0.1.39"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-traits"
|
name = "num-traits"
|
||||||
version = "0.2.8"
|
version = "0.2.8"
|
||||||
@@ -561,6 +592,14 @@ dependencies = [
|
|||||||
"winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
"winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "timer"
|
||||||
|
version = "0.1.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
dependencies = [
|
||||||
|
"chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ucd-util"
|
name = "ucd-util"
|
||||||
version = "0.1.5"
|
version = "0.1.5"
|
||||||
@@ -633,6 +672,7 @@ dependencies = [
|
|||||||
"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
|
"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
|
||||||
"checksum cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "ce400c638d48ee0e9ab75aef7997609ec57367ccfe1463f21bf53c3eca67bf46"
|
"checksum cc 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "ce400c638d48ee0e9ab75aef7997609ec57367ccfe1463f21bf53c3eca67bf46"
|
||||||
"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
|
"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
|
||||||
|
"checksum chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9213f7cd7c27e95c2b57c49f0e69b1ea65b27138da84a170133fd21b07659c00"
|
||||||
"checksum chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe"
|
"checksum chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe"
|
||||||
"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
|
"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
|
||||||
"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
|
"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
|
||||||
@@ -650,7 +690,9 @@ dependencies = [
|
|||||||
"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
|
"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
|
||||||
"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
|
"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
|
||||||
"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
|
"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
|
||||||
|
"checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
|
||||||
"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
|
"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
|
||||||
|
"checksum num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e"
|
||||||
"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
|
"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
|
||||||
"checksum pnet 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63d693c84430248366146e3181ff9d330243464fa9e6146c372b2f3eb2e2d8e7"
|
"checksum pnet 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63d693c84430248366146e3181ff9d330243464fa9e6146c372b2f3eb2e2d8e7"
|
||||||
"checksum pnet_base 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4df28acf2fcc77436dd2b91a9a0c2bb617f9ca5f2acefee1a4135058b9f9801f"
|
"checksum pnet_base 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4df28acf2fcc77436dd2b91a9a0c2bb617f9ca5f2acefee1a4135058b9f9801f"
|
||||||
@@ -685,6 +727,7 @@ dependencies = [
|
|||||||
"checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
|
"checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
|
||||||
"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
|
"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
|
||||||
"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
|
"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
|
||||||
|
"checksum timer 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a9522a9ec40055e2f9e514e38d2415a496e81dbfc1ece15d98d2fe55c44946b3"
|
||||||
"checksum ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa9b3b49edd3468c0e6565d85783f51af95212b6fa3986a5500954f00b460874"
|
"checksum ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa9b3b49edd3468c0e6565d85783f51af95212b6fa3986a5500954f00b460874"
|
||||||
"checksum unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb"
|
"checksum unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb"
|
||||||
"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
|
"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
|
||||||
|
|||||||
@@ -11,4 +11,6 @@ packet_sniffer = { path = "./lib/packet-sniffer" }
|
|||||||
protocol16 = { path = "./lib/protocol16" }
|
protocol16 = { path = "./lib/protocol16" }
|
||||||
bytes = "0.4"
|
bytes = "0.4"
|
||||||
simplelog = "0.6"
|
simplelog = "0.6"
|
||||||
|
timer = "0.1"
|
||||||
|
chrono = "0.4"
|
||||||
log = { version = "0.4", features = ["std"] }
|
log = { version = "0.4", features = ["std"] }
|
||||||
+19
-2
@@ -1,6 +1,7 @@
|
|||||||
extern crate bytes;
|
extern crate bytes;
|
||||||
extern crate packet_sniffer;
|
extern crate packet_sniffer;
|
||||||
extern crate protocol16;
|
extern crate protocol16;
|
||||||
|
|
||||||
use std::fs::File;
|
use std::fs::File;
|
||||||
use std::sync::mpsc::{Sender, Receiver};
|
use std::sync::mpsc::{Sender, Receiver};
|
||||||
use std::sync::mpsc;
|
use std::sync::mpsc;
|
||||||
@@ -12,10 +13,11 @@ use log::*;
|
|||||||
use packet_sniffer::UdpPacket;
|
use packet_sniffer::UdpPacket;
|
||||||
|
|
||||||
mod game_protocol;
|
mod game_protocol;
|
||||||
|
mod meter;
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
CombinedLogger::init(vec![
|
CombinedLogger::init(vec![
|
||||||
TermLogger::new(LevelFilter::Info, Config::default(), TerminalMode::Mixed).unwrap(),
|
TermLogger::new(LevelFilter::Error, Config::default(), TerminalMode::Mixed).unwrap(),
|
||||||
WriteLogger::new(
|
WriteLogger::new(
|
||||||
LevelFilter::Trace,
|
LevelFilter::Trace,
|
||||||
Config::default(),
|
Config::default(),
|
||||||
@@ -28,6 +30,8 @@ fn main() {
|
|||||||
|
|
||||||
packet_sniffer::receive(tx);
|
packet_sniffer::receive(tx);
|
||||||
|
|
||||||
|
let mut meter = meter::Meter::new();
|
||||||
|
|
||||||
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 {
|
||||||
@@ -36,7 +40,20 @@ fn main() {
|
|||||||
let messages = game_protocol::decode(&packet.payload);
|
let messages = game_protocol::decode(&packet.payload);
|
||||||
|
|
||||||
for msg in messages {
|
for msg in messages {
|
||||||
info!("Found message {:?}", msg);
|
debug!("Found message {:?}", msg);
|
||||||
|
|
||||||
|
match msg {
|
||||||
|
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::HealthUpdate(msg) => meter.register_damage_dealt(msg.source, msg.value),
|
||||||
|
game_protocol::Message::RegenerationHealthChanged(msg) => {
|
||||||
|
match msg.regeneration_rate {
|
||||||
|
Some(_) => meter.register_combat_leave(msg.source),
|
||||||
|
None => meter.register_combat_enter(msg.source)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,107 @@
|
|||||||
|
extern crate timer;
|
||||||
|
extern crate chrono;
|
||||||
|
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::collections::VecDeque;
|
||||||
|
|
||||||
|
use log::*;
|
||||||
|
|
||||||
|
mod player;
|
||||||
|
|
||||||
|
use player::Player;
|
||||||
|
|
||||||
|
|
||||||
|
#[derive(Hash, Eq, PartialEq)]
|
||||||
|
struct PlayerName(String);
|
||||||
|
|
||||||
|
pub struct Session {
|
||||||
|
players: HashMap<PlayerName, Player>
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Session {
|
||||||
|
fn new() -> Self {
|
||||||
|
Self {
|
||||||
|
players: HashMap::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_dps(&self) -> String {
|
||||||
|
let mut f = String::new();
|
||||||
|
f.push_str("\n");
|
||||||
|
for player in self.players.values() {
|
||||||
|
f.push_str(&format!("Name {} \t\t Damage {} \t\t DPS {}\n", player.get_name(), player.get_damage_dealt(), player.get_dps()))
|
||||||
|
}
|
||||||
|
f.push_str("\n");
|
||||||
|
f
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_player_by_name(&self, player_name: &str) -> Option<&Player> {
|
||||||
|
self.players.get(&PlayerName(player_name.to_owned()))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_player_by_id(&mut self, player_id: usize) -> Option<&mut Player> {
|
||||||
|
self.players.values_mut().find(|p| p.id == player_id)
|
||||||
|
}
|
||||||
|
|
||||||
|
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));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct Meter
|
||||||
|
{
|
||||||
|
instance_sessions: VecDeque<Session>
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Meter {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
Self {
|
||||||
|
instance_sessions: VecDeque::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn register_player(&mut self, name: &str, id: usize) {
|
||||||
|
if self.instance_sessions.is_empty() {
|
||||||
|
debug!("New session {} is_empty", name);
|
||||||
|
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();
|
||||||
|
session.add_player(name, id);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn register_damage_dealt(&mut self, player_id: usize, damage: f32) {
|
||||||
|
if let Some(session) = self.instance_sessions.back_mut() {
|
||||||
|
if let Some(player) = session.get_player_by_id(player_id) {
|
||||||
|
if damage < 0.0 {
|
||||||
|
player.register_damage_dealt(f32::abs(damage));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn register_combat_enter(&mut self, player_id: usize) {
|
||||||
|
if let Some(session) = self.instance_sessions.back_mut() {
|
||||||
|
if let Some(player) = session.get_player_by_id(player_id) {
|
||||||
|
player.enter_combat();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn register_combat_leave(&mut self, player_id: usize) {
|
||||||
|
if let Some(session) = self.instance_sessions.back_mut() {
|
||||||
|
if let Some(player) = session.get_player_by_id(player_id) {
|
||||||
|
player.leave_combat();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_instance_session(&self) -> Option<&Session> {
|
||||||
|
self.instance_sessions.back()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,128 @@
|
|||||||
|
use std::thread;
|
||||||
|
use std::sync::{Arc, Mutex};
|
||||||
|
use std::borrow::Cow;
|
||||||
|
|
||||||
|
use timer;
|
||||||
|
|
||||||
|
#[derive(PartialEq)]
|
||||||
|
enum CombatState
|
||||||
|
{
|
||||||
|
InCombat,
|
||||||
|
OutOfCombat
|
||||||
|
}
|
||||||
|
|
||||||
|
struct Time
|
||||||
|
{
|
||||||
|
guard: timer::Guard,
|
||||||
|
timer: timer::Timer
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct Player
|
||||||
|
{
|
||||||
|
pub id: usize,
|
||||||
|
name: String,
|
||||||
|
damage_dealt: f32,
|
||||||
|
time_elapsed: Arc<Mutex<f32>>,
|
||||||
|
combat_state: Arc<Mutex<CombatState>>,
|
||||||
|
time: Time
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Player
|
||||||
|
{
|
||||||
|
pub fn new(id: usize, name: &str) -> Self {
|
||||||
|
let timer = timer::Timer::new();
|
||||||
|
let time_elapsed = Arc::new(Mutex::new(0.0));
|
||||||
|
let combat_state = Arc::new(Mutex::new(CombatState::OutOfCombat));
|
||||||
|
let guard = {
|
||||||
|
let time_elapsed = time_elapsed.clone();
|
||||||
|
let combat_state = combat_state.clone();
|
||||||
|
timer.schedule_repeating(chrono::Duration::milliseconds(10), move || {
|
||||||
|
if *combat_state.lock().unwrap() == CombatState::InCombat {
|
||||||
|
*time_elapsed.lock().unwrap() += 10.0;
|
||||||
|
}
|
||||||
|
|
||||||
|
})
|
||||||
|
};
|
||||||
|
|
||||||
|
Self {
|
||||||
|
id,
|
||||||
|
name: name.to_owned(),
|
||||||
|
damage_dealt: 0.0,
|
||||||
|
time_elapsed,
|
||||||
|
combat_state,
|
||||||
|
time: Time{timer, guard}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn register_damage_dealt(&mut self, damage_dealt: f32) {
|
||||||
|
if *self.combat_state.lock().unwrap() == CombatState::OutOfCombat {
|
||||||
|
*self.time_elapsed.lock().unwrap() += 1000.0;
|
||||||
|
}
|
||||||
|
|
||||||
|
self.damage_dealt += damage_dealt
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn enter_combat(&mut self) {
|
||||||
|
*self.combat_state.lock().unwrap() = CombatState::InCombat;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn leave_combat(&mut self) {
|
||||||
|
*self.combat_state.lock().unwrap() = CombatState::OutOfCombat;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_name(&self) -> std::borrow::Cow<str> {
|
||||||
|
std::borrow::Cow::Borrowed(&self.name)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_damage_dealt(&self) -> f32 { self.damage_dealt }
|
||||||
|
|
||||||
|
pub fn get_dps(&self) -> f32 {
|
||||||
|
let elapsed = *self.time_elapsed.lock().unwrap();
|
||||||
|
if elapsed == 0.0 {
|
||||||
|
return 0.0;
|
||||||
|
}
|
||||||
|
|
||||||
|
(self.damage_dealt / *self.time_elapsed.lock().unwrap()) * 1000.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
mod test
|
||||||
|
{
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[allow(unused)]
|
||||||
|
fn get_test_player() -> Player {
|
||||||
|
Player::new(1, "test_player")
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_player_initial_stats() {
|
||||||
|
let player = Player::new(1, "test_player");
|
||||||
|
|
||||||
|
assert_eq!(player.name, "test_player");
|
||||||
|
|
||||||
|
assert_eq!(player.get_damage_dealt(), 0.0);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_damage_when_in_combat() {
|
||||||
|
let mut player = get_test_player();
|
||||||
|
|
||||||
|
player.enter_combat();
|
||||||
|
player.register_damage_dealt(1000.0);
|
||||||
|
assert_eq!(player.get_damage_dealt(), 1000.0);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_damage_after_tenth_second() {
|
||||||
|
let mut player = get_test_player();
|
||||||
|
|
||||||
|
player.register_damage_dealt(1000.0);
|
||||||
|
player.enter_combat();
|
||||||
|
|
||||||
|
thread::sleep(std::time::Duration::from_millis(100));
|
||||||
|
assert_eq!(player.get_damage_dealt(), 1000.0);
|
||||||
|
assert!(player.get_dps() < 1000.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user