Game messages generated from json file

This commit is contained in:
Wiktor Mazur
2019-12-16 15:35:11 +01:00
parent beec1c1fd3
commit 0cd462cbd1
6 changed files with 404 additions and 97 deletions
+2 -41
View File
@@ -101,7 +101,7 @@ pub fn initialize() -> Result<Arc<Mutex<meter::Meter>>, InitializationError> {
let game_messages = photon
.decode(&packet.payload)
.into_iter()
.filter_map(into_game_message)
.filter_map(game_protocol::into_game_message)
.collect();
register_messages(meter, &game_messages);
}
@@ -156,50 +156,11 @@ where
events.register_party_disbanded().unwrap_or(())
}
game_protocol::Message::FameUpdate(msg) => events
.register_fame_gain(msg.source, msg.fame)
.register_fame_gain(msg.source, msg.fame as f32 / 10000.0)
.unwrap_or(()),
_ => {}
}
}
fn into_game_message(photon_message: photon_decode::Message) -> Option<game_protocol::Message> {
static REQUEST_CONSTANT: usize = 10000;
static RESPONSE_CONSTANT: usize = 1000;
error!("Photon message: {:?}", photon_message);
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();
}
}
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,
}
}
photon_decode::Message::Response(r) => {
let code = r.code as usize + RESPONSE_CONSTANT;
game_protocol::Packet {
code,
parameters: r.parameters,
}
}
}
.decode()
}
#[cfg(test)]
mod tests {
use super::*;
+13 -39
View File
@@ -1,7 +1,6 @@
use log::*;
use super::Items;
use super::packet::Packet;
use photon_decode::Parameters;
use photon_decode::Value;
@@ -123,7 +122,7 @@ pub struct ChatSay {
}
impl ChatSay {
fn parse(val: Parameters) -> Option<Message> {
pub fn parse(val: Parameters) -> Option<Message> {
let source = decode_number!(val, 0, "ChatSay::source")?;
let source_name = decode_string!(val, 1, "ChatSay::source_name")?;
let text = decode_string!(val, 2, "ChatSay::text")?;
@@ -147,7 +146,7 @@ pub struct NewCharacter {
}
impl NewCharacter {
fn parse(val: Parameters) -> Option<Message> {
pub fn parse(val: Parameters) -> Option<Message> {
info!("NewCharacter parameters: {:?}", val);
let source = decode_number!(val, 0, "NewCharacter::source")?;
@@ -181,7 +180,7 @@ pub struct HealthUpdate {
}
impl HealthUpdate {
fn parse(val: Parameters) -> Option<Message> {
pub fn parse(val: Parameters) -> Option<Message> {
info!("HealthUpdate parameters: {:?}", val);
let source = decode_number!(val, 0, "HealthUpdate::source")?;
let target = decode_number!(val, 7, "HealthUpdate::target")?;
@@ -204,7 +203,7 @@ pub struct RegenerationHealthChanged {
}
impl RegenerationHealthChanged {
fn parse(val: Parameters) -> Option<Message> {
pub fn parse(val: Parameters) -> Option<Message> {
info!("RegenerationHealthChanged parameters: {:?}", val);
let source = decode_number!(val, 0, "RegenerationHealthChanged::source")?;
let health = decode_float!(val, 3, "RegenerationHealthChanged::health")?;
@@ -232,11 +231,8 @@ pub struct CharacterStats {
}
impl CharacterStats {
fn parse(val: Parameters) -> Option<Message> {
pub fn parse(val: Parameters) -> Option<Message> {
info!("CharacterStats parameters: {:?}", val);
if val.len() < 40 {
return None;
}
let source = decode_number!(val, 0, "CharacterStats::source")?;
@@ -265,7 +261,7 @@ pub struct Leave {
}
impl Leave {
fn parse(val: Parameters) -> Option<Message> {
pub fn parse(val: Parameters) -> Option<Message> {
info!("Leave parameters: {:?}", val);
let source = decode_number!(val, 0, "Leave::source")?;
@@ -281,7 +277,7 @@ pub struct Died {
}
impl Died {
fn parse(val: Parameters) -> Option<Message> {
pub fn parse(val: Parameters) -> Option<Message> {
info!("Died parameters: {:?}", val);
let source = decode_number!(val, 0, "Died::source")?;
let target = decode_number!(val, 3, "Died::target")?;
@@ -302,7 +298,7 @@ pub struct PartyNew {
}
impl PartyNew {
fn parse(val: Parameters) -> Option<Message> {
pub fn parse(val: Parameters) -> Option<Message> {
info!("PartyNew parameters: {:?}", val);
let source = decode_number!(val, 0, "PartyNew::source")?;
let players = decode_string_vec!(val, 5, "PartyNew::players")?;
@@ -318,7 +314,7 @@ pub struct PartyJoin {
}
impl PartyJoin {
fn parse(val: Parameters) -> Option<Message> {
pub fn parse(val: Parameters) -> Option<Message> {
info!("PartyJoin parameters: {:?}", val);
let source = decode_number!(val, 0, "PartyJoin::source")?;
let target_name = decode_string!(val, 2, "PartyJoin::target_name")?;
@@ -336,7 +332,7 @@ pub struct PartyDisbanded {
}
impl PartyDisbanded {
fn parse(val: Parameters) -> Option<Message> {
pub fn parse(val: Parameters) -> Option<Message> {
info!("PartyDisbanded parameters: {:?}", val);
let source = decode_number!(val, 0, "PartyDisbanded::source")?;
@@ -351,7 +347,7 @@ pub struct FameUpdate {
}
impl FameUpdate {
fn parse(val: Parameters) -> Option<Message> {
pub fn parse(val: Parameters) -> Option<Message> {
info!("FameUpdate parameters: {:?}", val);
let source = decode_number!(val, 0, "FameUpdate::source")?;
let raw_fame = decode_number!(val, 2, "FameUpdate::fame")?;
@@ -368,7 +364,7 @@ pub struct PlayerItems {
}
impl PlayerItems {
fn parse(val: Parameters) -> Option<Message> {
pub fn parse(val: Parameters) -> Option<Message> {
info!("PlayerItems parameters: {:?}", val);
let source = decode_number!(val, 0, "PlayerItems::source")?;
let item_array = decode_number_vec!(val, 3, "PlayerItems::items")?;
@@ -392,26 +388,4 @@ pub enum Message {
PartyNew(PartyNew),
PartyJoin(PartyJoin),
PartyDisbanded(PartyDisbanded),
}
impl Packet {
pub fn decode(self) -> Option<Message> {
debug!("Decode: {:?}", &self);
match self.code {
1 => Leave::parse(self.parameters),
6 => HealthUpdate::parse(self.parameters),
24 => NewCharacter::parse(self.parameters),
63 => ChatSay::parse(self.parameters),
80 => RegenerationHealthChanged::parse(self.parameters),
150 => Died::parse(self.parameters),
209 => PartyNew::parse(self.parameters),
211 => PartyJoin::parse(self.parameters),
213 => PartyDisbanded::parse(self.parameters),
72 => FameUpdate::parse(self.parameters),
79 => PlayerItems::parse(self.parameters),
1001 => CharacterStats::parse(self.parameters),
_ => None,
}
}
}
}
+6 -4
View File
@@ -1,10 +1,12 @@
include!(concat!(env!("OUT_DIR"), "/itemdb.rs"));
include!(concat!(env!("OUT_DIR"), "/messages.rs"));
mod packet;
pub mod message;
pub mod message{
include!(concat!(env!("OUT_DIR"), "/messages.rs"));
}
pub use message::Message;
pub use packet::Packet;
pub use message::into_game_message;
#[derive(Debug, Clone, PartialEq, Default)]
-7
View File
@@ -1,7 +0,0 @@
use photon_decode::Parameters;
#[derive(Debug)]
pub struct Packet {
pub code: usize,
pub parameters: Parameters
}