Two players in the zone, overall & last fight interface

This commit is contained in:
Wiktor Mazur
2019-09-15 12:53:05 +02:00
parent 9390e2623d
commit ead1da9731
5 changed files with 591 additions and 111 deletions
+405 -40
View File
@@ -11,8 +11,8 @@ use std::sync::mpsc::{channel, Receiver, Sender};
use std::sync::Mutex;
use std::thread;
use cpython::{PyDict, PyList, PyObject, PyResult, Python, PythonObject, ToPyObject};
use cpython::PyClone;
use cpython::{PyDict, PyList, PyObject, PyResult, Python, PythonObject, ToPyObject};
use log::*;
use simplelog::*;
@@ -21,8 +21,8 @@ use packet_sniffer::UdpPacket;
mod game_protocol;
mod meter;
use meter::ZoneStats;
use meter::PlayerEvents;
use meter::ZoneStats;
lazy_static! {
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 {
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();
stats.set_item(py, "damage", self.damage.to_py_object(py))
stats
.set_item(py, "damage", self.damage.to_py_object(py))
.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();
stats.set_item(py, "dps", self.dps.to_py_object(py)).unwrap();
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> {
let meter = &mut METER.lock().unwrap();
@@ -69,6 +106,22 @@ fn new_zone_session(_py: Python) -> PyResult<u32> {
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> {
CombinedLogger::init(vec![WriteLogger::new(
LevelFilter::Trace,
@@ -82,7 +135,6 @@ fn initialize(_py: Python) -> PyResult<u32> {
packet_sniffer::receive(tx);
info!("Listening to network packets...");
loop {
if let Ok(packet) = rx.recv() {
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
.register_damage_dealt(msg.target, msg.value)
.unwrap_or(()),
game_protocol::Message::RegenerationHealthChanged(msg) => {
match msg.regeneration_rate {
Some(_) => events.register_combat_leave(msg.source).unwrap_or(()),
None => events.register_combat_enter(msg.source).unwrap_or(()),
}
game_protocol::Message::RegenerationHealthChanged(msg) => match msg.regeneration_rate {
Some(_) => events.register_combat_leave(msg.source).unwrap_or(()),
None => events.register_combat_enter(msg.source).unwrap_or(()),
},
game_protocol::Message::Died(msg) => {
events.register_combat_leave(msg.source).unwrap_or(())
}
game_protocol::Message::Died(msg) => 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, "initialize", py_fn!(py, initialize()))?;
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(
py,
"get_zone_session",
py_fn!(py, get_zone_session()),
"get_last_fight_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(())
});
@@ -168,31 +224,101 @@ mod tests {
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 stat = zone_session.get_item(py, index);
let player = stat.cast_as::<PyDict>(py).unwrap().clone_ref(py);
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 {
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 {
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)
}
}
trait Testing {
fn new(source: usize) -> Self;
}
impl Testing for message::NewCharacter {
fn new(source: usize) -> Self {
trait NamedTesting {
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 {
source: source,
character_name: String::from("CH1"),
character_name: name.to_owned(),
health: 10.0,
max_health: 10.0,
energy: 1.0,
@@ -201,11 +327,11 @@ mod tests {
}
}
impl Testing for message::CharacterStats {
fn new(source: usize) -> Self {
impl NamedTesting for message::CharacterStats {
fn new_named(name: &str, source: usize) -> Self {
Self {
source: source,
character_name: String::from("MAIN_CH1"),
character_name: name.to_owned(),
health: 10.0,
max_health: 10.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 {
fn new(source: usize) -> Self {
Self {
@@ -224,8 +368,8 @@ mod tests {
}
}
impl Testing for message::RegenerationHealthChanged {
fn new(source: usize) -> Self {
impl SwitchableTesting for message::RegenerationHealthChanged {
fn enabled(source: usize) -> Self {
Self {
source: source,
health: 10.0,
@@ -233,6 +377,15 @@ mod tests {
regeneration_rate: Some(1.0),
}
}
fn disabled(source: usize) -> Self {
Self {
source: source,
health: 10.0,
max_health: 10.0,
regeneration_rate: None,
}
}
}
#[test]
@@ -261,7 +414,7 @@ mod tests {
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!(helpers::get_string(py, &stats, "player"), "CH1");
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);
}
#[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]
fn test_new_player_damage() {
let guard = helpers::init();
@@ -276,13 +447,13 @@ mod tests {
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_float(py, &stats, "damage"), 0.0);
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);
}
@@ -293,18 +464,17 @@ mod tests {
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_float(py, &stats, "damage"), 0.0);
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);
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);
}
@@ -315,20 +485,215 @@ mod tests {
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_float(py, &stats, "damage"), 0.0);
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);
helpers::register(Message::Leave(message::Leave::new(1)));
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);
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);
}
#[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
);
}
}