Source and target of Healing/Damage done
This commit is contained in:
Generated
-10
@@ -39,15 +39,6 @@ version = "0.11.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
|
checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "bimap"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "783204f24fd7724ea274d327619cfa6a6018047bb0561a68aadff6f56787591b"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bitflags"
|
name = "bitflags"
|
||||||
version = "0.5.0"
|
version = "0.5.0"
|
||||||
@@ -225,7 +216,6 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
|||||||
name = "libaostats"
|
name = "libaostats"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bimap",
|
|
||||||
"bytes",
|
"bytes",
|
||||||
"chrono 0.4.10",
|
"chrono 0.4.10",
|
||||||
"cpython",
|
"cpython",
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ chrono = "0.4"
|
|||||||
log = { version = "0.4", features = ["std"] }
|
log = { version = "0.4", features = ["std"] }
|
||||||
lazy_static = "1.2"
|
lazy_static = "1.2"
|
||||||
derive_more = "0.99"
|
derive_more = "0.99"
|
||||||
bimap = "0.4.0"
|
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
|
|||||||
+90
-53
@@ -3,23 +3,24 @@ use std::convert::From;
|
|||||||
use crate::photon_messages::messages;
|
use crate::photon_messages::messages;
|
||||||
|
|
||||||
use super::events;
|
use super::events;
|
||||||
use super::player::{StaticId, PlayerName};
|
use super::id_cache::{DynIdToStaticId, StaticIdToName};
|
||||||
|
use super::player::DynamicId;
|
||||||
|
|
||||||
pub struct EventIntermediate<Msg> {
|
pub struct EventIntermediate<Msg> {
|
||||||
id: StaticId,
|
dyn_id_to_static_id: DynIdToStaticId,
|
||||||
name: PlayerName,
|
static_id_to_name: StaticIdToName,
|
||||||
message: Msg,
|
message: Msg,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<Msg> EventIntermediate<Msg> {
|
impl<Msg> EventIntermediate<Msg> {
|
||||||
pub fn new(
|
pub fn new(
|
||||||
id: StaticId,
|
dyn_id_to_static_id: DynIdToStaticId,
|
||||||
name: PlayerName,
|
static_id_to_name: StaticIdToName,
|
||||||
message: Msg,
|
message: Msg,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
Self {
|
Self {
|
||||||
id,
|
dyn_id_to_static_id,
|
||||||
name,
|
static_id_to_name,
|
||||||
message,
|
message,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -34,100 +35,136 @@ impl EventList {
|
|||||||
Self { value: list }
|
Self { value: list }
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn values(self) -> Vec<events::Event> {
|
pub fn values(self) -> Option<Vec<events::Event>> {
|
||||||
self.value
|
Some(self.value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<EventIntermediate<messages::NewCharacter>> for events::Event {
|
macro_rules! try_from_dynamic {
|
||||||
fn from(intermediate: EventIntermediate<messages::NewCharacter>) -> Self {
|
($field_name:ident, $intermediate:expr) => {
|
||||||
Self::PlayerAppeared(events::Player {
|
if let Some(static_id) = $intermediate
|
||||||
id: intermediate.id,
|
.dyn_id_to_static_id
|
||||||
name: intermediate.message.character_name,
|
.get(&DynamicId::from($intermediate.message.$field_name as u32))
|
||||||
})
|
{
|
||||||
|
*static_id
|
||||||
|
} else {
|
||||||
|
return Self::new(vec![]);
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
macro_rules! try_from_dynamic_with_name {
|
||||||
|
($field_name:ident, $intermediate:expr) => {
|
||||||
|
if let Some(static_id) = $intermediate
|
||||||
|
.dyn_id_to_static_id
|
||||||
|
.get(&DynamicId::from($intermediate.message.$field_name as u32))
|
||||||
|
{
|
||||||
|
if let Some(player_name) = $intermediate.static_id_to_name.get(&static_id) {
|
||||||
|
(*static_id, player_name.to_string())
|
||||||
|
} else {
|
||||||
|
return Self::new(vec![]);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return Self::new(vec![]);
|
||||||
|
}
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<EventIntermediate<messages::NewCharacter>> for EventList {
|
impl From<EventIntermediate<messages::NewCharacter>> for EventList {
|
||||||
fn from(intermediate: EventIntermediate<messages::NewCharacter>) -> Self {
|
fn from(intermediate: EventIntermediate<messages::NewCharacter>) -> Self {
|
||||||
|
let static_id = try_from_dynamic!(source, intermediate);
|
||||||
Self::new(vec![
|
Self::new(vec![
|
||||||
events::Event::PlayerAppeared(events::Player {
|
events::Event::PlayerAppeared(events::Player {
|
||||||
id: intermediate.id,
|
id: static_id,
|
||||||
name: intermediate.message.character_name,
|
name: intermediate.message.character_name,
|
||||||
}),
|
}),
|
||||||
events::Event::UpdateItems(events::Items {
|
events::Event::UpdateItems(events::Items {
|
||||||
source: intermediate.id,
|
source: static_id,
|
||||||
value: intermediate.message.items,
|
value: intermediate.message.items,
|
||||||
}),
|
}),
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<EventIntermediate<messages::Join>> for events::Event {
|
impl From<EventIntermediate<messages::Join>> for EventList {
|
||||||
fn from(intermediate: EventIntermediate<messages::Join>) -> Self {
|
fn from(intermediate: EventIntermediate<messages::Join>) -> Self {
|
||||||
Self::MainPlayerAppeared(events::Player {
|
let static_id = try_from_dynamic!(source, intermediate);
|
||||||
id: intermediate.id,
|
Self::new(vec![events::Event::MainPlayerAppeared(events::Player {
|
||||||
|
id: static_id,
|
||||||
name: intermediate.message.character_name,
|
name: intermediate.message.character_name,
|
||||||
})
|
})])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<EventIntermediate<messages::HealthUpdate>> for events::Event {
|
impl From<EventIntermediate<messages::HealthUpdate>> for EventList {
|
||||||
fn from(intermediate: EventIntermediate<messages::HealthUpdate>) -> Self {
|
fn from(intermediate: EventIntermediate<messages::HealthUpdate>) -> Self {
|
||||||
|
let target_static_id = try_from_dynamic!(target, intermediate);
|
||||||
|
|
||||||
if intermediate.message.value < 0.0 {
|
if intermediate.message.value < 0.0 {
|
||||||
return Self::DamageDone(events::Damage {
|
return Self::new(vec![events::Event::DamageDone(events::Damage {
|
||||||
source: intermediate.id,
|
source: target_static_id,
|
||||||
target: None,
|
target: intermediate
|
||||||
|
.dyn_id_to_static_id
|
||||||
|
.get(&DynamicId::from(intermediate.message.source as u32))
|
||||||
|
.map(|v| *v),
|
||||||
value: f32::abs(intermediate.message.value),
|
value: f32::abs(intermediate.message.value),
|
||||||
});
|
})]);
|
||||||
}
|
}
|
||||||
Self::HealthReceived(events::Damage {
|
|
||||||
source: intermediate.id,
|
Self::new(vec![events::Event::HealthReceived(events::Damage {
|
||||||
target: None,
|
source: target_static_id,
|
||||||
|
target: intermediate
|
||||||
|
.dyn_id_to_static_id
|
||||||
|
.get(&DynamicId::from(intermediate.message.source as u32))
|
||||||
|
.map(|v| *v),
|
||||||
value: intermediate.message.value,
|
value: intermediate.message.value,
|
||||||
})
|
})])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl From<EventIntermediate<messages::RegenerationHealthChanged>> for EventList {
|
||||||
impl From<EventIntermediate<messages::RegenerationHealthChanged>> for events::Event {
|
|
||||||
fn from(intermediate: EventIntermediate<messages::RegenerationHealthChanged>) -> Self {
|
fn from(intermediate: EventIntermediate<messages::RegenerationHealthChanged>) -> Self {
|
||||||
|
let (static_id, name) = try_from_dynamic_with_name!(source, intermediate);
|
||||||
|
|
||||||
match intermediate.message.regeneration_rate {
|
match intermediate.message.regeneration_rate {
|
||||||
Some(_) => Self::LeaveCombat(events::Player {
|
Some(_) => Self::new(vec![events::Event::LeaveCombat(events::Player {
|
||||||
id: intermediate.id,
|
id: static_id,
|
||||||
name: intermediate.name.into(),
|
name: name,
|
||||||
}),
|
})]),
|
||||||
None => Self::EnterCombat(events::Player {
|
None => Self::new(vec![events::Event::EnterCombat(events::Player {
|
||||||
id: intermediate.id,
|
id: static_id,
|
||||||
name: intermediate.name.into(),
|
name: name,
|
||||||
}),
|
})]),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<EventIntermediate<messages::KnockedDown>> for events::Event {
|
impl From<EventIntermediate<messages::KnockedDown>> for EventList {
|
||||||
fn from(intermediate: EventIntermediate<messages::KnockedDown>) -> Self {
|
fn from(intermediate: EventIntermediate<messages::KnockedDown>) -> Self {
|
||||||
Self::LeaveCombat(events::Player {
|
let (static_id, name) = try_from_dynamic_with_name!(source, intermediate);
|
||||||
id: intermediate.id,
|
Self::new(vec![events::Event::LeaveCombat(events::Player {
|
||||||
name: intermediate.name.into(),
|
id: static_id,
|
||||||
})
|
name: name,
|
||||||
|
})])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<EventIntermediate<messages::UpdateFame>> for events::Event {
|
impl From<EventIntermediate<messages::UpdateFame>> for EventList {
|
||||||
fn from(intermediate: EventIntermediate<messages::UpdateFame>) -> Self {
|
fn from(intermediate: EventIntermediate<messages::UpdateFame>) -> Self {
|
||||||
Self::UpdateFame(events::Fame {
|
let source_static_id = try_from_dynamic!(source, intermediate);
|
||||||
source: intermediate.id,
|
Self::new(vec![events::Event::UpdateFame(events::Fame {
|
||||||
|
source: source_static_id,
|
||||||
value: intermediate.message.fame as f32 / 10000.0,
|
value: intermediate.message.fame as f32 / 10000.0,
|
||||||
})
|
})])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<EventIntermediate<messages::CharacterEquipmentChanged>> for events::Event {
|
impl From<EventIntermediate<messages::CharacterEquipmentChanged>> for EventList {
|
||||||
fn from(intermediate: EventIntermediate<messages::CharacterEquipmentChanged>) -> Self {
|
fn from(intermediate: EventIntermediate<messages::CharacterEquipmentChanged>) -> Self {
|
||||||
Self::UpdateItems(events::Items {
|
let source_static_id = try_from_dynamic!(source, intermediate);
|
||||||
source: intermediate.id,
|
Self::new(vec![events::Event::UpdateItems(events::Items {
|
||||||
|
source: source_static_id,
|
||||||
value: intermediate.message.items,
|
value: intermediate.message.items,
|
||||||
})
|
})])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
#![allow(dead_code)]
|
#![allow(dead_code)]
|
||||||
|
|
||||||
use bimap::BiMap;
|
|
||||||
|
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use super::player::{StaticId, DynamicId, PlayerName};
|
use super::player::{DynamicId, PlayerName, StaticId};
|
||||||
|
|
||||||
|
pub type DynIdToStaticId = HashMap<DynamicId, StaticId>;
|
||||||
|
pub type StaticIdToName = HashMap<StaticId, PlayerName>;
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Default)]
|
#[derive(Debug, PartialEq, Default)]
|
||||||
pub struct IdCache {
|
pub struct IdCache {
|
||||||
name_to_static_id: HashMap<String, u32>,
|
dyn_id_to_static_id: DynIdToStaticId,
|
||||||
dyn_id_to_name: BiMap<u32, String>,
|
static_id_to_name: StaticIdToName,
|
||||||
last_id: u32,
|
last_id: u32,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -21,34 +21,49 @@ impl IdCache {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn save(&mut self, dynamic_id: DynamicId, name: &str) {
|
pub fn save(&mut self, dynamic_id: DynamicId, name: &str) {
|
||||||
if self.name_to_static_id.get(name).is_none() {
|
let player_name: PlayerName = name.to_owned().into();
|
||||||
let id = self.last_id;
|
if let Some(static_id) = self.find_static_id(&player_name) {
|
||||||
|
if let Some(dyn_id) = self.find_dynamic_id(&static_id) {
|
||||||
|
self.dyn_id_to_static_id.remove(&dyn_id);
|
||||||
|
}
|
||||||
|
self.dyn_id_to_static_id.insert(dynamic_id, static_id);
|
||||||
|
} else {
|
||||||
|
let static_id: StaticId = self.last_id.into();
|
||||||
self.last_id += 1;
|
self.last_id += 1;
|
||||||
self.name_to_static_id.insert(name.to_owned(), id);
|
|
||||||
self.dyn_id_to_name.insert(dynamic_id.into(), name.to_owned());
|
self.dyn_id_to_static_id.insert(dynamic_id, static_id);
|
||||||
|
self.static_id_to_name.insert(static_id, player_name);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
self.dyn_id_to_name.insert(dynamic_id.into(), name.to_owned());
|
fn find_static_id(&self, name: &PlayerName) -> Option<StaticId> {
|
||||||
|
self.static_id_to_name
|
||||||
|
.iter()
|
||||||
|
.find(|(_k, v)| v == &name)
|
||||||
|
.map(|(k, _v)| *k)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn find_dynamic_id(&self, static_id: &StaticId) -> Option<DynamicId> {
|
||||||
|
self.dyn_id_to_static_id
|
||||||
|
.iter()
|
||||||
|
.find(|(_k, v)| v == &static_id)
|
||||||
|
.map(|(k, _v)| *k)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_dyn_id_to_static_id_map(&self) -> DynIdToStaticId {
|
||||||
|
self.dyn_id_to_static_id.clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_static_id_to_name_map(&self) -> StaticIdToName {
|
||||||
|
self.static_id_to_name.clone()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_static_id(&self, dynamic_id: DynamicId) -> Option<StaticId> {
|
pub fn get_static_id(&self, dynamic_id: DynamicId) -> Option<StaticId> {
|
||||||
self.dyn_id_to_name
|
self.dyn_id_to_static_id.get(&dynamic_id).map(|i| *i)
|
||||||
.get_by_left(&dynamic_id.into())
|
|
||||||
.map(|name| {
|
|
||||||
self.name_to_static_id
|
|
||||||
.get(name)
|
|
||||||
.map(|v| *v)
|
|
||||||
.map(|v| v.into())
|
|
||||||
})
|
|
||||||
.flatten()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_name(&self, static_id: StaticId) -> Option<PlayerName> {
|
pub fn get_name(&self, static_id: StaticId) -> Option<PlayerName> {
|
||||||
self.name_to_static_id
|
self.static_id_to_name.get(&static_id).map(|i| i.clone())
|
||||||
.iter()
|
|
||||||
.find(|(_k, v)| **v == StaticId::into(static_id))
|
|
||||||
.map(|v| v.0)
|
|
||||||
.map(|v| v.clone().into())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -64,11 +79,17 @@ mod tests {
|
|||||||
|
|
||||||
cache.save(DynamicId::from(1), "test");
|
cache.save(DynamicId::from(1), "test");
|
||||||
assert!(cache.get_static_id(DynamicId::from(1)).is_some());
|
assert!(cache.get_static_id(DynamicId::from(1)).is_some());
|
||||||
assert_eq!(cache.get_static_id(DynamicId::from(1)), Some(StaticId::from(0)));
|
assert_eq!(
|
||||||
|
cache.get_static_id(DynamicId::from(1)),
|
||||||
|
Some(StaticId::from(0))
|
||||||
|
);
|
||||||
|
|
||||||
cache.save(DynamicId::from(2), "test");
|
cache.save(DynamicId::from(2), "test");
|
||||||
assert!(cache.get_static_id(DynamicId::from(1)).is_none());
|
assert!(cache.get_static_id(DynamicId::from(1)).is_none());
|
||||||
assert_eq!(cache.get_static_id(DynamicId::from(2)), Some(StaticId::from(0)));
|
assert_eq!(
|
||||||
|
cache.get_static_id(DynamicId::from(2)),
|
||||||
|
Some(StaticId::from(0))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -76,13 +97,22 @@ mod tests {
|
|||||||
let mut cache = IdCache::new();
|
let mut cache = IdCache::new();
|
||||||
|
|
||||||
cache.save(DynamicId::from(1), "test");
|
cache.save(DynamicId::from(1), "test");
|
||||||
assert_eq!(cache.get_static_id(DynamicId::from(1)), Some(StaticId::from(0)));
|
assert_eq!(
|
||||||
|
cache.get_static_id(DynamicId::from(1)),
|
||||||
|
Some(StaticId::from(0))
|
||||||
|
);
|
||||||
|
|
||||||
cache.save(DynamicId::from(2), "test2");
|
cache.save(DynamicId::from(2), "test2");
|
||||||
assert_eq!(cache.get_static_id(DynamicId::from(2)), Some(StaticId::from(1)));
|
assert_eq!(
|
||||||
|
cache.get_static_id(DynamicId::from(2)),
|
||||||
|
Some(StaticId::from(1))
|
||||||
|
);
|
||||||
|
|
||||||
cache.save(DynamicId::from(12345), "test3");
|
cache.save(DynamicId::from(12345), "test3");
|
||||||
assert_eq!(cache.get_static_id(DynamicId::from(12345)), Some(StaticId::from(2)));
|
assert_eq!(
|
||||||
|
cache.get_static_id(DynamicId::from(12345)),
|
||||||
|
Some(StaticId::from(2))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -92,14 +122,20 @@ mod tests {
|
|||||||
assert!(cache.get_name(StaticId::from(1)).is_none());
|
assert!(cache.get_name(StaticId::from(1)).is_none());
|
||||||
|
|
||||||
cache.save(DynamicId::from(1), "test");
|
cache.save(DynamicId::from(1), "test");
|
||||||
assert_eq!(cache.get_static_id(DynamicId::from(1)), Some(StaticId::from(0)));
|
assert_eq!(
|
||||||
|
cache.get_static_id(DynamicId::from(1)),
|
||||||
|
Some(StaticId::from(0))
|
||||||
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
cache.get_name(StaticId::from(0)),
|
cache.get_name(StaticId::from(0)),
|
||||||
Some(PlayerName::from("test".to_owned()))
|
Some(PlayerName::from("test".to_owned()))
|
||||||
);
|
);
|
||||||
|
|
||||||
cache.save(DynamicId::from(2), "test2");
|
cache.save(DynamicId::from(2), "test2");
|
||||||
assert_eq!(cache.get_static_id(DynamicId::from(2)), Some(StaticId::from(1)));
|
assert_eq!(
|
||||||
|
cache.get_static_id(DynamicId::from(2)),
|
||||||
|
Some(StaticId::from(1))
|
||||||
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
cache.get_name(StaticId::from(1)),
|
cache.get_name(StaticId::from(1)),
|
||||||
Some(PlayerName::from("test2".to_owned()))
|
Some(PlayerName::from("test2".to_owned()))
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
use derive_more::{From, Into};
|
use derive_more::{From, Into};
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, PartialEq, From, Into, Default)]
|
#[derive(Copy, Clone, Debug, Eq, PartialEq, From, Into, Default, Hash)]
|
||||||
pub struct DynamicId(u32);
|
pub struct DynamicId(u32);
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, PartialEq, From, Into)]
|
#[derive(Copy, Clone, Debug, Eq, PartialEq, From, Into, Hash)]
|
||||||
pub struct StaticId(u32);
|
pub struct StaticId(u32);
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, From, Into, Default)]
|
#[derive(Clone, Debug, Eq, PartialEq, From, Into, Default, Hash)]
|
||||||
pub struct PlayerName(String);
|
pub struct PlayerName(String);
|
||||||
|
|
||||||
impl StaticId {
|
impl StaticId {
|
||||||
@@ -14,3 +14,9 @@ impl StaticId {
|
|||||||
self.0
|
self.0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl PlayerName {
|
||||||
|
pub fn to_string(&self) -> String {
|
||||||
|
self.0.clone()
|
||||||
|
}
|
||||||
|
}
|
||||||
+43
-86
@@ -6,12 +6,12 @@
|
|||||||
|
|
||||||
use crate::photon_messages;
|
use crate::photon_messages;
|
||||||
|
|
||||||
use super::events;
|
|
||||||
use super::convert;
|
use super::convert;
|
||||||
use super::convert::EventList;
|
use super::convert::EventList;
|
||||||
|
use super::events;
|
||||||
use super::id_cache;
|
use super::id_cache;
|
||||||
use super::party::{Party};
|
use super::party::Party;
|
||||||
use super::player::{StaticId, DynamicId};
|
use super::player::{DynamicId, StaticId};
|
||||||
use super::unconsumed_messages::UnconsumedMessages;
|
use super::unconsumed_messages::UnconsumedMessages;
|
||||||
|
|
||||||
#[derive(Debug, Default)]
|
#[derive(Debug, Default)]
|
||||||
@@ -19,7 +19,7 @@ pub struct World {
|
|||||||
cache: id_cache::IdCache,
|
cache: id_cache::IdCache,
|
||||||
unconsumed_messages: UnconsumedMessages,
|
unconsumed_messages: UnconsumedMessages,
|
||||||
main_player_id: Option<StaticId>,
|
main_player_id: Option<StaticId>,
|
||||||
party: Party
|
party: Party,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl World {
|
impl World {
|
||||||
@@ -30,19 +30,14 @@ impl World {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Transforms inconsistent game message into corresponding list of game events
|
/// Transforms inconsistent game message into corresponding list of game events
|
||||||
pub fn transform(
|
pub fn transform(&mut self, message: photon_messages::Message) -> Option<Vec<events::Event>> {
|
||||||
&mut self,
|
|
||||||
message: photon_messages::Message,
|
|
||||||
) -> Option<Vec<events::Event>> {
|
|
||||||
match message {
|
match message {
|
||||||
photon_messages::Message::NewCharacter(msg) => {
|
photon_messages::Message::NewCharacter(msg) => {
|
||||||
let mut result = vec![];
|
let mut result = vec![];
|
||||||
let dynamic_id = DynamicId::from(msg.source as u32);
|
let dynamic_id = DynamicId::from(msg.source as u32);
|
||||||
self.assign_dynamic_id(dynamic_id, &msg.character_name);
|
self.assign_dynamic_id(dynamic_id, &msg.character_name);
|
||||||
|
|
||||||
let static_id = self.get_static_id(msg.source)?;
|
result.append(&mut EventList::from(self.get_intermediate(msg)?).values()?);
|
||||||
|
|
||||||
result.append(&mut EventList::from(self.get_intermediate(static_id, msg)?).values());
|
|
||||||
|
|
||||||
if let Some(messages) = self.unconsumed_messages.get_for_id(dynamic_id) {
|
if let Some(messages) = self.unconsumed_messages.get_for_id(dynamic_id) {
|
||||||
for message in messages {
|
for message in messages {
|
||||||
@@ -63,8 +58,7 @@ impl World {
|
|||||||
result.push(events::Event::ZoneChange)
|
result.push(events::Event::ZoneChange)
|
||||||
}
|
}
|
||||||
self.party.set_main_player_name(&msg.character_name);
|
self.party.set_main_player_name(&msg.character_name);
|
||||||
result.push(self.get_intermediate(static_id, msg)?.into());
|
result.append(&mut EventList::from(self.get_intermediate(msg)?).values()?);
|
||||||
|
|
||||||
|
|
||||||
self.main_player_id = Some(static_id);
|
self.main_player_id = Some(static_id);
|
||||||
|
|
||||||
@@ -86,76 +80,54 @@ impl World {
|
|||||||
None
|
None
|
||||||
}
|
}
|
||||||
photon_messages::Message::HealthUpdate(msg) => {
|
photon_messages::Message::HealthUpdate(msg) => {
|
||||||
let static_id = self.get_static_id(msg.target)?;
|
EventList::from(self.get_intermediate(msg)?).values()
|
||||||
Some(vec![self.get_intermediate(static_id, msg)?.into()])
|
|
||||||
}
|
}
|
||||||
photon_messages::Message::RegenerationHealthChanged(msg) => {
|
photon_messages::Message::RegenerationHealthChanged(msg) => {
|
||||||
let static_id = self.get_static_id(msg.source)?;
|
EventList::from(self.get_intermediate(msg)?).values()
|
||||||
Some(vec![self.get_intermediate(static_id, msg)?.into()])
|
|
||||||
}
|
}
|
||||||
photon_messages::Message::KnockedDown(msg) => {
|
photon_messages::Message::KnockedDown(msg) => {
|
||||||
let static_id = self.get_static_id(msg.source)?;
|
EventList::from(self.get_intermediate(msg)?).values()
|
||||||
Some(vec![self.get_intermediate(static_id, msg)?.into()])
|
|
||||||
}
|
}
|
||||||
photon_messages::Message::UpdateFame(msg) => {
|
photon_messages::Message::UpdateFame(msg) => {
|
||||||
let static_id = self.get_static_id(msg.source)?;
|
EventList::from(self.get_intermediate(msg)?).values()
|
||||||
Some(vec![self.get_intermediate(static_id, msg)?.into()])
|
|
||||||
}
|
}
|
||||||
photon_messages::Message::CharacterEquipmentChanged(msg) => {
|
photon_messages::Message::CharacterEquipmentChanged(msg) => {
|
||||||
if let Some(static_id) = self.get_static_id(msg.source) {
|
if let Some(_) = self.get_static_id(msg.source) {
|
||||||
return Some(vec![self.get_intermediate(static_id, msg)?.into()]);
|
return EventList::from(self.get_intermediate(msg)?).values();
|
||||||
}
|
}
|
||||||
let id = DynamicId::from(msg.source as u32);
|
let id = DynamicId::from(msg.source as u32);
|
||||||
self.unconsumed_messages.add(
|
self.unconsumed_messages.add(
|
||||||
photon_messages::messages::Message::CharacterEquipmentChanged(msg), id);
|
photon_messages::messages::Message::CharacterEquipmentChanged(msg),
|
||||||
|
id,
|
||||||
|
);
|
||||||
None
|
None
|
||||||
},
|
}
|
||||||
photon_messages::Message::PartyInvitation(_) => {
|
photon_messages::Message::PartyInvitation(_) => None,
|
||||||
None
|
|
||||||
},
|
|
||||||
photon_messages::Message::PartyJoined(msg) => {
|
photon_messages::Message::PartyJoined(msg) => {
|
||||||
let evt = self.party.joined(msg)?;
|
let evt = self.party.joined(msg)?;
|
||||||
Some(vec![evt])
|
Some(vec![evt])
|
||||||
},
|
}
|
||||||
photon_messages::Message::PartyDisbanded(_) => {
|
photon_messages::Message::PartyDisbanded(_) => {
|
||||||
let evt = self.party.disbanded()?;
|
let evt = self.party.disbanded()?;
|
||||||
Some(vec![evt])
|
Some(vec![evt])
|
||||||
},
|
}
|
||||||
photon_messages::Message::PartyPlayerJoined(msg) => {
|
photon_messages::Message::PartyPlayerJoined(msg) => {
|
||||||
let evt = self.party.single_player_joined(msg)?;
|
let evt = self.party.single_player_joined(msg)?;
|
||||||
Some(vec![evt])
|
Some(vec![evt])
|
||||||
},
|
}
|
||||||
photon_messages::Message::PartyChangedOrder(_) => {
|
photon_messages::Message::PartyChangedOrder(_) => None,
|
||||||
None
|
|
||||||
},
|
|
||||||
photon_messages::Message::PartyPlayerLeft(msg) => {
|
photon_messages::Message::PartyPlayerLeft(msg) => {
|
||||||
let evt = self.party.player_left(msg)?;
|
let evt = self.party.player_left(msg)?;
|
||||||
Some(vec![evt])
|
Some(vec![evt])
|
||||||
},
|
}
|
||||||
photon_messages::Message::PartyLeaderChanged(_) => {
|
photon_messages::Message::PartyLeaderChanged(_) => None,
|
||||||
None
|
photon_messages::Message::PartyLootSettingChangedPlayer(_) => None,
|
||||||
},
|
photon_messages::Message::PartySilverGained(_) => None,
|
||||||
photon_messages::Message::PartyLootSettingChangedPlayer(_) => {
|
photon_messages::Message::PartyPlayerUpdated(_) => None,
|
||||||
None
|
photon_messages::Message::PartyInvitationPlayerBusy(_) => None,
|
||||||
},
|
photon_messages::Message::PartyMarkedObjectsUpdated(_) => None,
|
||||||
photon_messages::Message::PartySilverGained(_) => {
|
photon_messages::Message::PartyOnClusterPartyJoined(_) => None,
|
||||||
None
|
photon_messages::Message::PartySetRoleFlag(_) => None,
|
||||||
},
|
|
||||||
photon_messages::Message::PartyPlayerUpdated(_) => {
|
|
||||||
None
|
|
||||||
},
|
|
||||||
photon_messages::Message::PartyInvitationPlayerBusy(_) => {
|
|
||||||
None
|
|
||||||
},
|
|
||||||
photon_messages::Message::PartyMarkedObjectsUpdated(_) => {
|
|
||||||
None
|
|
||||||
},
|
|
||||||
photon_messages::Message::PartyOnClusterPartyJoined(_) => {
|
|
||||||
None
|
|
||||||
},
|
|
||||||
photon_messages::Message::PartySetRoleFlag(_) => {
|
|
||||||
None
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fn assign_dynamic_id(&mut self, id: DynamicId, name: &str) {
|
fn assign_dynamic_id(&mut self, id: DynamicId, name: &str) {
|
||||||
@@ -167,14 +139,10 @@ impl World {
|
|||||||
self.cache.get_static_id(dynamic_id) // queue message if static id isn't known
|
self.cache.get_static_id(dynamic_id) // queue message if static id isn't known
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_intermediate<Msg>(
|
fn get_intermediate<Msg>(&self, msg: Msg) -> Option<convert::EventIntermediate<Msg>> {
|
||||||
&self,
|
|
||||||
static_id: StaticId,
|
|
||||||
msg: Msg,
|
|
||||||
) -> Option<convert::EventIntermediate<Msg>> {
|
|
||||||
Some(convert::EventIntermediate::new(
|
Some(convert::EventIntermediate::new(
|
||||||
static_id,
|
self.cache.get_dyn_id_to_static_id_map(),
|
||||||
self.cache.get_name(static_id)?,
|
self.cache.get_static_id_to_name_map(),
|
||||||
msg,
|
msg,
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
@@ -211,10 +179,7 @@ mod tests {
|
|||||||
let game_message = simulate_new_player!(1, "TestCharacter", NewCharacter);
|
let game_message = simulate_new_player!(1, "TestCharacter", NewCharacter);
|
||||||
|
|
||||||
assert!(world.transform(game_message.clone()).is_some());
|
assert!(world.transform(game_message.clone()).is_some());
|
||||||
assert_contains!(
|
assert_contains!(world.transform(game_message.clone()), "PlayerAppeared");
|
||||||
world.transform(game_message.clone()),
|
|
||||||
"PlayerAppeared"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -225,10 +190,7 @@ mod tests {
|
|||||||
let game_message = simulate_new_player!(1, "TestCharacter", Join);
|
let game_message = simulate_new_player!(1, "TestCharacter", Join);
|
||||||
|
|
||||||
assert!(world.transform(game_message.clone()).is_some());
|
assert!(world.transform(game_message.clone()).is_some());
|
||||||
assert_contains!(
|
assert_contains!(world.transform(game_message.clone()), "PlayerAppeared");
|
||||||
world.transform(game_message.clone()),
|
|
||||||
"PlayerAppeared"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -238,14 +200,14 @@ mod tests {
|
|||||||
|
|
||||||
let game_message = simulate_new_player!(1, "TestCharacter", Join);
|
let game_message = simulate_new_player!(1, "TestCharacter", Join);
|
||||||
assert!(world.transform(game_message.clone()).is_some());
|
assert!(world.transform(game_message.clone()).is_some());
|
||||||
assert_contains!(
|
assert_contains!(world.transform(game_message.clone()), "PlayerAppeared");
|
||||||
world.transform(game_message.clone()),
|
let game_message = simulate_new_player!(2, "TestCharacter2", NewCharacter);
|
||||||
"PlayerAppeared"
|
assert!(world.transform(game_message.clone()).is_some());
|
||||||
);
|
|
||||||
|
|
||||||
let target = 1;
|
let target = 1;
|
||||||
let game_message =
|
let game_message =
|
||||||
photon_messages::Message::HealthUpdate(photon_messages::messages::HealthUpdate {
|
photon_messages::Message::HealthUpdate(photon_messages::messages::HealthUpdate {
|
||||||
|
source: 2,
|
||||||
target,
|
target,
|
||||||
value: -666.0,
|
value: -666.0,
|
||||||
..Default::default()
|
..Default::default()
|
||||||
@@ -258,16 +220,14 @@ mod tests {
|
|||||||
let target = 1;
|
let target = 1;
|
||||||
let game_message =
|
let game_message =
|
||||||
photon_messages::Message::HealthUpdate(photon_messages::messages::HealthUpdate {
|
photon_messages::Message::HealthUpdate(photon_messages::messages::HealthUpdate {
|
||||||
|
source: 2,
|
||||||
target,
|
target,
|
||||||
value: 666.0,
|
value: 666.0,
|
||||||
..Default::default()
|
..Default::default()
|
||||||
});
|
});
|
||||||
|
|
||||||
assert!(world.transform(game_message.clone()).is_some());
|
assert!(world.transform(game_message.clone()).is_some());
|
||||||
assert_contains!(
|
assert_contains!(world.transform(game_message.clone()), "HealthReceived");
|
||||||
world.transform(game_message.clone()),
|
|
||||||
"HealthReceived"
|
|
||||||
);
|
|
||||||
assert_contains!(world.transform(game_message.clone()), "666");
|
assert_contains!(world.transform(game_message.clone()), "666");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -286,10 +246,7 @@ mod tests {
|
|||||||
let game_message = simulate_new_player!(1, "TestCharacter", Join);
|
let game_message = simulate_new_player!(1, "TestCharacter", Join);
|
||||||
|
|
||||||
assert!(world.transform(game_message.clone()).is_some());
|
assert!(world.transform(game_message.clone()).is_some());
|
||||||
assert_contains!(
|
assert_contains!(world.transform(game_message.clone()), "PlayerAppeared");
|
||||||
world.transform(game_message.clone()),
|
|
||||||
"PlayerAppeared"
|
|
||||||
);
|
|
||||||
|
|
||||||
let game_message = photon_messages::Message::Leave(photon_messages::messages::Leave {
|
let game_message = photon_messages::Message::Leave(photon_messages::messages::Leave {
|
||||||
source: 1,
|
source: 1,
|
||||||
|
|||||||
Reference in New Issue
Block a user