jake/libpso
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

lobbyemote and talktonpc messages

Browse Source
This commit is contained in:
jake 2019-12-18 21:52:21 -08:00
parent 7f32af6729
commit 9a042e9995
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/packet/messages.rs
View File

@ -70,6 +70,16 @@ pub struct PlayerLoadedIn {
pub struct PlayerDoneChangingMap { pub struct PlayerDoneChangingMap {
} }
#[pso_message(0x52)]
pub struct TalkToNpc {
unknown1: u32,
unknown2: u32,
}
#[pso_message(0x58)]
pub struct LobbyEmote {
emote: u32,
}
#[pso_message(0xAE)] #[pso_message(0xAE)]
pub struct UnknownAE { pub struct UnknownAE {
@ -90,6 +100,8 @@ pub enum GameMessage {
PlayerChangedMap2(PlayerChangedMap2), PlayerChangedMap2(PlayerChangedMap2),
PlayerDoneChangingMap(PlayerDoneChangingMap), PlayerDoneChangingMap(PlayerDoneChangingMap),
TellOtherPlayerMyLocation(TellOtherPlayerMyLocation), TellOtherPlayerMyLocation(TellOtherPlayerMyLocation),
LobbyEmote(LobbyEmote),
TalkToNpc(TalkToNpc),
UnknownAE(UnknownAE), UnknownAE(UnknownAE),
} }
@ -109,6 +121,8 @@ impl PSOPacketData for GameMessage {
PlayerChangedMap2::CMD if len[0] == 2 => Ok(GameMessage::PlayerChangedMap2(PlayerChangedMap2::from_bytes(&mut cur)?)), PlayerChangedMap2::CMD if len[0] == 2 => Ok(GameMessage::PlayerChangedMap2(PlayerChangedMap2::from_bytes(&mut cur)?)),
PlayerDoneChangingMap::CMD => Ok(GameMessage::PlayerDoneChangingMap(PlayerDoneChangingMap::from_bytes(&mut cur)?)), PlayerDoneChangingMap::CMD => Ok(GameMessage::PlayerDoneChangingMap(PlayerDoneChangingMap::from_bytes(&mut cur)?)),
TellOtherPlayerMyLocation::CMD => Ok(GameMessage::TellOtherPlayerMyLocation(TellOtherPlayerMyLocation::from_bytes(&mut cur)?)), TellOtherPlayerMyLocation::CMD => Ok(GameMessage::TellOtherPlayerMyLocation(TellOtherPlayerMyLocation::from_bytes(&mut cur)?)),
LobbyEmote::CMD => Ok(GameMessage::LobbyEmote(LobbyEmote::from_bytes(&mut cur)?)),
TalkToNpc::CMD => Ok(GameMessage::TalkToNpc(TalkToNpc::from_bytes(&mut cur)?)),
UnknownAE::CMD => Ok(GameMessage::UnknownAE(UnknownAE::from_bytes(&mut cur)?)), UnknownAE::CMD => Ok(GameMessage::UnknownAE(UnknownAE::from_bytes(&mut cur)?)),
_ => Err(PacketParseError::UnknownMessage(byte[0], _ => Err(PacketParseError::UnknownMessage(byte[0],
{ {
@ -129,6 +143,8 @@ impl PSOPacketData for GameMessage {
GameMessage::PlayerChangedMap2(data) => data.as_bytes(), GameMessage::PlayerChangedMap2(data) => data.as_bytes(),
GameMessage::PlayerDoneChangingMap(data) => data.as_bytes(), GameMessage::PlayerDoneChangingMap(data) => data.as_bytes(),
GameMessage::TellOtherPlayerMyLocation(data) => data.as_bytes(), GameMessage::TellOtherPlayerMyLocation(data) => data.as_bytes(),
GameMessage::LobbyEmote(data) => data.as_bytes(),
GameMessage::TalkToNpc(data) => data.as_bytes(),
GameMessage::UnknownAE(data) => data.as_bytes(), GameMessage::UnknownAE(data) => data.as_bytes(),
} }
} }