+ Player items

This commit is contained in:
Wiktor Mazur
2019-12-12 15:58:14 +01:00
parent 9296f536e7
commit 47f64a9834
21 changed files with 10266 additions and 88 deletions
+59 -26
View File
@@ -15,18 +15,19 @@ use crate::game_protocol;
use crate::meter;
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::ZoneStats;
pub use meter::MeterConfig;
pub use meter::PlayerStatistics;
pub use meter::PlayerStatisticsVec;
pub use meter::ZoneStats;
pub use meter::StatType;
pub use crate::game_protocol::Items;
pub enum InitializationError {
NetworkInterfaceListMissing
NetworkInterfaceListMissing,
}
lazy_static! {
@@ -97,8 +98,11 @@ pub fn initialize() -> Result<Arc<Mutex<meter::Meter>>, InitializationError> {
continue;
}
if let Ok(ref mut meter) = cloned_meter.lock() {
let game_messages = photon.decode(&packet.payload)
.into_iter().filter_map(into_game_message).collect();
let game_messages = photon
.decode(&packet.payload)
.into_iter()
.filter_map(into_game_message)
.collect();
register_messages(meter, &game_messages);
}
}
@@ -117,13 +121,20 @@ pub fn register_messages(meter: &mut meter::Meter, messages: &Vec<game_protocol:
.for_each(|message| register_message(meter, &message));
}
fn register_message(events: &mut meter::Meter, message: &game_protocol::Message) {
fn register_message<Events>(events: &mut Events, message: &game_protocol::Message)
where
Events: PlayerEvents + PartyEvents,
{
info!("Found message {:?}", message);
match message {
game_protocol::Message::Leave(msg) => events.register_leave(msg.source).unwrap_or(()),
game_protocol::Message::NewCharacter(msg) => {
events.register_player(&msg.character_name, msg.source)
}
events.register_player(&msg.character_name, msg.source);
events.register_item_update(msg.source, &msg.items);
},
game_protocol::Message::PlayerItems(msg) => {
events.register_item_update(msg.source, &msg.items);
},
game_protocol::Message::CharacterStats(msg) => {
events.register_main_player(&msg.character_name, msg.source)
}
@@ -151,29 +162,41 @@ fn register_message(events: &mut meter::Meter, message: &game_protocol::Message)
}
}
fn into_game_message(photon_message : photon_decode::Message) -> Option<game_protocol::Message>
{
fn into_game_message(photon_message: photon_decode::Message) -> Option<game_protocol::Message> {
static REQUEST_CONSTANT: usize = 10000;
static RESPONSE_CONSTANT: usize = 1000;
match photon_message {
photon_decode::Message::Event(e) => {
if e.code != 2 && e.parameters.get(&252u8).is_some() {
if let photon_decode::Value::Short(event_code) = e.parameters.get(&252u8).unwrap() {
return game_protocol::Packet{code: *event_code as usize, parameters: e.parameters}.decode()
return game_protocol::Packet {
code: *event_code as usize,
parameters: e.parameters,
}
.decode();
}
}
game_protocol::Packet{code: 0, parameters: e.parameters}
},
game_protocol::Packet {
code: 0,
parameters: e.parameters,
}
}
photon_decode::Message::Request(r) => {
let code = r.code as usize + REQUEST_CONSTANT;
game_protocol::Packet{code, parameters: r.parameters}
},
game_protocol::Packet {
code,
parameters: r.parameters,
}
}
photon_decode::Message::Response(r) => {
let code = r.code as usize + RESPONSE_CONSTANT;
game_protocol::Packet{code, parameters: r.parameters}
game_protocol::Packet {
code,
parameters: r.parameters,
}
}
}.decode()
}
.decode()
}
#[cfg(test)]
@@ -181,6 +204,7 @@ mod tests {
use super::*;
use game_protocol::message;
use game_protocol::Items;
use game_protocol::Message;
mod helpers {
@@ -222,6 +246,7 @@ mod tests {
max_health: 10.0,
energy: 1.0,
max_energy: 1.0,
items: Items::from(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),
}
}
}
@@ -507,7 +532,9 @@ mod tests {
($meter:expr, $id:expr) => {
register_message(
&mut $meter,
&Message::RegenerationHealthChanged(message::RegenerationHealthChanged::disabled($id)),
&Message::RegenerationHealthChanged(message::RegenerationHealthChanged::disabled(
$id,
)),
);
register_message(
&mut $meter,
@@ -520,7 +547,9 @@ mod tests {
($meter:expr, $id:expr) => {
register_message(
&mut $meter,
&Message::RegenerationHealthChanged(message::RegenerationHealthChanged::enabled($id)),
&Message::RegenerationHealthChanged(message::RegenerationHealthChanged::enabled(
$id,
)),
);
};
}
@@ -552,7 +581,6 @@ mod tests {
let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
assert_eq!(player_stats.damage, 0.0);
attack!(meter, 1);
let zone_stats = stats(&meter, StatType::Zone);
let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
@@ -666,7 +694,7 @@ mod tests {
($meter:expr, $members:expr, $party_id:expr) => {
register_message(
&mut $meter,
&Message::PartyNew(message::PartyNew::new_list_of_named($members, $party_id))
&Message::PartyNew(message::PartyNew::new_list_of_named($members, $party_id)),
);
};
}
@@ -675,7 +703,7 @@ mod tests {
($meter:expr, $player:expr, $party_id:expr) => {
register_message(
&mut $meter,
&Message::PartyJoin(message::PartyJoin::new_named($player, $party_id))
&Message::PartyJoin(message::PartyJoin::new_named($player, $party_id)),
);
};
}
@@ -695,7 +723,6 @@ mod tests {
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());
@@ -713,7 +740,10 @@ mod tests {
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)));
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());
@@ -734,7 +764,10 @@ mod tests {
let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
assert_eq!(player_stats.fame_per_minute, 0);
register_message(&mut meter, &Message::FameUpdate(message::FameUpdate::new(1)));
register_message(
&mut meter,
&Message::FameUpdate(message::FameUpdate::new(1)),
);
let zone_stats = stats(&meter, StatType::Zone);
let player_stats = zone_stats.iter().find(|s| s.player == "MAIN_CH1").unwrap();
assert_eq!(player_stats.fame_per_minute, 100);
+83 -20
View File
@@ -1,5 +1,6 @@
use log::*;
use super::Items;
use super::packet::Packet;
use photon_decode::Parameters;
use photon_decode::Value;
@@ -14,7 +15,7 @@ macro_rules! deserialize_number {
_ => {
error!("Failed to deserialize {}", $name);
None
}
}
}
} else {
error!("Index {} not found in {}", $index, $name);
@@ -31,7 +32,7 @@ macro_rules! deserialize_string {
_ => {
error!("Failed to deserialize {}", $name);
None
}
}
}
} else {
None
@@ -52,11 +53,11 @@ macro_rules! deserialize_string_vec {
}
Some(ret)
},
}
_ => {
error!("Failed to deserialize {}", $name);
None
}
}
}
} else {
None
@@ -64,6 +65,39 @@ macro_rules! deserialize_string_vec {
};
}
macro_rules! deserialize_number_vec {
($val:expr, $index:expr, $name:expr) => {
if let Some(p) = $val.get(&$index) {
match p {
Value::Array(arr) => {
let mut ret = vec![];
for v in arr {
match v {
Value::Short(v) => {
ret.push(*v as u32);
},
Value::Byte(v) => {
ret.push(*v as u32);
},
_ => {}
}
}
Some(ret)
},
Value::ByteArray(v) => {
Some(v.iter().map(|b| *b as u32).collect::<Vec<u32>>())
},
_ => {
error!("Failed to deserialize {}", $name);
None
}
}
} else {
None
}
};
}
macro_rules! deserialize_float {
($val:expr, $index:expr, $name:expr) => {
@@ -73,7 +107,7 @@ macro_rules! deserialize_float {
_ => {
error!("Failed to deserialize {}", $name);
None
}
}
}
} else {
None
@@ -81,7 +115,6 @@ macro_rules! deserialize_float {
};
}
#[derive(Debug)]
pub struct ChatSay {
pub source: usize,
@@ -110,10 +143,12 @@ pub struct NewCharacter {
pub max_health: f32,
pub energy: f32,
pub max_energy: f32,
pub items: Items,
}
impl NewCharacter {
fn encode(val: Parameters) -> Option<Message> {
info!("NewCharacter parameters: {:?}", val);
let source = deserialize_number!(val, 0, "NewCharacter::source")?;
let character_name = deserialize_string!(val, 1, "NewCharacter::character_name")?;
@@ -123,6 +158,8 @@ impl NewCharacter {
let energy = deserialize_float!(val, 22, "NewCharacter::energy")?;
let max_energy = deserialize_float!(val, 23, "NewCharacter::max_energy")?;
let item_array = deserialize_number_vec!(val, 33, "NewCharacter::items")?;
let items = Items::from(&item_array);
Some(Message::NewCharacter(Self {
source,
@@ -131,6 +168,7 @@ impl NewCharacter {
max_health,
energy,
max_energy,
items,
}))
}
}
@@ -171,7 +209,8 @@ impl RegenerationHealthChanged {
let source = deserialize_number!(val, 0, "RegenerationHealthChanged::source")?;
let health = deserialize_float!(val, 3, "RegenerationHealthChanged::health")?;
let max_health = deserialize_float!(val, 4, "RegenerationHealthChanged::max_health")?;
let regeneration_rate = deserialize_float!(val, 5, "RegenerationHealthChanged::regeneration_rate");
let regeneration_rate =
deserialize_float!(val, 5, "RegenerationHealthChanged::regeneration_rate");
Some(Message::RegenerationHealthChanged(Self {
source,
@@ -209,7 +248,6 @@ impl CharacterStats {
let energy = deserialize_float!(val, 15, "CharacterStats::energy")?;
let max_energy = deserialize_float!(val, 16, "CharacterStats::max_energy")?;
Some(Message::CharacterStats(Self {
source,
character_name,
@@ -223,7 +261,7 @@ impl CharacterStats {
#[derive(Debug)]
pub struct Leave {
pub source: usize
pub source: usize,
}
impl Leave {
@@ -231,7 +269,7 @@ impl Leave {
info!("Leave parameters: {:?}", val);
let source = deserialize_number!(val, 0, "Leave::source")?;
Some(Message::Leave(Leave{source}))
Some(Message::Leave(Leave { source }))
}
}
@@ -239,7 +277,7 @@ impl Leave {
pub struct Died {
pub source: usize,
pub target: usize,
pub target_name: String
pub target_name: String,
}
impl Died {
@@ -249,7 +287,11 @@ impl Died {
let target = deserialize_number!(val, 3, "Died::target")?;
let target_name = deserialize_string!(val, 4, "Died::target_name")?;
Some(Message::Died(Died{source, target, target_name}))
Some(Message::Died(Died {
source,
target,
target_name,
}))
}
}
@@ -265,14 +307,14 @@ impl PartyNew {
let source = deserialize_number!(val, 0, "PartyNew::source")?;
let players = deserialize_string_vec!(val, 5, "PartyNew::players")?;
Some(Message::PartyNew(PartyNew{source, players}))
Some(Message::PartyNew(PartyNew { source, players }))
}
}
#[derive(Debug)]
pub struct PartyJoin {
pub source: usize,
pub target_name: String
pub target_name: String,
}
impl PartyJoin {
@@ -281,7 +323,10 @@ impl PartyJoin {
let source = deserialize_number!(val, 0, "PartyJoin::source")?;
let target_name = deserialize_string!(val, 2, "PartyJoin::target_name")?;
Some(Message::PartyJoin(PartyJoin{source, target_name}))
Some(Message::PartyJoin(PartyJoin {
source,
target_name,
}))
}
}
@@ -295,14 +340,14 @@ impl PartyDisbanded {
info!("PartyDisbanded parameters: {:?}", val);
let source = deserialize_number!(val, 0, "PartyDisbanded::source")?;
Some(Message::PartyDisbanded(PartyDisbanded{source}))
Some(Message::PartyDisbanded(PartyDisbanded { source }))
}
}
#[derive(Debug)]
pub struct FameUpdate {
pub source: usize,
pub fame: f32
pub fame: f32,
}
impl FameUpdate {
@@ -312,14 +357,31 @@ impl FameUpdate {
let raw_fame = deserialize_number!(val, 2, "FameUpdate::fame")?;
let fame = raw_fame as f32 / 10000.0;
Some(Message::FameUpdate(FameUpdate{source, fame}))
Some(Message::FameUpdate(FameUpdate { source, fame }))
}
}
#[derive(Debug)]
pub struct PlayerItems {
pub source: usize,
pub items: Items,
}
impl PlayerItems {
fn encode(val: Parameters) -> Option<Message> {
info!("PlayerItems parameters: {:?}", val);
let source = deserialize_number!(val, 0, "PlayerItems::source")?;
let item_array = deserialize_number_vec!(val, 3, "PlayerItems::items")?;
let items = Items::from(&item_array);
Some(Message::PlayerItems(PlayerItems { source, items }))
}
}
#[derive(Debug)]
pub enum Message {
FameUpdate(FameUpdate),
PlayerItems(PlayerItems),
Leave(Leave),
ChatSay(ChatSay),
NewCharacter(NewCharacter),
@@ -329,12 +391,12 @@ pub enum Message {
Died(Died),
PartyNew(PartyNew),
PartyJoin(PartyJoin),
PartyDisbanded(PartyDisbanded)
PartyDisbanded(PartyDisbanded),
}
impl Packet {
pub fn decode(self) -> Option<Message> {
debug!("Decode: {:?}", &self);
debug!("Decode: {:?}", &self);
match self.code {
1 => Leave::encode(self.parameters),
@@ -347,6 +409,7 @@ impl Packet {
211 => PartyJoin::encode(self.parameters),
213 => PartyDisbanded::encode(self.parameters),
72 => FameUpdate::encode(self.parameters),
79 => PlayerItems::encode(self.parameters),
1001 => CharacterStats::encode(self.parameters),
_ => None,
}
+46
View File
@@ -1,5 +1,51 @@
include!(concat!(env!("OUT_DIR"), "/itemdb.rs"));
mod packet;
pub mod message;
pub use message::Message;
pub use packet::Packet;
#[derive(Debug, Clone, PartialEq, Default)]
pub struct Items {
pub weapon: Option<String>,
pub offhand: Option<String>,
pub helmet: Option<String>,
pub armor: Option<String>,
pub boots: Option<String>,
pub bag: Option<String>,
pub cape: Option<String>,
pub mount: Option<String>,
pub potion: Option<String>,
pub food: Option<String>,
}
impl Items {
pub fn from(item_array: &[u32]) -> Self {
macro_rules! extract {
($id:expr) => {
item_array
.get($id)
.iter()
.filter(|id| **id != &0u32)
.map(|code| ITEMDB.get(code).map(|s| s.to_string()))
.filter_map(|o| o)
.next()
};
}
Self{
weapon: extract!(0),
offhand: extract!(1),
helmet: extract!(2),
armor: extract!(3),
boots: extract!(4),
bag: extract!(5),
cape: extract!(6),
mount: extract!(7),
potion: extract!(8),
food: extract!(9),
}
}
}
+28 -2
View File
@@ -4,7 +4,7 @@ extern crate cpython;
#[macro_use]
extern crate lazy_static;
mod game_protocol;
pub mod game_protocol;
mod meter;
mod core;
@@ -71,6 +71,7 @@ impl ToPyObject for core::PlayerStatistics {
set_dict_item!(py, stats, self, fame);
set_dict_item!(py, stats, self, fame_per_minute);
set_dict_item!(py, stats, self, fame_per_hour);
set_dict_item!(py, stats, self, items);
stats.into_object()
}
@@ -88,6 +89,31 @@ impl ToPyObject for core::PlayerStatisticsVec {
}
}
impl ToPyObject for core::Items {
type ObjectType = PyDict;
fn into_py_object(self, py: Python) -> Self::ObjectType {
self.to_py_object(py)
}
fn to_py_object(&self, py: Python) -> Self::ObjectType {
let items = PyDict::new(py);
set_dict_item!(py, items, self, weapon);
set_dict_item!(py, items, self, offhand);
set_dict_item!(py, items, self, helmet);
set_dict_item!(py, items, self, armor);
set_dict_item!(py, items, self, boots);
set_dict_item!(py, items, self, bag);
set_dict_item!(py, items, self, cape);
set_dict_item!(py, items, self, mount);
set_dict_item!(py, items, self, potion);
set_dict_item!(py, items, self, food);
items
}
}
impl <'source> FromPyObject<'source> for StatType {
fn extract(py: Python, obj: &'source PyObject) -> PyResult<Self> {
match obj.extract(py) {
@@ -111,7 +137,7 @@ pub fn stats(py: Python, stat_type: StatType) -> PyResult<PyList> {
if let Ok(ref mut meter) = m.lock() {
return Ok(core::stats(&meter, stat_type)
.into_iter()
.filter(|s| s.damage != 0.0 || s.fame != 0.0)
// .filter(|s| s.damage != 0.0 || s.fame != 0.0)
.collect::<Vec<meter::PlayerStatistics>>()
.into_py_object(py))
}
+9
View File
@@ -13,6 +13,7 @@ use player::Player;
pub use traits::*;
pub use types::*;
pub use super::game_protocol;
#[derive(Debug)]
pub struct Session {
@@ -56,6 +57,7 @@ impl Session {
fame: player.fame(),
fame_per_minute: player.fame_per_minute(),
fame_per_hour: player.fame_per_hour(),
items: player.items()
})
.collect(),
)
@@ -190,6 +192,13 @@ impl PlayerEvents for Meter {
Some(vec![zone_player, las_fight_session_player])
}
fn get_item_carriers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn ItemCarrier>> {
let (zone, last_fight) = self.sessions_mut()?;
let las_fight_session_player = last_fight.get_player_by_id(player_id)?;
let zone_player = zone.get_player_by_id(player_id)?;
Some(vec![zone_player, las_fight_session_player])
}
fn get_fame_gatherers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn FameGatherer>> {
let main_player_id = self.main_player_id?;
let (zone, last_fight) = self.sessions_mut()?;
+18 -2
View File
@@ -3,11 +3,14 @@ use fake_clock::FakeClock as Instant;
#[cfg(not(test))]
use std::time::Instant;
use super::game_protocol::Items;
use super::traits::CombatState;
use super::traits::DamageDealer;
use super::traits::DamageStats;
use super::traits::FameStats;
use super::traits::FameGatherer;
use super::traits::ItemCarrier;
#[derive(Debug)]
struct CombatTime
@@ -32,7 +35,8 @@ pub struct Player {
combat_time: CombatTime,
combat_state: CombatState,
time_started: Instant,
fame: f32
fame: f32,
items: Items
}
@@ -44,7 +48,8 @@ impl Player {
combat_time: CombatTime::new(),
combat_state: CombatState::OutOfCombat,
time_started: Instant::now(),
fame: 0.0
fame: 0.0,
items: Default::default(),
}
}
}
@@ -101,6 +106,17 @@ impl FameGatherer for Player {
}
}
impl ItemCarrier for Player {
fn items_update(&mut self, items: &Items) {
self.items = items.clone();
}
fn items(&self) -> Items {
self.items.clone()
}
}
impl FameStats for Player {
fn fame(&self) -> f32 {
self.fame
+16
View File
@@ -4,6 +4,7 @@ use fake_clock::FakeClock as Instant;
use std::time::Instant;
use super::types::PlayerStatisticsVec;
use super::game_protocol::Items;
#[derive(Debug, PartialEq)]
pub enum CombatState {
@@ -55,11 +56,18 @@ pub trait DamageDealer {
fn combat_state(&self) -> CombatState;
}
pub trait ItemCarrier {
fn items_update(&mut self, items: &Items);
fn items(&self) -> Items;
}
pub trait PlayerEvents {
fn get_damage_dealers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn DamageDealer>>;
fn get_fame_gatherers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn FameGatherer>>;
fn get_item_carriers_in_zone(&mut self, player_id: usize) -> Option<Vec<&mut dyn ItemCarrier>>;
fn register_main_player(&mut self, name: &str, id: usize);
fn register_leave(&mut self, id: usize) -> Option<()>;
@@ -74,6 +82,14 @@ pub trait PlayerEvents {
Some(())
}
fn register_item_update(&mut self, player_id: usize, items: &Items) -> Option<()> {
for player in self.get_item_carriers_in_zone(player_id)? {
player.items_update(items);
}
Some(())
}
fn register_damage_dealt(&mut self, player_id: usize, damage: f32) -> Option<()> {
for player in self.get_damage_dealers_in_zone(player_id)? {
if damage < 0.0 {
+3 -1
View File
@@ -7,6 +7,7 @@ use fake_clock::FakeClock as Instant;
#[cfg(not(test))]
use std::time::Instant;
use super::game_protocol::Items;
use super::traits::DamageStats;
use super::traits::FameStats;
@@ -42,7 +43,8 @@ pub struct PlayerStatistics {
pub seconds_in_game: f32,
pub fame: f32,
pub fame_per_minute: u32,
pub fame_per_hour: u32
pub fame_per_hour: u32,
pub items: Items
}
#[derive(Debug, PartialEq, Clone)]