Merge pull request 'boss warp msg' (#30) from bosswarp into master
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #30
This commit is contained in:
commit
55f46d867c
@ -536,6 +536,12 @@ pub struct NpcSpawn {
|
|||||||
data: [u8; 8],
|
data: [u8; 8],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#[pso_message(0x6A)]
|
||||||
|
pub struct ActivateBossWarp {
|
||||||
|
unknown: u32,
|
||||||
|
}
|
||||||
|
|
||||||
#[pso_message(0x6F)]
|
#[pso_message(0x6F)]
|
||||||
pub struct PlayerJoiningGame {
|
pub struct PlayerJoiningGame {
|
||||||
data: [u32; 0x81],
|
data: [u32; 0x81],
|
||||||
@ -1171,6 +1177,7 @@ pub enum GameMessage {
|
|||||||
SpawningMonsters(SpawningMonsters),
|
SpawningMonsters(SpawningMonsters),
|
||||||
PlayerTelepipe(PlayerTelepipe),
|
PlayerTelepipe(PlayerTelepipe),
|
||||||
NpcSpawn(NpcSpawn),
|
NpcSpawn(NpcSpawn),
|
||||||
|
ActivateBossWarp(ActivateBossWarp),
|
||||||
PlayerJoiningGame(PlayerJoiningGame),
|
PlayerJoiningGame(PlayerJoiningGame),
|
||||||
PlayerJoiningGame2(PlayerJoiningGame2),
|
PlayerJoiningGame2(PlayerJoiningGame2),
|
||||||
BurstDone(BurstDone),
|
BurstDone(BurstDone),
|
||||||
@ -1338,6 +1345,7 @@ impl PSOPacketData for GameMessage {
|
|||||||
SpawningMonsters::CMD => Ok(GameMessage::SpawningMonsters(SpawningMonsters::from_bytes(&mut cur)?)),
|
SpawningMonsters::CMD => Ok(GameMessage::SpawningMonsters(SpawningMonsters::from_bytes(&mut cur)?)),
|
||||||
PlayerTelepipe::CMD => Ok(GameMessage::PlayerTelepipe(PlayerTelepipe::from_bytes(&mut cur)?)),
|
PlayerTelepipe::CMD => Ok(GameMessage::PlayerTelepipe(PlayerTelepipe::from_bytes(&mut cur)?)),
|
||||||
NpcSpawn::CMD => Ok(GameMessage::NpcSpawn(NpcSpawn::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)?)),
|
PlayerJoiningGame::CMD => Ok(GameMessage::PlayerJoiningGame(PlayerJoiningGame::from_bytes(&mut cur)?)),
|
||||||
PlayerJoiningGame2::CMD => Ok(GameMessage::PlayerJoiningGame2(PlayerJoiningGame2::from_bytes(&mut cur)?)),
|
PlayerJoiningGame2::CMD => Ok(GameMessage::PlayerJoiningGame2(PlayerJoiningGame2::from_bytes(&mut cur)?)),
|
||||||
BurstDone::CMD => Ok(GameMessage::BurstDone(BurstDone::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::SpawningMonsters(data) => data.as_bytes(),
|
||||||
GameMessage::PlayerTelepipe(data) => data.as_bytes(),
|
GameMessage::PlayerTelepipe(data) => data.as_bytes(),
|
||||||
GameMessage::NpcSpawn(data) => data.as_bytes(),
|
GameMessage::NpcSpawn(data) => data.as_bytes(),
|
||||||
|
GameMessage::ActivateBossWarp(data) => data.as_bytes(),
|
||||||
GameMessage::PlayerJoiningGame(data) => data.as_bytes(),
|
GameMessage::PlayerJoiningGame(data) => data.as_bytes(),
|
||||||
GameMessage::PlayerJoiningGame2(data) => data.as_bytes(),
|
GameMessage::PlayerJoiningGame2(data) => data.as_bytes(),
|
||||||
GameMessage::BurstDone(data) => data.as_bytes(),
|
GameMessage::BurstDone(data) => data.as_bytes(),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user