Browse Source

Merge pull request 'boss warp msg' (#30) from bosswarp into master

Reviewed-on: #30
master
jake 1 year ago
parent
commit
55f46d867c
  1. 9
      src/packet/messages.rs

9
src/packet/messages.rs

@ -536,6 +536,12 @@ pub struct NpcSpawn {
data: [u8; 8],
}
#[pso_message(0x6A)]
pub struct ActivateBossWarp {
unknown: u32,
}
#[pso_message(0x6F)]
pub struct PlayerJoiningGame {
data: [u32; 0x81],
@ -1171,6 +1177,7 @@ pub enum GameMessage {
SpawningMonsters(SpawningMonsters),
PlayerTelepipe(PlayerTelepipe),
NpcSpawn(NpcSpawn),
ActivateBossWarp(ActivateBossWarp),
PlayerJoiningGame(PlayerJoiningGame),
PlayerJoiningGame2(PlayerJoiningGame2),
BurstDone(BurstDone),
@ -1338,6 +1345,7 @@ impl PSOPacketData for GameMessage {
SpawningMonsters::CMD => Ok(GameMessage::SpawningMonsters(SpawningMonsters::from_bytes(&mut cur)?)),
PlayerTelepipe::CMD => Ok(GameMessage::PlayerTelepipe(PlayerTelepipe::from_bytes(&mut cur)?)),
NpcSpawn::CMD => Ok(GameMessage::NpcSpawn(NpcSpawn::from_bytes(&mut cur)?)),
ActivateBossWarp::CMD => Ok(GameMessage::ActivateBossWarp(ActivateBossWarp::from_bytes(&mut cur)?)),
PlayerJoiningGame::CMD => Ok(GameMessage::PlayerJoiningGame(PlayerJoiningGame::from_bytes(&mut cur)?)),
PlayerJoiningGame2::CMD => Ok(GameMessage::PlayerJoiningGame2(PlayerJoiningGame2::from_bytes(&mut cur)?)),
BurstDone::CMD => Ok(GameMessage::BurstDone(BurstDone::from_bytes(&mut cur)?)),
@ -1507,6 +1515,7 @@ impl PSOPacketData for GameMessage {
GameMessage::SpawningMonsters(data) => data.as_bytes(),
GameMessage::PlayerTelepipe(data) => data.as_bytes(),
GameMessage::NpcSpawn(data) => data.as_bytes(),
GameMessage::ActivateBossWarp(data) => data.as_bytes(),
GameMessage::PlayerJoiningGame(data) => data.as_bytes(),
GameMessage::PlayerJoiningGame2(data) => data.as_bytes(),
GameMessage::BurstDone(data) => data.as_bytes(),

Loading…
Cancel
Save