Removed: party related features

This commit is contained in:
Wiktor Mazur
2019-12-30 12:50:10 +01:00
parent f58307b902
commit 59eff7a241
10 changed files with 17 additions and 258 deletions
+1 -99
View File
@@ -17,7 +17,6 @@ pub use meter::GameStats;
pub use meter::LastFightStats;
pub use meter::MeterConfig;
pub use meter::OverallStats;
pub use meter::PartyEvents;
pub use meter::PlayerEvents;
pub use meter::PlayerStatistics;
pub use meter::PlayerStatisticsVec;
@@ -67,10 +66,6 @@ pub fn reset(meter: &mut meter::Meter, stat_type: StatType) {
}
}
pub fn get_players_in_party(meter: &meter::Meter) -> Vec<String> {
meter.get_players_in_party().unwrap_or(vec![])
}
pub fn initialize() -> Result<Arc<Mutex<meter::Meter>>, InitializationError> {
CombinedLogger::init(vec![WriteLogger::new(
LevelFilter::Info,
@@ -123,7 +118,7 @@ pub fn register_messages(meter: &mut meter::Meter, messages: &Vec<game_protocol:
fn register_message<Events>(events: &mut Events, message: &game_protocol::Message)
where
Events: PlayerEvents + PartyEvents,
Events: PlayerEvents,
{
info!("Found message {:?}", message);
match message {
@@ -146,15 +141,6 @@ where
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::PartyNew(msg) => events
.register_new_party(&msg.players, msg.source)
.unwrap_or(()),
game_protocol::Message::PartyJoin(msg) => {
events.register_new_member(&msg.target_name).unwrap_or(())
}
game_protocol::Message::PartyDisbanded(_) => {
events.register_party_disbanded().unwrap_or(())
}
game_protocol::Message::FameUpdate(msg) => events
.register_fame_gain(msg.source, msg.fame as f32 / 10000.0)
.unwrap_or(()),
@@ -283,30 +269,6 @@ mod tests {
}
}
impl ListNamedTesting for message::PartyNew {
fn new_list_of_named(names: &[&str], source: usize) -> Self {
Self {
source: source,
players: names.iter().map(ToString::to_string).collect(),
}
}
}
impl NamedTesting for message::PartyJoin {
fn new_named(name: &str, source: usize) -> Self {
Self {
target_name: name.to_string(),
source,
}
}
}
impl Testing for message::PartyDisbanded {
fn new(source: usize) -> Self {
Self { source }
}
}
#[test]
fn test_empty_session() {
let meter = helpers::init_();
@@ -652,66 +614,6 @@ mod tests {
assert_eq!(player_stats.damage, 0.0);
}
macro_rules! new_party {
($meter:expr, $members:expr, $party_id:expr) => {
register_message(
&mut $meter,
&Message::PartyNew(message::PartyNew::new_list_of_named($members, $party_id)),
);
};
}
macro_rules! new_party_member {
($meter:expr, $player:expr, $party_id:expr) => {
register_message(
&mut $meter,
&Message::PartyJoin(message::PartyJoin::new_named($player, $party_id)),
);
};
}
#[test]
fn test_party_members() {
let mut meter = helpers::init_();
meter.configure(meter::MeterConfig {
skip_non_party_members: true,
..Default::default()
});
main_character_enters!(meter, "MAIN_CH1", 1);
character_enters!(meter, "CH1", 2);
let zone_stats = stats(&meter, StatType::Zone);
assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some());
assert!(zone_stats.iter().find(|s| s.player == "CH1").is_none());
new_party!(meter, &["MAIN_CH1", "CH1"], 1);
let zone_stats = stats(&meter, StatType::Zone);
assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some());
assert!(zone_stats.iter().find(|s| s.player == "CH1").is_some());
character_enters!(meter, "CH2", 3);
let zone_stats = stats(&meter, StatType::Zone);
assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some());
assert!(zone_stats.iter().find(|s| s.player == "CH1").is_some());
assert!(zone_stats.iter().find(|s| s.player == "CH2").is_none());
new_party_member!(meter, "CH2", 1);
let zone_stats = stats(&meter, StatType::Zone);
assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some());
assert!(zone_stats.iter().find(|s| s.player == "CH1").is_some());
assert!(zone_stats.iter().find(|s| s.player == "CH2").is_some());
register_message(
&mut meter,
&Message::PartyDisbanded(message::PartyDisbanded::new(1)),
);
let zone_stats = stats(&meter, StatType::Zone);
assert!(zone_stats.iter().find(|s| s.player == "MAIN_CH1").is_some());
assert!(zone_stats.iter().find(|s| s.player == "CH1").is_none());
assert!(zone_stats.iter().find(|s| s.player == "CH2").is_none());
}
#[test]
fn test_fame_statistics() {
let mut meter = helpers::init_();
+2 -17
View File
@@ -171,20 +171,7 @@ pub fn reset(_py: Python, stat_type: StatType) -> PyResult<u32> {
Ok(1)
}
pub fn get_players_in_party(py: Python) -> PyResult<PyList> {
if let Ok(ref mut py_meter) = METER.lock() {
if let Some(m) = py_meter.get() {
if let Ok(ref mut meter) = m.lock() {
return Ok(core::get_players_in_party(&meter).into_py_object(py))
}
}
}
error!("Failed to acquire locks on meter");
Ok(PyList::new(py, Vec::<PyObject>::new().as_slice()))
}
fn initialize(_py: Python, skip_non_party_members: bool) -> PyResult<u32> {
fn initialize(_py: Python) -> PyResult<u32> {
if let Ok(ref mut py_meter) = METER.lock() {
match core::initialize() {
Ok(core_meter) => py_meter.initialize(core_meter),
@@ -194,7 +181,6 @@ fn initialize(_py: Python, skip_non_party_members: bool) -> PyResult<u32> {
if let Some(m) = py_meter.get() {
if let Ok(ref mut meter) = m.lock() {
meter.configure(core::MeterConfig {
skip_non_party_members,
..Default::default()
});
return Ok(0);
@@ -207,9 +193,8 @@ fn initialize(_py: Python, skip_non_party_members: bool) -> PyResult<u32> {
py_module_initializer!(libaostats, initlibaostats, PyInit_libaostats, |py, m| {
m.add(py, "__doc__", "This module is implemented in Rust")?;
m.add(py, "initialize", py_fn!(py, initialize(skip_non_party_members: bool)))?;
m.add(py, "initialize", py_fn!(py, initialize()))?;
m.add(py, "stats", py_fn!(py, stats(stat_type: StatType)))?;
m.add(py, "reset", py_fn!(py, reset(stat_type: StatType)))?;
m.add(py, "get_players_in_party", py_fn!(py, get_players_in_party()))?;
Ok(())
});
+2 -45
View File
@@ -92,16 +92,13 @@ impl Session {
}
#[derive(Default)]
pub struct MeterConfig {
pub skip_non_party_members: bool,
}
pub struct MeterConfig {}
pub struct Meter {
zone_history: PlayerStatisticsVec,
zone_session: Option<Session>,
last_fight_session: Session,
main_player_id: Option<usize>,
party: Option<types::Party>,
unconsumed_items: HashMap<usize, game_protocol::Items>,
config: MeterConfig,
}
@@ -113,7 +110,6 @@ impl Meter {
zone_session: None,
last_fight_session: Session::new(),
main_player_id: None,
party: None,
unconsumed_items: HashMap::new(),
config: Default::default(),
}
@@ -123,14 +119,7 @@ impl Meter {
self.config = config;
}
fn stats_filter(&self, player: &(&String, &Player)) -> bool {
if self.config.skip_non_party_members {
let is_main_player = if let Some(id) = &self.main_player_id { *id == player.1.id() } else { false };
let is_in_party = if let Some(party) = &self.party { party.includes(&player.0) } else { false };
return is_main_player || is_in_party;
}
fn stats_filter(&self, _player: &(&String, &Player)) -> bool {
true
}
@@ -329,38 +318,6 @@ impl GameStats for Meter {
info!("Reset: overall");
Some(())
}
fn get_players_in_party(&self) -> Option<Vec<String>> {
if let Some(party) = &self.party {
let members = party.clone().members;
return Some(members.into_iter().collect())
}
None
}
}
impl traits::PartyEvents for Meter {
fn register_new_party(
&mut self,
player_names: &std::vec::Vec<std::string::String>,
id: usize,
) -> Option<()> {
self.party = Some(types::Party::new(id, player_names));
Some(())
}
fn register_new_member(&mut self, player_name: &str) -> Option<()> {
if let Some(party) = &mut self.party {
party.add_member(player_name);
}
Some(())
}
fn register_party_disbanded(&mut self) -> Option<()> {
self.party = None;
Some(())
}
}
#[test]
-7
View File
@@ -126,12 +126,5 @@ pub trait OverallStats {
}
pub trait GameStats {
fn get_players_in_party(&self) -> Option<Vec<String>>;
fn reset_stats(&mut self) -> Option<()>;
}
pub trait PartyEvents {
fn register_new_party(&mut self, player_names: &std::vec::Vec<std::string::String>, id: usize) -> Option<()>;
fn register_new_member(&mut self, player_name: &str) -> Option<()>;
fn register_party_disbanded(&mut self) -> Option<()>;
}
-25
View File
@@ -1,6 +1,4 @@
use std::collections::HashSet;
use std::collections::HashMap;
use std::iter::FromIterator;
#[cfg(test)]
use fake_clock::FakeClock as Instant;
@@ -11,29 +9,6 @@ use super::game_protocol::Items;
use super::traits::DamageStats;
use super::traits::FameStats;
#[derive(Debug, PartialEq, Clone)]
pub struct Party {
pub id: usize,
pub members: HashSet<String>
}
impl Party {
pub fn new(id: usize, members: &std::vec::Vec<std::string::String>) -> Self {
Self {
id,
members: HashSet::from_iter(members.iter().cloned()),
}
}
pub fn add_member(&mut self, member_name: &str) {
self.members.insert(member_name.to_string());
}
pub fn includes(&self, other: &str) -> bool {
return self.members.contains(other);
}
}
#[derive(Debug, PartialEq, Clone)]
pub struct PlayerStatistics {
pub player: String,