Game messages generated from json file
This commit is contained in:
@@ -0,0 +1,238 @@
|
||||
{
|
||||
"events": [
|
||||
{
|
||||
"name": "Leave",
|
||||
"code": 1,
|
||||
"params": [
|
||||
{
|
||||
"name": "source",
|
||||
"id": 0,
|
||||
"param_type": "Number"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "HealthUpdate",
|
||||
"code": 6,
|
||||
"params": [
|
||||
{
|
||||
"name": "source",
|
||||
"id": 0,
|
||||
"param_type": "Number"
|
||||
},
|
||||
{
|
||||
"name": "target",
|
||||
"id": 7,
|
||||
"param_type": "Number"
|
||||
},
|
||||
{
|
||||
"name": "value",
|
||||
"id": 3,
|
||||
"param_type": "Float"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "RegenerationHealthChanged",
|
||||
"code": 80,
|
||||
"params": [
|
||||
{
|
||||
"name": "source",
|
||||
"id": 0,
|
||||
"param_type": "Number"
|
||||
},
|
||||
{
|
||||
"name": "health",
|
||||
"id": 3,
|
||||
"param_type": "Float"
|
||||
},
|
||||
{
|
||||
"name": "max_health",
|
||||
"id": 4,
|
||||
"param_type": "Float"
|
||||
},
|
||||
{
|
||||
"name": "regeneration_rate",
|
||||
"id": 5,
|
||||
"param_type": "Float",
|
||||
"optional": true
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "Died",
|
||||
"code": 150,
|
||||
"params": [
|
||||
{
|
||||
"name": "source",
|
||||
"id": 0,
|
||||
"param_type": "Number"
|
||||
},
|
||||
{
|
||||
"name": "target",
|
||||
"id": 3,
|
||||
"param_type": "Number"
|
||||
},
|
||||
{
|
||||
"name": "target_name",
|
||||
"id": 4,
|
||||
"param_type": "String"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "NewCharacter",
|
||||
"code": 24,
|
||||
"params": [
|
||||
{
|
||||
"name": "source",
|
||||
"id": 0,
|
||||
"param_type": "Number"
|
||||
},
|
||||
{
|
||||
"name": "character_name",
|
||||
"id": 1,
|
||||
"param_type": "String"
|
||||
},
|
||||
{
|
||||
"name": "health",
|
||||
"id": 18,
|
||||
"param_type": "Float"
|
||||
},
|
||||
{
|
||||
"name": "max_health",
|
||||
"id": 19,
|
||||
"param_type": "Float"
|
||||
},
|
||||
{
|
||||
"name": "energy",
|
||||
"id": 22,
|
||||
"param_type": "Float"
|
||||
},
|
||||
{
|
||||
"name": "max_energy",
|
||||
"id": 23,
|
||||
"param_type": "Float"
|
||||
},
|
||||
{
|
||||
"name": "items",
|
||||
"id": 33,
|
||||
"param_type": "Items"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "FameUpdate",
|
||||
"code": 72,
|
||||
"params": [
|
||||
{
|
||||
"name": "source",
|
||||
"id": 0,
|
||||
"param_type": "Number"
|
||||
},
|
||||
{
|
||||
"name": "fame",
|
||||
"id": 2,
|
||||
"param_type": "Number"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "PlayerItems",
|
||||
"code": 79,
|
||||
"params": [
|
||||
{
|
||||
"name": "source",
|
||||
"id": 0,
|
||||
"param_type": "Number"
|
||||
},
|
||||
{
|
||||
"name": "items",
|
||||
"id": 3,
|
||||
"param_type": "Items"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "PartyNew",
|
||||
"code": 209,
|
||||
"params": [
|
||||
{
|
||||
"name": "source",
|
||||
"id": 0,
|
||||
"param_type": "Number"
|
||||
},
|
||||
{
|
||||
"name": "players",
|
||||
"id": 5,
|
||||
"param_type": "StringList"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "PartyJoin",
|
||||
"code": 211,
|
||||
"params": [
|
||||
{
|
||||
"name": "source",
|
||||
"id": 0,
|
||||
"param_type": "Number"
|
||||
},
|
||||
{
|
||||
"name": "target_name",
|
||||
"id": 2,
|
||||
"param_type": "String"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "PartyDisbanded",
|
||||
"code": 213,
|
||||
"params": [
|
||||
{
|
||||
"name": "source",
|
||||
"id": 0,
|
||||
"param_type": "Number"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"responses": [
|
||||
{
|
||||
"name": "CharacterStats",
|
||||
"code": 2,
|
||||
"params": [
|
||||
{
|
||||
"name": "source",
|
||||
"id": 0,
|
||||
"param_type": "Number"
|
||||
},
|
||||
{
|
||||
"name": "character_name",
|
||||
"id": 2,
|
||||
"param_type": "String"
|
||||
},
|
||||
{
|
||||
"name": "health",
|
||||
"id": 11,
|
||||
"param_type": "Float"
|
||||
},
|
||||
{
|
||||
"name": "max_health",
|
||||
"id": 12,
|
||||
"param_type": "Float"
|
||||
},
|
||||
{
|
||||
"name": "energy",
|
||||
"id": 15,
|
||||
"param_type": "Float"
|
||||
},
|
||||
{
|
||||
"name": "max_energy",
|
||||
"id": 16,
|
||||
"param_type": "Float"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
+145
-6
@@ -5,21 +5,48 @@ use std::path::Path;
|
||||
|
||||
use serde::{Deserialize};
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[derive(PartialEq, Clone, Deserialize)]
|
||||
enum ParamType
|
||||
{
|
||||
Number
|
||||
Number,
|
||||
Float,
|
||||
String,
|
||||
Items,
|
||||
StringList
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
impl ParamType {
|
||||
fn rust_type(&self) -> &'static str {
|
||||
match self {
|
||||
ParamType::Number => "usize",
|
||||
ParamType::Float => "f32",
|
||||
ParamType::String => "String",
|
||||
ParamType::Items => "Items",
|
||||
ParamType::StringList => "Vec<String>",
|
||||
}
|
||||
}
|
||||
|
||||
fn parse_macro(&self) -> &'static str {
|
||||
match self {
|
||||
ParamType::Number => "decode_number!",
|
||||
ParamType::Float => "decode_float!",
|
||||
ParamType::String => "decode_string!",
|
||||
ParamType::Items => "decode_number_vec!",
|
||||
ParamType::StringList => "decode_string_vec!",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Deserialize)]
|
||||
struct Param
|
||||
{
|
||||
name: String,
|
||||
id: u32,
|
||||
param_type: ParamType
|
||||
param_type: ParamType,
|
||||
optional: Option<bool>
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[derive(Clone, Deserialize)]
|
||||
struct Message
|
||||
{
|
||||
name: String,
|
||||
@@ -27,6 +54,13 @@ struct Message
|
||||
params: Vec<Param>
|
||||
}
|
||||
|
||||
#[derive(Clone, Deserialize)]
|
||||
struct Messages
|
||||
{
|
||||
events: Vec<Message>,
|
||||
responses: Vec<Message>,
|
||||
}
|
||||
|
||||
fn main() {
|
||||
save_file("itemdb.rs", &generate_itemdb());
|
||||
save_file("messages.rs", &generate_messages());
|
||||
@@ -37,13 +71,118 @@ fn generate_messages() -> String {
|
||||
|
||||
out.push_str(r"
|
||||
use log::*;
|
||||
|
||||
use crate::game_protocol::Items;
|
||||
use photon_decode::Parameters;
|
||||
use photon_decode::Value;
|
||||
");
|
||||
|
||||
out.push_str(include_str!("assets/decode_macros.rs"));
|
||||
let messages: Messages = serde_json::from_str(include_str!("assets/messages.json")).expect("Missing assets/messages.json");
|
||||
|
||||
for msg in &[&messages.events[..], &messages.responses[..]].concat() {
|
||||
let mut struct_params = String::new();
|
||||
for param in &msg.params {
|
||||
if param.optional.is_some() {
|
||||
struct_params.push_str(&format!("pub {}: Option<{}>,\n", param.name, param.param_type.rust_type()));
|
||||
} else {
|
||||
struct_params.push_str(&format!("pub {}: {},\n", param.name, param.param_type.rust_type()));
|
||||
}
|
||||
}
|
||||
|
||||
out.push_str(&format!(r###"
|
||||
#[derive(Debug)]
|
||||
pub struct {} {{
|
||||
{}
|
||||
}}
|
||||
"###, msg.name, struct_params));
|
||||
|
||||
|
||||
let mut parse_body = String::new();
|
||||
for param in &msg.params {
|
||||
if param.param_type == ParamType::Items {
|
||||
parse_body.push_str(&format!("let {} = {}(val, {}, \"{}::{0}\")?;\n", "item_array", param.param_type.parse_macro(), param.id, msg.name));
|
||||
parse_body.push_str(&format!("let items = Items::from(&item_array);\n"));
|
||||
} else {
|
||||
if param.optional.is_some() {
|
||||
parse_body.push_str(&format!("let {} = {}(val, {}, \"{}::{0}\");\n", param.name, param.param_type.parse_macro(), param.id, msg.name));
|
||||
} else {
|
||||
parse_body.push_str(&format!("let {} = {}(val, {}, \"{}::{0}\")?;\n", param.name, param.param_type.parse_macro(), param.id, msg.name));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
let mut param_names = String::new();
|
||||
for param in &msg.params {
|
||||
param_names.push_str(&format!("{}, ", param.name));
|
||||
}
|
||||
|
||||
out.push_str(&format!(r###"
|
||||
impl {0} {{
|
||||
pub fn parse(val: Parameters) -> Option<Message> {{
|
||||
info!("{0} parameters: {{:?}}", val);
|
||||
{1}
|
||||
|
||||
Some(Message::{0}({0} {{ {2} }}))
|
||||
}}
|
||||
}}
|
||||
"###, msg.name, parse_body, param_names));
|
||||
}
|
||||
|
||||
out.push_str("#[derive(Debug)]\n");
|
||||
out.push_str("pub enum Message {\n");
|
||||
for msg in &[&messages.events[..], &messages.responses[..]].concat() {
|
||||
out.push_str(&format!(r###"
|
||||
{0}({0}),"###, msg.name));
|
||||
}
|
||||
out.push_str("}");
|
||||
|
||||
let mut event_matches = String::new();
|
||||
let mut responses_matches = String::new();
|
||||
|
||||
for msg in &messages.events {
|
||||
event_matches.push_str(&format!("Some(photon_decode::Value::Short({})) => {}::parse(parameters),\n", msg.code, msg.name));
|
||||
}
|
||||
|
||||
for msg in &messages.responses {
|
||||
responses_matches.push_str(&format!("Some(photon_decode::Value::Short({})) => {}::parse(parameters),\n", msg.code, msg.name));
|
||||
}
|
||||
|
||||
out.push_str(&format!(r###"
|
||||
pub fn into_game_message(photon_message: photon_decode::Message) -> Option<Message> {{
|
||||
match photon_message {{
|
||||
photon_decode::Message::Event(photon_decode::EventData{{
|
||||
code: 1,
|
||||
parameters
|
||||
}}) => {{
|
||||
match parameters.get(&252u8) {{
|
||||
{}
|
||||
_ => None
|
||||
}}
|
||||
}},
|
||||
photon_decode::Message::Request(photon_decode::OperationRequest{{
|
||||
code: 1,
|
||||
parameters
|
||||
}}) => {{
|
||||
match parameters.get(&253u8) {{
|
||||
_ => None
|
||||
}}
|
||||
}},
|
||||
photon_decode::Message::Response(photon_decode::OperationResponse{{
|
||||
code: 1,
|
||||
parameters,
|
||||
return_code: _,
|
||||
debug_message: _
|
||||
}}) => {{
|
||||
match parameters.get(&253u8) {{
|
||||
{}
|
||||
_ => None
|
||||
}}
|
||||
}},
|
||||
_ => None
|
||||
}}
|
||||
}}
|
||||
"###, event_matches, responses_matches));
|
||||
out
|
||||
}
|
||||
|
||||
|
||||
+2
-41
@@ -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::*;
|
||||
|
||||
@@ -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")?;
|
||||
@@ -393,25 +389,3 @@ pub enum Message {
|
||||
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,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)]
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
use photon_decode::Parameters;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct Packet {
|
||||
pub code: usize,
|
||||
pub parameters: Parameters
|
||||
}
|
||||
Reference in New Issue
Block a user