Two players in the zone, overall & last fight interface
This commit is contained in:
+402
-37
@@ -11,8 +11,8 @@ use std::sync::mpsc::{channel, Receiver, Sender};
|
|||||||
use std::sync::Mutex;
|
use std::sync::Mutex;
|
||||||
use std::thread;
|
use std::thread;
|
||||||
|
|
||||||
use cpython::{PyDict, PyList, PyObject, PyResult, Python, PythonObject, ToPyObject};
|
|
||||||
use cpython::PyClone;
|
use cpython::PyClone;
|
||||||
|
use cpython::{PyDict, PyList, PyObject, PyResult, Python, PythonObject, ToPyObject};
|
||||||
use log::*;
|
use log::*;
|
||||||
use simplelog::*;
|
use simplelog::*;
|
||||||
|
|
||||||
@@ -21,8 +21,8 @@ use packet_sniffer::UdpPacket;
|
|||||||
mod game_protocol;
|
mod game_protocol;
|
||||||
mod meter;
|
mod meter;
|
||||||
|
|
||||||
use meter::ZoneStats;
|
|
||||||
use meter::PlayerEvents;
|
use meter::PlayerEvents;
|
||||||
|
use meter::ZoneStats;
|
||||||
|
|
||||||
lazy_static! {
|
lazy_static! {
|
||||||
static ref METER: Mutex<meter::Meter> = Mutex::new(meter::Meter::new());
|
static ref METER: Mutex<meter::Meter> = Mutex::new(meter::Meter::new());
|
||||||
@@ -33,13 +33,18 @@ impl ToPyObject for meter::PlayerStatistics {
|
|||||||
fn to_py_object(&self, py: Python) -> Self::ObjectType {
|
fn to_py_object(&self, py: Python) -> Self::ObjectType {
|
||||||
let stats = PyDict::new(py);
|
let stats = PyDict::new(py);
|
||||||
|
|
||||||
stats.set_item(py, "player", self.player.to_py_object(py))
|
stats
|
||||||
|
.set_item(py, "player", self.player.to_py_object(py))
|
||||||
.unwrap();
|
.unwrap();
|
||||||
stats.set_item(py, "damage", self.damage.to_py_object(py))
|
stats
|
||||||
|
.set_item(py, "damage", self.damage.to_py_object(py))
|
||||||
.unwrap();
|
.unwrap();
|
||||||
stats.set_item(py, "time_in_combat", self.time_in_combat.to_py_object(py))
|
stats
|
||||||
|
.set_item(py, "time_in_combat", self.time_in_combat.to_py_object(py))
|
||||||
|
.unwrap();
|
||||||
|
stats
|
||||||
|
.set_item(py, "dps", self.dps.to_py_object(py))
|
||||||
.unwrap();
|
.unwrap();
|
||||||
stats.set_item(py, "dps", self.dps.to_py_object(py)).unwrap();
|
|
||||||
|
|
||||||
stats.into_object()
|
stats.into_object()
|
||||||
}
|
}
|
||||||
@@ -61,6 +66,38 @@ fn get_zone_session(py: Python) -> PyResult<PyList> {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn get_overall_session(py: Python) -> PyResult<PyList> {
|
||||||
|
let meter = &mut METER.lock().unwrap();
|
||||||
|
meter.get_overall_session().map_or_else(
|
||||||
|
|| Ok(PyList::new(py, Vec::<PyObject>::new().as_slice())),
|
||||||
|
|v| {
|
||||||
|
Ok(PyList::new(
|
||||||
|
py,
|
||||||
|
v.iter()
|
||||||
|
.map(|s| s.into_py_object(py))
|
||||||
|
.collect::<Vec<PyObject>>()
|
||||||
|
.as_slice(),
|
||||||
|
))
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_last_fight_session(py: Python) -> PyResult<PyList> {
|
||||||
|
let meter = &mut METER.lock().unwrap();
|
||||||
|
meter.get_last_fight_session().map_or_else(
|
||||||
|
|| Ok(PyList::new(py, Vec::<PyObject>::new().as_slice())),
|
||||||
|
|v| {
|
||||||
|
Ok(PyList::new(
|
||||||
|
py,
|
||||||
|
v.iter()
|
||||||
|
.map(|s| s.into_py_object(py))
|
||||||
|
.collect::<Vec<PyObject>>()
|
||||||
|
.as_slice(),
|
||||||
|
))
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
fn new_zone_session(_py: Python) -> PyResult<u32> {
|
fn new_zone_session(_py: Python) -> PyResult<u32> {
|
||||||
let meter = &mut METER.lock().unwrap();
|
let meter = &mut METER.lock().unwrap();
|
||||||
|
|
||||||
@@ -69,6 +106,22 @@ fn new_zone_session(_py: Python) -> PyResult<u32> {
|
|||||||
Ok(0)
|
Ok(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn reset_sessions(_py: Python) -> PyResult<u32> {
|
||||||
|
let meter = &mut METER.lock().unwrap();
|
||||||
|
|
||||||
|
meter.reset();
|
||||||
|
|
||||||
|
Ok(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn new_last_fight_session(_py: Python) -> PyResult<u32> {
|
||||||
|
let meter = &mut METER.lock().unwrap();
|
||||||
|
|
||||||
|
meter.new_last_fight_session();
|
||||||
|
|
||||||
|
Ok(0)
|
||||||
|
}
|
||||||
|
|
||||||
fn initialize(_py: Python) -> PyResult<u32> {
|
fn initialize(_py: Python) -> PyResult<u32> {
|
||||||
CombinedLogger::init(vec![WriteLogger::new(
|
CombinedLogger::init(vec![WriteLogger::new(
|
||||||
LevelFilter::Trace,
|
LevelFilter::Trace,
|
||||||
@@ -82,7 +135,6 @@ fn initialize(_py: Python) -> PyResult<u32> {
|
|||||||
|
|
||||||
packet_sniffer::receive(tx);
|
packet_sniffer::receive(tx);
|
||||||
info!("Listening to network packets...");
|
info!("Listening to network packets...");
|
||||||
|
|
||||||
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 {
|
||||||
@@ -116,15 +168,11 @@ fn register_message(events: &mut PlayerEvents, message: &game_protocol::Message)
|
|||||||
game_protocol::Message::HealthUpdate(msg) => events
|
game_protocol::Message::HealthUpdate(msg) => events
|
||||||
.register_damage_dealt(msg.target, msg.value)
|
.register_damage_dealt(msg.target, msg.value)
|
||||||
.unwrap_or(()),
|
.unwrap_or(()),
|
||||||
game_protocol::Message::RegenerationHealthChanged(msg) => {
|
game_protocol::Message::RegenerationHealthChanged(msg) => match msg.regeneration_rate {
|
||||||
match msg.regeneration_rate {
|
|
||||||
Some(_) => events.register_combat_leave(msg.source).unwrap_or(()),
|
Some(_) => events.register_combat_leave(msg.source).unwrap_or(()),
|
||||||
None => events.register_combat_enter(msg.source).unwrap_or(()),
|
None => events.register_combat_enter(msg.source).unwrap_or(()),
|
||||||
}
|
|
||||||
},
|
},
|
||||||
game_protocol::Message::Died(msg) => {
|
game_protocol::Message::Died(msg) => events.register_combat_leave(msg.source).unwrap_or(()),
|
||||||
events.register_combat_leave(msg.source).unwrap_or(())
|
|
||||||
}
|
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -133,11 +181,19 @@ py_module_initializer!(libmeter, initliblibmeter, PyInit_libmeter, |py, m| {
|
|||||||
m.add(py, "__doc__", "This module is implemented in Rust")?;
|
m.add(py, "__doc__", "This module is implemented in Rust")?;
|
||||||
m.add(py, "initialize", py_fn!(py, initialize()))?;
|
m.add(py, "initialize", py_fn!(py, initialize()))?;
|
||||||
m.add(py, "new_zone_session", py_fn!(py, new_zone_session()))?;
|
m.add(py, "new_zone_session", py_fn!(py, new_zone_session()))?;
|
||||||
|
m.add(py, "get_overall_session", py_fn!(py, get_overall_session()))?;
|
||||||
m.add(
|
m.add(
|
||||||
py,
|
py,
|
||||||
"get_zone_session",
|
"get_last_fight_session",
|
||||||
py_fn!(py, get_zone_session()),
|
py_fn!(py, get_last_fight_session()),
|
||||||
)?;
|
)?;
|
||||||
|
m.add(py, "reset_sessions", py_fn!(py, reset_sessions()))?;
|
||||||
|
m.add(
|
||||||
|
py,
|
||||||
|
"new_last_fight_session",
|
||||||
|
py_fn!(py, new_last_fight_session()),
|
||||||
|
)?;
|
||||||
|
m.add(py, "get_zone_session", py_fn!(py, get_zone_session()))?;
|
||||||
Ok(())
|
Ok(())
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -168,19 +224,80 @@ mod tests {
|
|||||||
register_message(meter, &message);
|
register_message(meter, &message);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_player_in_zone_by_index(py: Python, index: usize) -> PyDict {
|
pub fn get_damage_dealer_in_zone_by_index(py: Python, index: usize) -> PyDict {
|
||||||
let zone_session = get_zone_session(py).unwrap();
|
let zone_session = get_zone_session(py).unwrap();
|
||||||
let stat = zone_session.get_item(py, index);
|
let stat = zone_session.get_item(py, index);
|
||||||
let player = stat.cast_as::<PyDict>(py).unwrap().clone_ref(py);
|
let player = stat.cast_as::<PyDict>(py).unwrap().clone_ref(py);
|
||||||
player
|
player
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn get_damage_dealer_in_zone_by_name(py: Python, name: &str) -> Option<PyDict> {
|
||||||
|
let zone_session_len = get_zone_session(py).unwrap().len(py);
|
||||||
|
|
||||||
|
for idx in 0..zone_session_len {
|
||||||
|
let player = get_damage_dealer_in_zone_by_index(py, idx);
|
||||||
|
if get_string(py, &player, "player") == name {
|
||||||
|
return Some(player);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_player_overall_index(py: Python, index: usize) -> PyDict {
|
||||||
|
let zone_session = get_overall_session(py).unwrap();
|
||||||
|
let stat = zone_session.get_item(py, index);
|
||||||
|
let player = stat.cast_as::<PyDict>(py).unwrap().clone_ref(py);
|
||||||
|
player
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_player_overall_by_name(py: Python, name: &str) -> Option<PyDict> {
|
||||||
|
let zone_session_len = get_overall_session(py).unwrap().len(py);
|
||||||
|
|
||||||
|
for idx in 0..zone_session_len {
|
||||||
|
let player = get_player_overall_index(py, idx);
|
||||||
|
if get_string(py, &player, "player") == name {
|
||||||
|
return Some(player);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_player_last_fight_index(py: Python, index: usize) -> PyDict {
|
||||||
|
let zone_session = get_last_fight_session(py).unwrap();
|
||||||
|
let stat = zone_session.get_item(py, index);
|
||||||
|
let player = stat.cast_as::<PyDict>(py).unwrap().clone_ref(py);
|
||||||
|
player
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_player_last_fight_by_name(py: Python, name: &str) -> Option<PyDict> {
|
||||||
|
let zone_session_len = get_last_fight_session(py).unwrap().len(py);
|
||||||
|
|
||||||
|
for idx in 0..zone_session_len {
|
||||||
|
let player = get_player_last_fight_index(py, idx);
|
||||||
|
if get_string(py, &player, "player") == name {
|
||||||
|
return Some(player);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
pub fn get_string(py: Python, stats: &PyDict, key: &str) -> String {
|
pub fn get_string(py: Python, stats: &PyDict, key: &str) -> String {
|
||||||
stats.get_item(py, key).unwrap().cast_as::<PyUnicode>(py).unwrap().to_string_lossy(py).to_string()
|
stats
|
||||||
|
.get_item(py, key)
|
||||||
|
.unwrap()
|
||||||
|
.cast_as::<PyUnicode>(py)
|
||||||
|
.unwrap()
|
||||||
|
.to_string_lossy(py)
|
||||||
|
.to_string()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_float(py: Python, stats: &PyDict, key: &str) -> f64 {
|
pub fn get_float(py: Python, stats: &PyDict, key: &str) -> f64 {
|
||||||
stats.get_item(py, key).unwrap().cast_as::<PyFloat>(py).unwrap().value(py)
|
stats
|
||||||
|
.get_item(py, key)
|
||||||
|
.unwrap()
|
||||||
|
.cast_as::<PyFloat>(py)
|
||||||
|
.unwrap()
|
||||||
|
.value(py)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -188,11 +305,20 @@ mod tests {
|
|||||||
fn new(source: usize) -> Self;
|
fn new(source: usize) -> Self;
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Testing for message::NewCharacter {
|
trait NamedTesting {
|
||||||
fn new(source: usize) -> Self {
|
fn new_named(name: &str, source: usize) -> Self;
|
||||||
|
}
|
||||||
|
|
||||||
|
trait SwitchableTesting {
|
||||||
|
fn enabled(source: usize) -> Self;
|
||||||
|
fn disabled(source: usize) -> Self;
|
||||||
|
}
|
||||||
|
|
||||||
|
impl NamedTesting for message::NewCharacter {
|
||||||
|
fn new_named(name: &str, source: usize) -> Self {
|
||||||
Self {
|
Self {
|
||||||
source: source,
|
source: source,
|
||||||
character_name: String::from("CH1"),
|
character_name: name.to_owned(),
|
||||||
health: 10.0,
|
health: 10.0,
|
||||||
max_health: 10.0,
|
max_health: 10.0,
|
||||||
energy: 1.0,
|
energy: 1.0,
|
||||||
@@ -201,11 +327,11 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Testing for message::CharacterStats {
|
impl NamedTesting for message::CharacterStats {
|
||||||
fn new(source: usize) -> Self {
|
fn new_named(name: &str, source: usize) -> Self {
|
||||||
Self {
|
Self {
|
||||||
source: source,
|
source: source,
|
||||||
character_name: String::from("MAIN_CH1"),
|
character_name: name.to_owned(),
|
||||||
health: 10.0,
|
health: 10.0,
|
||||||
max_health: 10.0,
|
max_health: 10.0,
|
||||||
energy: 1.0,
|
energy: 1.0,
|
||||||
@@ -214,6 +340,24 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Testing for message::NewCharacter {
|
||||||
|
fn new(source: usize) -> Self {
|
||||||
|
message::NewCharacter::new_named("CH1", source)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Testing for message::CharacterStats {
|
||||||
|
fn new(source: usize) -> Self {
|
||||||
|
message::CharacterStats::new_named("MAIN_CH1", source)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Testing for message::Leave {
|
||||||
|
fn new(source: usize) -> Self {
|
||||||
|
Self { source: source }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl Testing for message::HealthUpdate {
|
impl Testing for message::HealthUpdate {
|
||||||
fn new(source: usize) -> Self {
|
fn new(source: usize) -> Self {
|
||||||
Self {
|
Self {
|
||||||
@@ -224,8 +368,8 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Testing for message::RegenerationHealthChanged {
|
impl SwitchableTesting for message::RegenerationHealthChanged {
|
||||||
fn new(source: usize) -> Self {
|
fn enabled(source: usize) -> Self {
|
||||||
Self {
|
Self {
|
||||||
source: source,
|
source: source,
|
||||||
health: 10.0,
|
health: 10.0,
|
||||||
@@ -233,6 +377,15 @@ mod tests {
|
|||||||
regeneration_rate: Some(1.0),
|
regeneration_rate: Some(1.0),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn disabled(source: usize) -> Self {
|
||||||
|
Self {
|
||||||
|
source: source,
|
||||||
|
health: 10.0,
|
||||||
|
max_health: 10.0,
|
||||||
|
regeneration_rate: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -261,7 +414,7 @@ mod tests {
|
|||||||
|
|
||||||
helpers::register(Message::NewCharacter(message::NewCharacter::new(1)));
|
helpers::register(Message::NewCharacter(message::NewCharacter::new(1)));
|
||||||
|
|
||||||
let stats = helpers::get_player_in_zone_by_index(py, 0);
|
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
|
||||||
assert_eq!(stats.len(py), 4);
|
assert_eq!(stats.len(py), 4);
|
||||||
assert_eq!(helpers::get_string(py, &stats, "player"), "CH1");
|
assert_eq!(helpers::get_string(py, &stats, "player"), "CH1");
|
||||||
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
||||||
@@ -269,6 +422,24 @@ mod tests {
|
|||||||
assert_eq!(helpers::get_float(py, &stats, "dps"), 0.0);
|
assert_eq!(helpers::get_float(py, &stats, "dps"), 0.0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_damage_aggregation() {
|
||||||
|
let guard = helpers::init();
|
||||||
|
let py = guard.python();
|
||||||
|
|
||||||
|
helpers::register(Message::NewCharacter(message::NewCharacter::new(1)));
|
||||||
|
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
|
||||||
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
||||||
|
|
||||||
|
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
|
||||||
|
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
|
||||||
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
|
||||||
|
|
||||||
|
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
|
||||||
|
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
|
||||||
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 20.0);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_new_player_damage() {
|
fn test_new_player_damage() {
|
||||||
let guard = helpers::init();
|
let guard = helpers::init();
|
||||||
@@ -276,13 +447,13 @@ mod tests {
|
|||||||
|
|
||||||
helpers::register(Message::NewCharacter(message::NewCharacter::new(1)));
|
helpers::register(Message::NewCharacter(message::NewCharacter::new(1)));
|
||||||
|
|
||||||
let stats = helpers::get_player_in_zone_by_index(py, 0);
|
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
|
||||||
assert_eq!(helpers::get_string(py, &stats, "player"), "CH1");
|
assert_eq!(helpers::get_string(py, &stats, "player"), "CH1");
|
||||||
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
||||||
|
|
||||||
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
|
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
|
||||||
|
|
||||||
let stats = helpers::get_player_in_zone_by_index(py, 0);
|
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
|
||||||
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -293,18 +464,17 @@ mod tests {
|
|||||||
|
|
||||||
helpers::register(Message::NewCharacter(message::NewCharacter::new(1)));
|
helpers::register(Message::NewCharacter(message::NewCharacter::new(1)));
|
||||||
|
|
||||||
let stats = helpers::get_player_in_zone_by_index(py, 0);
|
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
|
||||||
assert_eq!(helpers::get_string(py, &stats, "player"), "CH1");
|
assert_eq!(helpers::get_string(py, &stats, "player"), "CH1");
|
||||||
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
||||||
|
|
||||||
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
|
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
|
||||||
|
|
||||||
let stats = helpers::get_player_in_zone_by_index(py, 0);
|
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
|
||||||
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
|
||||||
|
|
||||||
|
|
||||||
new_zone_session(py).unwrap();
|
new_zone_session(py).unwrap();
|
||||||
let stats = helpers::get_player_in_zone_by_index(py, 0);
|
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
|
||||||
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -315,20 +485,215 @@ mod tests {
|
|||||||
|
|
||||||
helpers::register(Message::CharacterStats(message::CharacterStats::new(1)));
|
helpers::register(Message::CharacterStats(message::CharacterStats::new(1)));
|
||||||
|
|
||||||
let stats = helpers::get_player_in_zone_by_index(py, 0);
|
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
|
||||||
assert_eq!(helpers::get_string(py, &stats, "player"), "MAIN_CH1");
|
assert_eq!(helpers::get_string(py, &stats, "player"), "MAIN_CH1");
|
||||||
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
||||||
|
|
||||||
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
|
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
|
||||||
let stats = helpers::get_player_in_zone_by_index(py, 0);
|
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
|
||||||
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
|
||||||
|
|
||||||
|
helpers::register(Message::Leave(message::Leave::new(1)));
|
||||||
helpers::register(Message::CharacterStats(message::CharacterStats::new(2)));
|
helpers::register(Message::CharacterStats(message::CharacterStats::new(2)));
|
||||||
let stats = helpers::get_player_in_zone_by_index(py, 0);
|
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
|
||||||
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
||||||
|
|
||||||
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(2)));
|
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(2)));
|
||||||
let stats = helpers::get_player_in_zone_by_index(py, 0);
|
let stats = helpers::get_damage_dealer_in_zone_by_index(py, 0);
|
||||||
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_two_players_in_the_zone() {
|
||||||
|
let guard = helpers::init();
|
||||||
|
let py = guard.python();
|
||||||
|
|
||||||
|
helpers::register(Message::CharacterStats(message::CharacterStats::new_named(
|
||||||
|
"MAIN_CH1", 1,
|
||||||
|
)));
|
||||||
|
let stats = helpers::get_damage_dealer_in_zone_by_name(py, "MAIN_CH1").unwrap();
|
||||||
|
assert_eq!(helpers::get_string(py, &stats, "player"), "MAIN_CH1");
|
||||||
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
||||||
|
|
||||||
|
helpers::register(Message::NewCharacter(message::NewCharacter::new_named(
|
||||||
|
"CH1", 2,
|
||||||
|
)));
|
||||||
|
let stats = helpers::get_damage_dealer_in_zone_by_name(py, "CH1").unwrap();
|
||||||
|
assert_eq!(helpers::get_string(py, &stats, "player"), "CH1");
|
||||||
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
||||||
|
|
||||||
|
helpers::register(Message::Leave(message::Leave::new(1)));
|
||||||
|
let stats = helpers::get_damage_dealer_in_zone_by_name(py, "CH1");
|
||||||
|
assert!(stats.is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_overall_damage() {
|
||||||
|
let guard = helpers::init();
|
||||||
|
let py = guard.python();
|
||||||
|
|
||||||
|
helpers::register(Message::CharacterStats(message::CharacterStats::new_named(
|
||||||
|
"MAIN_CH1", 1,
|
||||||
|
)));
|
||||||
|
let stats = helpers::get_player_overall_by_name(py, "MAIN_CH1").unwrap();
|
||||||
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
||||||
|
|
||||||
|
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
|
||||||
|
let stats = helpers::get_player_overall_by_name(py, "MAIN_CH1").unwrap();
|
||||||
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
|
||||||
|
|
||||||
|
helpers::register(Message::Leave(message::Leave::new(1)));
|
||||||
|
helpers::register(Message::CharacterStats(message::CharacterStats::new_named(
|
||||||
|
"MAIN_CH1", 1,
|
||||||
|
)));
|
||||||
|
let stats = helpers::get_player_overall_by_name(py, "MAIN_CH1").unwrap();
|
||||||
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
|
||||||
|
|
||||||
|
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
|
||||||
|
let stats = helpers::get_player_overall_by_name(py, "MAIN_CH1").unwrap();
|
||||||
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 20.0);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_last_fight_damage() {
|
||||||
|
let guard = helpers::init();
|
||||||
|
let py = guard.python();
|
||||||
|
|
||||||
|
helpers::register(Message::CharacterStats(message::CharacterStats::new_named(
|
||||||
|
"MAIN_CH1", 1,
|
||||||
|
)));
|
||||||
|
let stats = helpers::get_player_last_fight_by_name(py, "MAIN_CH1").unwrap();
|
||||||
|
assert_eq!(helpers::get_string(py, &stats, "player"), "MAIN_CH1");
|
||||||
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 0.0);
|
||||||
|
|
||||||
|
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
|
||||||
|
let stats = helpers::get_player_last_fight_by_name(py, "MAIN_CH1").unwrap();
|
||||||
|
assert_eq!(helpers::get_float(py, &stats, "damage"), 10.0);
|
||||||
|
|
||||||
|
helpers::register(Message::RegenerationHealthChanged(
|
||||||
|
message::RegenerationHealthChanged::enabled(1),
|
||||||
|
));
|
||||||
|
helpers::register(Message::RegenerationHealthChanged(
|
||||||
|
message::RegenerationHealthChanged::disabled(1),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_last_fight_management() {
|
||||||
|
// session should be started when first player attacks
|
||||||
|
// damage should be 0 when all players are out of combat
|
||||||
|
|
||||||
|
let guard = helpers::init();
|
||||||
|
let py = guard.python();
|
||||||
|
|
||||||
|
helpers::register(Message::CharacterStats(message::CharacterStats::new_named(
|
||||||
|
"1", 1,
|
||||||
|
)));
|
||||||
|
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(1)));
|
||||||
|
helpers::register(Message::RegenerationHealthChanged(
|
||||||
|
message::RegenerationHealthChanged::disabled(1),
|
||||||
|
));
|
||||||
|
|
||||||
|
assert!(helpers::get_player_last_fight_by_name(py, "1").is_some());
|
||||||
|
|
||||||
|
helpers::register(Message::NewCharacter(message::NewCharacter::new_named(
|
||||||
|
"2", 2,
|
||||||
|
)));
|
||||||
|
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(2)));
|
||||||
|
helpers::register(Message::RegenerationHealthChanged(
|
||||||
|
message::RegenerationHealthChanged::disabled(2),
|
||||||
|
));
|
||||||
|
|
||||||
|
helpers::register(Message::NewCharacter(message::NewCharacter::new_named(
|
||||||
|
"3", 3,
|
||||||
|
)));
|
||||||
|
helpers::register(Message::HealthUpdate(message::HealthUpdate::new(3)));
|
||||||
|
helpers::register(Message::RegenerationHealthChanged(
|
||||||
|
message::RegenerationHealthChanged::disabled(3),
|
||||||
|
));
|
||||||
|
|
||||||
|
helpers::register(Message::RegenerationHealthChanged(
|
||||||
|
message::RegenerationHealthChanged::enabled(1),
|
||||||
|
));
|
||||||
|
assert_eq!(
|
||||||
|
helpers::get_float(
|
||||||
|
py,
|
||||||
|
&helpers::get_player_last_fight_by_name(py, "1").unwrap(),
|
||||||
|
"damage"
|
||||||
|
),
|
||||||
|
10.0
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
helpers::get_float(
|
||||||
|
py,
|
||||||
|
&helpers::get_player_last_fight_by_name(py, "2").unwrap(),
|
||||||
|
"damage"
|
||||||
|
),
|
||||||
|
10.0
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
helpers::get_float(
|
||||||
|
py,
|
||||||
|
&helpers::get_player_last_fight_by_name(py, "3").unwrap(),
|
||||||
|
"damage"
|
||||||
|
),
|
||||||
|
10.0
|
||||||
|
);
|
||||||
|
|
||||||
|
helpers::register(Message::RegenerationHealthChanged(
|
||||||
|
message::RegenerationHealthChanged::enabled(2),
|
||||||
|
));
|
||||||
|
assert_eq!(
|
||||||
|
helpers::get_float(
|
||||||
|
py,
|
||||||
|
&helpers::get_player_last_fight_by_name(py, "1").unwrap(),
|
||||||
|
"damage"
|
||||||
|
),
|
||||||
|
10.0
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
helpers::get_float(
|
||||||
|
py,
|
||||||
|
&helpers::get_player_last_fight_by_name(py, "2").unwrap(),
|
||||||
|
"damage"
|
||||||
|
),
|
||||||
|
10.0
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
helpers::get_float(
|
||||||
|
py,
|
||||||
|
&helpers::get_player_last_fight_by_name(py, "3").unwrap(),
|
||||||
|
"damage"
|
||||||
|
),
|
||||||
|
10.0
|
||||||
|
);
|
||||||
|
|
||||||
|
helpers::register(Message::RegenerationHealthChanged(
|
||||||
|
message::RegenerationHealthChanged::enabled(3),
|
||||||
|
));
|
||||||
|
assert_eq!(
|
||||||
|
helpers::get_float(
|
||||||
|
py,
|
||||||
|
&helpers::get_player_last_fight_by_name(py, "1").unwrap(),
|
||||||
|
"damage"
|
||||||
|
),
|
||||||
|
0.0
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
helpers::get_float(
|
||||||
|
py,
|
||||||
|
&helpers::get_player_last_fight_by_name(py, "2").unwrap(),
|
||||||
|
"damage"
|
||||||
|
),
|
||||||
|
0.0
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
helpers::get_float(
|
||||||
|
py,
|
||||||
|
&helpers::get_player_last_fight_by_name(py, "3").unwrap(),
|
||||||
|
"damage"
|
||||||
|
),
|
||||||
|
0.0
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+104
-30
@@ -15,13 +15,16 @@ use player::Player;
|
|||||||
pub use traits::*;
|
pub use traits::*;
|
||||||
pub use types::*;
|
pub use types::*;
|
||||||
|
|
||||||
#[derive(Hash, Eq, PartialEq, Clone)]
|
#[derive(Hash, Eq, PartialEq, Clone, Debug)]
|
||||||
pub struct PlayerName(String);
|
pub struct PlayerName(String);
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
pub struct Session {
|
pub struct Session {
|
||||||
players: HashMap<PlayerName, Player>,
|
players: HashMap<PlayerName, Player>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type PlayerStatisticsVec = Vec<PlayerStatistics>;
|
||||||
|
|
||||||
impl Session {
|
impl Session {
|
||||||
fn new() -> Self {
|
fn new() -> Self {
|
||||||
Self {
|
Self {
|
||||||
@@ -35,37 +38,50 @@ impl Session {
|
|||||||
players.insert(player_name.clone(), Player::new(player.id));
|
players.insert(player_name.clone(), Player::new(player.id));
|
||||||
}
|
}
|
||||||
|
|
||||||
Self {
|
Self { players }
|
||||||
players
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn stats(&self) -> Vec<PlayerStatistics> {
|
pub fn stats(&self) -> PlayerStatisticsVec {
|
||||||
self.players
|
self.players
|
||||||
.iter()
|
.iter()
|
||||||
.map(|(name, player)| PlayerStatistics {
|
.map(|(name, player)| PlayerStatistics {
|
||||||
player: name.0.to_owned(),
|
player: name.0.to_owned(),
|
||||||
damage: player.damage(),
|
damage: player.damage(),
|
||||||
time_in_combat: player.time_in_combat(),
|
time_in_combat: player.time_in_combat(),
|
||||||
dps: player.dps()
|
dps: player.dps(),
|
||||||
})
|
})
|
||||||
.collect()
|
.collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn cleanup_players(&mut self) {
|
||||||
|
let without_dmg = self
|
||||||
|
.players
|
||||||
|
.iter()
|
||||||
|
.filter(|(_, player)| player.damage() == 0.0)
|
||||||
|
.map(|(name, _)| name.clone())
|
||||||
|
.collect::<Vec<PlayerName>>();
|
||||||
|
for w in without_dmg {
|
||||||
|
self.players.remove_entry(&w);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn players(&self) -> Vec<&Player> {
|
||||||
|
self.players.iter().map(|(_, p)| p).collect()
|
||||||
|
}
|
||||||
|
|
||||||
fn get_player_by_id(&mut self, player_id: usize) -> Option<&mut Player> {
|
fn get_player_by_id(&mut self, player_id: usize) -> Option<&mut Player> {
|
||||||
self.players.values_mut().find(|p| p.id == player_id)
|
self.players.values_mut().find(|p| p.id == player_id)
|
||||||
}
|
}
|
||||||
|
|
||||||
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(
|
self.players
|
||||||
PlayerName(player_name.to_owned()),
|
.insert(PlayerName(player_name.to_owned()), Player::new(player_id));
|
||||||
Player::new(player_id),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct Meter {
|
pub struct Meter {
|
||||||
zone_sessions: VecDeque<Session>,
|
zone_sessions: VecDeque<Session>,
|
||||||
|
last_fight_session: Session,
|
||||||
main_player_id: Option<usize>,
|
main_player_id: Option<usize>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -73,42 +89,50 @@ impl Meter {
|
|||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
Self {
|
Self {
|
||||||
zone_sessions: VecDeque::new(),
|
zone_sessions: VecDeque::new(),
|
||||||
|
last_fight_session: Session::new(),
|
||||||
main_player_id: None,
|
main_player_id: None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[allow(dead_code)]
|
fn add_player(&mut self, name: &str, id: usize) -> Option<()> {
|
||||||
pub fn reset(&mut self) {
|
let session = self.zone_sessions.back_mut()?;
|
||||||
self.zone_sessions = VecDeque::new();
|
session.add_player(name, id);
|
||||||
self.main_player_id = None;
|
self.last_fight_session.add_player(name, id);
|
||||||
|
Some(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn new_session(&mut self) {
|
||||||
|
self.zone_sessions.push_back(Session::new());
|
||||||
|
self.last_fight_session = Session::new();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
impl PlayerEvents for Meter {
|
impl PlayerEvents for Meter {
|
||||||
fn get_player_in_zone(&mut self, player_id: usize) -> Option<&mut Player> {
|
fn get_damage_dealers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut DamageDealer>> {
|
||||||
let session = self.zone_sessions.back_mut()?;
|
let session = self.zone_sessions.back_mut()?;
|
||||||
session.get_player_by_id(player_id)
|
let zone_player = session.get_player_by_id(player_id)?;
|
||||||
|
Some(vec![
|
||||||
|
zone_player,
|
||||||
|
self.last_fight_session.get_player_by_id(player_id)?,
|
||||||
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
fn register_main_player(&mut self, name: &str, id: usize) {
|
fn register_main_player(&mut self, name: &str, id: usize) {
|
||||||
debug!("Main player {} registerd with id {}", name, id);
|
debug!("Main player {} registerd with id {}", name, id);
|
||||||
self.main_player_id = Some(id);
|
self.main_player_id = Some(id);
|
||||||
match self.zone_sessions.back_mut() {
|
|
||||||
Some(session) => session.add_player(name, id),
|
if self.zone_sessions.back().is_none() {
|
||||||
None => {
|
self.new_session();
|
||||||
let mut session = Session::new();
|
|
||||||
session.add_player(name, id);
|
|
||||||
self.zone_sessions.push_back(session);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
self.add_player(name, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn register_leave(&mut self, id: usize) -> Option<()> {
|
fn register_leave(&mut self, id: usize) -> Option<()> {
|
||||||
let main_player_id = self.main_player_id?;
|
let main_player_id = self.main_player_id?;
|
||||||
if id == main_player_id {
|
if id == main_player_id {
|
||||||
debug!("New session, main player left the zone");
|
debug!("New session, main player left the zone");
|
||||||
self.zone_sessions.push_back(Session::new());
|
self.zone_sessions.back_mut()?.cleanup_players();
|
||||||
|
self.new_session();
|
||||||
}
|
}
|
||||||
|
|
||||||
Some(())
|
Some(())
|
||||||
@@ -117,11 +141,25 @@ impl PlayerEvents for Meter {
|
|||||||
fn register_player(&mut self, name: &str, id: usize) {
|
fn register_player(&mut self, name: &str, id: usize) {
|
||||||
if self.zone_sessions.is_empty() {
|
if self.zone_sessions.is_empty() {
|
||||||
debug!("New session");
|
debug!("New session");
|
||||||
self.zone_sessions.push_back(Session::new());
|
self.new_session();
|
||||||
}
|
}
|
||||||
|
|
||||||
let session = self.zone_sessions.back_mut().unwrap();
|
self.add_player(name, id);
|
||||||
session.add_player(name, id);
|
}
|
||||||
|
fn register_combat_leave(&mut self, player_id: usize) -> Option<()> {
|
||||||
|
for player in self.get_damage_dealers_in_zone(player_id)? {
|
||||||
|
player.leave_combat();
|
||||||
|
}
|
||||||
|
|
||||||
|
if self
|
||||||
|
.last_fight_session
|
||||||
|
.players()
|
||||||
|
.iter()
|
||||||
|
.all(|p| p.combat_state() == CombatState::OutOfCombat)
|
||||||
|
{
|
||||||
|
self.last_fight_session = Session::from(&self.last_fight_session);
|
||||||
|
}
|
||||||
|
Some(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -138,6 +176,40 @@ impl ZoneStats for Meter {
|
|||||||
|
|
||||||
Some(())
|
Some(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn get_overall_session(&self) -> Option<PlayerStatisticsVec> {
|
||||||
|
let all_stats = self.zone_sessions.iter().flat_map(|s| s.stats()).fold(
|
||||||
|
HashMap::<String, PlayerStatistics>::new(),
|
||||||
|
|mut acc, stat| {
|
||||||
|
acc.entry(stat.player.clone())
|
||||||
|
.and_modify(|s| {
|
||||||
|
s.damage += stat.damage;
|
||||||
|
s.time_in_combat += stat.time_in_combat;
|
||||||
|
s.dps = s.dps();
|
||||||
|
})
|
||||||
|
.or_insert(stat);
|
||||||
|
acc
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
Some(all_stats.iter().map(|(_, v)| v.clone()).collect())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn reset(&mut self) {
|
||||||
|
self.zone_sessions = VecDeque::new();
|
||||||
|
self.last_fight_session = Session::new();
|
||||||
|
self.main_player_id = None;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_last_fight_session(&self) -> Option<PlayerStatisticsVec> {
|
||||||
|
let last_session = &self.last_fight_session;
|
||||||
|
Some(last_session.stats())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn new_last_fight_session(&mut self) -> Option<()> {
|
||||||
|
self.last_fight_session = Session::from(&self.last_fight_session);
|
||||||
|
Some(())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -147,7 +219,9 @@ fn test_meter() {
|
|||||||
assert_eq!(meter.get_zone_session(), None);
|
assert_eq!(meter.get_zone_session(), None);
|
||||||
|
|
||||||
meter.register_main_player("name", 0);
|
meter.register_main_player("name", 0);
|
||||||
|
|
||||||
assert!(meter.get_zone_session().is_some());
|
assert!(meter.get_zone_session().is_some());
|
||||||
assert_eq!(meter.get_zone_session().unwrap()[0].player, "name".to_owned());
|
assert_eq!(
|
||||||
|
meter.get_zone_session().unwrap()[0].player,
|
||||||
|
"name".to_owned()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
+28
-21
@@ -1,33 +1,33 @@
|
|||||||
|
use std::fmt;
|
||||||
use std::sync::{Arc, Mutex};
|
use std::sync::{Arc, Mutex};
|
||||||
|
|
||||||
use timer;
|
use timer;
|
||||||
|
|
||||||
|
use super::traits::CombatState;
|
||||||
|
use super::traits::DamageDealer;
|
||||||
use super::traits::DamageStats;
|
use super::traits::DamageStats;
|
||||||
|
|
||||||
#[derive(PartialEq)]
|
struct Time {
|
||||||
enum CombatState
|
|
||||||
{
|
|
||||||
InCombat,
|
|
||||||
OutOfCombat
|
|
||||||
}
|
|
||||||
|
|
||||||
struct Time
|
|
||||||
{
|
|
||||||
_guard: timer::Guard,
|
_guard: timer::Guard,
|
||||||
_timer: timer::Timer
|
_timer: timer::Timer,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct Player
|
impl fmt::Debug for Time {
|
||||||
{
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
write!(f, "")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct Player {
|
||||||
pub id: usize,
|
pub id: usize,
|
||||||
damage_dealt: f32,
|
damage_dealt: f32,
|
||||||
time_elapsed: Arc<Mutex<f32>>,
|
time_elapsed: Arc<Mutex<f32>>,
|
||||||
combat_state: Arc<Mutex<CombatState>>,
|
combat_state: Arc<Mutex<CombatState>>,
|
||||||
_time: Time
|
_time: Time,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Player
|
impl Player {
|
||||||
{
|
|
||||||
pub fn new(id: usize) -> Self {
|
pub fn new(id: usize) -> Self {
|
||||||
let _timer = timer::Timer::new();
|
let _timer = timer::Timer::new();
|
||||||
let time_elapsed = Arc::new(Mutex::new(0.0));
|
let time_elapsed = Arc::new(Mutex::new(0.0));
|
||||||
@@ -39,7 +39,6 @@ impl Player
|
|||||||
if *combat_state.lock().unwrap() == CombatState::InCombat {
|
if *combat_state.lock().unwrap() == CombatState::InCombat {
|
||||||
*time_elapsed.lock().unwrap() += 10.0;
|
*time_elapsed.lock().unwrap() += 10.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -48,11 +47,13 @@ impl Player
|
|||||||
damage_dealt: 0.0,
|
damage_dealt: 0.0,
|
||||||
time_elapsed,
|
time_elapsed,
|
||||||
combat_state,
|
combat_state,
|
||||||
_time: Time{_timer, _guard}
|
_time: Time { _timer, _guard },
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn register_damage_dealt(&mut self, damage_dealt: f32) {
|
impl DamageDealer for Player {
|
||||||
|
fn register_damage_dealt(&mut self, damage_dealt: f32) {
|
||||||
if *self.combat_state.lock().unwrap() == CombatState::OutOfCombat {
|
if *self.combat_state.lock().unwrap() == CombatState::OutOfCombat {
|
||||||
*self.time_elapsed.lock().unwrap() += 1000.0;
|
*self.time_elapsed.lock().unwrap() += 1000.0;
|
||||||
}
|
}
|
||||||
@@ -60,20 +61,26 @@ impl Player
|
|||||||
self.damage_dealt += damage_dealt
|
self.damage_dealt += damage_dealt
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn enter_combat(&mut self) {
|
fn enter_combat(&mut self) {
|
||||||
*self.combat_state.lock().unwrap() = CombatState::InCombat;
|
*self.combat_state.lock().unwrap() = CombatState::InCombat;
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn leave_combat(&mut self) {
|
fn leave_combat(&mut self) {
|
||||||
*self.combat_state.lock().unwrap() = CombatState::OutOfCombat;
|
*self.combat_state.lock().unwrap() = CombatState::OutOfCombat;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn combat_state(&self) -> CombatState {
|
||||||
|
match *self.combat_state.lock().unwrap() {
|
||||||
|
CombatState::InCombat => CombatState::InCombat,
|
||||||
|
CombatState::OutOfCombat => CombatState::OutOfCombat,
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl DamageStats for Player {
|
impl DamageStats for Player {
|
||||||
fn damage(&self) -> f32 {
|
fn damage(&self) -> f32 {
|
||||||
self.damage_dealt
|
self.damage_dealt
|
||||||
}
|
}
|
||||||
|
|
||||||
fn time_in_combat(&self) -> f32 {
|
fn time_in_combat(&self) -> f32 {
|
||||||
*self.time_elapsed.lock().unwrap()
|
*self.time_elapsed.lock().unwrap()
|
||||||
}
|
}
|
||||||
|
|||||||
+30
-7
@@ -1,5 +1,10 @@
|
|||||||
use super::types::PlayerStatistics;
|
use super::types::PlayerStatistics;
|
||||||
use super::Player;
|
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub enum CombatState {
|
||||||
|
InCombat,
|
||||||
|
OutOfCombat,
|
||||||
|
}
|
||||||
|
|
||||||
pub trait DamageStats {
|
pub trait DamageStats {
|
||||||
fn damage(&self) -> f32;
|
fn damage(&self) -> f32;
|
||||||
@@ -15,8 +20,18 @@ pub trait DamageStats {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub trait DamageDealer {
|
||||||
|
fn register_damage_dealt(&mut self, damage_dealt: f32);
|
||||||
|
|
||||||
|
fn enter_combat(&mut self);
|
||||||
|
|
||||||
|
fn leave_combat(&mut self);
|
||||||
|
|
||||||
|
fn combat_state(&self) -> CombatState;
|
||||||
|
}
|
||||||
|
|
||||||
pub trait PlayerEvents {
|
pub trait PlayerEvents {
|
||||||
fn get_player_in_zone(&mut self, player_id: usize) -> Option<&mut Player>;
|
fn get_damage_dealers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut DamageDealer>>;
|
||||||
|
|
||||||
fn register_main_player(&mut self, name: &str, id: usize);
|
fn register_main_player(&mut self, name: &str, id: usize);
|
||||||
|
|
||||||
@@ -25,32 +40,40 @@ pub trait PlayerEvents {
|
|||||||
fn register_player(&mut self, name: &str, id: usize);
|
fn register_player(&mut self, name: &str, id: usize);
|
||||||
|
|
||||||
fn register_damage_dealt(&mut self, player_id: usize, damage: f32) -> Option<()> {
|
fn register_damage_dealt(&mut self, player_id: usize, damage: f32) -> Option<()> {
|
||||||
let player = self.get_player_in_zone(player_id)?;
|
for player in self.get_damage_dealers_in_zone(player_id)? {
|
||||||
if damage < 0.0 {
|
if damage < 0.0 {
|
||||||
player.register_damage_dealt(f32::abs(damage));
|
player.register_damage_dealt(f32::abs(damage));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Some(())
|
Some(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn register_combat_enter(&mut self, player_id: usize) -> Option<()> {
|
fn register_combat_enter(&mut self, player_id: usize) -> Option<()> {
|
||||||
let player = self.get_player_in_zone(player_id)?;
|
for player in self.get_damage_dealers_in_zone(player_id)? {
|
||||||
|
|
||||||
player.enter_combat();
|
player.enter_combat();
|
||||||
|
}
|
||||||
|
|
||||||
Some(())
|
Some(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn register_combat_leave(&mut self, player_id: usize) -> Option<()> {
|
fn register_combat_leave(&mut self, player_id: usize) -> Option<()> {
|
||||||
let player = self.get_player_in_zone(player_id)?;
|
for player in self.get_damage_dealers_in_zone(player_id)? {
|
||||||
|
|
||||||
player.leave_combat();
|
player.leave_combat();
|
||||||
|
}
|
||||||
|
|
||||||
Some(())
|
Some(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub trait ZoneStats {
|
pub trait ZoneStats {
|
||||||
|
fn reset(&mut self);
|
||||||
|
|
||||||
fn get_zone_session(&self) -> Option<Vec<PlayerStatistics>>;
|
fn get_zone_session(&self) -> Option<Vec<PlayerStatistics>>;
|
||||||
fn new_zone_session(&mut self) -> Option<()>;
|
fn new_zone_session(&mut self) -> Option<()>;
|
||||||
|
|
||||||
|
fn get_overall_session(&self) -> Option<Vec<PlayerStatistics>>;
|
||||||
|
|
||||||
|
fn get_last_fight_session(&self) -> Option<Vec<PlayerStatistics>>;
|
||||||
|
fn new_last_fight_session(&mut self) -> Option<()>;
|
||||||
}
|
}
|
||||||
|
|||||||
+13
-2
@@ -1,7 +1,18 @@
|
|||||||
#[derive(Debug, PartialEq)]
|
use super::traits::DamageStats;
|
||||||
|
|
||||||
|
#[derive(Debug, PartialEq, Clone)]
|
||||||
pub struct PlayerStatistics {
|
pub struct PlayerStatistics {
|
||||||
pub player: String,
|
pub player: String,
|
||||||
pub damage: f32,
|
pub damage: f32,
|
||||||
pub time_in_combat: f32,
|
pub time_in_combat: f32,
|
||||||
pub dps: f32
|
pub dps: f32,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl DamageStats for PlayerStatistics {
|
||||||
|
fn damage(&self) -> f32 {
|
||||||
|
self.damage
|
||||||
|
}
|
||||||
|
fn time_in_combat(&self) -> f32 {
|
||||||
|
self.time_in_combat
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user