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

traps #5

Merged
jake merged 3 commits from traps into master 2021-06-20 11:35:16 -04:00
Conversation 1 Commits 3 Files Changed 1 +8 -8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dbfb396643 - Show all commits

16
src/packet/messages.rs
View File

@ -561,6 +561,11 @@ pub struct KillMonster {
//}
#[pso_message(0x80)]
pub struct PlayerTrapActivate {
data: [u8; 4],
}
#[pso_message(0x83)]
pub struct PlayerTrapSet {
trap_type: u16,
@ -572,11 +577,6 @@ pub struct PlayerTrapSet {
//}
//#[pso_message(0x80)]
//pub struct PlayerTrapActivate {
//}
//#[pso_message(0x87)]
//pub struct PlayerShrink {
@ -1042,7 +1042,7 @@ pub enum GameMessage {
//BmodeData(BmodeData),
PlayerTrapSet(PlayerTrapSet),
//Unknown84(Unknown84),
//PlayerTrapActivate(PlayerTrapActivate),
PlayerTrapActivate(PlayerTrapActivate),
//PlayerShrink(PlayerShrink),
//PlayerUnshrink(PlayerUnshrink),
PlayerKilledByMonster(PlayerKilledByMonster),
@ -1207,7 +1207,7 @@ impl PSOPacketData for GameMessage {
//BmodeData::CMD => Ok(GameMessage::BmodeData(BmodeData::from_bytes(&mut cur)?)),
PlayerTrapSet::CMD => Ok(GameMessage::PlayerTrapSet(PlayerTrapSet::from_bytes(&mut cur)?)),
//Unknown84::CMD => Ok(GameMessage::Unknown84(Unknown84::from_bytes(&mut cur)?)),
//PlayerTrapActivate::CMD => Ok(GameMessage::PlayerTrapActivate(PlayerTrapActivate::from_bytes(&mut cur)?)),
PlayerTrapActivate::CMD => Ok(GameMessage::PlayerTrapActivate(PlayerTrapActivate::from_bytes(&mut cur)?)),
//PlayerShrink::CMD => Ok(GameMessage::PlayerShrink(PlayerShrink::from_bytes(&mut cur)?)),
//PlayerUnshrink::CMD => Ok(GameMessage::PlayerUnshrink(PlayerUnshrink::from_bytes(&mut cur)?)),
PlayerKilledByMonster::CMD => Ok(GameMessage::PlayerKilledByMonster(PlayerKilledByMonster::from_bytes(&mut cur)?)),
@ -1374,7 +1374,7 @@ impl PSOPacketData for GameMessage {
//GameMessage::BmodeData(data) => data.as_bytes(),
GameMessage::PlayerTrapSet(data) => data.as_bytes(),
//GameMessage::Unknown84(data) => data.as_bytes(),
//GameMessage::PlayerTrapActivate(data) => data.as_bytes(),
GameMessage::PlayerTrapActivate(data) => data.as_bytes(),
//GameMessage::PlayerShrink(data) => data.as_bytes(),
//GameMessage::PlayerUnshrink(data) => data.as_bytes(),
GameMessage::PlayerKilledByMonster(data) => data.as_bytes(),