Browse Source

Merge pull request 'box drop packet' (#33) from box_drops into master

Reviewed-by: jake <jake@sharnoth.com>
pull/3/head
jake 5 years ago
parent
commit
d8b6953edb
  1. 20
      src/packet/messages.rs

20
src/packet/messages.rs

@ -633,10 +633,16 @@ pub struct ModifyPlayerStats {
//} //}
//#[pso_message(0xA2)]
//pub struct BoxDropRequest {
//}
#[pso_message(0xA2)]
pub struct BoxDropRequest {
pub area: u8,
pub unknown1: u8,
pub object_id: u16,
pub x: f32,
pub z: f32,
pub section: u8,
pub unknown2: [u8; 23],
}
//#[pso_message(0xA3)] //#[pso_message(0xA3)]
//pub struct BossInteractionOlgaFlow { //pub struct BossInteractionOlgaFlow {
@ -1016,7 +1022,7 @@ pub enum GameMessage {
//CmodePartyWipe(CmodePartyWipe), //CmodePartyWipe(CmodePartyWipe),
//BossInteractionGalGryphon(BossInteractionGalGryphon), //BossInteractionGalGryphon(BossInteractionGalGryphon),
//PlayerMoonAtomizerResurrection(PlayerMoonAtomizerResurrection), //PlayerMoonAtomizerResurrection(PlayerMoonAtomizerResurrection),
//BoxDropRequest(BoxDropRequest),
BoxDropRequest(BoxDropRequest),
//BossInteractionOlgaFlow(BossInteractionOlgaFlow), //BossInteractionOlgaFlow(BossInteractionOlgaFlow),
//BossInteractionOlgaFlow2(BossInteractionOlgaFlow2), //BossInteractionOlgaFlow2(BossInteractionOlgaFlow2),
//BossInteractionOlgaFlow3(BossInteractionOlgaFlow3), //BossInteractionOlgaFlow3(BossInteractionOlgaFlow3),
@ -1178,7 +1184,7 @@ impl PSOPacketData for GameMessage {
//CmodePartyWipe::CMD => Ok(GameMessage::CmodePartyWipe(CmodePartyWipe::from_bytes(&mut cur)?)), //CmodePartyWipe::CMD => Ok(GameMessage::CmodePartyWipe(CmodePartyWipe::from_bytes(&mut cur)?)),
//BossInteractionGalGryphon::CMD => Ok(GameMessage::BossInteractionGalGryphon(BossInteractionGalGryphon::from_bytes(&mut cur)?)), //BossInteractionGalGryphon::CMD => Ok(GameMessage::BossInteractionGalGryphon(BossInteractionGalGryphon::from_bytes(&mut cur)?)),
//PlayerMoonAtomizerResurrection::CMD => Ok(GameMessage::PlayerMoonAtomizerResurrection(PlayerMoonAtomizerResurrection::from_bytes(&mut cur)?)), //PlayerMoonAtomizerResurrection::CMD => Ok(GameMessage::PlayerMoonAtomizerResurrection(PlayerMoonAtomizerResurrection::from_bytes(&mut cur)?)),
//BoxDropRequest::CMD => Ok(GameMessage::BoxDropRequest(BoxDropRequest::from_bytes(&mut cur)?)),
BoxDropRequest::CMD => Ok(GameMessage::BoxDropRequest(BoxDropRequest::from_bytes(&mut cur)?)),
//BossInteractionOlgaFlow::CMD => Ok(GameMessage::BossInteractionOlgaFlow(BossInteractionOlgaFlow::from_bytes(&mut cur)?)), //BossInteractionOlgaFlow::CMD => Ok(GameMessage::BossInteractionOlgaFlow(BossInteractionOlgaFlow::from_bytes(&mut cur)?)),
//BossInteractionOlgaFlow2::CMD => Ok(GameMessage::BossInteractionOlgaFlow2(BossInteractionOlgaFlow2::from_bytes(&mut cur)?)), //BossInteractionOlgaFlow2::CMD => Ok(GameMessage::BossInteractionOlgaFlow2(BossInteractionOlgaFlow2::from_bytes(&mut cur)?)),
//BossInteractionOlgaFlow3::CMD => Ok(GameMessage::BossInteractionOlgaFlow3(BossInteractionOlgaFlow3::from_bytes(&mut cur)?)), //BossInteractionOlgaFlow3::CMD => Ok(GameMessage::BossInteractionOlgaFlow3(BossInteractionOlgaFlow3::from_bytes(&mut cur)?)),
@ -1342,7 +1348,7 @@ impl PSOPacketData for GameMessage {
//GameMessage::CmodePartyWipe(data) => data.as_bytes(), //GameMessage::CmodePartyWipe(data) => data.as_bytes(),
//GameMessage::BossInteractionGalGryphon(data) => data.as_bytes(), //GameMessage::BossInteractionGalGryphon(data) => data.as_bytes(),
//GameMessage::PlayerMoonAtomizerResurrection(data) => data.as_bytes(), //GameMessage::PlayerMoonAtomizerResurrection(data) => data.as_bytes(),
//GameMessage::BoxDropRequest(data) => data.as_bytes(),
GameMessage::BoxDropRequest(data) => data.as_bytes(),
//GameMessage::BossInteractionOlgaFlow(data) => data.as_bytes(), //GameMessage::BossInteractionOlgaFlow(data) => data.as_bytes(),
//GameMessage::BossInteractionOlgaFlow2(data) => data.as_bytes(), //GameMessage::BossInteractionOlgaFlow2(data) => data.as_bytes(),
//GameMessage::BossInteractionOlgaFlow3(data) => data.as_bytes(), //GameMessage::BossInteractionOlgaFlow3(data) => data.as_bytes(),

Loading…
Cancel
Save